Normalize testcase format

This commit normalizes the test case format used across test262. It applies the following transformations:

* Convert to YAML for frontmatter
* Remove of trailing whitespace
* Replace /r/n with /n except in chapters 6 and 7.
* Copyright header always uses // comments
* new includes attribute replaces $INCLUDE
* No implicit assumptions about test environment other than $ERROR. Everything else appears in the include array. This includes "runTestCase" which is now included in a substantial number of tests.

11824 files changed, 215629 insertions, 212118 deletions

diff --git a/test/suite/annexB/B.2.1.js b/test/suite/annexB/B.2.1.js
index 89754a48c..1b86820ca 100644
--- a/test/suite/annexB/B.2.1.js
+++ b/test/suite/annexB/B.2.1.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.1.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.escape)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global, "escape");

-  if (desc.value === global.escape &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.escape)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global, "escape");
+  if (desc.value === global.escape &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.1.propertyCheck.js b/test/suite/annexB/B.2.1.propertyCheck.js
index cadef9877..a3262b8bd 100644
--- a/test/suite/annexB/B.2.1.propertyCheck.js
+++ b/test/suite/annexB/B.2.1.propertyCheck.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path annexB/B.2.1.propertyCheck.js
- * @description Checking properties of this object (escape)
- */
+/*---
+info: Check type of various properties
+description: Checking properties of this object (escape)
+---*/
 
 if (typeof this.escape  === "undefined")  $ERROR('#1: typeof this.escape !== "undefined"');
 if (typeof this['escape'] === "undefined")  $ERROR('#2: typeof this["escape"] !== "undefined"');
diff --git a/test/suite/annexB/B.2.2.js b/test/suite/annexB/B.2.2.js
index 987a0d651..18e9abc6e 100644
--- a/test/suite/annexB/B.2.2.js
+++ b/test/suite/annexB/B.2.2.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.2.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.unescape)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "unescape");

-  if (desc.value === global.unescape &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.unescape)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "unescape");
+  if (desc.value === global.unescape &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.2.propertyCheck.js b/test/suite/annexB/B.2.2.propertyCheck.js
index be9cac6a7..3104670f0 100644
--- a/test/suite/annexB/B.2.2.propertyCheck.js
+++ b/test/suite/annexB/B.2.2.propertyCheck.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path annexB/B.2.2.propertyCheck.js
- * @description Checking properties of this object (unescape)
- */
+/*---
+info: Check type of various properties
+description: Checking properties of this object (unescape)
+---*/
 
 if (typeof this.unescape  === "undefined")  $ERROR('#1: typeof this.unescape !== "undefined"');
 if (typeof this['unescape'] === "undefined")  $ERROR('#2: typeof this["unescape"] !== "undefined"');
diff --git a/test/suite/annexB/B.2.3.js b/test/suite/annexB/B.2.3.js
index 538cc16fc..b08f4bf16 100644
--- a/test/suite/annexB/B.2.3.js
+++ b/test/suite/annexB/B.2.3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.3.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.substr)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "substr");

-  if (desc.value === String.prototype.substr &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.substr)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "substr");
+  if (desc.value === String.prototype.substr &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.4.js b/test/suite/annexB/B.2.4.js
index 252c6c151..d745bc4d5 100644
--- a/test/suite/annexB/B.2.4.js
+++ b/test/suite/annexB/B.2.4.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.4.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getYear");

-  if (desc.value === Date.prototype.getYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getYear");
+  if (desc.value === Date.prototype.getYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.4.propertyCheck.js b/test/suite/annexB/B.2.4.propertyCheck.js
index 959c8b7da..e0a7f1a1d 100644
--- a/test/suite/annexB/B.2.4.propertyCheck.js
+++ b/test/suite/annexB/B.2.4.propertyCheck.js
@@ -1,15 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path annexB/B.2.4.propertyCheck.js
- * @description Checking properties of the Date object (getYear)
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Date object (getYear)
+---*/
 
 if (typeof Date.prototype.getYear !== "function")  $ERROR('#1: typeof Date.prototype.getYear === "function". Actual: ' + (typeof Date.prototype.getYear ));
 if (typeof Date.prototype['getYear'] !== "function")  $ERROR('#2: typeof Date.prototype["getYear"] === "function". Actual: ' + (typeof Date.prototype["getYear"] ));
-
-
-
diff --git a/test/suite/annexB/B.2.5.js b/test/suite/annexB/B.2.5.js
index 7754c221d..a977fd5c8 100644
--- a/test/suite/annexB/B.2.5.js
+++ b/test/suite/annexB/B.2.5.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.5.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setYear");

-  if (desc.value === Date.prototype.setYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setYear");
+  if (desc.value === Date.prototype.setYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.5.propertyCheck.js b/test/suite/annexB/B.2.5.propertyCheck.js
index 2af44c251..562a8ade2 100644
--- a/test/suite/annexB/B.2.5.propertyCheck.js
+++ b/test/suite/annexB/B.2.5.propertyCheck.js
@@ -1,15 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path annexB/B.2.5.propertyCheck.js
- * @description Checking properties of the Date object (setYear)
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Date object (setYear)
+---*/
 
 if (typeof Date.prototype.setYear !== "function")  $ERROR('#1: typeof Date.prototype.setYear === "function". Actual: ' + (typeof Date.prototype.setYear ));
 if (typeof Date.prototype['setYear'] !== "function")  $ERROR('#2: typeof Date.prototype["setYear"] === "function". Actual: ' + (typeof Date.prototype["setYear"] ));
-
-
-
diff --git a/test/suite/annexB/B.2.6.js b/test/suite/annexB/B.2.6.js
index 84a223a7a..b767a50f8 100644
--- a/test/suite/annexB/B.2.6.js
+++ b/test/suite/annexB/B.2.6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path annexB/B.2.6.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toGMTString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toGMTString");

-  if (desc.value === Date.prototype.toGMTString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toGMTString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toGMTString");
+  if (desc.value === Date.prototype.toGMTString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/annexB/B.2.6.propertyCheck.js b/test/suite/annexB/B.2.6.propertyCheck.js
index 339ee5367..82676c804 100644
--- a/test/suite/annexB/B.2.6.propertyCheck.js
+++ b/test/suite/annexB/B.2.6.propertyCheck.js
@@ -1,16 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path annexB/B.2.6.propertyCheck.js
- * @description Checking properties of the Date object (toGMTString)
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Date object (toGMTString)
+---*/
 
 if (typeof Date.prototype.toGMTString !== "function")  $ERROR('#1: typeof Date.prototype.toGMTString === "function". Actual: ' + (typeof Date.prototype.toGMTString ));
 if (typeof Date.prototype['toGMTString'] !== "function")  $ERROR('#2: typeof Date.prototype["toGMTString"] === "function". Actual: ' + (typeof Date.prototype["toGMTString"] ));
-
-
-
-
diff --git a/test/suite/annexB/B.RegExp.prototype.compile.js b/test/suite/annexB/B.RegExp.prototype.compile.js
index 1be3e70c9..43ce91ff7 100644
--- a/test/suite/annexB/B.RegExp.prototype.compile.js
+++ b/test/suite/annexB/B.RegExp.prototype.compile.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path test/suite/annexB/B.RegExp.prototype.compile.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RegExp.prototype.compile)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "compile");

-  if (desc.value === RegExp.prototype.compile &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RegExp.prototype.compile)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "compile");
+  if (desc.value === RegExp.prototype.compile &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/bestPractice/Sbp_12.5_A9_T3.js b/test/suite/bestPractice/Sbp_12.5_A9_T3.js
index e9cbb0eb3..b66b91d74 100644
--- a/test/suite/bestPractice/Sbp_12.5_A9_T3.js
+++ b/test/suite/bestPractice/Sbp_12.5_A9_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration within an "if" statement is not allowed
- *
- * @path bestPractice/Sbp_12.5_A9_T3.js
- * @description Declaring function within an "if" statement that is declared within the function declaration
- * @negative
- */
+/*---
+info: Function declaration within an "if" statement is not allowed
+description: >
+    Declaring function within an "if" statement that is declared
+    within the function declaration
+flags: [negative]
+---*/
 
 function(){
 
@@ -18,4 +18,3 @@ if (true) {
 }
 
 };
-
diff --git a/test/suite/bestPractice/Sbp_12.6.1_A13_T3.js b/test/suite/bestPractice/Sbp_12.6.1_A13_T3.js
index 943aa2182..65cb3331b 100644
--- a/test/suite/bestPractice/Sbp_12.6.1_A13_T3.js
+++ b/test/suite/bestPractice/Sbp_12.6.1_A13_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "do-while" Block is not allowed
- *
- * @path bestPractice/Sbp_12.6.1_A13_T3.js
- * @description Declaring a function within a "do-while" loop that is within a function declaration itself
- * @negative
- */
+/*---
+info: FunctionDeclaration within a "do-while" Block is not allowed
+description: >
+    Declaring a function within a "do-while" loop that is within a
+    function declaration itself
+flags: [negative]
+---*/
 
 function(){
 
@@ -16,4 +16,3 @@ do{
 }while(0);
 
 };
-
diff --git a/test/suite/bestPractice/Sbp_12.6.2_A13_T3.js b/test/suite/bestPractice/Sbp_12.6.2_A13_T3.js
index 17bfdab66..cc6a2e1c7 100644
--- a/test/suite/bestPractice/Sbp_12.6.2_A13_T3.js
+++ b/test/suite/bestPractice/Sbp_12.6.2_A13_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "while" Statement is not allowed
- *
- * @path bestPractice/Sbp_12.6.2_A13_T3.js
- * @description Checking if declaring a function within a "while" Statement that is in a function body leads to an exception
- * @negative
- */
+/*---
+info: FunctionDeclaration within a "while" Statement is not allowed
+description: >
+    Checking if declaring a function within a "while" Statement that
+    is in a function body leads to an exception
+flags: [negative]
+---*/
 
 function(){
 
@@ -16,4 +16,3 @@ while(0){
 };
 
 };
-
diff --git a/test/suite/bestPractice/Sbp_12.6.4_A13_T3.js b/test/suite/bestPractice/Sbp_12.6.4_A13_T3.js
index f76366167..1da0487f6 100644
--- a/test/suite/bestPractice/Sbp_12.6.4_A13_T3.js
+++ b/test/suite/bestPractice/Sbp_12.6.4_A13_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "for-in" Statement is not allowed
- *
- * @path bestPractice/Sbp_12.6.4_A13_T3.js
- * @description Declaring function within a "for-in" Statement that is within function declaration
- * @negative
- */
+/*---
+info: FunctionDeclaration within a "for-in" Statement is not allowed
+description: >
+    Declaring function within a "for-in" Statement that is within
+    function declaration
+flags: [negative]
+---*/
 
 function(){
 
@@ -16,4 +16,3 @@ for(x in this){
 };
 
 };
-
diff --git a/test/suite/bestPractice/Sbp_7.8.4_A6.1_T4.js b/test/suite/bestPractice/Sbp_7.8.4_A6.1_T4.js
index d426efc57..ec504c503 100644
--- a/test/suite/bestPractice/Sbp_7.8.4_A6.1_T4.js
+++ b/test/suite/bestPractice/Sbp_7.8.4_A6.1_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path bestPractice/Sbp_7.8.4_A6.1_T4.js
- * @description HexEscapeSequence :: x0G is incorrect
- * @negative
- */
+/*---
+info: "EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit"
+description: "HexEscapeSequence :: x0G is incorrect"
+flags: [negative]
+---*/
 
 //CHECK#
 "\x0G"
-
diff --git a/test/suite/bestPractice/Sbp_7.8.4_A6.2_T1.js b/test/suite/bestPractice/Sbp_7.8.4_A6.2_T1.js
index 5a3612621..517eb0093 100644
--- a/test/suite/bestPractice/Sbp_7.8.4_A6.2_T1.js
+++ b/test/suite/bestPractice/Sbp_7.8.4_A6.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HexEscapeSequence :: x HexDigit is incorrect
- *
- * @path bestPractice/Sbp_7.8.4_A6.2_T1.js
- * @description HexDigit :: 1
- * @negative
- */
+/*---
+info: "HexEscapeSequence :: x HexDigit is incorrect"
+description: "HexDigit :: 1"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\x1"
-
diff --git a/test/suite/bestPractice/Sbp_7.8.4_A6.2_T2.js b/test/suite/bestPractice/Sbp_7.8.4_A6.2_T2.js
index 0513fac65..f8193f2a4 100644
--- a/test/suite/bestPractice/Sbp_7.8.4_A6.2_T2.js
+++ b/test/suite/bestPractice/Sbp_7.8.4_A6.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HexEscapeSequence :: x HexDigit is incorrect
- *
- * @path bestPractice/Sbp_7.8.4_A6.2_T2.js
- * @description HexDigit :: A
- * @negative
- */
+/*---
+info: "HexEscapeSequence :: x HexDigit is incorrect"
+description: "HexDigit :: A"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\xA"
-
diff --git a/test/suite/bestPractice/Sbp_7.9_A9_T3.js b/test/suite/bestPractice/Sbp_7.9_A9_T3.js
index 4a0eb188f..a1d72919b 100644
--- a/test/suite/bestPractice/Sbp_7.9_A9_T3.js
+++ b/test/suite/bestPractice/Sbp_7.9_A9_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path bestPractice/Sbp_7.9_A9_T3.js
- * @description Execute do { \n ; \n }while(false) true
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do { \n ; \n }while(false) true
+---*/
 
 //CHECK#1
 do {
   ;
 } while (false) true
-
diff --git a/test/suite/bestPractice/Sbp_7.9_A9_T4.js b/test/suite/bestPractice/Sbp_7.9_A9_T4.js
index 76f3f6b3a..2f41ee39d 100644
--- a/test/suite/bestPractice/Sbp_7.9_A9_T4.js
+++ b/test/suite/bestPractice/Sbp_7.9_A9_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path bestPractice/Sbp_7.9_A9_T4.js
- * @description Execute do ; while \n (false) true
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do ; while \n (false) true
+---*/
 
 //CHECK#1
 do ; while 
 (false) true
-
diff --git a/test/suite/bestPractice/Sbp_A10_T1.js b/test/suite/bestPractice/Sbp_A10_T1.js
index 76647e724..d12572491 100644
--- a/test/suite/bestPractice/Sbp_A10_T1.js
+++ b/test/suite/bestPractice/Sbp_A10_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path bestPractice/Sbp_A10_T1.js
- * @description Built-in functions should not have a non-deletable,
- * non-poisoned "caller" property.
- * @bestPractice
- * http://wiki.ecmascript.org/doku.php?id=conventions:make_non-standard_properties_configurable
- */
+/*---
+description: >
+    Built-in functions should not have a non-deletable,  non-poisoned
+    "caller" property.
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:make_non-standard_properties_configurable"
+---*/
 
 (function() {
    var map = Array.prototype.map;
@@ -43,4 +42,4 @@
      $ERROR('#2: Built-in revealed caller');
    }
    $ERROR('#3: Unexpected "caller": ' + caller);
-})();
\ No newline at end of file
+})();
diff --git a/test/suite/bestPractice/Sbp_A10_T2.js b/test/suite/bestPractice/Sbp_A10_T2.js
index 6037a5ea3..7d7eb2071 100644
--- a/test/suite/bestPractice/Sbp_A10_T2.js
+++ b/test/suite/bestPractice/Sbp_A10_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path bestPractice/Sbp_A10_T2.js
- * @description Built-in functions should not have a non-deletable,
- * non-poisoned "arguments" property.
- * @bestPractice
- * http://wiki.ecmascript.org/doku.php?id=conventions:make_non-standard_properties_configurable
- */
+/*---
+description: >
+    Built-in functions should not have a non-deletable,  non-poisoned
+    "arguments" property.
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:make_non-standard_properties_configurable"
+---*/
 
 (function() {
    var map = Array.prototype.map;
diff --git a/test/suite/bestPractice/Sbp_A1_T1.js b/test/suite/bestPractice/Sbp_A1_T1.js
index ff41177c5..409a74c51 100644
--- a/test/suite/bestPractice/Sbp_A1_T1.js
+++ b/test/suite/bestPractice/Sbp_A1_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Block { } in strict code can't contain function
- * declaration;
- *
- * @path bestPractice/Sbp_A1_T1.js
- * @description Trying to declare function at the Block statement
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: >
+    The production Block { } in strict code can't contain function
+    declaration;
+description: Trying to declare function at the Block statement
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 {
     function __func(){}
 }
-
diff --git a/test/suite/bestPractice/Sbp_A2_T1.js b/test/suite/bestPractice/Sbp_A2_T1.js
index 52d28970d..ed2e11ab5 100644
--- a/test/suite/bestPractice/Sbp_A2_T1.js
+++ b/test/suite/bestPractice/Sbp_A2_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration within an "if" statement in strict code is not
- * allowed
- *
- * @path bestPractice/Sbp_A2_T1.js
- * @description Declaring function within a strict "if" statement
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: >
+    Function declaration within an "if" statement in strict code is not
+    allowed
+description: Declaring function within a strict "if" statement
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 if (true) {
@@ -18,4 +17,3 @@ if (true) {
 } else {
     function __func(){};
 }
-
diff --git a/test/suite/bestPractice/Sbp_A2_T2.js b/test/suite/bestPractice/Sbp_A2_T2.js
index 8fedbf1ce..007ebb4c8 100644
--- a/test/suite/bestPractice/Sbp_A2_T2.js
+++ b/test/suite/bestPractice/Sbp_A2_T2.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration within an "if" statement in strict code is not allowed;
- *
- * @path bestPractice/Sbp_A2_T2.js
- * @description Declaring function within an "if" that is declared
- * within the strict function
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: >
+    Function declaration within an "if" statement in strict code is not
+    allowed;
+description: >
+    Declaring function within an "if" that is declared  within the
+    strict function
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){
@@ -20,4 +21,3 @@
      function __func(){};
    }
 });
-
diff --git a/test/suite/bestPractice/Sbp_A3_T1.js b/test/suite/bestPractice/Sbp_A3_T1.js
index e73dd940d..793f277f4 100644
--- a/test/suite/bestPractice/Sbp_A3_T1.js
+++ b/test/suite/bestPractice/Sbp_A3_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "do-while" Block in strict code is not
- * allowed
- *
- * @path bestPractice/Sbp_A3_T1.js
- * @description Declaring function within a "do-while" loop
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: >
+    FunctionDeclaration within a "do-while" Block in strict code is not
+    allowed
+description: Declaring function within a "do-while" loop
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 do {
     function __func(){};
 } while(0);
-
diff --git a/test/suite/bestPractice/Sbp_A3_T2.js b/test/suite/bestPractice/Sbp_A3_T2.js
index 9d6c6a7de..21139af0d 100644
--- a/test/suite/bestPractice/Sbp_A3_T2.js
+++ b/test/suite/bestPractice/Sbp_A3_T2.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "do-while" Block in strict code is not allowed
- *
- * @path bestPractice/Sbp_A3_T2.js
- * @description Declaring a function within a "do-while" loop that is
- * within a strict function
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: >
+    FunctionDeclaration within a "do-while" Block in strict code is not
+    allowed
+description: >
+    Declaring a function within a "do-while" loop that is  within a
+    strict function
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){
@@ -18,4 +19,3 @@
      function __func(){};
    } while(0);
 });
-
diff --git a/test/suite/bestPractice/Sbp_A4_T1.js b/test/suite/bestPractice/Sbp_A4_T1.js
index 0fdb43897..fa64297be 100644
--- a/test/suite/bestPractice/Sbp_A4_T1.js
+++ b/test/suite/bestPractice/Sbp_A4_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "while" Statement is not allowed
- *
- * @path bestPractice/Sbp_A4_T1.js
- * @description Checking if declaring a function within a "while"
- * Statement leads to an exception
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: FunctionDeclaration within a "while" Statement is not allowed
+description: >
+    Checking if declaring a function within a "while"  Statement leads
+    to an exception
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 while (0) {
     function __func(){};
 };
-
diff --git a/test/suite/bestPractice/Sbp_A4_T2.js b/test/suite/bestPractice/Sbp_A4_T2.js
index c9145fcc4..52e6e76fd 100644
--- a/test/suite/bestPractice/Sbp_A4_T2.js
+++ b/test/suite/bestPractice/Sbp_A4_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "while" Statement is not allowed
- *
- * @path bestPractice/Sbp_A4_T2.js
- * @description Checking if declaring a function within a "while"
- *  Statement that is in a function call leads to an exception
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: FunctionDeclaration within a "while" Statement is not allowed
+description: >
+    Checking if declaring a function within a "while"  Statement that
+    is in a function call leads to an exception
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){
@@ -18,4 +17,3 @@
      function __func(){};
    };
 })();
-
diff --git a/test/suite/bestPractice/Sbp_A5_T1.js b/test/suite/bestPractice/Sbp_A5_T1.js
index b9cf11080..b5b34a01a 100644
--- a/test/suite/bestPractice/Sbp_A5_T1.js
+++ b/test/suite/bestPractice/Sbp_A5_T1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "for-in" Statement is not allowed
- *
- * @path bestPractice/Sbp_A5_T1.js
- * @description Declaring function within a "for-in" Statement
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: FunctionDeclaration within a "for-in" Statement is not allowed
+description: Declaring function within a "for-in" Statement
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 for (x in this) {
     function __func(){};
 }
-
diff --git a/test/suite/bestPractice/Sbp_A5_T2.js b/test/suite/bestPractice/Sbp_A5_T2.js
index 208be598f..d139b8548 100644
--- a/test/suite/bestPractice/Sbp_A5_T2.js
+++ b/test/suite/bestPractice/Sbp_A5_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration within a "for-in" Statement is not allowed
- *
- * @path bestPractice/Sbp_A5_T2.js
- * @description Declaring function within a "for-in" Statement that is
- * within a function call
- * @onlyStrict
- * @negative SyntaxError
- * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
- */
+/*---
+info: FunctionDeclaration within a "for-in" Statement is not allowed
+description: >
+    Declaring function within a "for-in" Statement that is  within a
+    function call
+negative: SyntaxError
+bestPractice: "http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls"
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){
@@ -18,4 +17,3 @@
      function __func(){};
    }
 })();
-
diff --git a/test/suite/ch06/6.1.js b/test/suite/ch06/6.1.js
index f53b105f5..db1116d66 100644
--- a/test/suite/ch06/6.1.js
+++ b/test/suite/ch06/6.1.js
@@ -1,12 +1,12 @@
-// Copyright (c) 2012 Ecma International.  All rights reserved. 
+// Copyright (c) 2012 Ecma International.  All rights reserved.
 // Ecma International makes this code available under the terms and conditions set
-// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-// "Use Terms").   Any redistribution of this code must retain the above 
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
 // copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * @description Test for handling of supplementary characters
- */
+/*---
+description: Test for handling of supplementary characters
+---*/
 
 var chars = "𐒠";  // Single Unicode character at codepoint \u{104A0}
 if(chars.length !== 2) {
diff --git a/test/suite/ch07/7.2/S7.2_A1.1_T1.js b/test/suite/ch07/7.2/S7.2_A1.1_T1.js
index 1c8e5a9ca..69e5f1768 100644
--- a/test/suite/ch07/7.2/S7.2_A1.1_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HORIZONTAL TAB (U+0009) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.1_T1.js
- * @description Insert HORIZONTAL TAB(\u0009 and \t) between tokens of var x=1
- */
+/*---
+info: HORIZONTAL TAB (U+0009) between any two tokens is allowed
+description: Insert HORIZONTAL TAB(\u0009 and \t) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u0009var\u0009x\u0009=\u00091\u0009");
@@ -37,4 +35,3 @@ eval("\u0009" + "var" + "\t" + "x" + "\u0009" + "=" + "\t" + "1" + "\u0009");
 if (x !== 1) {
   $ERROR('#5: eval("\\u0009" + "var" + "\\t" + "x" + "\\u0009" + "=" + "\\t" + "1" + "\\u0009"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.1_T2.js b/test/suite/ch07/7.2/S7.2_A1.1_T2.js
index 081c60ef3..3dbaf225d 100644
--- a/test/suite/ch07/7.2/S7.2_A1.1_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HORIZONTAL TAB (U+0009) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.1_T2.js
- * @description Insert real HORIZONTAL TAB between tokens of var x=1
- */
+/*---
+info: HORIZONTAL TAB (U+0009) between any two tokens is allowed
+description: Insert real HORIZONTAL TAB between tokens of var x=1
+---*/
 
 //CHECK#1
 	var  x	=	1	;
@@ -19,4 +17,3 @@ eval("	var\tx	=\t2	");
 if (x !== 2) {
   $ERROR('#2: 	var\\tx	=\\t1	; x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.2_T1.js b/test/suite/ch07/7.2/S7.2_A1.2_T1.js
index 19be1c7e2..05a5d1e3f 100644
--- a/test/suite/ch07/7.2/S7.2_A1.2_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VERTICAL TAB (U+000B) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.2_T1.js
- * @description Insert VERTICAL TAB(\u000B and \v) between tokens of var x=1
- */
+/*---
+info: VERTICAL TAB (U+000B) between any two tokens is allowed
+description: Insert VERTICAL TAB(\u000B and \v) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u000Bvar\u000Bx\u000B=\u000B1\u000B");
@@ -37,4 +35,3 @@ eval("\u000B" + "var" + "\v" + "x" + "\u000B" + "=" + "\v" + "1" + "\u000B");
 if (x !== 1) {
   $ERROR('#5: eval("\\u000B" + "var" + "\\v" + "x" + "\\u000B" + "=" + "\\v" + "1" + "\\u000B"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.2_T2.js b/test/suite/ch07/7.2/S7.2_A1.2_T2.js
index f5ab425f5..0111344a2 100644
--- a/test/suite/ch07/7.2/S7.2_A1.2_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A1.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VERTICAL TAB (U+000B) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.2_T2.js
- * @description Insert real VERTICAL TAB between tokens of var x=1
- */
+/*---
+info: VERTICAL TAB (U+000B) between any two tokens is allowed
+description: Insert real VERTICAL TAB between tokens of var x=1
+---*/
 
 //CHECK#1
 varx=1;
@@ -19,5 +17,3 @@ eval("var\vx=\v1");
 if (x !== 1) {
   $ERROR('#2: var\\vx=\\v1; x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.3_T1.js b/test/suite/ch07/7.2/S7.2_A1.3_T1.js
index eb8c2f85c..01450895f 100644
--- a/test/suite/ch07/7.2/S7.2_A1.3_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FORM FEED (U+000C) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.3_T1.js
- * @description Insert FORM FEED(\u000C and \f) between tokens of var x=1
- */
+/*---
+info: FORM FEED (U+000C) between any two tokens is allowed
+description: Insert FORM FEED(\u000C and \f) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u000Cvar\u000Cx\u000C=\u000C1\u000C");
@@ -37,4 +35,3 @@ eval("\u000C" + "var" + "\f" + "x" + "\u000C" + "=" + "\f" + "1" + "\u000C");
 if (x !== 1) {
   $ERROR('#5: eval("\\u000C" + "var" + "\\f" + "x" + "\\u000C" + "=" + "\\f" + "1" + "\\u000C"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.3_T2.js b/test/suite/ch07/7.2/S7.2_A1.3_T2.js
index 90fe95742..9c654e53e 100644
--- a/test/suite/ch07/7.2/S7.2_A1.3_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A1.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FORM FEED (U+000C) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.3_T2.js
- * @description Insert real FORM FEED between tokens of var x=1
- */
+/*---
+info: FORM FEED (U+000C) between any two tokens is allowed
+description: Insert real FORM FEED between tokens of var x=1
+---*/
 
 //CHECK#1
 varx=1;
@@ -19,5 +17,3 @@ eval("var\fx=\f1");
 if (x !== 1) {
   $ERROR('#2: var\\fx=\\f1; x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.4_T1.js b/test/suite/ch07/7.2/S7.2_A1.4_T1.js
index 1f10f9166..2561d918d 100644
--- a/test/suite/ch07/7.2/S7.2_A1.4_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A1.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * SPACE (U+0020) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.4_T1.js
- * @description Insert SPACE(\u0020) between tokens of var x=1
- */
+/*---
+info: SPACE (U+0020) between any two tokens is allowed
+description: Insert SPACE(\u0020) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u0020var\u0020x\u0020=\u00201\u0020");
@@ -19,4 +17,3 @@ eval("\u0020" + "var" + "\u0020" + "x" + "\u0020" + "=" + "\u0020" + "1" + "\u00
 if (x !== 1) {
   $ERROR('#2: eval("\\u0020" + "var" + "\\u0020" + "x" + "\\u0020" + "=" + "\\u0020" + "1" + "\\u0020"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.4_T2.js b/test/suite/ch07/7.2/S7.2_A1.4_T2.js
index 67c9c96c1..12d7908d3 100644
--- a/test/suite/ch07/7.2/S7.2_A1.4_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A1.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * SPACE (U+0020) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.4_T2.js
- * @description Insert real SPACE between tokens of var x=1
- */
+/*---
+info: SPACE (U+0020) between any two tokens is allowed
+description: Insert real SPACE between tokens of var x=1
+---*/
 
 //CHECK#1
 eval("\u0020var x\u0020= 1\u0020");
@@ -19,5 +17,3 @@ if (x !== 1) {
 if (x !== 1) {
   $ERROR('#2:  var x = 1 ; x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.5_T1.js b/test/suite/ch07/7.2/S7.2_A1.5_T1.js
index 59339116e..0636ebacb 100644
--- a/test/suite/ch07/7.2/S7.2_A1.5_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NO-BREAK SPACE (U+00A0) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.5_T1.js
- * @description Insert NO-BREAK SPACE(\u00A0) between tokens of var x=1
- */
+/*---
+info: NO-BREAK SPACE (U+00A0) between any two tokens is allowed
+description: Insert NO-BREAK SPACE(\u00A0) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u00A0var\u00A0x\u00A0=\u00A01\u00A0");
@@ -19,4 +17,3 @@ eval("\u00A0" + "var" + "\u00A0" + "x" + "\u00A0" + "=" + "\u00A0" + "1" + "\u00
 if (x !== 1) {
   $ERROR('#2: eval("\\u00A0" + "var" + "\\u00A0" + "x" + "\\u00A0" + "=" + "\\u00A0" + "1" + "\\u00A0"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A1.5_T2.js b/test/suite/ch07/7.2/S7.2_A1.5_T2.js
index e4635e697..370c85b78 100644
--- a/test/suite/ch07/7.2/S7.2_A1.5_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A1.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NO-BREAK SPACE (U+00A0) between any two tokens is allowed
- *
- * @path ch07/7.2/S7.2_A1.5_T2.js
- * @description Insert real NO-BREAK SPACE between tokens of var x=1
- */
+/*---
+info: NO-BREAK SPACE (U+00A0) between any two tokens is allowed
+description: Insert real NO-BREAK SPACE between tokens of var x=1
+---*/
 
 //CHECK#1
 eval("\u00A0var x\u00A0= 1\u00A0");
@@ -19,5 +17,3 @@ if (x !== 1) {
 if (x !== 1) {
   $ERROR('#2:  var x = 1 ; x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.1_T1.js b/test/suite/ch07/7.2/S7.2_A2.1_T1.js
index c7fdaaf3e..2df91663a 100644
--- a/test/suite/ch07/7.2/S7.2_A2.1_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HORIZONTAL TAB (U+0009) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.1_T1.js
- * @description Use HORIZONTAL TAB(\u0009 and \t)
- */
+/*---
+info: HORIZONTAL TAB (U+0009) may occur within strings
+description: Use HORIZONTAL TAB(\u0009 and \t)
+---*/
 
 // CHECK#1
 if (eval("'\u0009str\u0009ing\u0009'") !== "\u0009str\u0009ing\u0009") {
@@ -17,4 +15,3 @@ if (eval("'\u0009str\u0009ing\u0009'") !== "\u0009str\u0009ing\u0009") {
 if (eval("'\tstr\ting\t'") !== "\tstr\ting\t") {
   $ERROR('#2: eval("\'\\tstr\\ting\\t\'") === "\\tstr\\ting\\t"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.1_T2.js b/test/suite/ch07/7.2/S7.2_A2.1_T2.js
index 7a89875ba..8f6ab6c9e 100644
--- a/test/suite/ch07/7.2/S7.2_A2.1_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A2.1_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HORIZONTAL TAB (U+0009) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.1_T2.js
- * @description Use real HORIZONTAL TAB
- */
+/*---
+info: HORIZONTAL TAB (U+0009) may occur within strings
+description: Use real HORIZONTAL TAB
+---*/
 
 //CHECK#1
 if ("	str	ing	" !== "\u0009str\u0009ing\u0009") {
   $ERROR('#1: "	str	ing	" === "\\u0009str\\u0009ing\\u0009"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.2_T1.js b/test/suite/ch07/7.2/S7.2_A2.2_T1.js
index 69c8de8ff..fdb255854 100644
--- a/test/suite/ch07/7.2/S7.2_A2.2_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VERTICAL TAB (U+000B) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.2_T1.js
- * @description Use VERTICAL TAB(\u000B and \v)
- */
+/*---
+info: VERTICAL TAB (U+000B) may occur within strings
+description: Use VERTICAL TAB(\u000B and \v)
+---*/
 
 // CHECK#1
 if (eval("'\u000Bstr\u000Bing\u000B'") !== "\u000Bstr\u000Bing\u000B") {
@@ -17,4 +15,3 @@ if (eval("'\u000Bstr\u000Bing\u000B'") !== "\u000Bstr\u000Bing\u000B") {
 if (eval("'\vstr\ving\v'") !== "\vstr\ving\v") {
   $ERROR('#2: eval("\'\\vstr\\ving\\v\'") === "\\vstr\\ving\\v"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.2_T2.js b/test/suite/ch07/7.2/S7.2_A2.2_T2.js
index f7b415972..745eb4d3f 100644
--- a/test/suite/ch07/7.2/S7.2_A2.2_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A2.2_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VERTICAL TAB (U+000B) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.2_T2.js
- * @description Use real VERTICAL TAB
- */
+/*---
+info: VERTICAL TAB (U+000B) may occur within strings
+description: Use real VERTICAL TAB
+---*/
 
 //CHECK#1
 if ("string" !== "\u000Bstr\u000Bing\u000B") {
   $ERROR('#1: "string" === "\\u000Bstr\\u000Bing\\u000B"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.3_T1.js b/test/suite/ch07/7.2/S7.2_A2.3_T1.js
index 9b30396fc..47dd6dc2b 100644
--- a/test/suite/ch07/7.2/S7.2_A2.3_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FORM FEED (U+000C) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.3_T1.js
- * @description Use FORM FEED(\u000C and \f)
- */
+/*---
+info: FORM FEED (U+000C) may occur within strings
+description: Use FORM FEED(\u000C and \f)
+---*/
 
 // CHECK#1
 if (eval("'\u000Cstr\u000Cing\u000C'") !== "\u000Cstr\u000Cing\u000C") {
@@ -17,4 +15,3 @@ if (eval("'\u000Cstr\u000Cing\u000C'") !== "\u000Cstr\u000Cing\u000C") {
 if (eval("'\fstr\fing\f'") !== "\fstr\fing\f") {
   $ERROR('#2: eval("\'\\fstr\\fing\\f\'") === "\\fstr\\fing\\f"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.3_T2.js b/test/suite/ch07/7.2/S7.2_A2.3_T2.js
index a575f8a0d..b99d85568 100644
--- a/test/suite/ch07/7.2/S7.2_A2.3_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A2.3_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FORM FEED (U+000C) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.3_T2.js
- * @description Use real FORM FEED
- */
+/*---
+info: FORM FEED (U+000C) may occur within strings
+description: Use real FORM FEED
+---*/
 
 //CHECK#1
 if ("string" !== "\u000Cstr\u000Cing\u000C") {
   $ERROR('#1: "string" === "\\u000Cstr\\u000Cing\\u000C"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.4_T1.js b/test/suite/ch07/7.2/S7.2_A2.4_T1.js
index 4b41932c7..ad18d6ced 100644
--- a/test/suite/ch07/7.2/S7.2_A2.4_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * SPACE (U+0020) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.4_T1.js
- * @description Use SPACE(\u0020)
- */
+/*---
+info: SPACE (U+0020) may occur within strings
+description: Use SPACE(\u0020)
+---*/
 
 // CHECK#1
 if (eval("'\u0020str\u0020ing\u0020'") !== "\u0020str\u0020ing\u0020") {
@@ -17,4 +15,3 @@ if (eval("'\u0020str\u0020ing\u0020'") !== "\u0020str\u0020ing\u0020") {
 if (eval("' str ing '") !== " str ing ") {
   $ERROR('#2: eval("\' str ing \'") === " str ing "');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.4_T2.js b/test/suite/ch07/7.2/S7.2_A2.4_T2.js
index b61d2313d..d065012e5 100644
--- a/test/suite/ch07/7.2/S7.2_A2.4_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A2.4_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * SPACE (U+0020) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.4_T2.js
- * @description Use real SPACE
- */
+/*---
+info: SPACE (U+0020) may occur within strings
+description: Use real SPACE
+---*/
 
 //CHECK#1
 if (" str ing " !== "\u0020str\u0020ing\u0020") {
   $ERROR('#1: " str ing " === "\\u0020str\\u0020ing\\u0020"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.5_T1.js b/test/suite/ch07/7.2/S7.2_A2.5_T1.js
index 60fb7f358..ec401bb5f 100644
--- a/test/suite/ch07/7.2/S7.2_A2.5_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A2.5_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NO-BREAK SPACE (U+00A0) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.5_T1.js
- * @description Use NO-BREAK SPACE(\u00A0)
- */
+/*---
+info: NO-BREAK SPACE (U+00A0) may occur within strings
+description: Use NO-BREAK SPACE(\u00A0)
+---*/
 
 // CHECK#1
 if (eval("'\u00A0str\u00A0ing\u00A0'") !== "\u00A0str\u00A0ing\u00A0") {
   $ERROR('#1: eval("\'\\u00A0str\\u00A0ing\\u00A0\'") === "\\u00A0str\\u00A0ing\\u00A0"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A2.5_T2.js b/test/suite/ch07/7.2/S7.2_A2.5_T2.js
index 0cf26e596..72b6ecfda 100644
--- a/test/suite/ch07/7.2/S7.2_A2.5_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A2.5_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NO-BREAK SPACE (U+00A0) may occur within strings
- *
- * @path ch07/7.2/S7.2_A2.5_T2.js
- * @description Use real NO-BREAK SPACE
- */
+/*---
+info: NO-BREAK SPACE (U+00A0) may occur within strings
+description: Use real NO-BREAK SPACE
+---*/
 
 //CHECK#1
 if (" str ing " !== "\u00A0str\u00A0ing\u00A0") {
   $ERROR('#1: " str ing " === "\\u00A0str\\u00A0ing\\u00A0"');
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.1_T1.js b/test/suite/ch07/7.2/S7.2_A3.1_T1.js
index c8eae5be2..d25509d52 100644
--- a/test/suite/ch07/7.2/S7.2_A3.1_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain HORIZONTAL TAB (U+0009)
- *
- * @path ch07/7.2/S7.2_A3.1_T1.js
- * @description Use HORIZONTAL TAB(\u0009)
- */
+/*---
+info: Single line comment can contain HORIZONTAL TAB (U+0009)
+description: Use HORIZONTAL TAB(\u0009)
+---*/
 
 // CHECK#1
 eval("//\u0009 single line \u0009 comment \u0009");
@@ -17,4 +15,3 @@ eval("//\u0009 single line \u0009 comment \u0009 x = 1;");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("//\\u0009 single line \\u0009 comment \\u0009 x = 1;"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.1_T2.js b/test/suite/ch07/7.2/S7.2_A3.1_T2.js
index b5b479240..98fe6974f 100644
--- a/test/suite/ch07/7.2/S7.2_A3.1_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain HORIZONTAL TAB (U+0009)
- *
- * @path ch07/7.2/S7.2_A3.1_T2.js
- * @description Use real HORIZONTAL TAB
- */
+/*---
+info: Single line comment can contain HORIZONTAL TAB (U+0009)
+description: Use real HORIZONTAL TAB
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; //	single	line	comment	x = 1; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.2_T1.js b/test/suite/ch07/7.2/S7.2_A3.2_T1.js
index 435a2493f..6d70d1466 100644
--- a/test/suite/ch07/7.2/S7.2_A3.2_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain VERTICAL TAB (U+000B)
- *
- * @path ch07/7.2/S7.2_A3.2_T1.js
- * @description Use VERTICAL TAB(\u000B)
- */
+/*---
+info: Single line comment can contain VERTICAL TAB (U+000B)
+description: Use VERTICAL TAB(\u000B)
+---*/
 
 // CHECK#1
 eval("//\u000B single line \u000B comment \u000B");
@@ -17,4 +15,3 @@ eval("//\u000B single line \u000B comment \u000B x = 1;");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("//\\u000B single line \\u000B comment \\u000B x = 1;"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.2_T2.js b/test/suite/ch07/7.2/S7.2_A3.2_T2.js
index cfdd6bc0a..8d2f88087 100644
--- a/test/suite/ch07/7.2/S7.2_A3.2_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain VERTICAL TAB (U+000B)
- *
- * @path ch07/7.2/S7.2_A3.2_T2.js
- * @description Use real VERTICAL TAB
- */
+/*---
+info: Single line comment can contain VERTICAL TAB (U+000B)
+description: Use real VERTICAL TAB
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; //singlelinecommentx = 1; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.3_T1.js b/test/suite/ch07/7.2/S7.2_A3.3_T1.js
index 260d07073..7e5c2673e 100644
--- a/test/suite/ch07/7.2/S7.2_A3.3_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A3.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain FORM FEED (U+000C)
- *
- * @path ch07/7.2/S7.2_A3.3_T1.js
- * @description Use FORM FEED(\u000C)
- */
+/*---
+info: Single line comment can contain FORM FEED (U+000C)
+description: Use FORM FEED(\u000C)
+---*/
 
 // CHECK#1
 eval("//\u000C single line \u000C comment \u000C");
@@ -17,4 +15,3 @@ eval("//\u000C single line \u000C comment \u000C x = 1;");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("//\\u000C single line \\u000C comment \\u000C x = 1;"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.3_T2.js b/test/suite/ch07/7.2/S7.2_A3.3_T2.js
index f1ce32510..b58efa9af 100644
--- a/test/suite/ch07/7.2/S7.2_A3.3_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A3.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain FORM FEED (U+000C)
- *
- * @path ch07/7.2/S7.2_A3.3_T2.js
- * @description Use real FORM FEED
- */
+/*---
+info: Single line comment can contain FORM FEED (U+000C)
+description: Use real FORM FEED
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; //singlelinecommentx = 1; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.4_T1.js b/test/suite/ch07/7.2/S7.2_A3.4_T1.js
index 41264606b..3e440256b 100644
--- a/test/suite/ch07/7.2/S7.2_A3.4_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A3.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain SPACE (U+0020)
- *
- * @path ch07/7.2/S7.2_A3.4_T1.js
- * @description Use SPACE(\u0020)
- */
+/*---
+info: Single line comment can contain SPACE (U+0020)
+description: Use SPACE(\u0020)
+---*/
 
 // CHECK#1
 eval("//\u0020 single line \u0020 comment \u0020");
@@ -17,4 +15,3 @@ eval("//\u0020 single line \u0020 comment \u0020 x = 1;");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("//\\u0020 single line \\u0020 comment \\u0020 x = 1;"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.4_T2.js b/test/suite/ch07/7.2/S7.2_A3.4_T2.js
index bfc4650fe..3a14b7e4d 100644
--- a/test/suite/ch07/7.2/S7.2_A3.4_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A3.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain SPACE (U+0020)
- *
- * @path ch07/7.2/S7.2_A3.4_T2.js
- * @description Use real SPACE
- */
+/*---
+info: Single line comment can contain SPACE (U+0020)
+description: Use real SPACE
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; // single line comment x = 1; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.5_T1.js b/test/suite/ch07/7.2/S7.2_A3.5_T1.js
index 6d12abddf..265ee9c18 100644
--- a/test/suite/ch07/7.2/S7.2_A3.5_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A3.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain NO-BREAK SPACE (U+00A0)
- *
- * @path ch07/7.2/S7.2_A3.5_T1.js
- * @description Use NO-BREAK SPACE(\u00A0)
- */
+/*---
+info: Single line comment can contain NO-BREAK SPACE (U+00A0)
+description: Use NO-BREAK SPACE(\u00A0)
+---*/
 
 // CHECK#1
 eval("//\u00A0 single line \u00A0 comment \u00A0");
@@ -17,4 +15,3 @@ eval("//\u00A0 single line \u00A0 comment \u00A0 x = 1;");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("//\\u00A0 single line \\u00A0 comment \\u00A0 x = 1;"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A3.5_T2.js b/test/suite/ch07/7.2/S7.2_A3.5_T2.js
index 2085a3b38..defe7086b 100644
--- a/test/suite/ch07/7.2/S7.2_A3.5_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A3.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comment can contain NO-BREAK SPACE (U+00A0)
- *
- * @path ch07/7.2/S7.2_A3.5_T2.js
- * @description Use real NO-BREAK SPACE
- */
+/*---
+info: Single line comment can contain NO-BREAK SPACE (U+00A0)
+description: Use real NO-BREAK SPACE
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; // single line comment x = 1; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.1_T1.js b/test/suite/ch07/7.2/S7.2_A4.1_T1.js
index 6881a144f..b249b35da 100644
--- a/test/suite/ch07/7.2/S7.2_A4.1_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain HORIZONTAL TAB (U+0009)
- *
- * @path ch07/7.2/S7.2_A4.1_T1.js
- * @description Use HORIZONTAL TAB(\u0009)
- */
+/*---
+info: Multi line comment can contain HORIZONTAL TAB (U+0009)
+description: Use HORIZONTAL TAB(\u0009)
+---*/
 
 // CHECK#1
 eval("/*\u0009 multi line \u0009 comment \u0009*/");
@@ -17,4 +15,3 @@ eval("/*\u0009 multi line \u0009 comment \u0009 x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u0009 multi line \\u0009 comment \\u0009 x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.1_T2.js b/test/suite/ch07/7.2/S7.2_A4.1_T2.js
index a7d7cb758..7596746d5 100644
--- a/test/suite/ch07/7.2/S7.2_A4.1_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain HORIZONTAL TAB (U+0009)
- *
- * @path ch07/7.2/S7.2_A4.1_T2.js
- * @description Use real HORIZONTAL TAB
- */
+/*---
+info: Multi line comment can contain HORIZONTAL TAB (U+0009)
+description: Use real HORIZONTAL TAB
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /*	multi	line	comment	x = 1;*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.2_T1.js b/test/suite/ch07/7.2/S7.2_A4.2_T1.js
index a3361d47c..ea8c717ce 100644
--- a/test/suite/ch07/7.2/S7.2_A4.2_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A4.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain VERTICAL TAB (U+000B)
- *
- * @path ch07/7.2/S7.2_A4.2_T1.js
- * @description Use VERTICAL TAB(\u000B)
- */
+/*---
+info: Multi line comment can contain VERTICAL TAB (U+000B)
+description: Use VERTICAL TAB(\u000B)
+---*/
 
 // CHECK#1
 eval("/*\u000B multi line \u000B comment \u000B*/");
@@ -17,4 +15,3 @@ eval("/*\u000B multi line \u000B comment \u000B x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u000B multi line \\u000B comment \\u000B x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.2_T2.js b/test/suite/ch07/7.2/S7.2_A4.2_T2.js
index 87ef32235..ec1abb729 100644
--- a/test/suite/ch07/7.2/S7.2_A4.2_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A4.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain VERTICAL TAB (U+000B)
- *
- * @path ch07/7.2/S7.2_A4.2_T2.js
- * @description Use real VERTICAL TAB
- */
+/*---
+info: Multi line comment can contain VERTICAL TAB (U+000B)
+description: Use real VERTICAL TAB
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /*multilinecommentx = 1;*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.3_T1.js b/test/suite/ch07/7.2/S7.2_A4.3_T1.js
index 689d28790..aab0f4aa8 100644
--- a/test/suite/ch07/7.2/S7.2_A4.3_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A4.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain FORM FEED (U+000C)
- *
- * @path ch07/7.2/S7.2_A4.3_T1.js
- * @description Use FORM FEED(\u000C)
- */
+/*---
+info: Multi line comment can contain FORM FEED (U+000C)
+description: Use FORM FEED(\u000C)
+---*/
 
 // CHECK#1
 eval("/*\u000C multi line \u000C comment \u000C*/");
@@ -17,4 +15,3 @@ eval("/*\u000C multi line \u000C comment \u000C x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u000C multi line \\u000C comment \\u000C x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.3_T2.js b/test/suite/ch07/7.2/S7.2_A4.3_T2.js
index f6f404372..4cfbe7653 100644
--- a/test/suite/ch07/7.2/S7.2_A4.3_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A4.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain FORM FEED (U+000C)
- *
- * @path ch07/7.2/S7.2_A4.3_T2.js
- * @description Use real FORM FEED
- */
+/*---
+info: Multi line comment can contain FORM FEED (U+000C)
+description: Use real FORM FEED
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /*multilinecommentx = 1;*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.4_T1.js b/test/suite/ch07/7.2/S7.2_A4.4_T1.js
index 9f5908e17..92956874e 100644
--- a/test/suite/ch07/7.2/S7.2_A4.4_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A4.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain SPACE (U+0020)
- *
- * @path ch07/7.2/S7.2_A4.4_T1.js
- * @description Use SPACE(\u0020)
- */
+/*---
+info: Multi line comment can contain SPACE (U+0020)
+description: Use SPACE(\u0020)
+---*/
 
 // CHECK#1
 eval("/*\u0020 multi line \u0020 comment \u0020*/");
@@ -17,4 +15,3 @@ eval("/*\u0020 multi line \u0020 comment \u0020 x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u0020 multi line \\u0020 comment \\u0020 x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.4_T2.js b/test/suite/ch07/7.2/S7.2_A4.4_T2.js
index ce446861e..854ec66ca 100644
--- a/test/suite/ch07/7.2/S7.2_A4.4_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A4.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain SPACE (U+0020)
- *
- * @path ch07/7.2/S7.2_A4.4_T2.js
- * @description Use real SPACE
- */
+/*---
+info: Multi line comment can contain SPACE (U+0020)
+description: Use real SPACE
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /* multi line comment x = 1;*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.5_T1.js b/test/suite/ch07/7.2/S7.2_A4.5_T1.js
index cef5216e3..d3954abc9 100644
--- a/test/suite/ch07/7.2/S7.2_A4.5_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A4.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain NO-BREAK SPACE (U+00A0)
- *
- * @path ch07/7.2/S7.2_A4.5_T1.js
- * @description Use NO-BREAK SPACE(\u00A0)
- */
+/*---
+info: Multi line comment can contain NO-BREAK SPACE (U+00A0)
+description: Use NO-BREAK SPACE(\u00A0)
+---*/
 
 // CHECK#1
 eval("/*\u00A0 multi line \u00A0 comment \u00A0*/");
@@ -17,4 +15,3 @@ eval("/*\u00A0 multi line \u00A0 comment \u00A0 x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u00A0 multi line \\u00A0 comment \\u00A0 x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A4.5_T2.js b/test/suite/ch07/7.2/S7.2_A4.5_T2.js
index c4457c432..0859a4a8d 100644
--- a/test/suite/ch07/7.2/S7.2_A4.5_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A4.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain NO-BREAK SPACE (U+00A0)
- *
- * @path ch07/7.2/S7.2_A4.5_T2.js
- * @description Use real NO-BREAK SPACE
- */
+/*---
+info: Multi line comment can contain NO-BREAK SPACE (U+00A0)
+description: Use real NO-BREAK SPACE
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -14,4 +12,3 @@ var x = 0;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /* multi line comment x = 1;*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.2/S7.2_A5_T1.js b/test/suite/ch07/7.2/S7.2_A5_T1.js
index 6fb19c55d..87c09b0a2 100644
--- a/test/suite/ch07/7.2/S7.2_A5_T1.js
+++ b/test/suite/ch07/7.2/S7.2_A5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White space cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.2/S7.2_A5_T1.js
- * @description Use TAB (U+0009)
- * @negative
- */
+/*---
+info: >
+    White space cannot be expressed as a Unicode escape sequence consisting
+    of six characters, namely \u plus four hexadecimal digits
+description: Use TAB (U+0009)
+flags: [negative]
+---*/
 
 var\u0009x;
-
diff --git a/test/suite/ch07/7.2/S7.2_A5_T2.js b/test/suite/ch07/7.2/S7.2_A5_T2.js
index 1036b4ffa..dff3d74c0 100644
--- a/test/suite/ch07/7.2/S7.2_A5_T2.js
+++ b/test/suite/ch07/7.2/S7.2_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White space cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.2/S7.2_A5_T2.js
- * @description Use VERTICAL TAB (U+000B)
- * @negative
- */
+/*---
+info: >
+    White space cannot be expressed as a Unicode escape sequence consisting
+    of six characters, namely \u plus four hexadecimal digits
+description: Use VERTICAL TAB (U+000B)
+flags: [negative]
+---*/
 
 var\u000Bx;
-
diff --git a/test/suite/ch07/7.2/S7.2_A5_T3.js b/test/suite/ch07/7.2/S7.2_A5_T3.js
index 4eb8212cd..821c29d22 100644
--- a/test/suite/ch07/7.2/S7.2_A5_T3.js
+++ b/test/suite/ch07/7.2/S7.2_A5_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White space cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.2/S7.2_A5_T3.js
- * @description Use FORM FEED (U+000C)
- * @negative
- */
+/*---
+info: >
+    White space cannot be expressed as a Unicode escape sequence consisting
+    of six characters, namely \u plus four hexadecimal digits
+description: Use FORM FEED (U+000C)
+flags: [negative]
+---*/
 
 var\u000Cx;
-
diff --git a/test/suite/ch07/7.2/S7.2_A5_T4.js b/test/suite/ch07/7.2/S7.2_A5_T4.js
index 9a47a618d..aa0e75088 100644
--- a/test/suite/ch07/7.2/S7.2_A5_T4.js
+++ b/test/suite/ch07/7.2/S7.2_A5_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White space cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.2/S7.2_A5_T4.js
- * @description Use SPACE (U+0020)
- * @negative
- */
+/*---
+info: >
+    White space cannot be expressed as a Unicode escape sequence consisting
+    of six characters, namely \u plus four hexadecimal digits
+description: Use SPACE (U+0020)
+flags: [negative]
+---*/
 
 var\u0020x;
-
diff --git a/test/suite/ch07/7.2/S7.2_A5_T5.js b/test/suite/ch07/7.2/S7.2_A5_T5.js
index 5076c3b24..903afab2c 100644
--- a/test/suite/ch07/7.2/S7.2_A5_T5.js
+++ b/test/suite/ch07/7.2/S7.2_A5_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White space cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.2/S7.2_A5_T5.js
- * @description Use NO-BREAK SPACE (U+00A0)
- * @negative
- */
+/*---
+info: >
+    White space cannot be expressed as a Unicode escape sequence consisting
+    of six characters, namely \u plus four hexadecimal digits
+description: Use NO-BREAK SPACE (U+00A0)
+flags: [negative]
+---*/
 
 var\u00A0x;
-
diff --git a/test/suite/ch07/7.3/7.3-1.js b/test/suite/ch07/7.3/7.3-1.js
index 3309e649a..e3ad73a9b 100644
--- a/test/suite/ch07/7.3/7.3-1.js
+++ b/test/suite/ch07/7.3/7.3-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-1.js

- * @description 7.3 - ES5 recognizes the character <LS> (\u2028) as line terminators when parsing statements

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <LS> (\u2028) as line
+    terminators when parsing statements
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         eval("var test7_3_1\u2028prop = 66;");

         return (prop === 66) && ((typeof test7_3_1) === "undefined");

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-10.js b/test/suite/ch07/7.3/7.3-10.js
index 141841b9c..a0c8afb8b 100644
--- a/test/suite/ch07/7.3/7.3-10.js
+++ b/test/suite/ch07/7.3/7.3-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-10.js

- * @description 7.3 - ES5 recognizes the character <PS> (\u2029) as a NonEscapeCharacter

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <PS> (\u2029) as a
+    NonEscapeCharacter
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("var prop = \\u2029;");

@@ -17,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-11.js b/test/suite/ch07/7.3/7.3-11.js
index 42116da20..e8e025378 100644
--- a/test/suite/ch07/7.3/7.3-11.js
+++ b/test/suite/ch07/7.3/7.3-11.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-11.js

- * @description 7.3 - ES5 specifies that a multiline comment that contains a line terminator character <LS> (\u2028) must be treated as a single line terminator for the purposes of semicolon insertion

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 specifies that a multiline comment that contains a line
+    terminator character <LS> (\u2028) must be treated as a single
+    line terminator for the purposes of semicolon insertion
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         /*MultiLine

         Comments 

@@ -16,4 +19,4 @@ function testcase() {
         */

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-12.js b/test/suite/ch07/7.3/7.3-12.js
index b993f5bde..6ad70ba46 100644
--- a/test/suite/ch07/7.3/7.3-12.js
+++ b/test/suite/ch07/7.3/7.3-12.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-12.js

- * @description 7.3 - ES5 specifies that a multiline comment that contains a line terminator character <PS> (\u2029) must be treated as a single line terminator for the purposes of semicolon insertion

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 specifies that a multiline comment that contains a line
+    terminator character <PS> (\u2029) must be treated as a single
+    line terminator for the purposes of semicolon insertion
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         /*MultiLine

         Comments 

@@ -16,4 +19,4 @@ function testcase() {
         */

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-13.js b/test/suite/ch07/7.3/7.3-13.js
index d7f941c38..fc9c864d8 100644
--- a/test/suite/ch07/7.3/7.3-13.js
+++ b/test/suite/ch07/7.3/7.3-13.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-13.js

- * @description 7.3 - ES5 specifies that a multiline comment that contains a line terminator character <CR> (\u000D) must be treated as a single line terminator for the purposes of semicolon insertion

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 specifies that a multiline comment that contains a line
+    terminator character <CR> (\u000D) must be treated as a single
+    line terminator for the purposes of semicolon insertion
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         /*MultiLine

         Comments 

@@ -16,4 +19,4 @@ function testcase() {
         */

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-14.js b/test/suite/ch07/7.3/7.3-14.js
index 8f973ae06..04bf9ccb4 100644
--- a/test/suite/ch07/7.3/7.3-14.js
+++ b/test/suite/ch07/7.3/7.3-14.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-14.js

- * @description 7.3 - ES5 specifies that a multiline comment that contains a line terminator character <LF> (\u000A) must be treated as a single line terminator for the purposes of semicolon insertion

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 specifies that a multiline comment that contains a line
+    terminator character <LF> (\u000A) must be treated as a single
+    line terminator for the purposes of semicolon insertion
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         /*MultiLine

         Comments 

@@ -16,4 +19,4 @@ function testcase() {
         */

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-15.js b/test/suite/ch07/7.3/7.3-15.js
index 7dc88a644..4acb94d33 100644
--- a/test/suite/ch07/7.3/7.3-15.js
+++ b/test/suite/ch07/7.3/7.3-15.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-15.js

- * @description 7.3 - ES5 recognize <BOM> (\uFFFF) as a whitespace character

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: 7.3 - ES5 recognize <BOM> (\uFFFF) as a whitespace character
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var prop = "a\uFFFFa";

         return prop.length === 3 && prop !== "aa" && prop[1] === "\uFFFF";

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-2.js b/test/suite/ch07/7.3/7.3-2.js
index 95fb24280..c9604b97a 100644
--- a/test/suite/ch07/7.3/7.3-2.js
+++ b/test/suite/ch07/7.3/7.3-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-2.js

- * @description 7.3 - ES5 recognizes the character <PS> (\u2029) as line terminators when parsing statements

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <PS> (\u2029) as line
+    terminators when parsing statements
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         eval("var test7_3_2\u2029prop = 66;");

         return (prop===66) && ((typeof test7_3_2) === "undefined");

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-3.js b/test/suite/ch07/7.3/7.3-3.js
index 5a05cd16e..ae46dbac8 100644
--- a/test/suite/ch07/7.3/7.3-3.js
+++ b/test/suite/ch07/7.3/7.3-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-3.js

- * @description 7.3 - ES5 recognizes the character <LS> (\u2028) as terminating SingleLineComments

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <LS> (\u2028) as terminating
+    SingleLineComments
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("//Single Line Comments\u2028 var =;");

@@ -17,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-4.js b/test/suite/ch07/7.3/7.3-4.js
index 41285cb46..9c0d34a96 100644
--- a/test/suite/ch07/7.3/7.3-4.js
+++ b/test/suite/ch07/7.3/7.3-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-4.js

- * @description 7.3 - ES5 recognizes the character <PS> (\u2029) as terminating SingleLineComments

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <PS> (\u2029) as terminating
+    SingleLineComments
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("//Single Line Comments\u2029 var =;");

@@ -17,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-5.js b/test/suite/ch07/7.3/7.3-5.js
index ad65ebbf2..141187551 100644
--- a/test/suite/ch07/7.3/7.3-5.js
+++ b/test/suite/ch07/7.3/7.3-5.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-5.js

- * @description 7.3 - ES5 recognizes the character <LS> (\u2028) as terminating string literal

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <LS> (\u2028) as terminating
+    string literal
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var prop = "66\u2028123";

         return prop === "66\u2028123" && prop[2] === "\u2028" && prop.length === 6;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-6.js b/test/suite/ch07/7.3/7.3-6.js
index 5035eae1c..1394d90fb 100644
--- a/test/suite/ch07/7.3/7.3-6.js
+++ b/test/suite/ch07/7.3/7.3-6.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-6.js

- * @description 7.3 - ES5 recognizes the character <PS> (\u2029) as terminating string literal

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <PS> (\u2029) as terminating
+    string literal
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var prop = "66\u2029123";

         return prop === "66\u2029123" && prop[2] === "\u2029" && prop.length === 6;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-7.js b/test/suite/ch07/7.3/7.3-7.js
index 641117ddf..aee7b75d1 100644
--- a/test/suite/ch07/7.3/7.3-7.js
+++ b/test/suite/ch07/7.3/7.3-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-7.js

- * @description 7.3 - ES5 recognizes the character <LS> (\u2028) as terminating regular expression literals

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <LS> (\u2028) as terminating
+    regular expression literals
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("var regExp =  /[\u2028]/");

@@ -18,4 +20,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-8.js b/test/suite/ch07/7.3/7.3-8.js
index 7ac4481b1..aa158b419 100644
--- a/test/suite/ch07/7.3/7.3-8.js
+++ b/test/suite/ch07/7.3/7.3-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-8.js

- * @description 7.3 - ES5 recognizes the character <PS> (\u2029) as terminating regular expression literals

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <PS> (\u2029) as terminating
+    regular expression literals
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("var regExp =  /[\u2029]/");

@@ -18,4 +20,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/7.3-9.js b/test/suite/ch07/7.3/7.3-9.js
index 53e964491..c89552e65 100644
--- a/test/suite/ch07/7.3/7.3-9.js
+++ b/test/suite/ch07/7.3/7.3-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.3/7.3-9.js

- * @description 7.3 - ES5 recognizes the character <LS> (\u2028) as a NonEscapeCharacter

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.3 - ES5 recognizes the character <LS> (\u2028) as a
+    NonEscapeCharacter
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("var prop = \\u2028;");

@@ -17,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.3/S7.3_A1.1_T1.js b/test/suite/ch07/7.3/S7.3_A1.1_T1.js
index b5814c2e0..8e406af5a 100644
--- a/test/suite/ch07/7.3/S7.3_A1.1_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE FEED (U+000A) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.1_T1.js
- * @description Insert LINE FEED (\u000A and \n) between tokens of var x=1
- */
+/*---
+info: LINE FEED (U+000A) may occur between any two tokens
+description: Insert LINE FEED (\u000A and \n) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u000Avar\u000Ax\u000A=\u000A1\u000A");
@@ -37,4 +35,3 @@ eval("\u000A" + "var" + "\n" + "x" + "\u000A" + "=" + "\n" + "1" + "\u000A");
 if (x !== 1) {
   $ERROR('#5: eval("\\u000A" + "var" + "\\n" + "x" + "\\u000A" + "=" + "\\n" + "1" + "\\u000A"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A1.1_T2.js b/test/suite/ch07/7.3/S7.3_A1.1_T2.js
index b4780361b..a48992768 100644
--- a/test/suite/ch07/7.3/S7.3_A1.1_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE FEED (U+000A) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.1_T2.js
- * @description Insert real LINE FEED between tokens of var x=1
- */
+/*---
+info: LINE FEED (U+000A) may occur between any two tokens
+description: Insert real LINE FEED between tokens of var x=1
+---*/
 
 //CHECK#1
 var
@@ -16,4 +14,3 @@ x
 if (x !== 1) {
   $ERROR('#1: var\\nx\\n=\\n1\\n; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A1.2_T1.js b/test/suite/ch07/7.3/S7.3_A1.2_T1.js
index bb11122f7..8d13112f3 100644
--- a/test/suite/ch07/7.3/S7.3_A1.2_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CARRIAGE RETURN (U+000D) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.2_T1.js
- * @description Insert CARRIAGE RETURN (\u000D and \r) between tokens of var x=1
- */
+/*---
+info: CARRIAGE RETURN (U+000D) may occur between any two tokens
+description: Insert CARRIAGE RETURN (\u000D and \r) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u000Dvar\u000Dx\u000D=\u000D1\u000D");
@@ -37,4 +35,3 @@ eval("\u000D" + "var" + "\r" + "x" + "\u000D" + "=" + "\r" + "1" + "\u000D");
 if (x !== 1) {
   $ERROR('#5: eval("\\u000D" + "var" + "\\r" + "x" + "\\u000D" + "=" + "\\r" + "1" + "\\u000D"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A1.2_T2.js b/test/suite/ch07/7.3/S7.3_A1.2_T2.js
index 52fb9b52a..fc50eea77 100644
--- a/test/suite/ch07/7.3/S7.3_A1.2_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A1.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CARRIAGE RETURN (U+000D) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.2_T2.js
- * @description Insert real CARRIAGE RETURN between tokens of var x=1
- */
+/*---
+info: CARRIAGE RETURN (U+000D) may occur between any two tokens
+description: Insert real CARRIAGE RETURN between tokens of var x=1
+---*/
 
 //CHECK#1
 var
@@ -16,4 +14,3 @@ x
 if (x !== 1) {
   $ERROR('#1: var\\nx\\n=\\n1\\n; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A1.3.js b/test/suite/ch07/7.3/S7.3_A1.3.js
index bf8281937..99275cb8e 100644
--- a/test/suite/ch07/7.3/S7.3_A1.3.js
+++ b/test/suite/ch07/7.3/S7.3_A1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE SEPARATOR (U+2028) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.3.js
- * @description Insert LINE SEPARATOR (\u2028) between tokens of var x=1
- */
+/*---
+info: LINE SEPARATOR (U+2028) may occur between any two tokens
+description: Insert LINE SEPARATOR (\u2028) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u2028var\u2028x\u2028=\u20281\u2028");
@@ -19,5 +17,3 @@ eval("\u2028" + "var" + "\u2028" + "x" + "\u2028" + "=" + "\u2028" + "1" + "\u20
 if (x !== 1) {
   $ERROR('#2: eval("\\u2028" + "var" + "\\u2028" + "x" + "\\u2028" + "=" + "\\u2028" + "1" + "\\u2028"); x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch07/7.3/S7.3_A1.4.js b/test/suite/ch07/7.3/S7.3_A1.4.js
index f761d0376..24691e10d 100644
--- a/test/suite/ch07/7.3/S7.3_A1.4.js
+++ b/test/suite/ch07/7.3/S7.3_A1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * PARAGRAPH SEPARATOR (U+2029) may occur between any two tokens
- *
- * @path ch07/7.3/S7.3_A1.4.js
- * @description Insert PARAGRAPH SEPARATOR (\u2029) between tokens of var x=1
- */
+/*---
+info: PARAGRAPH SEPARATOR (U+2029) may occur between any two tokens
+description: Insert PARAGRAPH SEPARATOR (\u2029) between tokens of var x=1
+---*/
 
 // CHECK#1
 eval("\u2029var\u2029x\u2029=\u20291\u2029");
@@ -19,7 +17,3 @@ eval("\u2029" + "var" + "\u2029" + "x" + "\u2029" + "=" + "\u2029" + "1" + "\u20
 if (x !== 1) {
   $ERROR('#2: eval("\\u2029" + "var" + "\\u2029" + "x" + "\\u2029" + "=" + "\\u2029" + "1" + "\\u2029"); x === 1. Actual: ' + (x));
 }
-
-
-
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.1_T1.js b/test/suite/ch07/7.3/S7.3_A2.1_T1.js
index 16cb25e69..acc1d6542 100644
--- a/test/suite/ch07/7.3/S7.3_A2.1_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A2.1_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE FEED (U+000A) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.1_T1.js
- * @description Insert LINE FEED (\u000A) into string
- * @negative
- */
+/*---
+info: LINE FEED (U+000A) within strings is not allowed
+description: Insert LINE FEED (\u000A) into string
+flags: [negative]
+---*/
 
 // CHECK#1
 if (eval("'\u000Astr\u000Aing\u000A'") === "\u000Astr\u000Aing\u000A") {
   $ERROR('#1: eval("\'\\u000Astr\\u000Aing\\u000A\'") === "\\u000Astr\\u000Aing\\u000A"');
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.1_T2.js b/test/suite/ch07/7.3/S7.3_A2.1_T2.js
index f587ec97e..a1708b729 100644
--- a/test/suite/ch07/7.3/S7.3_A2.1_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A2.1_T2.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE FEED (U+000A) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.1_T2.js
- * @description Use real LINE FEED into string
- * @negative
- */
+/*---
+info: LINE FEED (U+000A) within strings is not allowed
+description: Use real LINE FEED into string
+flags: [negative]
+---*/
 
 //CHECK#1
 "
 str
 ing
 ";
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.2_T1.js b/test/suite/ch07/7.3/S7.3_A2.2_T1.js
index b58d20227..cb1abe57e 100644
--- a/test/suite/ch07/7.3/S7.3_A2.2_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A2.2_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CARRIAGE RETURN (U+000D) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.2_T1.js
- * @description Insert CARRIAGE RETURN (\u000D) into string
- * @negative
- */
+/*---
+info: CARRIAGE RETURN (U+000D) within strings is not allowed
+description: Insert CARRIAGE RETURN (\u000D) into string
+flags: [negative]
+---*/
 
 // CHECK#1
 if (eval("'\u000Dstr\u000Ding\u000D'") === "\u000Dstr\u000Ding\u000D") {
   $ERROR('#1: eval("\'\\u000Dstr\\u000Ding\\u000D\'") === "\\u000Dstr\\u000Ding\\u000D"');
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.2_T2.js b/test/suite/ch07/7.3/S7.3_A2.2_T2.js
index 9e8c5e30d..fe4b5f10c 100644
--- a/test/suite/ch07/7.3/S7.3_A2.2_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A2.2_T2.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CARRIAGE RETURN (U+000D) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.2_T2.js
- * @description Insert real CARRIAGE RETURN into string
- * @negative
- */
+/*---
+info: CARRIAGE RETURN (U+000D) within strings is not allowed
+description: Insert real CARRIAGE RETURN into string
+flags: [negative]
+---*/
 
 //CHECK#1
 "
 str
 ing
 ";
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.3.js b/test/suite/ch07/7.3/S7.3_A2.3.js
index 645dfaaf3..32fb860c6 100644
--- a/test/suite/ch07/7.3/S7.3_A2.3.js
+++ b/test/suite/ch07/7.3/S7.3_A2.3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LINE SEPARATOR (U+2028) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.3.js
- * @description Insert LINE SEPARATOR (\u2028) into string
- * @negative
- */
+/*---
+info: LINE SEPARATOR (U+2028) within strings is not allowed
+description: Insert LINE SEPARATOR (\u2028) into string
+flags: [negative]
+---*/
 
 // CHECK#1
 if (eval("'\u2028str\u2028ing\u2028'") === "\u2028str\u2028ing\u2028") {
   $ERROR('#1: eval("\'\\u2028str\\u2028ing\\u2028\'") === "\\u2028str\\u2028ing\\u2028"');
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A2.4.js b/test/suite/ch07/7.3/S7.3_A2.4.js
index 00e185037..f39935845 100644
--- a/test/suite/ch07/7.3/S7.3_A2.4.js
+++ b/test/suite/ch07/7.3/S7.3_A2.4.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * PARAGRAPH SEPARATOR (U+2029) within strings is not allowed
- *
- * @path ch07/7.3/S7.3_A2.4.js
- * @description Insert PARAGRAPH SEPARATOR (\u2029) into string
- * @negative
- */
+/*---
+info: PARAGRAPH SEPARATOR (U+2029) within strings is not allowed
+description: Insert PARAGRAPH SEPARATOR (\u2029) into string
+flags: [negative]
+---*/
 
 // CHECK#1
 if (eval("'\u2029str\u2029ing\u2029'") === "\u2029str\u2029ing\u2029") {
   $ERROR('#1: eval("\'\\u2029str\\u2029ing\\u2029\'") === "\\u2029str\\u2029ing\\u2029"');
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.1_T1.js b/test/suite/ch07/7.3/S7.3_A3.1_T1.js
index f44c153cf..7f016d7e9 100644
--- a/test/suite/ch07/7.3/S7.3_A3.1_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A3.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain LINE FEED (U+000A) inside
- *
- * @path ch07/7.3/S7.3_A3.1_T1.js
- * @description Insert LINE FEED (\u000A) into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain LINE FEED (U+000A) inside
+description: Insert LINE FEED (\u000A) into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("// single line \u000A comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.1_T2.js b/test/suite/ch07/7.3/S7.3_A3.1_T2.js
index cb808a87a..80867161b 100644
--- a/test/suite/ch07/7.3/S7.3_A3.1_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A3.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain LINE FEED (U+000A) inside
- *
- * @path ch07/7.3/S7.3_A3.1_T2.js
- * @description Insert LINE FEED (\u000A) into begin of single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain LINE FEED (U+000A) inside
+description: Insert LINE FEED (\u000A) into begin of single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("//\u000A single line comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.1_T3.js b/test/suite/ch07/7.3/S7.3_A3.1_T3.js
index 6394c939c..d048bec12 100644
--- a/test/suite/ch07/7.3/S7.3_A3.1_T3.js
+++ b/test/suite/ch07/7.3/S7.3_A3.1_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain LINE FEED (U+000A) inside
- *
- * @path ch07/7.3/S7.3_A3.1_T3.js
- * @description Insert real LINE FEED into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain LINE FEED (U+000A) inside
+description: Insert real LINE FEED into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 //single 
 line comment
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.2_T1.js b/test/suite/ch07/7.3/S7.3_A3.2_T1.js
index 2fa270693..4339daa18 100644
--- a/test/suite/ch07/7.3/S7.3_A3.2_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A3.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain CARRIAGE RETURN (U+000D) inside
- *
- * @path ch07/7.3/S7.3_A3.2_T1.js
- * @description Insert CARRIAGE RETURN (\u000D) into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain CARRIAGE RETURN (U+000D) inside
+description: Insert CARRIAGE RETURN (\u000D) into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("// single line \u000D comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.2_T2.js b/test/suite/ch07/7.3/S7.3_A3.2_T2.js
index 9ffdc5cf9..d7c922aeb 100644
--- a/test/suite/ch07/7.3/S7.3_A3.2_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A3.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain CARRIAGE RETURN (U+000D) inside
- *
- * @path ch07/7.3/S7.3_A3.2_T2.js
- * @description Insert CARRIAGE RETURN (\u000D) into begin of single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain CARRIAGE RETURN (U+000D) inside
+description: Insert CARRIAGE RETURN (\u000D) into begin of single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("//\u000D single line comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.2_T3.js b/test/suite/ch07/7.3/S7.3_A3.2_T3.js
index d16ee33be..1f4cf3bfc 100644
--- a/test/suite/ch07/7.3/S7.3_A3.2_T3.js
+++ b/test/suite/ch07/7.3/S7.3_A3.2_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain CARRIAGE RETURN (U+000D) inside
- *
- * @path ch07/7.3/S7.3_A3.2_T3.js
- * @description Insert real CARRIAGE RETURN into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain CARRIAGE RETURN (U+000D) inside
+description: Insert real CARRIAGE RETURN into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 //single 
 line comment
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.3_T1.js b/test/suite/ch07/7.3/S7.3_A3.3_T1.js
index ae926c456..76c6a0637 100644
--- a/test/suite/ch07/7.3/S7.3_A3.3_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A3.3_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain LINE SEPARATOR (U+2028) inside
- *
- * @path ch07/7.3/S7.3_A3.3_T1.js
- * @description Insert LINE SEPARATOR (\u2028) into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain LINE SEPARATOR (U+2028) inside
+description: Insert LINE SEPARATOR (\u2028) into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("// single line \u2028 comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.3_T2.js b/test/suite/ch07/7.3/S7.3_A3.3_T2.js
index 43ff45843..c3ec79f11 100644
--- a/test/suite/ch07/7.3/S7.3_A3.3_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A3.3_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain LINE SEPARATOR (U+2028) inside
- *
- * @path ch07/7.3/S7.3_A3.3_T2.js
- * @description Insert LINE SEPARATOR (\u2028) into begin of single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain LINE SEPARATOR (U+2028) inside
+description: Insert LINE SEPARATOR (\u2028) into begin of single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("//\u2028 single line comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.4_T1.js b/test/suite/ch07/7.3/S7.3_A3.4_T1.js
index 1a8fae53f..617d65aa6 100644
--- a/test/suite/ch07/7.3/S7.3_A3.4_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A3.4_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain PARAGRAPH SEPARATOR (U+2029) inside
- *
- * @path ch07/7.3/S7.3_A3.4_T1.js
- * @description Insert PARAGRAPH SEPARATOR (\u2029) into single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain PARAGRAPH SEPARATOR (U+2029) inside
+description: Insert PARAGRAPH SEPARATOR (\u2029) into single line comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("// single line \u2029 comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A3.4_T2.js b/test/suite/ch07/7.3/S7.3_A3.4_T2.js
index 8a6c59d8d..4eac8e87b 100644
--- a/test/suite/ch07/7.3/S7.3_A3.4_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A3.4_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can not contain PARAGRAPH SEPARATOR (U+2029) inside
- *
- * @path ch07/7.3/S7.3_A3.4_T2.js
- * @description Insert PARAGRAPH SEPARATOR (\u2029) into begin of single line comment
- * @negative
- */
+/*---
+info: Single line comments can not contain PARAGRAPH SEPARATOR (U+2029) inside
+description: >
+    Insert PARAGRAPH SEPARATOR (\u2029) into begin of single line
+    comment
+flags: [negative]
+---*/
 
 // CHECK#1
 eval("//\u2029 single line comment");
-
diff --git a/test/suite/ch07/7.3/S7.3_A4_T1.js b/test/suite/ch07/7.3/S7.3_A4_T1.js
index df523f9a3..52b1a337b 100644
--- a/test/suite/ch07/7.3/S7.3_A4_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can contain Line Terminator at the end of line
- *
- * @path ch07/7.3/S7.3_A4_T1.js
- * @description Insert LINE FEED (U+000A) into the end of single line comment
- */
+/*---
+info: Single line comments can contain Line Terminator at the end of line
+description: Insert LINE FEED (U+000A) into the end of single line comment
+---*/
 
 // CHECK#1
 eval("// single line comment\u000A");
@@ -17,4 +15,3 @@ eval("// single line comment\u000A x = 1;");
 if (x !== 1) {
   $ERROR('#1: var x = 0; eval("// single line comment\\u000A x = 1;"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A4_T2.js b/test/suite/ch07/7.3/S7.3_A4_T2.js
index d99dc7dc1..9081f4fc5 100644
--- a/test/suite/ch07/7.3/S7.3_A4_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can contain Line Terminator at the end of line
- *
- * @path ch07/7.3/S7.3_A4_T2.js
- * @description Insert CARRIAGE RETURN (U+000D) into the end of single line comment
- */
+/*---
+info: Single line comments can contain Line Terminator at the end of line
+description: Insert CARRIAGE RETURN (U+000D) into the end of single line comment
+---*/
 
 // CHECK#1
 eval("// single line comment\u000D");
@@ -17,4 +15,3 @@ eval("// single line comment\u000D x = 1;");
 if (x !== 1) {
   $ERROR('#1: var x = 0; eval("// single line comment\\u000D x = 1;"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A4_T3.js b/test/suite/ch07/7.3/S7.3_A4_T3.js
index 5677bc0cd..f5f7bfe40 100644
--- a/test/suite/ch07/7.3/S7.3_A4_T3.js
+++ b/test/suite/ch07/7.3/S7.3_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can contain Line Terminator at the end of line
- *
- * @path ch07/7.3/S7.3_A4_T3.js
- * @description Insert LINE SEPARATOR (U+2028) into the end of single line comment
- */
+/*---
+info: Single line comments can contain Line Terminator at the end of line
+description: Insert LINE SEPARATOR (U+2028) into the end of single line comment
+---*/
 
 // CHECK#1
 eval("// single line comment\u2028");
@@ -17,4 +15,3 @@ eval("// single line comment\u2028 x = 1;");
 if (x !== 1) {
   $ERROR('#1: var x = 0; eval("// single line comment\\u2028 x = 1;"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A4_T4.js b/test/suite/ch07/7.3/S7.3_A4_T4.js
index c34f0e15e..f384be7e4 100644
--- a/test/suite/ch07/7.3/S7.3_A4_T4.js
+++ b/test/suite/ch07/7.3/S7.3_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can contain Line Terminator at the end of line
- *
- * @path ch07/7.3/S7.3_A4_T4.js
- * @description Insert PARAGRAPH SEPARATOR (U+2029) into the end of single line comment
- */
+/*---
+info: Single line comments can contain Line Terminator at the end of line
+description: >
+    Insert PARAGRAPH SEPARATOR (U+2029) into the end of single line
+    comment
+---*/
 
 // CHECK#1
 eval("// single line comment\u2029");
@@ -17,4 +17,3 @@ eval("// single line comment\u2029 x = 1;");
 if (x !== 1) {
   $ERROR('#1: var x = 0; eval("// single line comment\\u2029 x = 1;"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.1_T1.js b/test/suite/ch07/7.3/S7.3_A5.1_T1.js
index fe8d7173e..3fd7dd416 100644
--- a/test/suite/ch07/7.3/S7.3_A5.1_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A5.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain LINE FEED (U+000A)
- *
- * @path ch07/7.3/S7.3_A5.1_T1.js
- * @description Insert LINE FEED (U+000A) into multi line comment
- */
+/*---
+info: Multi line comment can contain LINE FEED (U+000A)
+description: Insert LINE FEED (U+000A) into multi line comment
+---*/
 
 // CHECK#1
 eval("/*\u000A multi line \u000A comment \u000A*/");
@@ -17,4 +15,3 @@ eval("/*\u000A multi line \u000A comment \u000A x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u000A multi line \\u000A comment \\u000A x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.1_T2.js b/test/suite/ch07/7.3/S7.3_A5.1_T2.js
index 661df860e..3cc636647 100644
--- a/test/suite/ch07/7.3/S7.3_A5.1_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A5.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain LINE FEED (U+000A)
- *
- * @path ch07/7.3/S7.3_A5.1_T2.js
- * @description Insert real LINE FEED into multi line comment
- */
+/*---
+info: Multi line comment can contain LINE FEED (U+000A)
+description: Insert real LINE FEED into multi line comment
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -19,4 +17,3 @@ x = 1;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /*\\nmulti\\nline\\ncomment\\nx = 1;\\n*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.2_T1.js b/test/suite/ch07/7.3/S7.3_A5.2_T1.js
index 20c5dd194..be0dc4681 100644
--- a/test/suite/ch07/7.3/S7.3_A5.2_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A5.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain CARRIAGE RETURN (U+000D)
- *
- * @path ch07/7.3/S7.3_A5.2_T1.js
- * @description Insert CARRIAGE RETURN (U+000D) into multi line comment
- */
+/*---
+info: Multi line comment can contain CARRIAGE RETURN (U+000D)
+description: Insert CARRIAGE RETURN (U+000D) into multi line comment
+---*/
 
 // CHECK#1
 eval("/*\u000D multi line \u000D comment \u000D*/");
@@ -17,4 +15,3 @@ eval("/*\u000D multi line \u000D comment \u000D x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u000D multi line \\u000D comment \\u000D x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.2_T2.js b/test/suite/ch07/7.3/S7.3_A5.2_T2.js
index a83a2be2d..6dd674169 100644
--- a/test/suite/ch07/7.3/S7.3_A5.2_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A5.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain CARRIAGE RETURN (U+000D)
- *
- * @path ch07/7.3/S7.3_A5.2_T2.js
- * @description Insert real CARRIAGE RETURN into multi line comment
- */
+/*---
+info: Multi line comment can contain CARRIAGE RETURN (U+000D)
+description: Insert real CARRIAGE RETURN into multi line comment
+---*/
 
 /*CHECK#1*/
 var x = 0;
@@ -19,4 +17,3 @@ x = 1;
 if (x !== 0) {
   $ERROR('#1: var x = 0; /*\\rmulti\\rline\\rcomment\\rx = 1;\\r*/ x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.3.js b/test/suite/ch07/7.3/S7.3_A5.3.js
index 501392bc0..fe33f06d6 100644
--- a/test/suite/ch07/7.3/S7.3_A5.3.js
+++ b/test/suite/ch07/7.3/S7.3_A5.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain LINE SEPARATOR (U+2028)
- *
- * @path ch07/7.3/S7.3_A5.3.js
- * @description Insert LINE SEPARATOR (U+2028) into multi line comment
- */
+/*---
+info: Multi line comment can contain LINE SEPARATOR (U+2028)
+description: Insert LINE SEPARATOR (U+2028) into multi line comment
+---*/
 
 // CHECK#1
 eval("/*\u2028 multi line \u2028 comment \u2028*/");
@@ -17,4 +15,3 @@ eval("/*\u2028 multi line \u2028 comment \u2028 x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u2028 multi line \\u2028 comment \\u2028 x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A5.4.js b/test/suite/ch07/7.3/S7.3_A5.4.js
index 8f8597477..b793e5e46 100644
--- a/test/suite/ch07/7.3/S7.3_A5.4.js
+++ b/test/suite/ch07/7.3/S7.3_A5.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comment can contain LINE SEPARATOR (U+2029)
- *
- * @path ch07/7.3/S7.3_A5.4.js
- * @description Insert PARAGRAPH SEPARATOR (U+2029) into multi line comment
- */
+/*---
+info: Multi line comment can contain LINE SEPARATOR (U+2029)
+description: Insert PARAGRAPH SEPARATOR (U+2029) into multi line comment
+---*/
 
 // CHECK#1
 eval("/*\u2029 multi line \u2029 comment \u2029*/");
@@ -17,4 +15,3 @@ eval("/*\u2029 multi line \u2029 comment \u2029 x = 1;*/");
 if (x !== 0) {
   $ERROR('#1: var x = 0; eval("/*\\u2029 multi line \\u2029 comment \\u2029 x = 1;*/"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A6_T1.js b/test/suite/ch07/7.3/S7.3_A6_T1.js
index 89b3751f6..85c2c8ce1 100644
--- a/test/suite/ch07/7.3/S7.3_A6_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A6_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.3/S7.3_A6_T1.js
- * @description Insert LINE FEED (U+000A) in var x
- * @negative
- */
+/*---
+info: >
+    Line Terminator cannot be expressed as a Unicode escape sequence
+    consisting of six characters, namely \u plus four hexadecimal digits
+description: Insert LINE FEED (U+000A) in var x
+flags: [negative]
+---*/
 
 var\u000Ax;
-
diff --git a/test/suite/ch07/7.3/S7.3_A6_T2.js b/test/suite/ch07/7.3/S7.3_A6_T2.js
index 3dc52d206..31e5082a5 100644
--- a/test/suite/ch07/7.3/S7.3_A6_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A6_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.3/S7.3_A6_T2.js
- * @description Insert CARRIAGE RETURN (U+000D) in var x
- * @negative
- */
+/*---
+info: >
+    Line Terminator cannot be expressed as a Unicode escape sequence
+    consisting of six characters, namely \u plus four hexadecimal digits
+description: Insert CARRIAGE RETURN (U+000D) in var x
+flags: [negative]
+---*/
 
 var\u000Dx;
-
diff --git a/test/suite/ch07/7.3/S7.3_A6_T3.js b/test/suite/ch07/7.3/S7.3_A6_T3.js
index 62d6ef10f..f8046aea9 100644
--- a/test/suite/ch07/7.3/S7.3_A6_T3.js
+++ b/test/suite/ch07/7.3/S7.3_A6_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.3/S7.3_A6_T3.js
- * @description Insert LINE SEPARATOR (U+2028) in var x
- * @negative
- */
+/*---
+info: >
+    Line Terminator cannot be expressed as a Unicode escape sequence
+    consisting of six characters, namely \u plus four hexadecimal digits
+description: Insert LINE SEPARATOR (U+2028) in var x
+flags: [negative]
+---*/
 
 var\u2028x;
-
diff --git a/test/suite/ch07/7.3/S7.3_A6_T4.js b/test/suite/ch07/7.3/S7.3_A6_T4.js
index cd5d2d40a..e0be43aa4 100644
--- a/test/suite/ch07/7.3/S7.3_A6_T4.js
+++ b/test/suite/ch07/7.3/S7.3_A6_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.3/S7.3_A6_T4.js
- * @description Insert PARAGRAPH SEPARATOR (U+2029) in var x
- * @negative
- */
+/*---
+info: >
+    Line Terminator cannot be expressed as a Unicode escape sequence
+    consisting of six characters, namely \u plus four hexadecimal digits
+description: Insert PARAGRAPH SEPARATOR (U+2029) in var x
+flags: [negative]
+---*/
 
 var\u2029x;
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T1.js b/test/suite/ch07/7.3/S7.3_A7_T1.js
index 861b737e4..600cd16d7 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T1.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T1.js
- * @description Insert Line Terminator in var x=y+z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y+z
+---*/
 
 // CHECK#1
 var y=2;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029+\u2029z\u2029");
 if (x !== 5) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029+\\u2029z\\u2029"); x === 5. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T2.js b/test/suite/ch07/7.3/S7.3_A7_T2.js
index cdc5801c9..9cc232786 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T2.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T2.js
- * @description Insert Line Terminator in var x=y-z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y-z
+---*/
 
 // CHECK#1
 var y=3;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029-\u2029z\u2029");
 if (x !== 1) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029-\\u2029z\\u2029"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T3.js b/test/suite/ch07/7.3/S7.3_A7_T3.js
index 1c83956da..74f2c0c51 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T3.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T3.js
- * @description Insert Line Terminator in var x=y*z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y*z
+---*/
 
 // CHECK#1
 var y=3;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029*\u2029z\u2029");
 if (x !== 6) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029*\\u2029z\\u2029"); x === 6. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T4.js b/test/suite/ch07/7.3/S7.3_A7_T4.js
index fad60b4cb..7e81a7efe 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T4.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T4.js
- * @description Insert Line Terminator in var x=y/z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y/z
+---*/
 
 // CHECK#1
 var y=12;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029/\u2029z\u2029");
 if (x !== 6) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029/\\u2029z\\u2029"); x === 6. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T5.js b/test/suite/ch07/7.3/S7.3_A7_T5.js
index f7aff0122..7b6540ad8 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T5.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T5.js
- * @description Insert Line Terminator in var x=y%z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y%z
+---*/
 
 // CHECK#1
 var y=16;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029%\u2029z\u2029");
 if (x !== 6) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029%\\u2029z\\u2029"); x === 6. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T6.js b/test/suite/ch07/7.3/S7.3_A7_T6.js
index 9dc8c0141..58f647e3a 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T6.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T6.js
- * @description Insert Line Terminator in var x=y>>z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y>>z
+---*/
 
 // CHECK#1
 var y=16;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029>>\u2029z\u2029");
 if (x !== 2) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029>>\\u2029z\\u2029"); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T7.js b/test/suite/ch07/7.3/S7.3_A7_T7.js
index 510b958c4..7432fdbdb 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T7.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T7.js
- * @description Insert Line Terminator in var x=y<<z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y<<z
+---*/
 
 // CHECK#1
 var y=2;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029<<\u2029z\u2029");
 if (x !== 16) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029<<\\u2029z\\u2029"); x === 16. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.3/S7.3_A7_T8.js b/test/suite/ch07/7.3/S7.3_A7_T8.js
index 1b55b96ce..fd2cce1cf 100644
--- a/test/suite/ch07/7.3/S7.3_A7_T8.js
+++ b/test/suite/ch07/7.3/S7.3_A7_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminators between operators are allowed
- *
- * @path ch07/7.3/S7.3_A7_T8.js
- * @description Insert Line Terminator in var x=y<z
- */
+/*---
+info: Line Terminators between operators are allowed
+description: Insert Line Terminator in var x=y<z
+---*/
 
 // CHECK#1
 var y=2;
@@ -54,4 +52,3 @@ eval("\u2029var\u2029x\u2029=\u2029y\u2029<\u2029z\u2029");
 if (x !== true) {
   $ERROR('#4: eval("\\u2029var\\u2029x\\u2029=\\u2029y\\u2029<\\u2029z\\u2029"); x === true. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch07/7.4/S7.4_A1_T1.js b/test/suite/ch07/7.4/S7.4_A1_T1.js
index 87bb8ce1a..74040ccea 100644
--- a/test/suite/ch07/7.4/S7.4_A1_T1.js
+++ b/test/suite/ch07/7.4/S7.4_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of single line comments
- *
- * @path ch07/7.4/S7.4_A1_T1.js
- * @description Create comments with any code
- */
+/*---
+info: Correct interpretation of single line comments
+description: Create comments with any code
+---*/
 
 //CHECK#1
 // $ERROR('#1: Correct interpretation single line comments');
@@ -40,5 +38,3 @@ this.y++;
 if (isNaN(y) !== true) {
   $ERROR('#6: //var this.y = 1; \\n this.y++; y === Not-a-Number. Actual: ' + (y));
 }
-
-
diff --git a/test/suite/ch07/7.4/S7.4_A1_T2.js b/test/suite/ch07/7.4/S7.4_A1_T2.js
index 4d8d8af43..7c8355785 100644
--- a/test/suite/ch07/7.4/S7.4_A1_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A1_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of single line comments
- *
- * @path ch07/7.4/S7.4_A1_T2.js
- * @description Simple test, create empty comment: ///
- */
+/*---
+info: Correct interpretation of single line comments
+description: "Simple test, create empty comment: ///"
+---*/
 
 //CHECK#1
 ///
-
diff --git a/test/suite/ch07/7.4/S7.4_A2_T1.js b/test/suite/ch07/7.4/S7.4_A2_T1.js
index 97b8e6268..58ca41360 100644
--- a/test/suite/ch07/7.4/S7.4_A2_T1.js
+++ b/test/suite/ch07/7.4/S7.4_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of multi line comments
- *
- * @path ch07/7.4/S7.4_A2_T1.js
- * @description Create comments with any code
- */
+/*---
+info: Correct interpretation of multi line comments
+description: Create comments with any code
+---*/
 
 /*CHECK#1*/
 /* $ERROR('#1: Correct interpretation multi line comments');
@@ -74,5 +72,3 @@ $ERROR('#8: var string = "/*var y = 0" /* y = 1;*/ string === "//var y = 0"');
 
 **********
 **/
-
-
diff --git a/test/suite/ch07/7.4/S7.4_A2_T2.js b/test/suite/ch07/7.4/S7.4_A2_T2.js
index feb4c9c2b..ddd0bbe70 100644
--- a/test/suite/ch07/7.4/S7.4_A2_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A2_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of multi line comments
- *
- * @path ch07/7.4/S7.4_A2_T2.js
- * @description Try use /*CHECK#1/. This is not closed multi line comment
- * @negative
- */
+/*---
+info: Correct interpretation of multi line comments
+description: Try use /*CHECK#1/. This is not closed multi line comment
+flags: [negative]
+---*/
 
 /*CHECK#1/
-
diff --git a/test/suite/ch07/7.4/S7.4_A3.js b/test/suite/ch07/7.4/S7.4_A3.js
index 2efc9fab1..4ba2bc391 100644
--- a/test/suite/ch07/7.4/S7.4_A3.js
+++ b/test/suite/ch07/7.4/S7.4_A3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comments cannot nest
- *
- * @path ch07/7.4/S7.4_A3.js
- * @description Try use nested comments
- * @negative
- */
+/*---
+info: Multi line comments cannot nest
+description: Try use nested comments
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
@@ -17,4 +15,3 @@ var
 /* x */
 = 1;
 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T1.js b/test/suite/ch07/7.4/S7.4_A4_T1.js
index 87c6ace88..c99541c1e 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T1.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T1.js
- * @description Try use 2 close comment tags
- * @negative
- */
+/*---
+info: Single and Multi line comments are used together
+description: Try use 2 close comment tags
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
 /* var*/
 x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T2.js b/test/suite/ch07/7.4/S7.4_A4_T2.js
index b64b28e0e..656be9c18 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T2.js
- * @description Fist Multi line comment, then Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Fist Multi line comment, then Single line comment
+---*/
 
 /*CHECK#1*/
 
 /* var
 *///x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T3.js b/test/suite/ch07/7.4/S7.4_A4_T3.js
index 3e39f693a..480c9c30d 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T3.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T3.js
- * @description Insert Single line comment into Multi line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Single line comment into Multi line comment
+---*/
 
 /*CHECK#1*/
 
 /* var
 //x
 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T4.js b/test/suite/ch07/7.4/S7.4_A4_T4.js
index 1b5657663..efb62499f 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T4.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T4.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T4.js
- * @description Try to open Multi line comment at the end of Single comment
- * @negative
- */
+/*---
+info: Single and Multi line comments are used together
+description: Try to open Multi line comment at the end of Single comment
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
 // var /* 
 x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T5.js b/test/suite/ch07/7.4/S7.4_A4_T5.js
index 9a01060ee..796c1e29e 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T5.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T5.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T5.js
- * @description Insert Multi line comment into Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Multi line comment into Single line comment
+---*/
 
 /*CHECK#1*/
 
 // var /* x */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T6.js b/test/suite/ch07/7.4/S7.4_A4_T6.js
index 08c983d7b..cee9abe9f 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T6.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T6.js
- * @description Insert Multi line comment with two closed tags into Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: >
+    Insert Multi line comment with two closed tags into Single line
+    comment
+---*/
 
 /*CHECK#1*/
 
 // var /* x / = */ 1 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T7.js b/test/suite/ch07/7.4/S7.4_A4_T7.js
index a58aa7d5d..037b690b7 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T7.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T7.js
- * @description Insert Multi line comment into Single line comments
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Multi line comment into Single line comments
+---*/
 
 /*CHECK#1*/
 
@@ -14,4 +12,3 @@
 // x 
 // =
 // 1*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A5.js b/test/suite/ch07/7.4/S7.4_A5.js
index bbdba29de..01fc38db0 100644
--- a/test/suite/ch07/7.4/S7.4_A5.js
+++ b/test/suite/ch07/7.4/S7.4_A5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single line comments can contain any Unicode character without Line Terminators
- *
- * @path ch07/7.4/S7.4_A5.js
- * @description //var " + xx + "yy = -1", insert instead of xx all Unicode characters
- */
+/*---
+info: >
+    Single line comments can contain any Unicode character without Line
+    Terminators
+description: >
+    //var " + xx + "yy = -1", insert instead of xx all Unicode
+    characters
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -46,4 +48,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
diff --git a/test/suite/ch07/7.4/S7.4_A6.js b/test/suite/ch07/7.4/S7.4_A6.js
index c51790aeb..39d2766fa 100644
--- a/test/suite/ch07/7.4/S7.4_A6.js
+++ b/test/suite/ch07/7.4/S7.4_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If multi line comments csn not nest, they can contain any Unicode character
- *
- * @path ch07/7.4/S7.4_A6.js
- * @description "var"+ yy+ "xx = 1", insert instead of yy all Unicode characters
- */
+/*---
+info: >
+    If multi line comments csn not nest, they can contain any Unicode
+    character
+description: "\"var\"+ yy+ \"xx = 1\", insert instead of yy all Unicode characters"
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -54,4 +54,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch07/7.6/7.6-1.js b/test/suite/ch07/7.6/7.6-1.js
index b4bc37326..99254e006 100644
--- a/test/suite/ch07/7.6/7.6-1.js
+++ b/test/suite/ch07/7.6/7.6-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-1.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: null (null)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: null (null)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u006eull = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-10.js b/test/suite/ch07/7.6/7.6-10.js
index 36e6ea699..e5149379c 100644
--- a/test/suite/ch07/7.6/7.6-10.js
+++ b/test/suite/ch07/7.6/7.6-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-10.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: new (new)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: new (new)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var n\u0065w = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-11.js b/test/suite/ch07/7.6/7.6-11.js
index 4e5fee3be..e9af09dc6 100644
--- a/test/suite/ch07/7.6/7.6-11.js
+++ b/test/suite/ch07/7.6/7.6-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-11.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: var (var)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: var (var)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var va\u0072 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-12.js b/test/suite/ch07/7.6/7.6-12.js
index 3d939c8a9..f064b7cb9 100644
--- a/test/suite/ch07/7.6/7.6-12.js
+++ b/test/suite/ch07/7.6/7.6-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-12.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: try (try)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: try (try)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0074\u0072\u0079 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-13.js b/test/suite/ch07/7.6/7.6-13.js
index bde18e099..e18005f17 100644
--- a/test/suite/ch07/7.6/7.6-13.js
+++ b/test/suite/ch07/7.6/7.6-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-13.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: catch (catch)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: catch (catch)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0063atch = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-14.js b/test/suite/ch07/7.6/7.6-14.js
index d9c6d794f..aecf17902 100644
--- a/test/suite/ch07/7.6/7.6-14.js
+++ b/test/suite/ch07/7.6/7.6-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-14.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: finally (finally)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: finally (finally)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var fina\u006cly = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-15.js b/test/suite/ch07/7.6/7.6-15.js
index b2f034760..3193cee24 100644
--- a/test/suite/ch07/7.6/7.6-15.js
+++ b/test/suite/ch07/7.6/7.6-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-15.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: return (return)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: return (return)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var retur\u006e = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-16.js b/test/suite/ch07/7.6/7.6-16.js
index ba98c547b..fa82eef2c 100644
--- a/test/suite/ch07/7.6/7.6-16.js
+++ b/test/suite/ch07/7.6/7.6-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-16.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: void (void)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: void (void)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0076\u006f\u0069\u0064 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-17.js b/test/suite/ch07/7.6/7.6-17.js
index 93a309cbd..42f1b11ad 100644
--- a/test/suite/ch07/7.6/7.6-17.js
+++ b/test/suite/ch07/7.6/7.6-17.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-17.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: continue (continue)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: continue (continue)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0063ontinue = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-18.js b/test/suite/ch07/7.6/7.6-18.js
index aba469e60..aaa18aab4 100644
--- a/test/suite/ch07/7.6/7.6-18.js
+++ b/test/suite/ch07/7.6/7.6-18.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-18.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: for (for)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: for (for)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var f\u006fr = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-19.js b/test/suite/ch07/7.6/7.6-19.js
index b6df7be44..7a1d06dee 100644
--- a/test/suite/ch07/7.6/7.6-19.js
+++ b/test/suite/ch07/7.6/7.6-19.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-19.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: switch (switch)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: switch (switch)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var switc\u0068 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-2.js b/test/suite/ch07/7.6/7.6-2.js
index c6ecd7172..c706f39ec 100644
--- a/test/suite/ch07/7.6/7.6-2.js
+++ b/test/suite/ch07/7.6/7.6-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-2.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: true (true)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: true (true)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var tr\u0075e = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-20.js b/test/suite/ch07/7.6/7.6-20.js
index 1eefcf064..dc01317fd 100644
--- a/test/suite/ch07/7.6/7.6-20.js
+++ b/test/suite/ch07/7.6/7.6-20.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-20.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: while (while)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: while (while)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0077\u0068\u0069\u006c\u0065 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-21.js b/test/suite/ch07/7.6/7.6-21.js
index c1cc483ec..dd8ef8040 100644
--- a/test/suite/ch07/7.6/7.6-21.js
+++ b/test/suite/ch07/7.6/7.6-21.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-21.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: debugger (debugger)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: debugger (debugger)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0064ebugger = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-22.js b/test/suite/ch07/7.6/7.6-22.js
index a050ca989..7a2bd8c10 100644
--- a/test/suite/ch07/7.6/7.6-22.js
+++ b/test/suite/ch07/7.6/7.6-22.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-22.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: function (function)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: function (function)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var func\u0074ion = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-23.js b/test/suite/ch07/7.6/7.6-23.js
index df98f3815..1b9cdffcb 100644
--- a/test/suite/ch07/7.6/7.6-23.js
+++ b/test/suite/ch07/7.6/7.6-23.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-23.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: this (this)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: this (this)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var thi\u0073 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-24.js b/test/suite/ch07/7.6/7.6-24.js
index d5773ebf2..fae50ce62 100644
--- a/test/suite/ch07/7.6/7.6-24.js
+++ b/test/suite/ch07/7.6/7.6-24.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-24.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: if (if)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: if (if)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0069\u0066 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-25.js b/test/suite/ch07/7.6/7.6-25.js
index ff25f3e02..86d984abc 100644
--- a/test/suite/ch07/7.6/7.6-25.js
+++ b/test/suite/ch07/7.6/7.6-25.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-25.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: with (with)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: with (with)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0077ith = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-26.js b/test/suite/ch07/7.6/7.6-26.js
index c740431cb..6289e1374 100644
--- a/test/suite/ch07/7.6/7.6-26.js
+++ b/test/suite/ch07/7.6/7.6-26.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-26.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: default (default)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: default (default)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var def\u0061ult = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-27.js b/test/suite/ch07/7.6/7.6-27.js
index e51bb26d8..d4ebd2fde 100644
--- a/test/suite/ch07/7.6/7.6-27.js
+++ b/test/suite/ch07/7.6/7.6-27.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-27.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: throw (throw)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: throw (throw)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var thro\u0077 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-28.js b/test/suite/ch07/7.6/7.6-28.js
index 8f4dd26cf..0bb46f493 100644
--- a/test/suite/ch07/7.6/7.6-28.js
+++ b/test/suite/ch07/7.6/7.6-28.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-28.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: in (in)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: in (in)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0069\u006e = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-29.js b/test/suite/ch07/7.6/7.6-29.js
index 9e97c02ba..5f7b9f73e 100644
--- a/test/suite/ch07/7.6/7.6-29.js
+++ b/test/suite/ch07/7.6/7.6-29.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-29.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: delete (delete)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: delete (delete)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0064elete = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-3.js b/test/suite/ch07/7.6/7.6-3.js
index d14357042..376996c12 100644
--- a/test/suite/ch07/7.6/7.6-3.js
+++ b/test/suite/ch07/7.6/7.6-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-3.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: false (false)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: false (false)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var fals\u0065 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-30.js b/test/suite/ch07/7.6/7.6-30.js
index 6e4af63b4..71136892c 100644
--- a/test/suite/ch07/7.6/7.6-30.js
+++ b/test/suite/ch07/7.6/7.6-30.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-30.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: class (class)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: class (class)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var cla\u0073s = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-31.js b/test/suite/ch07/7.6/7.6-31.js
index c9fb1089e..eeb57f89d 100644
--- a/test/suite/ch07/7.6/7.6-31.js
+++ b/test/suite/ch07/7.6/7.6-31.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-31.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: extends (extends)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: extends (extends)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var extend\u0073 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-32.js b/test/suite/ch07/7.6/7.6-32.js
index 86ea96417..6a0e70534 100644
--- a/test/suite/ch07/7.6/7.6-32.js
+++ b/test/suite/ch07/7.6/7.6-32.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-32.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: enum (enum)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: enum (enum)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0065\u006e\u0075\u006d = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-33.js b/test/suite/ch07/7.6/7.6-33.js
index 3d6c8dbe3..6ebaeea9e 100644
--- a/test/suite/ch07/7.6/7.6-33.js
+++ b/test/suite/ch07/7.6/7.6-33.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-33.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: super (super)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: super (super)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0073uper = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-34.js b/test/suite/ch07/7.6/7.6-34.js
index 391fa0191..32b4c1d66 100644
--- a/test/suite/ch07/7.6/7.6-34.js
+++ b/test/suite/ch07/7.6/7.6-34.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-34.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: const (const)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: const (const)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var co\u006est = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-35.js b/test/suite/ch07/7.6/7.6-35.js
index 5a729ad00..db302dc4b 100644
--- a/test/suite/ch07/7.6/7.6-35.js
+++ b/test/suite/ch07/7.6/7.6-35.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-35.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: export (export)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: export (export)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var expor\u0074 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-36.js b/test/suite/ch07/7.6/7.6-36.js
index afc680a0e..c12e5ca6b 100644
--- a/test/suite/ch07/7.6/7.6-36.js
+++ b/test/suite/ch07/7.6/7.6-36.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-36.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: import (import)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: import (import)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0069\u006d\u0070\u006f\u0072\u0074 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-4.js b/test/suite/ch07/7.6/7.6-4.js
index b621b8d7e..88f8b4f7c 100644
--- a/test/suite/ch07/7.6/7.6-4.js
+++ b/test/suite/ch07/7.6/7.6-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-4.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: break (break)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: break (break)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0062\u0072\u0065\u0061\u006b = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-5.js b/test/suite/ch07/7.6/7.6-5.js
index 5889b2fc6..2523b31b1 100644
--- a/test/suite/ch07/7.6/7.6-5.js
+++ b/test/suite/ch07/7.6/7.6-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-5.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: case (case)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: case (case)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0063ase = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-6.js b/test/suite/ch07/7.6/7.6-6.js
index d70805344..40b590e1f 100644
--- a/test/suite/ch07/7.6/7.6-6.js
+++ b/test/suite/ch07/7.6/7.6-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-6.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: instanceof (instanceof)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: instanceof (instanceof)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var insta\u006eceof = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-7.js b/test/suite/ch07/7.6/7.6-7.js
index f388e1302..862f04e07 100644
--- a/test/suite/ch07/7.6/7.6-7.js
+++ b/test/suite/ch07/7.6/7.6-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-7.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: typeof (typeof)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: typeof (typeof)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var typeo\u0066 = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-8.js b/test/suite/ch07/7.6/7.6-8.js
index ab4f25978..fc7a0d84c 100644
--- a/test/suite/ch07/7.6/7.6-8.js
+++ b/test/suite/ch07/7.6/7.6-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-8.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: do (do)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: do (do)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0064\u006f = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6-9.js b/test/suite/ch07/7.6/7.6-9.js
index 2e9f07b03..238e1009f 100644
--- a/test/suite/ch07/7.6/7.6-9.js
+++ b/test/suite/ch07/7.6/7.6-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6-9.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: else (else) (null)

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: else (else) (null)
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

             try {

                 eval("var \u0065lse = 123;");  

@@ -17,4 +19,4 @@ function testcase() {
                 return e instanceof SyntaxError;  

             }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-1.js
index 20be0698f..e152888de 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-1.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             null: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-10.js
index 08f1d0026..81bdb897c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-10.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             in: 0, 

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-11.js
index 6875887d9..4fec3d3d9 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-11.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             enum: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-12.js
index 52940898d..ff2cc2bfa 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-12.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             const: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-13.js
index d35543629..fc5a9f30e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-13.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             implements: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-14.js
index 6d9270d3e..b58df6880 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-14.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             public: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-15.js
index 4585126a0..6b02595c8 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-15.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             package: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-16.js
index 20b61eccf..06e7e2542 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-16.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: undeefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: undeefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             undefined: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-2.js
index 8b0ca79ea..dc834d144 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-2.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             break: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-3.js
index 5254fdfa3..6ee8dc2cb 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-3.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             instanceof: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-4.js
index 5391b5be8..305e31b44 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-4.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             new: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-5.js
index cc65a2bd2..88fae4fa0 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-5.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             finally: 0,

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-6.js
index 157b2fec9..b29505d0f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-6.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             continue: 0, 

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-7.js
index 227e58d5a..3b682c6f8 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-7.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             while: 0, 

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-8.js
index 0045ead1d..60a55d7a9 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-8.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase(){

         var tokenCodes  = {       

             this: 0,  

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-1-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-1-9.js
index 285d14ec9..411410f57 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-1-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-1-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-1-9.js

- * @description Allow reserved words as property names at object initialization, verified with hasOwnProperty: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    verified with hasOwnProperty: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase(){      

         var tokenCodes  = { 

             if: 0, 

@@ -31,4 +33,4 @@ function testcase(){
         }

         return true;

 }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-1.js
index d652a22a4..e82407601 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-1.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.null = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-10.js
index 2d8ed66f1..629e5ed01 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-10.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.in = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-11.js
index 2185f2de0..321739a62 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-11.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.enum = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-12.js
index 622ec9067..45a0c65ec 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-12.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.const = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-13.js
index 169cbc798..a5ea81a9c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-13.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.implements = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-14.js
index 3343b2670..a18af7cbe 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-14.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.public = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-15.js
index ce04d2900..f681cb947 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-15.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.package = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-16.js
index e078859fc..a2b8e200c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-16.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.undefined = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-2.js
index 3a8997852..8a2c3f8ba 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-2.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.break = 0;  	

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-3.js
index 30e4bc139..b352d2640 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-3.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.instanceof = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-4.js
index 0d43d0373..4f541b013 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-4.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.new = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-5.js
index 542175c02..d1f4ee984 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-5.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.finally = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-6.js
index 20a949a70..031ac69da 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-6.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.continue = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-7.js
index 83f526468..75c500fe1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-7.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.while = 0; 

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-8.js
index 62e39d18a..8cec3d552 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-8.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.this = 0; 

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-2-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-2-9.js
index 99678952f..c899ff219 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-2-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-2-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-2-9.js

- * @description Allow reserved words as property names by dot operator assignment, verified with hasOwnProperty: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    verified with hasOwnProperty: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.if = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-1.js
index 7f890eb5d..7c591a92a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-1.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['null'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-10.js
index 83dddc14e..9328a5970 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-10.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['in'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-11.js
index 4b1f58b41..dd94c2a6b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-11.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['enum'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-12.js
index 72cc76dbe..2b909d357 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-12.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['const'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-13.js
index 6bd557357..4a896b7c6 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-13.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['implements'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-14.js
index b70990d6c..934b949b1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-14.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['public'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-15.js
index f5b7664b8..cafad39ff 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-15.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['package'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-16.js
index afd96393c..bc9e831e7 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-16.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['undefined'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-2.js
index 351e26392..61b59bb83 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-2.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['break'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-3.js
index c756355fe..6422421f0 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-3.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['instanceof'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-4.js
index 15de6619b..851e749ac 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-4.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['new'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-5.js
index cae2bb6e6..d5552134b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-5.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['finally'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-6.js
index 452072295..485c5a5ae 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-6.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['continue'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-7.js
index 15092a0cf..4367b1a0e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-7.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['while'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-8.js
index 19db5267f..c860b73bc 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-8.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['this'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-3-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-3-9.js
index 856cdb104..db900be78 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-3-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-3-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-3-9.js

- * @description Allow reserved words as property names by index assignment,verified with hasOwnProperty: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index
+    assignment,verified with hasOwnProperty: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes['if'] = 0;

@@ -30,4 +32,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-1.js
index 8f81d173c..4c79ecd65 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-1.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-10.js
index ae2445a25..a389be91e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-10.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-11.js
index 081d81170..77413732f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-11.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-12.js
index 3c16683f7..a14257b0b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-12.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-13.js
index 47dd6e266..d6ad18813 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-13.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-14.js
index 0d1e1aa4f..53f620d31 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-14.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-15.js
index 111f00706..dcc6c3874 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-15.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-16.js
index 0edafa8e3..218dc1938 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-16.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-2.js
index 8569c9cea..396e4c7d6 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-2.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-3.js
index 3ef8ea7aa..b7234d85c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-3.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-4.js
index afb165ed1..7b424f4ea 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-4.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-5.js
index e4c6badae..0252606ae 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-5.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-6.js
index f240ded36..ee2ce3350 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-6.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-7.js
index 6134976c8..6ef4ca018 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-7.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-8.js
index a027cf608..415731dd2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-8.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-4-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-4-9.js
index 1828b0d9a..881371129 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-4-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-4-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-4-9.js

- * @description Allow reserved words as property names by set function within an object, verified with hasOwnProperty: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, verified with hasOwnProperty: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -47,4 +49,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-1.js
index 88eb2869f..7ee7d8e92 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-1.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             null: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-10.js
index a00ce7096..d68d0f617 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-10.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             in: 0, 

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-11.js
index 7a3a3af0c..d3425cb69 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-11.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             enum: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-12.js
index b2b7645f5..324825868 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-12.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             const : 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-13.js
index a7b03b95c..c366336f3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-13.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             implements: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-14.js
index f24467c8f..82464e994 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-14.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             public: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-15.js
index 498e5e7d5..fb0fd186e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-15.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             package: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-16.js
index 8bf471549..83079aa1d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-16.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {

             undefined: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-2.js
index 79ccb65b9..bcb52fae5 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-2.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             break: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-3.js
index 643fce68f..ff53dc5e1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-3.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             instanceof: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-4.js
index 8080248a2..6287ed7fc 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-4.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             new: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-5.js
index bb3280732..d2432c88b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-5.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             finally: 0,

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-6.js
index c9dc5a146..e7fea4674 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-6.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             continue: 0, 

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-7.js
index a0a5a977b..f040c5588 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-7.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             while: 0, 

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-8.js
index d659f6acd..00bd68a35 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-8.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {       

             this: 0,  

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-5-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-5-9.js
index 6e21dfd78..30f3454be 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-5-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-5-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-5-9.js

- * @description Allow reserved words as property names at object initialization, accessed via indexing: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names at object initialization,
+    accessed via indexing: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = { 

             if: 0, 

@@ -27,4 +29,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-1.js
index b2c98910a..aa951aad2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-1.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.null = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-10.js
index 3099c4abc..423efca67 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-10.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.in = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-11.js
index 9fda29ca4..055c39b18 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-11.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.enum = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-12.js
index 7cfb6643a..4c2638547 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-12.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.const = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-13.js
index ff4bf38cf..44a061d05 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-13.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.implements = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-14.js
index 4bea56fe5..892cf26c3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-14.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.public = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-15.js
index 0021da41b..7aefd5f05 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-15.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.package = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-16.js
index bc98a8a5f..aa6ba7bd1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-16.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.undefined = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-2.js
index 65c06c957..149dd010c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-2.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes.break = 0;  	

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-3.js
index b403a3efe..834e7d381 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-3.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.instanceof = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-4.js
index cbe85b25e..875693a88 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-4.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.new = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-5.js
index 5d2e1b6f6..9360d3a58 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-5.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.finally = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-6.js
index df407917b..1846c8410 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-6.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.continue = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-7.js
index 1c4ca549c..aa5d81404 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-7.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.while = 0; 

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-8.js
index 945eecf73..33dcb3d72 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-8.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.this = 0; 

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-6-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-6-9.js
index ae8bbbcd2..d8568e027 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-6-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-6-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-6-9.js

- * @description Allow reserved words as property names by dot operator assignment, accessed via indexing: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by dot operator assignment,
+    accessed via indexing: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes  = {};

         tokenCodes.if = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-1.js
index 060d98cb9..f5d887e07 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-1.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['null'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-10.js
index 22a2e32fb..4a1fec0af 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-10.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['in'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-11.js
index 0c0176399..36bee196c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-11.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['enum'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-12.js
index 56eb9d318..c20dcc5f2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-12.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['const'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-13.js
index fd8beb9a2..0d08da554 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-13.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['implements'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-14.js
index 295abc5d1..3e3df39c1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-14.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['public'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-15.js
index 5c95f6db6..af262c31d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-15.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['package'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-16.js
index f8146c5ab..7e20d489b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-16.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['undefined'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-2.js
index 62df8ea1d..d893d4e1f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-2.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['break'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-3.js
index 772c108b4..f7965a8ff 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-3.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['instanceof'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-4.js
index 99d7868b9..1f47ed943 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-4.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['new'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-5.js
index 3543e4f25..625b6fd49 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-5.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['finally'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-6.js
index 652fc97d7..61fadac94 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-6.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['continue'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-7.js
index 1605d5d0b..33973e848 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-7.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['while'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-8.js
index eab4c423a..4a3a7f690 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-8.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['this'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-7-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-7-9.js
index 9f018dfa6..ed8dcdecd 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-7-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-7-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-7-9.js

- * @description Allow reserved words as property names by index assignment, accessed via indexing: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by index assignment,
+    accessed via indexing: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var tokenCodes = {};

         tokenCodes['if'] = 0;

@@ -26,4 +28,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-1.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-1.js
index 7d816111d..00ab69388 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-1.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-1.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: null, true, false

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: null, true, false
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-10.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-10.js
index 3b48de443..7866690c2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-10.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-10.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: in, try, class

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: in, try, class
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-11.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-11.js
index ff92952e1..fab1a9f85 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-11.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-11.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: enum, extends, super

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: enum, extends, super
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-12.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-12.js
index 2a4a1d170..62da332a4 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-12.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-12.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: const, export, import

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: const, export, import
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-13.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-13.js
index a2f46d570..89f76f312 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-13.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-13.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: implements, let, private

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: implements, let, private
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-14.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-14.js
index 393ae46b0..475e094ad 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-14.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-14.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: public, yield, interface

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: public, yield, interface
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-15.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-15.js
index 81d5f4b7f..7fa893a99 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-15.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-15.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: package, protected, static

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: package, protected, static
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-16.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-16.js
index 91ff6b9c8..d5b60c494 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-16.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-16.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: undefined, NaN, Infinity

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: undefined, NaN, Infinity
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-2.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-2.js
index 9af600938..e9f991e05 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-2.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-2.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: break, case, do

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: break, case, do
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-3.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-3.js
index b26b4d020..de828f912 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-3.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-3.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: instanceof, typeof, else

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: instanceof, typeof, else
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-4.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-4.js
index b8de25452..38af7ca50 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-4.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-4.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: new, var, catch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: new, var, catch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-5.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-5.js
index 26d5f3aac..5f72f854d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-5.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-5.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: finally, return, void

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: finally, return, void
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-6.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-6.js
index 4b5f217f4..f8c762cb3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-6.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-6.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: continue, for, switch

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: continue, for, switch
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-7.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-7.js
index 58555e62e..ff78b0a3a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-7.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-7.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: while, debugger, function

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: while, debugger, function
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-8.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-8.js
index c6c39dd22..3ab8f4a83 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-8.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-8.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: this, with, default

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: this, with, default
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1-8-9.js b/test/suite/ch07/7.6/7.6.1/7.6.1-8-9.js
index f61ec565b..bfd6b8226 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1-8-9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1-8-9.js
@@ -1,14 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1-8-9.js

- * @description Allow reserved words as property names by set function within an object, accessed via indexing: if, throw, delete

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Allow reserved words as property names by set function within an
+    object, accessed via indexing: if, throw, delete
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         var test0 = 0, test1 = 1, test2 = 2;

         var tokenCodes  = {

@@ -43,4 +45,4 @@ function testcase() {
         }

         return true;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.1.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.1.js
index 89653b5cd..6297d2c81 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "break" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.1.js
- * @description Checking if execution of "break=1" fails
- * @negative
- */
+/*---
+info: The "break" token can not be used as identifier
+description: Checking if execution of "break=1" fails
+flags: [negative]
+---*/
 
 break = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
index 0511807b6..2d08967b2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "for" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.10.js
- * @description Checking if execution of "for=1" fails
- * @negative
- */
+/*---
+info: The "for" token can not be used as identifier
+description: Checking if execution of "for=1" fails
+flags: [negative]
+---*/
 
 for = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.11.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.11.js
index 39d4b7efa..e2c51c87f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.11.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "function" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.11.js
- * @description Checking if execution of "function=1" fails
- * @negative
- */
+/*---
+info: The "function" token can not be used as identifier
+description: Checking if execution of "function=1" fails
+flags: [negative]
+---*/
 
 function = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.12.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.12.js
index 43433a6b5..35a397443 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.12.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "if" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.12.js
- * @description Checking if execution of "if=1" fails
- * @negative
- */
+/*---
+info: The "if" token can not be used as identifier
+description: Checking if execution of "if=1" fails
+flags: [negative]
+---*/
 
 if = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.13.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.13.js
index 2e52df961..e018c9e4d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.13.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "in" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.13.js
- * @description Checking if execution of "in=1" fails
- * @negative
- */
+/*---
+info: The "in" token can not be used as identifier
+description: Checking if execution of "in=1" fails
+flags: [negative]
+---*/
 
 in = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.14.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.14.js
index 5867436c7..7060f8beb 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.14.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "instanceof" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.14.js
- * @description Checking if execution of "instanceof=1" fails
- * @negative
- */
+/*---
+info: The "instanceof" token can not be used as identifier
+description: Checking if execution of "instanceof=1" fails
+flags: [negative]
+---*/
 
 instanceof = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.15.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.15.js
index 56ec3af72..e62727f28 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.15.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "new" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.15.js
- * @description Checking if execution of "new=1" fails
- * @negative
- */
+/*---
+info: The "new" token can not be used as identifier
+description: Checking if execution of "new=1" fails
+flags: [negative]
+---*/
 
 new = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.16.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.16.js
index 7f6a21a7c..81dd89743 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.16.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "return" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.16.js
- * @description Checking if execution of "return=1" fails
- * @negative
- */
+/*---
+info: The "return" token can not be used as identifier
+description: Checking if execution of "return=1" fails
+flags: [negative]
+---*/
 
 return = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.17.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.17.js
index 34024b4d4..0521b0548 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.17.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.17.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "switch" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.17.js
- * @description Checking if execution of "switch=1" fails
- * @negative
- */
+/*---
+info: The "switch" token can not be used as identifier
+description: Checking if execution of "switch=1" fails
+flags: [negative]
+---*/
 
 switch = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.18.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.18.js
index 6068789b6..69a5010d9 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.18.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.18.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "this" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.18.js
- * @description Checking if execution of "this=1" fails
- * @negative
- */
+/*---
+info: The "this" token can not be used as identifier
+description: Checking if execution of "this=1" fails
+flags: [negative]
+---*/
 
 this = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.19.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.19.js
index bb5ce8b7d..56449d9f7 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.19.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.19.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "throw" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.19.js
- * @description Checking if execution of "throw=1" fails
- * @negative
- */
+/*---
+info: The "throw" token can not be used as identifier
+description: Checking if execution of "throw=1" fails
+flags: [negative]
+---*/
 
 throw = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.2.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.2.js
index fa0b3a8fd..291bbac53 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "case" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.2.js
- * @description Checking if execution of "case=1" fails
- * @negative
- */
+/*---
+info: The "case" token can not be used as identifier
+description: Checking if execution of "case=1" fails
+flags: [negative]
+---*/
 
 case = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.20.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.20.js
index 62ce326f6..f2a5e66d0 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.20.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.20.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "try" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.20.js
- * @description Checking if execution of "try=1" fails
- * @negative
- */
+/*---
+info: The "try" token can not be used as identifier
+description: Checking if execution of "try=1" fails
+flags: [negative]
+---*/
 
 try = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.21.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.21.js
index d2aeca3fc..6111f4919 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.21.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.21.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "typeof" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.21.js
- * @description Checking if execution of "typeof=1" fails
- * @negative
- */
+/*---
+info: The "typeof" token can not be used as identifier
+description: Checking if execution of "typeof=1" fails
+flags: [negative]
+---*/
 
 typeof = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.22.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.22.js
index 2530ab8e7..3cfdf4038 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.22.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.22.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "var" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.22.js
- * @description Checking if execution of "var=1" fails
- * @negative
- */
+/*---
+info: The "var" token can not be used as identifier
+description: Checking if execution of "var=1" fails
+flags: [negative]
+---*/
 
 var = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.23.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.23.js
index 61f99bce1..0cbd7da1a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.23.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.23.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "void" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.23.js
- * @description Checking if execution of "void=1" fails
- * @negative
- */
+/*---
+info: The "void" token can not be used as identifier
+description: Checking if execution of "void=1" fails
+flags: [negative]
+---*/
 
 void = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.24.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.24.js
index 8c6c2816d..8f50c109e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.24.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.24.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "while" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.24.js
- * @description Checking if execution of "while=1" fails
- * @negative
- */
+/*---
+info: The "while" token can not be used as identifier
+description: Checking if execution of "while=1" fails
+flags: [negative]
+---*/
 
 while = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.25.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.25.js
index 15a7745b1..c76a85862 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.25.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.25.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "with" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.25.js
- * @description Checking if execution of "with=1" fails
- * @negative
- */
+/*---
+info: The "with" token can not be used as identifier
+description: Checking if execution of "with=1" fails
+flags: [negative]
+---*/
 
 with = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.3.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.3.js
index f69193845..a7bfec04c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "catch" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.3.js
- * @description Checking if execution of "catch=1" fails
- * @negative
- */
+/*---
+info: The "catch" token can not be used as identifier
+description: Checking if execution of "catch=1" fails
+flags: [negative]
+---*/
 
 catch = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.4.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.4.js
index 86c02078d..c56c8b137 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.4.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "continue" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.4.js
- * @description Checking if execution of "contunue=1" fails
- * @negative
- */
+/*---
+info: The "continue" token can not be used as identifier
+description: Checking if execution of "contunue=1" fails
+flags: [negative]
+---*/
 
 continue = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.5.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.5.js
index 52ad11b46..5e6127397 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.5.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "default" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.5.js
- * @description Checking if execution of "default=1" fails
- * @negative
- */
+/*---
+info: The "default" token can not be used as identifier
+description: Checking if execution of "default=1" fails
+flags: [negative]
+---*/
 
 default = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.6.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.6.js
index b6c24d8bf..0cf56e2af 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.6.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "delete" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.6.js
- * @description Checking if execution of "delete=1" fails
- * @negative
- */
+/*---
+info: The "delete" token can not be used as identifier
+description: Checking if execution of "delete=1" fails
+flags: [negative]
+---*/
 
 delete = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.7.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.7.js
index bce1d54ec..74a1eef2e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.7.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "do" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.7.js
- * @description Checking if execution of "do=1" fails
- * @negative
- */
+/*---
+info: The "do" token can not be used as identifier
+description: Checking if execution of "do=1" fails
+flags: [negative]
+---*/
 
 do = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.8.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.8.js
index b51909070..2e9696160 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.8.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "else" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.8.js
- * @description Checking if execution of "else=1" fails
- * @negative
- */
+/*---
+info: The "else" token can not be used as identifier
+description: Checking if execution of "else=1" fails
+flags: [negative]
+---*/
 
 else = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.9.js b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.9.js
index cea582656..36371fa9a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.9.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "finally" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.1/S7.6.1.1_A1.9.js
- * @description Checking if execution of "finally=1" fails
- * @negative
- */
+/*---
+info: The "finally" token can not be used as identifier
+description: Checking if execution of "finally=1" fails
+flags: [negative]
+---*/
 
 finally = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2-1gs.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2-1gs.js
index b76c692e7..496a1595a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2-1gs.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2-1gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2-1gs.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'implements' occurs in strict mode code

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'implements' occurs in strict mode code
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
 "use strict";

 throw NotEarlyError;

-var implements = 1;

+var implements = 1;
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-17-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-17-s.js
index 99014065a..ea3236c5d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-17-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-17-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-17-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: implements (implements)

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: implements (implements)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -20,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-18-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-18-s.js
index 3327995db..e4f3adc95 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-18-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-18-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-18-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: l\u0065t (let)

- * @onlyStrict 

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: l\u0065t (let)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {        

         "use strict";

 

@@ -20,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-19-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-19-s.js
index 14a5183d8..ce2ae6093 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-19-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-19-s.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-19-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: privat\u0065 (private)

- * @onlyStrict 

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: privat\u0065 (private)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -19,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-20-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-20-s.js
index 846805b69..172ae913b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-20-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-20-s.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-20-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: \u0070\u0075\u0062\u006c\u0069\u0063 (public)

- * @onlyStrict

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: \u0070\u0075\u0062\u006c\u0069\u0063 (public)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -19,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-21-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-21-s.js
index f0536eac3..6d4525a0c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-21-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-21-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-21-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: \u0079ield (yield)

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: \u0079ield (yield)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-22-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-22-s.js
index 5eb6d1ec6..07b32dded 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-22-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-22-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-22-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: inte\u0072face (interface)

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: inte\u0072face (interface)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-23-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-23-s.js
index db11bad05..b193ecbdb 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-23-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-23-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-23-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: packag\u0065 (package)

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: packag\u0065 (package)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-24-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-24-s.js
index f2c7e9f90..52f300399 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-24-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-24-s.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-24-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: \u0070\u0072\u006f\u0074\u0065\u0063\u0074\u0065\u0064 (protected)

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8:
+    \u0070\u0072\u006f\u0074\u0065\u0063\u0074\u0065\u0064 (protected)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +23,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-25-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-25-s.js
index b6ca63f82..4a82d5e7f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-25-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1-25-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1-25-s.js

- * @description 7.6 - SyntaxError expected: reserved words used as Identifier Names in UTF8: \u0073\u0074\u0061\u0074\u0069\u0063 (static)

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    7.6 - SyntaxError expected: reserved words used as Identifier
+    Names in UTF8: \u0073\u0074\u0061\u0074\u0069\u0063 (static)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-1-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-1-s.js
index 3c34bc7cb..c8ddd5c89 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-1-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-1-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-1-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'implements' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'implements' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -20,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-10-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-10-s.js
index 8c5004d91..c04cb2da9 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-10-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-10-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-10-s.js

- * @description Strict Mode - SyntaxError isn't thrown when 'IMPLEMENTS' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when 'IMPLEMENTS' occurs in
+    strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var IMPLEMENTS = 1;

         return IMPLEMENTS === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-11-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-11-s.js
index 34a017854..dee51e059 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-11-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-11-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-11-s.js

- * @description Strict Mode - SyntaxError isn't thrown when 'Implements' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when 'Implements' occurs in
+    strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var Implements = 1;

         return Implements === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-12-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-12-s.js
index 14796c164..f837c1bf2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-12-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-12-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-12-s.js

- * @description Strict Mode - SyntaxError isn't thrown when 'implement' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when 'implement' occurs in
+    strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var implement = 1;

         return implement === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-13-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-13-s.js
index 4513e1222..f1934a9f0 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-13-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-13-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-13-s.js

- * @description Strict Mode - SyntaxError isn't thrown when 'implementss' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when 'implementss' occurs
+    in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var implementss = 1;

         return implementss === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-14-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-14-s.js
index 4863705c0..db304fe2a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-14-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-14-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-14-s.js

- * @description Strict Mode - SyntaxError isn't thrown when 'implements0' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when 'implements0' occurs
+    in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var implements0 = 1;

         return implements0 === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-16-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-16-s.js
index 16f6bc191..0a4e3ce24 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-16-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-16-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-16-s.js

- * @description Strict Mode - SyntaxError isn't thrown when '_implements' occurs in strict mode code

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when '_implements' occurs
+    in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         var _implements = 1;

         return _implements === 1;

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-2-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-2-s.js
index 9f922e41d..2d1615a96 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-2-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-2-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-2-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'let' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord 'let'
+    occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-3-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-3-s.js
index 77530dd7b..2b135f936 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-3-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-3-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-3-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'private' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'private' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-4-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-4-s.js
index 6f021380b..50263d2da 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-4-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-4-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-4-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'public' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'public' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-5-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-5-s.js
index f6a798385..cfe7d306b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-5-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-5-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-5-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'yield' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'yield' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-6-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-6-s.js
index 3e1e35ccd..a4a09d5fe 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-6-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-6-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-6-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'interface' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'interface' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-7-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-7-s.js
index 6d2487376..dc47f5d9c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-7-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-7-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-7-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'package' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'package' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-8-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-8-s.js
index 8e2f8e8fe..f7b679a9a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-8-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-8-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-8-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'protected' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'protected' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-9-s.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-9-s.js
index 6e5ebfd21..1796ea0c6 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-9-s.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-9-s.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.6/7.6.1/7.6.1.2/7.6.1.2-9-s.js

- * @description Strict Mode - SyntaxError is thrown when FutureReservedWord 'static' occurs in strict mode code

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when FutureReservedWord
+    'static' occurs in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

 

@@ -22,4 +22,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.1.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.1.js
index 4b7573d26..dab17123b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.1.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.1.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "abstract" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.1.js
- * @description Checking if execution of "abstract=1" succeeds
- */
+/*---
+info: The "abstract" token can be used as identifier
+description: Checking if execution of "abstract=1" succeeds
+---*/
 
 var abstract = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.10.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.10.js
index d255891bb..c90e16dd5 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.10.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.10.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "export" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.10.js
- * @description Checking if execution of "export=1" fails
- * @negative
- */
+/*---
+info: The "export" token can not be used as identifier
+description: Checking if execution of "export=1" fails
+flags: [negative]
+---*/
 
 var export = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.11.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.11.js
index f95dbf77e..572942674 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.11.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.11.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "extends" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.11.js
- * @description Checking if execution of "extends=1" fails
- * @negative
- */
+/*---
+info: The "extends" token can not be used as identifier
+description: Checking if execution of "extends=1" fails
+flags: [negative]
+---*/
 
 var extends = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.12.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.12.js
index 41d1a2aa3..56e2ceced 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.12.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.12.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "final" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.12.js
- * @description Checking if execution of "final=1" succeeds
- */
+/*---
+info: The "final" token can be used as identifier
+description: Checking if execution of "final=1" succeeds
+---*/
 
 var final = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.13.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.13.js
index fcea14220..599479e87 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.13.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.13.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "float" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.13.js
- * @description Checking if execution of "float=1" succeeds
- */
+/*---
+info: The "float" token can be used as identifier
+description: Checking if execution of "float=1" succeeds
+---*/
 
 var float = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.14.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.14.js
index a8c81aef6..b0238049b 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.14.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.14.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "goto" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.14.js
- * @description Checking if execution of "goto=1" succeeds
- */
+/*---
+info: The "goto" token can be used as identifier
+description: Checking if execution of "goto=1" succeeds
+---*/
 
 var goto = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15.js
index b1d3adb8a..e970fdd7c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "implements" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15.js
- * @description Checking if execution of "implements=1" fails in strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "implements" token can not be used as identifier in strict code
+description: Checking if execution of "implements=1" fails in strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15ns.js
index 845f7914a..c3e177e68 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "implements" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.15ns.js
- * @description Checking if execution of "implements=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "implements" token can be used as identifier in non-strict code
+description: Checking if execution of "implements=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var implements = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.16.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.16.js
index 0e28098f0..7f8b5d75d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.16.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.16.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "import" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.16.js
- * @description Checking if execution of "import=1" fails
- * @negative
- */
+/*---
+info: The "import" token can not be used as identifier
+description: Checking if execution of "import=1" fails
+flags: [negative]
+---*/
 
 var import = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.17.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.17.js
index 97bd27342..e55c4ef6e 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.17.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.17.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "int" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.17.js
- * @description Checking if execution of "int=1" succeeds
- */
+/*---
+info: The "int" token can be used as identifier
+description: Checking if execution of "int=1" succeeds
+---*/
 
 var int = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18.js
index e8dd1ff42..6b5dcd5a0 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "interface" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18.js
- * @description Checking if execution of "interface = 1" fails in
- *               strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "interface" token can not be used as identifier in strict code
+description: Checking if execution of "interface = 1" fails in  strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var interface = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18ns.js
index 878a7cd42..ad7db6163 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18ns.js
@@ -1,15 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "interface" token can be used as identifier in
- * non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.18ns.js
- * @description Checking if execution of "interface = 1" succeeds in
- * non-strict code
- * @noStrict
- */
+/*---
+info: >
+    The "interface" token can be used as identifier in
+    non-strict code
+description: >
+    Checking if execution of "interface = 1" succeeds in  non-strict
+    code
+flags: [noStrict]
+---*/
 
 var interface = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.19.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.19.js
index d4905b5aa..737b77e1a 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.19.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.19.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "long" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.19.js
- * @description Checking if execution of "long=1" succeeds
- */
+/*---
+info: The "long" token can be used as identifier
+description: Checking if execution of "long=1" succeeds
+---*/
 
 var long = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.2.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.2.js
index 16f86cd48..550dc2551 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.2.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.2.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "boolean" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.2.js
- * @description Checking if execution of "boolean=1" succeeds
- */
+/*---
+info: The "boolean" token can be used as identifier
+description: Checking if execution of "boolean=1" succeeds
+---*/
 
 var boolean = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.20.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.20.js
index 1646a5a8f..a4b0900ad 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.20.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.20.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "native" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.20.js
- * @description Checking if execution of "native=1" succeeds
- */
+/*---
+info: The "native" token can be used as identifier
+description: Checking if execution of "native=1" succeeds
+---*/
 
 var native = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21.js
index ef2d1dacc..806f34443 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21.js
@@ -1,15 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "package" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21.js
- * @description Checking if execution of "package=1" fails in strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "package" token can not be used as identifier in strict code
+description: Checking if execution of "package=1" fails in strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var package = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21ns.js
index 3a33532fe..7628dd90c 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "package" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.21ns.js
- * @description Checking if execution of "package=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "package" token can be used as identifier in non-strict code
+description: Checking if execution of "package=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var package = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22.js
index 45fc83f29..a78790f8f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22.js
@@ -1,15 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "private" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22.js
- * @description Checking if execution of "private=1" fails in strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "private" token can not be used as identifier in strict code
+description: Checking if execution of "private=1" fails in strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var private = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22ns.js
index 0562ca843..0826add49 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "private" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.22ns.js
- * @description Checking if execution of "private=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "private" token can be used as identifier in non-strict code
+description: Checking if execution of "private=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var private = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23.js
index c04b13172..6fd37e8b3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "protected" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23.js
- * @description Checking if execution of "protected=1" fails in
- * strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "protected" token can not be used as identifier in strict code
+description: Checking if execution of "protected=1" fails in  strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var protected = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23ns.js
index 499512d5b..0efc31264 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "protected" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.23ns.js
- * @description Checking if execution of "protected=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "protected" token can be used as identifier in non-strict code
+description: Checking if execution of "protected=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var protected = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24.js
index 55f99e8fd..bfa0a47f2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24.js
@@ -1,15 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "public" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24.js
- * @description Checking if execution of "public=1" fails in strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "public" token can not be used as identifier in strict code
+description: Checking if execution of "public=1" fails in strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var public = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24ns.js
index 7090147cd..3205e58ed 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "public" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.24ns.js
- * @description Checking if execution of "public=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "public" token can be used as identifier in non-strict code
+description: Checking if execution of "public=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var public = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.25.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.25.js
index 0c11e3cf3..34860c4b7 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.25.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.25.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "short" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.25.js
- * @description Checking if execution of "short=1" succeeds
- */
+/*---
+info: The "short" token can be used as identifier
+description: Checking if execution of "short=1" succeeds
+---*/
 
 var short = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26.js
index a1f336935..a9ff7f065 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26.js
@@ -1,15 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "static" token can not be used as identifier in strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26.js
- * @description Checking if execution of "static=1" fails in strict code
- * @onlyStrict
- * @negative
- */
+/*---
+info: The "static" token can not be used as identifier in strict code
+description: Checking if execution of "static=1" fails in strict code
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 var static = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26ns.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26ns.js
index 2e7e1f7b7..7fa053b8f 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26ns.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26ns.js
@@ -1,13 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "static" token can be used as identifier in non-strict code
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.26ns.js
- * @description Checking if execution of "static=1" succeeds in non-strict code
- * @noStrict
- */
+/*---
+info: The "static" token can be used as identifier in non-strict code
+description: Checking if execution of "static=1" succeeds in non-strict code
+flags: [noStrict]
+---*/
 
 var static = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.27.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.27.js
index c78862fb9..67c389bf3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.27.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.27.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "super" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.27.js
- * @description Checking if execution of "super=1" fails
- * @negative
- */
+/*---
+info: The "super" token can not be used as identifier
+description: Checking if execution of "super=1" fails
+flags: [negative]
+---*/
 
 var super = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.28.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.28.js
index 515372a7a..83e68bc03 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.28.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.28.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "synchronized" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.28.js
- * @description Checking if execution of "synchronized=1" succeeds
- */
+/*---
+info: The "synchronized" token can be used as identifier
+description: Checking if execution of "synchronized=1" succeeds
+---*/
 
 var synchronized = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.29.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.29.js
index 54dec6155..f25593d31 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.29.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.29.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "throws" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.29.js
- * @description Checking if execution of "throws=1" succeeds
- */
+/*---
+info: The "throws" token can be used as identifier
+description: Checking if execution of "throws=1" succeeds
+---*/
 
 var throws = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.3.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.3.js
index 50c5d7885..4ccbe77c2 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.3.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.3.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "byte" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.3.js
- * @description Checking if execution of "byte=1" succeeds
- */
+/*---
+info: The "byte" token can be used as identifier
+description: Checking if execution of "byte=1" succeeds
+---*/
 
 var byte = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.30.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.30.js
index 37128f047..290d11df1 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.30.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.30.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "transient" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.30.js
- * @description Checking if execution of "transient=1" succeeds
- */
+/*---
+info: The "transient" token can be used as identifier
+description: Checking if execution of "transient=1" succeeds
+---*/
 
 var transient = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.31.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.31.js
index 57fb357d8..aa6e673d3 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.31.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.31.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "volatile" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.31.js
- * @description Checking if execution of "volatile=1" succeeds
- */
+/*---
+info: The "volatile" token can be used as identifier
+description: Checking if execution of "volatile=1" succeeds
+---*/
 
 var volatile = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.4.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.4.js
index 1af1677e4..5f5a01b08 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.4.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.4.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "char" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.4.js
- * @description Checking if execution of "char=1" succeeds
- */
+/*---
+info: The "char" token can be used as identifier
+description: Checking if execution of "char=1" succeeds
+---*/
 
 var char = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.5.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.5.js
index b84b44248..a6f5e70fe 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.5.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.5.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "class" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.5.js
- * @description Checking if execution of "class=1" fails
- * @negative
- */
+/*---
+info: The "class" token can not be used as identifier
+description: Checking if execution of "class=1" fails
+flags: [negative]
+---*/
 
 var class = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.6.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.6.js
index da95d7ebf..60a703308 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.6.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.6.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "const" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.6.js
- * @description Checking if execution of "const=1" fails
- * @negative
- */
+/*---
+info: The "const" token can not be used as identifier
+description: Checking if execution of "const=1" fails
+flags: [negative]
+---*/
 
 var const = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.7.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.7.js
index ed4c3f0fc..00b3550c6 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.7.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.7.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "debugger" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.7.js
- * @description Checking if execution of "debugger=1" fails
- * @negative
- */
+/*---
+info: The "debugger" token can not be used as identifier
+description: Checking if execution of "debugger=1" fails
+flags: [negative]
+---*/
 
 var debugger = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.8.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.8.js
index 70a0a0a49..51dc3470d 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.8.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.8.js
@@ -1,12 +1,9 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "double" token can be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.8.js
- * @description Checking if execution of "double=1" succeeds
- */
+/*---
+info: The "double" token can be used as identifier
+description: Checking if execution of "double=1" succeeds
+---*/
 
 var double = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.9.js b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.9.js
index 5294cb0d0..4dcdb9949 100644
--- a/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.9.js
+++ b/test/suite/ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.9.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "enum" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/7.6.1.2/S7.6.1.2_A1.9.js
- * @description Checking if execution of "enum=1" fails
- * @negative
- */
+/*---
+info: The "enum" token can not be used as identifier
+description: Checking if execution of "enum=1" fails
+flags: [negative]
+---*/
 
 var enum = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.1.js b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.1.js
index d97c7843a..a7eb547fa 100644
--- a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.1.js
+++ b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "null" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/S7.6.1_A1.1.js
- * @description Checking if execution of "null = 1" fails
- * @negative
- */
+/*---
+info: The "null" token can not be used as identifier
+description: Checking if execution of "null = 1" fails
+flags: [negative]
+---*/
 
 null = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.2.js b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.2.js
index 2c49731cb..f4545d92c 100644
--- a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.2.js
+++ b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "true" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/S7.6.1_A1.2.js
- * @description Checking if execution of "true=1" fails
- * @negative
- */
+/*---
+info: The "true" token can not be used as identifier
+description: Checking if execution of "true=1" fails
+flags: [negative]
+---*/
 
 true = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.3.js b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.3.js
index 01cf52f75..602fa3f9a 100644
--- a/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.3.js
+++ b/test/suite/ch07/7.6/7.6.1/S7.6.1_A1.3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "false" token can not be used as identifier
- *
- * @path ch07/7.6/7.6.1/S7.6.1_A1.3.js
- * @description Checking if execution of "false=1" fails
- * @negative
- */
+/*---
+info: The "false" token can not be used as identifier
+description: Checking if execution of "false=1" fails
+flags: [negative]
+---*/
 
 false = 1;
-
diff --git a/test/suite/ch07/7.6/7.6.1/S7.6.1_A2.js b/test/suite/ch07/7.6/7.6.1/S7.6.1_A2.js
index e123f067f..d37a1482a 100644
--- a/test/suite/ch07/7.6/7.6.1/S7.6.1_A2.js
+++ b/test/suite/ch07/7.6/7.6.1/S7.6.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * List of words that are not reserved
- *
- * @path ch07/7.6/7.6.1/S7.6.1_A2.js
- * @description Try assign 1 for not reserved words
- */
+/*---
+info: List of words that are not reserved
+description: Try assign 1 for not reserved words
+---*/
 
 // a
 var and = 1;
@@ -118,4 +116,3 @@ var xor = 1;
 var xor_eq = 1;
 // y
 // z
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.2_T1.js b/test/suite/ch07/7.6/S7.6_A1.2_T1.js
index 54aee1064..f4343bbe7 100644
--- a/test/suite/ch07/7.6/S7.6_A1.2_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A1.2_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: $
- *
- * @path ch07/7.6/S7.6_A1.2_T1.js
- * @description Create variable $
- */
+/*---
+info: "IdentifierStart :: $"
+description: Create variable $
+---*/
 
 //CHECK#1
 var $ = 1;
 if ($ !== 1) {
   $ERROR('#1: var $ = 1; $ === 1. Actual: ' + ($));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.2_T2.js b/test/suite/ch07/7.6/S7.6_A1.2_T2.js
index d6474ac41..23c8fad4e 100644
--- a/test/suite/ch07/7.6/S7.6_A1.2_T2.js
+++ b/test/suite/ch07/7.6/S7.6_A1.2_T2.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: $
- *
- * @path ch07/7.6/S7.6_A1.2_T2.js
- * @description The $ as unicode character \u0024
- */
+/*---
+info: "IdentifierStart :: $"
+description: The $ as unicode character \u0024
+---*/
 
 //CHECK#1
 var \u0024 = 1;
 if ($ !== 1) {
   $ERROR('#1: var \\u0024 = 1; $ === 1. Actual: ' + ($));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.2_T3.js b/test/suite/ch07/7.6/S7.6_A1.2_T3.js
index 571075a76..8cdbd8a40 100644
--- a/test/suite/ch07/7.6/S7.6_A1.2_T3.js
+++ b/test/suite/ch07/7.6/S7.6_A1.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: $
- *
- * @path ch07/7.6/S7.6_A1.2_T3.js
- * @description The $ as unicode character \u0024
- */
+/*---
+info: "IdentifierStart :: $"
+description: The $ as unicode character \u0024
+---*/
 
 //CHECK#1
 var identifier = String.fromCharCode(0x0024);
@@ -19,4 +17,3 @@ if (eval(identifier + "===1") !== true) {
 if ("$" !== String.fromCharCode(0x0024)) {
   $ERROR('#2: "$" === String.fromCharCode(0x0024)');
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.3_T1.js b/test/suite/ch07/7.6/S7.6_A1.3_T1.js
index 8d1164d2b..90a9b924a 100644
--- a/test/suite/ch07/7.6/S7.6_A1.3_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A1.3_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: _
- *
- * @path ch07/7.6/S7.6_A1.3_T1.js
- * @description Create variable _
- */
+/*---
+info: "IdentifierStart :: _"
+description: Create variable _
+---*/
 
 //CHECK#1
 var _ = 1;
 if (_ !== 1) {
   $ERROR('#1: var _ = 1; _ === 1. Actual: ' + (_));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.3_T2.js b/test/suite/ch07/7.6/S7.6_A1.3_T2.js
index ba300f76d..223b09d91 100644
--- a/test/suite/ch07/7.6/S7.6_A1.3_T2.js
+++ b/test/suite/ch07/7.6/S7.6_A1.3_T2.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: _
- *
- * @path ch07/7.6/S7.6_A1.3_T2.js
- * @description The _ as unicode character \u005F
- */
+/*---
+info: "IdentifierStart :: _"
+description: The _ as unicode character \u005F
+---*/
 
 //CHECK#1
 var \u005F = 1;
 if (_ !== 1) {
   $ERROR('#1: var \\u005F = 1; _ === 1. Actual: ' + (_));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A1.3_T3.js b/test/suite/ch07/7.6/S7.6_A1.3_T3.js
index e3a8361c2..a5213ec30 100644
--- a/test/suite/ch07/7.6/S7.6_A1.3_T3.js
+++ b/test/suite/ch07/7.6/S7.6_A1.3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierStart :: _
- *
- * @path ch07/7.6/S7.6_A1.3_T3.js
- * @description The _ as unicode character \u005F
- */
+/*---
+info: "IdentifierStart :: _"
+description: The _ as unicode character \u005F
+---*/
 
 //CHECK#1
 var identifier = String.fromCharCode(0x005F);
@@ -19,4 +17,3 @@ if (eval(identifier + "===1") !== true) {
 if ("_" !== String.fromCharCode(0x005F)) {
   $ERROR('#2: "_" === String.fromCharCode(0x005F)');
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A2.1_T1.js b/test/suite/ch07/7.6/S7.6_A2.1_T1.js
index 5ef24abef..f62aaf81a 100644
--- a/test/suite/ch07/7.6/S7.6_A2.1_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierPart :: IdentifierStart
- *
- * @path ch07/7.6/S7.6_A2.1_T1.js
- * @description IdentifierStart :: UnicodeLetter
- */
+/*---
+info: "IdentifierPart :: IdentifierStart"
+description: "IdentifierStart :: UnicodeLetter"
+---*/
 
 //CHECK#1
 try {
@@ -72,4 +70,3 @@ try {
 } catch (e) {
   $ERROR('#6.2: var \\u0078x = 1; xx === 6. Actual: ' + (xx));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A2.1_T2.js b/test/suite/ch07/7.6/S7.6_A2.1_T2.js
index 3d595b566..39d95ccf7 100644
--- a/test/suite/ch07/7.6/S7.6_A2.1_T2.js
+++ b/test/suite/ch07/7.6/S7.6_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierPart :: IdentifierStart
- *
- * @path ch07/7.6/S7.6_A2.1_T2.js
- * @description IdentifierStart :: $
- */
+/*---
+info: "IdentifierPart :: IdentifierStart"
+description: "IdentifierStart :: $"
+---*/
 
 //CHECK#1
 try {
@@ -72,4 +70,3 @@ try {
 } catch (e) {
   $ERROR('#6.2: var \\u0078$ = 1; x$ === 6. Actual: ' + (x$));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A2.1_T3.js b/test/suite/ch07/7.6/S7.6_A2.1_T3.js
index 9c1032169..efe9b954e 100644
--- a/test/suite/ch07/7.6/S7.6_A2.1_T3.js
+++ b/test/suite/ch07/7.6/S7.6_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierPart :: IdentifierStart
- *
- * @path ch07/7.6/S7.6_A2.1_T3.js
- * @description IdentifierStart :: _
- */
+/*---
+info: "IdentifierPart :: IdentifierStart"
+description: "IdentifierStart :: _"
+---*/
 
 //CHECK#1
 try {
@@ -72,4 +70,3 @@ try {
 } catch (e) {
   $ERROR('#6.2: var \\u0078_ = 1; x_ === 6. Actual: ' + (x_));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A2.1_T4.js b/test/suite/ch07/7.6/S7.6_A2.1_T4.js
index a03182254..bcef91b20 100644
--- a/test/suite/ch07/7.6/S7.6_A2.1_T4.js
+++ b/test/suite/ch07/7.6/S7.6_A2.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * IdentifierPart :: IdentifierStart
- *
- * @path ch07/7.6/S7.6_A2.1_T4.js
- * @description IdentifierStart :: \UnicodeEscapeSequence
- */
+/*---
+info: "IdentifierPart :: IdentifierStart"
+description: "IdentifierStart :: \\UnicodeEscapeSequence"
+---*/
 
 //CHECK#1
 try {
@@ -47,4 +45,3 @@ try {
 } catch (e) {
   $ERROR('#4.2: var \\u005F\\u005F = 1; __ === 4. Actual: ' + (__));
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A4.1_T1.js b/test/suite/ch07/7.6/S7.6_A4.1_T1.js
index 1e18ed18d..9b0c3d719 100644
--- a/test/suite/ch07/7.6/S7.6_A4.1_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of ENGLISH ALPHABET
- *
- * @path ch07/7.6/S7.6_A4.1_T1.js
- * @description Check ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: Correct interpretation of ENGLISH ALPHABET
+description: Check ENGLISH CAPITAL ALPHABET
+---*/
 
 //CHECK#A-Z
 var \u0041 = 1;
@@ -113,4 +111,3 @@ var \u005A = 1;
 if (Z !== 1) {
   $ERROR('#Z');
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A4.1_T2.js b/test/suite/ch07/7.6/S7.6_A4.1_T2.js
index 20003197e..9fad09c5f 100644
--- a/test/suite/ch07/7.6/S7.6_A4.1_T2.js
+++ b/test/suite/ch07/7.6/S7.6_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of ENGLISH ALPHABET
- *
- * @path ch07/7.6/S7.6_A4.1_T2.js
- * @description Check ENGLISH SMALL ALPHABET
- */
+/*---
+info: Correct interpretation of ENGLISH ALPHABET
+description: Check ENGLISH SMALL ALPHABET
+---*/
 
 //CHECK#a-z
 var \u0061 = 1;
@@ -113,5 +111,3 @@ var \u007A = 1;
 if (z !== 1) {
   $ERROR('#z');
 }
-
-
diff --git a/test/suite/ch07/7.6/S7.6_A4.2_T1.js b/test/suite/ch07/7.6/S7.6_A4.2_T1.js
index e588b8c15..d09b4c0ab 100644
--- a/test/suite/ch07/7.6/S7.6_A4.2_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A4.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of RUSSIAN ALPHABET
- *
- * @path ch07/7.6/S7.6_A4.2_T1.js
- * @description Check RUSSIAN CAPITAL ALPHABET
- */
+/*---
+info: Correct interpretation of RUSSIAN ALPHABET
+description: Check RUSSIAN CAPITAL ALPHABET
+---*/
 
 //CHECK#А-Я
 var \u0410 = 1;
@@ -141,4 +139,3 @@ var \u0401 = 1;
 if (Ё !== 1) {
   $ERROR('#Ё');
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A4.2_T2.js b/test/suite/ch07/7.6/S7.6_A4.2_T2.js
index 119b94918..5d7cd5617 100644
--- a/test/suite/ch07/7.6/S7.6_A4.2_T2.js
+++ b/test/suite/ch07/7.6/S7.6_A4.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of RUSSIAN ALPHABET
- *
- * @path ch07/7.6/S7.6_A4.2_T2.js
- * @description Check RUSSIAN SMALL ALPHABET
- */
+/*---
+info: Correct interpretation of RUSSIAN ALPHABET
+description: Check RUSSIAN SMALL ALPHABET
+---*/
 
 //CHECK#а-я
 var \u0430 = 1;
@@ -141,4 +139,3 @@ var \u0451 = 1;
 if (ё !== 1) {
   $ERROR('#ё');
 }
-
diff --git a/test/suite/ch07/7.6/S7.6_A4.3_T1.js b/test/suite/ch07/7.6/S7.6_A4.3_T1.js
index ab13aa253..8dea7bc35 100644
--- a/test/suite/ch07/7.6/S7.6_A4.3_T1.js
+++ b/test/suite/ch07/7.6/S7.6_A4.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of DIGITS
- *
- * @path ch07/7.6/S7.6_A4.3_T1.js
- * @description Identifier is $+ANY_DIGIT
- */
+/*---
+info: Correct interpretation of DIGITS
+description: Identifier is $+ANY_DIGIT
+---*/
 
 //CHECK#0-9
 var $\u0030 = 0;
@@ -49,4 +47,3 @@ var $\u0039 = 9;
 if ($9 !== 9) {
   $ERROR('#9: $\\u0039 = 9; $9 === 9');
 }
-
diff --git a/test/suite/ch07/7.7/S7.7_A1.js b/test/suite/ch07/7.7/S7.7_A1.js
index e033e1164..6e495bc60 100644
--- a/test/suite/ch07/7.7/S7.7_A1.js
+++ b/test/suite/ch07/7.7/S7.7_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of all punctuators
- *
- * @path ch07/7.7/S7.7_A1.js
- * @description Using all punctuators
- */
+/*---
+info: Correct interpretation of all punctuators
+description: Using all punctuators
+---*/
 
 //CHECK#1
   ({});[];
@@ -18,5 +16,4 @@
   1 ? 2 : 3;
   this.NaN = 1; this.NaN += 2; this.NaN -= 3; this.NaN *= 4; this.NaN /= 5;
   this.NaN %= 6; this.NaN <<= 7; this.NaN >>= 8; this.NaN >>>= 9;
-  this.NaN &= 1; this.NaN |= 2; this.NaN ^= 3;  
-
+  this.NaN &= 1; this.NaN |= 2; this.NaN ^= 3;
diff --git a/test/suite/ch07/7.7/S7.7_A2_T1.js b/test/suite/ch07/7.7/S7.7_A2_T1.js
index 1a545639d..e8b81f30d 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T1.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T1.js
- * @description Try to use {} as a Unicode \u007B\u007D
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use {} as a Unicode \u007B\u007D
+flags: [negative]
+---*/
 
 \u007B\u007D;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T10.js b/test/suite/ch07/7.7/S7.7_A2_T10.js
index 6d71a5617..7b1f41a43 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T10.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T10.js
- * @description Try to use / as a Unicode \u002F
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use / as a Unicode \u002F
+flags: [negative]
+---*/
 
 1\u002F2;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T2.js b/test/suite/ch07/7.7/S7.7_A2_T2.js
index 1a06e190e..09737b314 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T2.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T2.js
- * @description Try to use () as Unicode \u00281\u0029
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use () as Unicode \u00281\u0029
+flags: [negative]
+---*/
 
 \u00281\u0029;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T3.js b/test/suite/ch07/7.7/S7.7_A2_T3.js
index 1b9b950f4..0c1e7a2fe 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T3.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T3.js
- * @description Try to use [] as a Unicode \u005B\u005D
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use [] as a Unicode \u005B\u005D
+flags: [negative]
+---*/
 
 \u005B\u005D;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T4.js b/test/suite/ch07/7.7/S7.7_A2_T4.js
index c877858e2..e42d8d6dd 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T4.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T4.js
- * @description Try to use ; as a Unicode \u003B
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use ; as a Unicode \u003B
+flags: [negative]
+---*/
 
 \u003B;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T5.js b/test/suite/ch07/7.7/S7.7_A2_T5.js
index 1b92226af..228d0eb37 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T5.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T5.js
- * @description Try to use . as a Unicode \u002E
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use . as a Unicode \u002E
+flags: [negative]
+---*/
 
 x = 1;
 this\u002Ex;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T6.js b/test/suite/ch07/7.7/S7.7_A2_T6.js
index e0cb0382f..fe8cda554 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T6.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T6.js
- * @description Try to use , as a Unicode \u002C
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use , as a Unicode \u002C
+flags: [negative]
+---*/
 
 1\u002C2;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T7.js b/test/suite/ch07/7.7/S7.7_A2_T7.js
index aff3092a6..45f5c7a5c 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T7.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T7.js
- * @description Try to use + as a Unicode \u002B
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use + as a Unicode \u002B
+flags: [negative]
+---*/
 
 1\u002B2;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T8.js b/test/suite/ch07/7.7/S7.7_A2_T8.js
index 9e9cd1ac4..00cf48349 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T8.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T8.js
- * @description Try to use -  as a Unicode \u002D
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use -  as a Unicode \u002D
+flags: [negative]
+---*/
 
 1\u002D2;
-
diff --git a/test/suite/ch07/7.7/S7.7_A2_T9.js b/test/suite/ch07/7.7/S7.7_A2_T9.js
index 7ba61f5a9..41a27e5f4 100644
--- a/test/suite/ch07/7.7/S7.7_A2_T9.js
+++ b/test/suite/ch07/7.7/S7.7_A2_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Punctuator cannot be expressed as a Unicode escape sequence consisting of six characters, namely \u plus four hexadecimal digits
- *
- * @path ch07/7.7/S7.7_A2_T9.js
- * @description Try to use * as a Unicode \u002A
- * @negative
- */
+/*---
+info: >
+    Punctuator cannot be expressed as a Unicode escape sequence consisting of
+    six characters, namely \u plus four hexadecimal digits
+description: Try to use * as a Unicode \u002A
+flags: [negative]
+---*/
 
 1\u002A2;
-
diff --git a/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T1.js b/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T1.js
index e7b188b6c..152863f9f 100644
--- a/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T1.js
+++ b/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Literal :: NullLiteral
- *
- * @path ch07/7.8/7.8.1/S7.8.1_A1_T1.js
- * @description Check null === null
- */
+/*---
+info: "Literal :: NullLiteral"
+description: Check null === null
+---*/
 
 //CHECK#1
 if (null !== null) {
   $ERROR('#1: null === null');
-} 
-
+}
diff --git a/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T2.js b/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T2.js
index 340f8bed4..f69a5eb12 100644
--- a/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T2.js
+++ b/test/suite/ch07/7.8/7.8.1/S7.8.1_A1_T2.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Literal :: NullLiteral
- *
- * @path ch07/7.8/7.8.1/S7.8.1_A1_T2.js
- * @description Check RegExp("0").exec("1") === null
- */
+/*---
+info: "Literal :: NullLiteral"
+description: Check RegExp("0").exec("1") === null
+---*/
 
 //CHECK#1
 if (RegExp("0").exec("1") !== null) {
   $ERROR('#1: RegExp("0").exec("1") === null');
-}  
- 
-
+}
diff --git a/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T1.js b/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T1.js
index f2925a291..f6f41dd8d 100644
--- a/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T1.js
+++ b/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Literal :: BooleanLiteral
- *
- * @path ch07/7.8/7.8.2/S7.8.2_A1_T1.js
- * @description BooleanLiteral :: true
- */
+/*---
+info: "Literal :: BooleanLiteral"
+description: "BooleanLiteral :: true"
+---*/
 
 //CHECK#1
 if (Boolean(true) !== true) {
   $ERROR('#1: Boolean(true) === true. Actual: Boolean(true) === ' + (Boolean(true)));
-} 
-
+}
diff --git a/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T2.js b/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T2.js
index 5adaf379d..906665f55 100644
--- a/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T2.js
+++ b/test/suite/ch07/7.8/7.8.2/S7.8.2_A1_T2.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Literal :: BooleanLiteral
- *
- * @path ch07/7.8/7.8.2/S7.8.2_A1_T2.js
- * @description BooleanLiteral :: false
- */
+/*---
+info: "Literal :: BooleanLiteral"
+description: "BooleanLiteral :: false"
+---*/
 
 //CHECK#1
 if (Boolean(false) !== false) {
   $ERROR('#1: Boolean(false) === false. Actual: Boolean(false) === ' + (Boolean(false)));
-} 
- 
-
+}
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-1-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-1-s.js
index fa67b5095..b40441fcb 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-1-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-1-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-1-s.js

- * @description Strict Mode - octal extension (010) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (010) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {           

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_1 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-1gs.js b/test/suite/ch07/7.8/7.8.3/7.8.3-1gs.js
index 91b6ceae2..a2328a3a6 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-1gs.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-1gs.js
@@ -1,16 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch07/7.8/7.8.3/7.8.3-1gs.js

- * @description Strict Mode - octal extension(010) is forbidden in strict mode

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension(010) is forbidden in strict mode
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
 "use strict";

 throw NotEarlyError;

-var y = 010;

+var y = 010;
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-2-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-2-s.js
index 79755f8df..9dd844653 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-2-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-2-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-2-s.js

- * @description Strict Mode - octal extension (00) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (00) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_2 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-2gs.js b/test/suite/ch07/7.8/7.8.3/7.8.3-2gs.js
index dae203a53..e7f37e2af 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-2gs.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-2gs.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-2gs.js

- * @description Strict Mode - octal extension is forbidden in strict mode (after a hex number is assigned to a variable)

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - octal extension is forbidden in strict mode (after a
+    hex number is assigned to a variable)
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
 "use strict";

 throw NotEarlyError;

 var a;

 a = 0x1;

-a = 01;

+a = 01;
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-3-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-3-s.js
index 7d33f9a5c..b13aba097 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-3-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-3-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-3-s.js

- * @description Strict Mode - octal extension (01) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (01) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_3 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-3gs.js b/test/suite/ch07/7.8/7.8.3/7.8.3-3gs.js
index 48d56d63e..03d640426 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-3gs.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-3gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-3gs.js

- * @description Strict Mode - octal extension is forbidden in strict mode (after a hex number is assigned to a variable from an eval)

- * @onlyStrict

- * @negative SyntaxError

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - octal extension is forbidden in strict mode (after a
+    hex number is assigned to a variable from an eval)
+negative: SyntaxError
+flags: [onlyStrict]
+---*/
+
 "use strict";

 var a;

-eval("a = 0x1;a = 01;");

+eval("a = 0x1;a = 01;");
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-4-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-4-s.js
index 53a486b05..568490aea 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-4-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-4-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-4-s.js

- * @description Strict Mode - octal extension (06) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (06) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_4 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-5-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-5-s.js
index 98ac43f58..51c3d77b2 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-5-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-5-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-5-s.js

- * @description Strict Mode - octal extension (07) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (07) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_5 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-6-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-6-s.js
index fe2f60c64..966d585ab 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-6-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-6-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-6-s.js

- * @description Strict Mode - octal extension (000) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (000) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_6 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/7.8.3-7-s.js b/test/suite/ch07/7.8/7.8.3/7.8.3-7-s.js
index d0ffda882..84615cb39 100644
--- a/test/suite/ch07/7.8/7.8.3/7.8.3-7-s.js
+++ b/test/suite/ch07/7.8/7.8.3/7.8.3-7-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.3/7.8.3-7-s.js

- * @description Strict Mode - octal extension (005) is forbidden in strict mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - octal extension (005) is forbidden in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         "use strict";

         try {

@@ -19,4 +19,4 @@ function testcase() {
             return e instanceof SyntaxError && typeof _7_8_3_7 === "undefined";

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T1.js
index ff82f498e..52bad15ab 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.1_T1.js
- * @description DecimalIntegerLiteral :: 0, NoNZeroDigit
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral"
+description: "DecimalIntegerLiteral :: 0, NoNZeroDigit"
+---*/
 
 //CHECK#0
 if (0 !== 0) {
@@ -57,4 +55,3 @@ if (8 !== 8) {
 if (9 !== 9) {
   $ERROR('#9: 9 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T2.js
index df2206462..b7ec39305 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.1_T2.js
- * @description DecimalIntegerLiteral :: NoNZeroDigit DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral"
+description: "DecimalIntegerLiteral :: NoNZeroDigit DecimalDigits"
+---*/
 
 //CHECK#1
 if (11 !== 11) {
@@ -52,4 +50,3 @@ if (88 !== 88) {
 if (99 !== 99) {
   $ERROR('#9: 99 === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T1.js
index 50a042d2c..0845330fd 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T1.js
- * @description ExponentPart :: e DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: e DecimalDigits"
+---*/
 
 //CHECK#0
 if (0e1 !== 0) {
@@ -57,4 +55,3 @@ if (8e1 !== 80) {
 if (9e1 !== 90) {
   $ERROR('#9: 9e1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T2.js
index f2398a460..ebf53754e 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T2.js
- * @description ExponentPart :: E DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: E DecimalDigits"
+---*/
 
 //CHECK#0
 if (0E1 !== 0) {
@@ -57,4 +55,3 @@ if (8E1 !== 80) {
 if (9E1 !== 90) {
   $ERROR('#9: 9E1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T3.js
index 352745f8a..bbca0c3d6 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T3.js
- * @description ExponentPart :: e -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: e -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0e-1 !== 0) {
@@ -57,4 +55,3 @@ if (8e-1 !== 0.8) {
 if (9e-1 !== 0.9) {
   $ERROR('#9: 9e-1 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T4.js
index b0f95210f..1c2c75a40 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T4.js
- * @description ExponentPart :: E -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: E -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0E-1 !== 0) {
@@ -57,4 +55,3 @@ if (8E-1 !== 0.8) {
 if (9E-1 !== 0.9) {
   $ERROR('#9: 9E-1 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T5.js
index 87c79f63d..7118cecb2 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T5.js
- * @description ExponentPart :: e +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: e +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0e+1 !== 0) {
@@ -57,4 +55,3 @@ if (8e+1 !== 80) {
 if (9e+1 !== 90) {
   $ERROR('#9: 9e+1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T6.js
index bdfc65d33..c951065be 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T6.js
- * @description ExponentPart :: E +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: E +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0E+1 !== 0) {
@@ -57,4 +55,3 @@ if (8E+1 !== 80) {
 if (9E+1 !== 90) {
   $ERROR('#9: 9E+1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T7.js
index d636e7e6b..05303a3c3 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T7.js
- * @description ExponentPart :: e 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: e 0"
+---*/
 
 //CHECK#0
 if (0e0 !== 0) {
@@ -57,4 +55,3 @@ if (8e0 !== 8) {
 if (9e0 !== 9) {
   $ERROR('#9: 9e0 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T8.js
index c45e4353d..a0b371c37 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A1.2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A1.2_T8.js
- * @description ExponentPart :: E 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral ExponentPart"
+description: "ExponentPart :: E 0"
+---*/
 
 //CHECK#0
 if (0E0 !== 0) {
@@ -57,4 +55,3 @@ if (8E0 !== 8) {
 if (9E0 !== 9) {
   $ERROR('#9: 9E0 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T1.js
index 571cfe65e..b0ee8ca28 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.1_T1.js
- * @description Use .DecimalDigit
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits"
+description: Use .DecimalDigit
+---*/
 
 //CHECK#0
 if (.0 !== 0.0) {
@@ -57,4 +55,3 @@ if (.8 !== 0.8) {
 if (.9 !== 0.9) {
   $ERROR('#9: .9 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T2.js
index 88ed6fc02..00601f683 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.1_T2.js
- * @description Use .DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits"
+description: Use .DecimalDigits
+---*/
 
 //CHECK#0
 if (.00 !== 0.00) {
@@ -57,4 +55,3 @@ if (.88 !== 0.88) {
 if (.99 !== 0.99) {
   $ERROR('#9: .99 === 0.99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T3.js
index 2b5d47bd1..2b96ae0fd 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.1_T3.js
- * @description Use .DecimalDigits that have at the end zeros
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits"
+description: Use .DecimalDigits that have at the end zeros
+---*/
 
 //CHECK#0
 if (.00 !== 0.0) {
@@ -57,4 +55,3 @@ if (.80 !== 0.8) {
 if (.90 !== 0.9) {
   $ERROR('#9: .9 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T1.js
index bd80eb9d7..adb9bff88 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T1.js
- * @description ExponentPart :: e DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: e DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0e1 !== 0) {
@@ -57,4 +55,3 @@ if (.8e1 !== 8) {
 if (.9e1 !== 9) {
   $ERROR('#9: .9e1 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T2.js
index 0e6db7925..ea960a1ea 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T2.js
- * @description ExponentPart :: E DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: E DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0E1 !== 0) {
@@ -57,4 +55,3 @@ if (.8E1 !== 8) {
 if (.9E1 !== 9) {
   $ERROR('#9: .9E1 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T3.js
index 513868760..8d20a2c34 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T3.js
- * @description ExponentPart :: e +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: e +DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0e-1 !== 0) {
@@ -57,4 +55,3 @@ if (.8e-1 !== 0.08) {
 if (.9e-1 !== 0.09) {
   $ERROR('#9: .9e-1 === 0.09');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T4.js
index 88ddf9858..9b8bd8cf6 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T4.js
- * @description ExponentPart :: E +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: E +DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0E-1 !== 0) {
@@ -57,4 +55,3 @@ if (.8E-1 !== 0.08) {
 if (.9E-1 !== 0.09) {
   $ERROR('#9: .9E-1 === 0.09');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T5.js
index 881511a10..98f14b596 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T5.js
- * @description ExponentPart :: e +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: e +DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0e+1 !== 0) {
@@ -57,4 +55,3 @@ if (.8e+1 !== 8) {
 if (.9e+1 !== 9) {
   $ERROR('#9: .9e+1 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T6.js
index 8b206eee7..dbab8ec72 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T6.js
- * @description ExponentPart :: E +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: E +DecimalDigits"
+---*/
 
 //CHECK#0
 if (.0E+1 !== 0) {
@@ -57,4 +55,3 @@ if (.8E+1 !== 8) {
 if (.9E+1 !== 9) {
   $ERROR('#9: .9E+1 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T7.js
index a3701e00c..f44311141 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T7.js
- * @description ExponentPart :: e 0
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: e 0"
+---*/
 
 //CHECK#0
 if (.0e0 !== 0.0) {
@@ -57,4 +55,3 @@ if (.8e0 !== 0.8) {
 if (.9e0 !== 0.9) {
   $ERROR('#9: .9e0 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T8.js
index d8bca29e1..61c7becb6 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A2.2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: .DecimalDigits ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A2.2_T8.js
- * @description ExponentPart :: E 0
- */
+/*---
+info: "DecimalLiteral :: .DecimalDigits ExponentPart"
+description: "ExponentPart :: E 0"
+---*/
 
 //CHECK#0
 if (.0E0 !== 0.0) {
@@ -57,4 +55,3 @@ if (.8E0 !== 0.8) {
 if (.9E0 !== 0.9) {
   $ERROR('#9: .9E0 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T1.js
index 0e34b120b..9256679ce 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral.
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.1_T1.js
- * @description DecimalIntegerLiteral :: 0, NoNZeroDigit
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral."
+description: "DecimalIntegerLiteral :: 0, NoNZeroDigit"
+---*/
 
 //CHECK#0
 if (0. !== 0) {
@@ -57,4 +55,3 @@ if (8. !== 8) {
 if (9. !== 9) {
   $ERROR('#9: 9. === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T2.js
index 6dcdd78e3..44c2f4009 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral.
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.1_T2.js
- * @description DecimalIntegerLiteral :: NoNZeroDigit DecimalDigigts
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral."
+description: "DecimalIntegerLiteral :: NoNZeroDigit DecimalDigigts"
+---*/
 
 //CHECK#1
 if (11. !== 11) {
@@ -52,4 +50,3 @@ if (88. !== 88) {
 if (99. !== 99) {
   $ERROR('#9: 99. === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T1.js
index 5c0a5ffa7..d3e1fef0b 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.2_T1.js
- * @description After DecimalIntegerLiteral. used ZeroDigit
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits"
+description: After DecimalIntegerLiteral. used ZeroDigit
+---*/
 
 //CHECK#0
 if (0.0 !== 0) {
@@ -57,4 +55,3 @@ if (8.0 !== 8) {
 if (9.0 !== 9) {
   $ERROR('#9: 9.0 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T2.js
index 110c931e5..0883680d8 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.2_T2.js
- * @description After DecimalIntegerLiteral. used ZeroDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits"
+description: After DecimalIntegerLiteral. used ZeroDigits
+---*/
 
 //CHECK#0
 if (0.00 !== 0) {
@@ -57,4 +55,3 @@ if (8.00 !== 8) {
 if (9.00 !== 9) {
   $ERROR('#9: 9.00 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T3.js
index fe293b95b..9c06c54b5 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.2_T3.js
- * @description After DecimalIntegerLiteral. used NoNZeroDigit
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigits"
+description: After DecimalIntegerLiteral. used NoNZeroDigit
+---*/
 
 //CHECK#0
 if (0.0 !== 0.0) {
@@ -57,4 +55,3 @@ if (8.8 !== 8.8) {
 if (9.9 !== 9.9) {
   $ERROR('#9: 9.9 === 9.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T1.js
index e0a6edba5..71c8b31ea 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T1.js
- * @description ExponentPart :: e DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: e DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.e1 !== 0) {
@@ -57,4 +55,3 @@ if (8.e1 !== 80) {
 if (9.e1 !== 90) {
   $ERROR('#9: 9.e1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T2.js
index 034d2c548..dce00d16e 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T2.js
- * @description ExponentPart :: E DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: E DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.E1 !== 0) {
@@ -57,4 +55,3 @@ if (8.E1 !== 80) {
 if (9.E1 !== 90) {
   $ERROR('#9: 9.E1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T3.js
index a60c83d58..ed1c7905d 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T3.js
- * @description ExponentPart :: e -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: e -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.e-1 !== 0) {
@@ -57,4 +55,3 @@ if (8.e-1 !== 0.8) {
 if (9.e-1 !== 0.9) {
   $ERROR('#9: 9.e-1 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T4.js
index 9dc5be7a2..a5ace0547 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T4.js
- * @description ExponentPart :: E -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: E -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.E-1 !== 0) {
@@ -57,4 +55,3 @@ if (8.E-1 !== 0.8) {
 if (9.E-1 !== 0.9) {
   $ERROR('#9: 9.E-1 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T5.js
index 9b2e9b820..4a50f5e6e 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T5.js
- * @description ExponentPart :: e +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: e +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.e+1 !== 0) {
@@ -57,4 +55,3 @@ if (8.e+1 !== 80) {
 if (9.e+1 !== 90) {
   $ERROR('#9: 9.e+1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T6.js
index 33c8a84c9..427c816ee 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T6.js
- * @description ExponentPart :: E +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: E +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.E+1 !== 0) {
@@ -57,4 +55,3 @@ if (8.E+1 !== 80) {
 if (9.E+1 !== 90) {
   $ERROR('#9: 9.E+1 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T7.js
index 628581d66..5a93c8354 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T7.js
- * @description ExponentPart :: e 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: e 0"
+---*/
 
 //CHECK#0
 if (0.e0 !== 0) {
@@ -57,4 +55,3 @@ if (8.e0 !== 8) {
 if (9.e0 !== 9) {
   $ERROR('#9: 9.e0 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T8.js
index b6f249124..f2907c15d 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.3_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.3_T8.js
- * @description ExponentPart :: E 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. ExponentPart"
+description: "ExponentPart :: E 0"
+---*/
 
 //CHECK#0
 if (0.E0 !== 0) {
@@ -57,4 +55,3 @@ if (8.E0 !== 8) {
 if (9.E0 !== 9) {
   $ERROR('#9: 9.E0 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T1.js
index 15ad5b224..edc51cf99 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T1.js
- * @description ExponentPart :: e DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: e DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0e1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8e1 !== 88) {
 if (9.9e1 !== 99) {
   $ERROR('#9: 9.9e1 === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T2.js
index a3a67a30e..742bd3564 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T2.js
- * @description ExponentPart :: E DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: E DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0E1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8E1 !== 88) {
 if (9.9E1 !== 99) {
   $ERROR('#9: 9.9E1 === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T3.js
index fef945e47..4d183da03 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T3.js
- * @description ExponentPart :: e -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: e -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0e-1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8e-1 !== 0.88) {
 if (9.9e-1 !== 0.99) {
   $ERROR('#9: 9.9e-1 === 0.99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T4.js
index f68532fd8..157fa782f 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T4.js
- * @description ExponentPart :: E -DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: E -DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0E-1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8E-1 !== 0.88) {
 if (9.9E-1 !== 0.99) {
   $ERROR('#9: 9.9E-1 === 0.99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T5.js
index 161105928..b4ae62b8f 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T5.js
- * @description ExponentPart :: e +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: e +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0e+1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8e+1 !== 88) {
 if (9.9e+1 !== 99) {
   $ERROR('#9: 9.9e+1 === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T6.js
index 5d28f6609..bf8095176 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T6.js
- * @description ExponentPart :: E +DecimalDigits
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: E +DecimalDigits"
+---*/
 
 //CHECK#0
 if (0.0E+1 !== 0) {
@@ -57,4 +55,3 @@ if (8.8E+1 !== 88) {
 if (9.9E+1 !== 99) {
   $ERROR('#9: 9.9E+1 === 99');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T7.js
index b5ebe39d4..f2a59526d 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T7.js
- * @description ExponentPart :: e 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: e 0"
+---*/
 
 //CHECK#0
 if (0.0e0 !== 0.0) {
@@ -57,4 +55,3 @@ if (8.8e0 !== 8.8) {
 if (9.9e0 !== 9.9) {
   $ERROR('#9: 9.9e0 === 9.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T8.js
index 36b643364..5eae4a958 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A3.4_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A3.4_T8.js
- * @description ExponentPart :: E 0
- */
+/*---
+info: "DecimalLiteral :: DecimalIntegerLiteral. DecimalDigigts ExponentPart"
+description: "ExponentPart :: E 0"
+---*/
 
 //CHECK#0
 if (0.0E0 !== 0.0) {
@@ -57,4 +55,3 @@ if (8.8E0 !== 8.8) {
 if (9.9E0 !== 9.9) {
   $ERROR('#9: 9.9E0 === 9.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T1.js
index eaed76725..d46b73aca 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T1.js
- * @description ExponentPart :: e DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: e DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 e1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T2.js
index 306ed8ba2..8eeba96f7 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T2.js
- * @description ExponentPart :: E DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: E DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 E1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T3.js
index b7c5e5a9f..01b72f08f 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T3.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T3.js
- * @description ExponentPart :: e DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: e DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 e-1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T4.js
index fb21413d4..b5d0a9883 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T4.js
- * @description ExponentPart :: E DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: E DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 E-1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T5.js
index 89719f0f7..b472f0341 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T5.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T5.js
- * @description ExponentPart :: e DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: e DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 e+1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T6.js
index 533e23bc4..5971b1189 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T6.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T6.js
- * @description ExponentPart :: E DecimalDigits
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: E DecimalDigits"
+flags: [negative]
+---*/
 
 //CHECK#1
 E+1
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T7.js
index d6475e50f..233b0ba3a 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T7.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T7.js
- * @description ExponentPart :: e 0
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: e 0"
+flags: [negative]
+---*/
 
 //CHECK#1
 e0
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T8.js
index 89e284f4f..fb1429667 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.1_T8.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: ExponentPart is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.1_T8.js
- * @description ExponentPart :: E 0
- * @negative
- */
+/*---
+info: "DecimalLiteral :: ExponentPart is incorrect"
+description: "ExponentPart :: E 0"
+flags: [negative]
+---*/
 
 //CHECK#1
 E0
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T1.js
index a925aaed9..2d6d7f27f 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T1.js
- * @description ExponentIndicator :: e
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: e"
+---*/
 
 //CHECK#0
 if (0e01 !== 0) {
@@ -57,4 +55,3 @@ if (8e01 !== 80) {
 if (9e01 !== 90) {
   $ERROR('#9: 9e01 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T2.js
index bfc6f4eee..e7154f3e4 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T2.js
- * @description ExponentIndicator :: E
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: E"
+---*/
 
 //CHECK#0
 if (0E01 !== 0) {
@@ -57,4 +55,3 @@ if (8E01 !== 80) {
 if (9E01 !== 90) {
   $ERROR('#9: 9E01 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T3.js
index 15f7bf7bd..2dd85b9aa 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T3.js
- * @description ExponentIndicator :: e
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: e"
+---*/
 
 //CHECK#0
 if (0e-01 !== 0) {
@@ -57,4 +55,3 @@ if (8e-01 !== 0.8) {
 if (9e-01 !== 0.9) {
   $ERROR('#9: 9e-01 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T4.js
index 2682b8f0e..a52671a04 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T4.js
- * @description ExponentIndicator :: E
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: E"
+---*/
 
 //CHECK#0
 if (0E-01 !== 0) {
@@ -57,4 +55,3 @@ if (8E-01 !== 0.8) {
 if (9E-01 !== 0.9) {
   $ERROR('#9: 9E-01 === 0.9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T5.js
index 386daa930..e6e7d7642 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T5.js
- * @description ExponentIndicator :: e
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: e"
+---*/
 
 //CHECK#0
 if (0e+01 !== 0) {
@@ -57,4 +55,3 @@ if (8e+01 !== 80) {
 if (9e+01 !== 90) {
   $ERROR('#9: 9e+01 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T6.js
index df360f5ea..063f1c8ef 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T6.js
- * @description ExponentIndicator :: E
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: E"
+---*/
 
 //CHECK#0
 if (0E+01 !== 0) {
@@ -57,4 +55,3 @@ if (8E+01 !== 80) {
 if (9E+01 !== 90) {
   $ERROR('#9: 9E+01 === 90');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T7.js
index 9fbd8a679..90d12208b 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T7.js
- * @description ExponentIndicator :: e
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: e"
+---*/
 
 //CHECK#0
 if (0e00 !== 0) {
@@ -57,4 +55,3 @@ if (8e00 !== 8) {
 if (9e00 !== 9) {
   $ERROR('#9: 9e00 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T8.js
index 2c62351fa..0c82e7aab 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A4.2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A4.2_T8.js
- * @description ExponentIndicator :: E
- */
+/*---
+info: "ExponentPart :: ExponentIndicator ( /+/-) 0 DecimalDigits is allowed"
+description: "ExponentIndicator :: E"
+---*/
 
 //CHECK#0
 if (0E00 !== 0) {
@@ -57,4 +55,3 @@ if (8E00 !== 8) {
 if (9E00 !== 9) {
   $ERROR('#9: 9E00 === 9');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T1.js
index 2e6b786b4..d54fc33e2 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T1.js
- * @description HexIntegerLiteral :: 0x Digit
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0x Digit"
+---*/
 
 //CHECK#0
 if (0x0 !== 0) {
@@ -87,4 +85,3 @@ if (0xE !== 14) {
 if (0xF !== 15) {
   $ERROR('#F: 0xF === 15');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T2.js
index ca55655e2..e2996a8d9 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T2.js
- * @description HexIntegerLiteral :: 0X Digit
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0X Digit"
+---*/
 
 //CHECK#0
 if (0X0 !== 0) {
@@ -87,4 +85,3 @@ if (0XE !== 14) {
 if (0XF !== 15) {
   $ERROR('#F: 0XF === 15');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T3.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T3.js
index 089a84112..5c05d0e0c 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T3.js
- * @description HexIntegerLiteral :: 0x NonZeroDigit Digits
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0x NonZeroDigit Digits"
+---*/
 
 //CHECK#0
 if (0x0 !== 0) {
@@ -52,4 +50,3 @@ if (0x1000000 !== 16777216) {
 if (0x10000000 !== 268435456) {
   $ERROR('#8: 0x10000000 === 268435456');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T4.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T4.js
index 5ddc484a8..8591389a4 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T4.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T4.js
- * @description HexIntegerLiteral :: 0X NonZeroDigit Digits
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0X NonZeroDigit Digits"
+---*/
 
 //CHECK#0
 if (0X0 !== 0) {
@@ -52,4 +50,3 @@ if (0X1000000 !== 16777216) {
 if (0X10000000 !== 268435456) {
   $ERROR('#8: 0X10000000 === 268435456');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T5.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T5.js
index da8e61ed4..146a71671 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T5.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T5.js
- * @description HexIntegerLiteral :: 0x0 Digits
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0x0 Digits"
+---*/
 
 //CHECK#0
 if (0x00 !== 0) {
@@ -52,4 +50,3 @@ if (0x01000000 !== 16777216) {
 if (0x010000000 !== 268435456) {
   $ERROR('#8: 0x010000000 === 268435456');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T6.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T6.js
index 659c7dfbb..b7d179f19 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T6.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T6.js
- * @description HexIntegerLiteral :: 0X0 Digits
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0X0 Digits"
+---*/
 
 //CHECK#0
 if (0X00 !== 0) {
@@ -52,4 +50,3 @@ if (0X01000000 !== 16777216) {
 if (0X010000000 !== 268435456) {
   $ERROR('#8: 0X010000000 === 268435456');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T7.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T7.js
index 7bc52989c..e58f087d1 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T7.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T7.js
- * @description HexIntegerLiteral :: 0x one of a, b, c, d, e, f
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0x one of a, b, c, d, e, f"
+---*/
 
 //CHECK#a
 if (0xa !== 10) {
@@ -37,4 +35,3 @@ if (0xe !== 14) {
 if (0xf !== 15) {
   $ERROR('#f: 0xf === 15');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T8.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T8.js
index 1f95ab586..9fe2d5f41 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T8.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A5.1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalLiteral :: HexIntegerLiteral
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A5.1_T8.js
- * @description HexIntegerLiteral :: 0X one of a, b, c, d, e, f
- */
+/*---
+info: "DecimalLiteral :: HexIntegerLiteral"
+description: "HexIntegerLiteral :: 0X one of a, b, c, d, e, f"
+---*/
 
 //CHECK#a
 if (0Xa !== 10) {
@@ -37,4 +35,3 @@ if (0Xe !== 14) {
 if (0Xf !== 15) {
   $ERROR('#f: 0Xf === 15');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T1.js
index 3be2b908f..6650cb488 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HexIntegerLiteral :: 0(x/X) is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A6.1_T1.js
- * @description Checking if execution of "0x" passes
- * @negative
- */
+/*---
+info: "HexIntegerLiteral :: 0(x/X) is incorrect"
+description: Checking if execution of "0x" passes
+flags: [negative]
+---*/
 
 //CHECK#1
 0x
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T2.js
index 8b813b81f..e3e023f59 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * HexIntegerLiteral :: 0(x/X) is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A6.1_T2.js
- * @description Checking if execution of "0X" passes
- * @negative
- */
+/*---
+info: "HexIntegerLiteral :: 0(x/X) is incorrect"
+description: Checking if execution of "0X" passes
+flags: [negative]
+---*/
 
 //CHECK#1
 0X
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T1.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T1.js
index accd26589..a0619ad97 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 0xG is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A6.2_T1.js
- * @description Checking if execution of "0xG" fails
- * @negative
- */
+/*---
+info: 0xG is incorrect
+description: Checking if execution of "0xG" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 0xG
-
diff --git a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T2.js b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T2.js
index 7a14fef29..55052fbf0 100644
--- a/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.3/S7.8.3_A6.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 0xG is incorrect
- *
- * @path ch07/7.8/7.8.3/S7.8.3_A6.2_T2.js
- * @description Checking if execution of "0xg" fails
- * @negative
- */
+/*---
+info: 0xG is incorrect
+description: Checking if execution of "0xg" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 0xg
-
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-1-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-1-s.js
index f5548e4f3..ea973b950 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-1-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-1-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-1-s.js

- * @description A directive preceeding an 'use strict' directive may not contain an OctalEscapeSequence

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A directive preceeding an 'use strict' directive may not contain
+    an OctalEscapeSequence
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +23,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-10-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-10-s.js
index c7069c0fa..abad72ed0 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-10-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-10-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-10-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-11-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-11-s.js
index 02e5264b9..444429717 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-11-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-11-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-11-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-12-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-12-s.js
index 27211ab83..ee1bd2d01 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-12-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-12-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-12-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-13-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-13-s.js
index a5641d491..997c7f69f 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-13-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-13-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-13-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-14-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-14-s.js
index 11a3ceaba..af977e312 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-14-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-14-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-14-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-15-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-15-s.js
index ddf59df33..d6e0f35c5 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-15-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-15-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-15-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-16-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-16-s.js
index add6f1b16..1ca32f8ee 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-16-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-16-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-16-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-17-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-17-s.js
index f132d927c..39dbd5020 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-17-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-17-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-17-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-18-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-18-s.js
index db679216f..ba6ac168d 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-18-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-18-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-18-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-19-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-19-s.js
index c1792cfa3..eb474c039 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-19-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-19-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-19-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-1gs.js b/test/suite/ch07/7.8/7.8.4/7.8.4-1gs.js
index 4974d0b5f..e819d2c5f 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-1gs.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-1gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-1gs.js

- * @description Strict Mode - OctalEscapeSequence(\0110) is forbidden in strict mode

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - OctalEscapeSequence(\0110) is forbidden in strict
+    mode
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
 "use strict";

 throw NotEarlyError;

-var _7_8_4_2 = '100abc\0110def';

+var _7_8_4_2 = '100abc\0110def';
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-2-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-2-s.js
index 5d5e02dc3..27ccfb11d 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-2-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-2-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-2-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-20-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-20-s.js
index 170cb4c5a..fe88759ee 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-20-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-20-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-20-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-21-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-21-s.js
index 1dca614fc..0d124d05a 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-21-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-21-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-21-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-22-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-22-s.js
index dc7399147..7a90b0e29 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-22-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-22-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-22-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-23-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-23-s.js
index e8d7c1204..82bdd8386 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-23-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-23-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-23-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-24-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-24-s.js
index e0cea8f6e..2b5772c82 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-24-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-24-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-24-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-25-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-25-s.js
index 060d0cd07..0371e9e8d 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-25-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-25-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-25-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-26-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-26-s.js
index d986b4de9..d5f8089c2 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-26-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-26-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-26-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-27-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-27-s.js
index b208bdb6f..7dd90b7a0 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-27-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-27-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-27-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-28-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-28-s.js
index a0967eb8e..3dfe1f47f 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-28-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-28-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-28-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-29-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-29-s.js
index 60e65af65..e4a25bd40 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-29-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-29-s.js
@@ -1,17 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-29-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -23,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

 }

-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-3-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-3-s.js
index 0885c5c74..3703d9c6d 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-3-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-3-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-3-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-30-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-30-s.js
index 73cbdfedc..a642a809a 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-30-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-30-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-30-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-31-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-31-s.js
index a33c8bbc6..3e301ec1c 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-31-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-31-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-31-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-32-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-32-s.js
index 312e870c3..882e44fdc 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-32-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-32-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-32-s.js

- * @description Two OctalEscapeSequences in a String are not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Two OctalEscapeSequences in a String are not allowed in a String
+    under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +23,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-33-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-33-s.js
index 639313c92..290508aa2 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-33-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-33-s.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-33-s.js

- * @description Three OctalEscapeSequences in a String are not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Three OctalEscapeSequences in a String are not allowed in a String
+    under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +23,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-4-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-4-s.js
index bd4e93fe6..f2a00076b 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-4-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-4-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-4-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-5-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-5-s.js
index 1108364ab..fd7c08a90 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-5-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-5-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-5-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-6-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-6-s.js
index 119415796..f9612aaca 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-6-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-6-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-6-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-7-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-7-s.js
index 254d2953e..d1871fe9e 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-7-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-7-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-7-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-8-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-8-s.js
index 04e3eac9b..fc6b3c7bd 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-8-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-8-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-8-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/7.8.4-9-s.js b/test/suite/ch07/7.8/7.8.4/7.8.4-9-s.js
index 1efa2e57a..929ab6cc0 100644
--- a/test/suite/ch07/7.8/7.8.4/7.8.4-9-s.js
+++ b/test/suite/ch07/7.8/7.8.4/7.8.4-9-s.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.4/7.8.4-9-s.js

- * @description An OctalEscapeSequence is not allowed in a String under Strict Mode

- * @onlyStrict

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An OctalEscapeSequence is not allowed in a String under Strict Mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
 function testcase()

 {

   try 

@@ -21,4 +21,4 @@ function testcase()
     return (e instanceof SyntaxError);

   }

  }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T1.js
index 02c823418..023e9ea5e 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "DoubleStringCharacters_opt"
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A1.1_T1.js
- * @description DoubleStringCharacter :: SourceCharacter but not double-quote " or LineTerminator
- * @negative
- */
+/*---
+info: "StringLiteral :: \"DoubleStringCharacters_opt\""
+description: >
+    DoubleStringCharacter :: SourceCharacter but not double-quote " or
+    LineTerminator
+flags: [negative]
+---*/
 
 //CHECK#1
 """
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T2.js
index bedbcea86..afb854f67 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.1_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "DoubleStringCharacters_opt"
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A1.1_T2.js
- * @description DoubleStringCharacter :: SourceCharacter but not double-quote " or LineTerminator
- * @negative
- */
+/*---
+info: "StringLiteral :: \"DoubleStringCharacters_opt\""
+description: >
+    DoubleStringCharacter :: SourceCharacter but not double-quote " or
+    LineTerminator
+flags: [negative]
+---*/
 
 //CHECK#1
 "
 "
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T1.js
index 964e5be6c..bbdedad26 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: 'SingleStringCharacters_opt'
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A1.2_T1.js
- * @description SingleStringCharacter :: SourceCharacter but not single-quote ' or LineTerminator
- * @negative
- */
+/*---
+info: "StringLiteral :: 'SingleStringCharacters_opt'"
+description: >
+    SingleStringCharacter :: SourceCharacter but not single-quote ' or
+    LineTerminator
+flags: [negative]
+---*/
 
 //CHECK#1
 '''
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T2.js
index 82890f5c2..06f38a6da 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A1.2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: 'SingleStringCharacters_opt'
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A1.2_T2.js
- * @description SingleStringCharacter :: SourceCharacter but not single-quote ' or LineTerminator
- * @negative
- */
+/*---
+info: "StringLiteral :: 'SingleStringCharacters_opt'"
+description: >
+    SingleStringCharacter :: SourceCharacter but not single-quote ' or
+    LineTerminator
+flags: [negative]
+---*/
 
 //CHECK#1
 '
 '
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T1.js
index 9a555b814..c6a111d29 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of ENGLISH ALPHABET
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A2.1_T1.js
- * @description Check ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: Correct interpretation of ENGLISH ALPHABET
+description: Check ENGLISH CAPITAL ALPHABET
+---*/
 
 //CHECK#A-Z
 var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T2.js
index f7e8ccfa3..5cc88b447 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of ENGLISH ALPHABET
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A2.1_T2.js
- * @description Check ENGLISH SMALL ALPHABET
- */
+/*---
+info: Correct interpretation of ENGLISH ALPHABET
+description: Check ENGLISH SMALL ALPHABET
+---*/
 
 //CHECK#a-z
 var hex = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T1.js
index cefe28d57..6d76b223b 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of RUSSIAN ALPHABET
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A2.2_T1.js
- * @description Check RUSSIAN CAPITAL ALPHABET
- */
+/*---
+info: Correct interpretation of RUSSIAN ALPHABET
+description: Check RUSSIAN CAPITAL ALPHABET
+---*/
 
 //CHECK#А-Я
 var unicode = ["\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417", "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F", "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427", "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F", "\u0401"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 32; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T2.js
index 09fc5877b..9643e68dd 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of RUSSIAN ALPHABET
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A2.2_T2.js
- * @description Check RUSSIAN SMALL ALPHABET
- */
+/*---
+info: Correct interpretation of RUSSIAN ALPHABET
+description: Check RUSSIAN SMALL ALPHABET
+---*/
 
 //CHECK#а-я
 var unicode = ["\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437", "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F", "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447", "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F", "\u0451"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 32; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.3_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.3_T1.js
index 30e6133b7..77bcc9d76 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of DIGITS
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A2.3_T1.js
- * @description Check DIGITS
- */
+/*---
+info: Correct interpretation of DIGITS
+description: Check DIGITS
+---*/
 
 //CHECK#0-9
 var unicode = ["\u0030", "\u0031", "\u0032", "\u0033", "\u0034", "\u0035", "\u0036", "\u0037", "\u0038", "\u0039"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 9; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T1.js
index f25e6538d..0529177cd 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "\" or '\' is not correct
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A3.1_T1.js
- * @description Checking if execution of "\" fails
- * @negative
- */
+/*---
+info: "StringLiteral :: \"\\\" or '\\' is not correct"
+description: Checking if execution of "\" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 "\"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T2.js
index 82cf8717b..8169271cd 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "\" or '\' is not correct
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A3.1_T2.js
- * @description Checking if execution of "'\'" fails
- * @negative
- */
+/*---
+info: "StringLiteral :: \"\\\" or '\\' is not correct"
+description: Checking if execution of "'\'" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 '\'
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T1.js
index 54aaf12c6..66195f1e7 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "\\\" or '\\\' is not correct
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A3.2_T1.js
- * @description Checking if execution of "\\\" fails
- * @negative
- */
+/*---
+info: "StringLiteral :: \"\\\\\\\" or '\\\\\\' is not correct"
+description: Checking if execution of "\\\" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 "\\\"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T2.js
index a26421e76..094fd184c 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A3.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StringLiteral :: "\\\" or '\\\' is not correct
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A3.2_T2.js
- * @description Checking if execution of '\\\' fails
- * @negative
- */
+/*---
+info: "StringLiteral :: \"\\\\\\\" or '\\\\\\' is not correct"
+description: Checking if execution of '\\\' fails
+flags: [negative]
+---*/
 
 //CHECK#1
 '\\\'
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T1.js
index 9cac9a2d9..3e0b0ac54 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: SingleEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.1_T1.js
- * @description SingleEscapeSequence :: one of b f n r t v
- */
+/*---
+info: "CharacterEscapeSequnce :: SingleEscapeSequence"
+description: "SingleEscapeSequence :: one of b f n r t v"
+---*/
 
 //CHECK#1
 if (String.fromCharCode(0x0008) !== "\b") {
@@ -37,4 +35,3 @@ if (String.fromCharCode(0x000C) !== "\f") {
 if (String.fromCharCode(0x000D) !== "\r") {
   $ERROR('#6: String.fromCharCode(0x000D) === "\\r"');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T2.js
index c99f669ef..7ddef6cf9 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: SingleEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.1_T2.js
- * @description SingleEscapeSequence :: one of ' " \
- */
+/*---
+info: "CharacterEscapeSequnce :: SingleEscapeSequence"
+description: "SingleEscapeSequence :: one of ' \" \\"
+---*/
 
 //CHECK#1
 if (String.fromCharCode(0x0027) !== "\'") {
@@ -32,4 +30,3 @@ if ("\'" !== "'") {
 if ('\"' !== '"') {
   $ERROR('#5: \'\"\' === \'\\\"\'');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T1.js
index 8abfdd031..363f6a79c 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T1.js
- * @description NonEscapeSequence :: ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: ENGLISH CAPITAL ALPHABET"
+---*/
 
 //CHECK#A-Z
 var CharacterCode = [0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T2.js
index 660d2e62e..5b476d9c2 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T2.js
- * @description NonEscapeSequence :: ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: ENGLISH CAPITAL ALPHABET"
+---*/
 
 //CHECK#A-Z
 if ("A" !== "\A") {
@@ -112,4 +110,3 @@ if ("Y" !== "\Y") {
 if ("Z" !== "\Z") {
   $ERROR('#Z');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T3.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T3.js
index 39194063a..aff309ef6 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T3.js
- * @description NonEscapeSequence :: ENGLISH SMALL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: ENGLISH SMALL ALPHABET"
+---*/
 
 //CHECK#a-z without b, f, n, r, t, v, x, u
 var CharacterCode = [0x0061, 0x0063, 0x0064, 0x0065, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006F, 0x0070, 0x0071, 0x0073, 0x0077, 0x0079, 0x007A];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 17; index++) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T4.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T4.js
index 19e61c5e1..bb66b29b1 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T4.js
- * @description NonEscapeSequence :: ENGLISH SMALL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: ENGLISH SMALL ALPHABET"
+---*/
 
 //CHECK#a-z without b, f, n, r, t, v, x, u
 
@@ -82,5 +80,3 @@ if ("y" !== "\y") {
 if ("z" !== "\z") {
   $ERROR('#z');
 }
-
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T5.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T5.js
index 57c1b8efd..6fc0933ba 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T5.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T5.js
- * @description NonEscapeSequence :: RUSSIAN CAPITAL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: RUSSIAN CAPITAL ALPHABET"
+---*/
 
 //CHECK#А-Я
 var CharacterCode = [0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0401];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 32; index++) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T6.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T6.js
index 86e7ac2ca..61b43e71c 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T6.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T6.js
- * @description NonEscapeSequence :: RUSSIAN CAPITAL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: RUSSIAN CAPITAL ALPHABET"
+---*/
 
 //CHECK#А-Я
 
@@ -141,4 +139,3 @@ if ("Я" !== "\Я") {
 if ("Ё" !== "\Ё") {
   $ERROR('#Ё');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T7.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T7.js
index 78915dce4..9b718e280 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T7.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T7.js
- * @description NonEscapeSequence :: RUSSIAN SMALL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: RUSSIAN SMALL ALPHABET"
+---*/
 
 //CHECK#а-я
 var CharacterCode = [0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0451];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 32; index++) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T8.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T8.js
index 3ef3f843e..cab21d4fa 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T8.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscapeSequnce :: NonEscapeSequence
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.2_T8.js
- * @description NonEscapeSequence :: RUSSIAN SMALL ALPHABET
- */
+/*---
+info: "CharacterEscapeSequnce :: NonEscapeSequence"
+description: "NonEscapeSequence :: RUSSIAN SMALL ALPHABET"
+---*/
 
 //CHECK#а-я
 
@@ -141,4 +139,3 @@ if ("я" !== "\я") {
 if ("ё" !== "\ё") {
   $ERROR('#ё');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T1.js
index 96c823ee8..7d3ed67e2 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NonEscapeSequence is not EscapeCharacter
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.3_T1.js
- * @description EscapeCharacter :: DecimalDigits :: 1
- * @onlyStrict
- * @negative
- */
+/*---
+info: NonEscapeSequence is not EscapeCharacter
+description: "EscapeCharacter :: DecimalDigits :: 1"
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 
 //CHECK#1
 "\1"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T2.js
index b7f743e49..7750588ea 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T2.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NonEscapeSequence is not EscapeCharacter
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.3_T2.js
- * @description EscapeCharacter :: DecimalDigits :: 7
- * @onlyStrict
- * @negative
- */
+/*---
+info: NonEscapeSequence is not EscapeCharacter
+description: "EscapeCharacter :: DecimalDigits :: 7"
+flags:
+    - onlyStrict
+    - negative
+---*/
 
 "use strict";
 
 //CHECK#1
 "\7"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T7.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T7.js
index 063930342..669024363 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T7.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A4.3_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NonEscapeSequence is not EscapeCharacter
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A4.3_T7.js
- * @description EscapeCharacter :: SingleEscapeCharacter :: one of b f n r t v
- */
+/*---
+info: NonEscapeSequence is not EscapeCharacter
+description: "EscapeCharacter :: SingleEscapeCharacter :: one of b f n r t v"
+---*/
 
 //CHECK#bfnrtv
 if ("b" === "\b") {
@@ -32,5 +30,3 @@ if ("t" === "\t") {
 if ("v" === "\v") {
   $ERROR('#v');
 }
-
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T1.js
index aa0acecb6..c5d950e48 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: 0
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A5.1_T1.js
- * @description String.fromCharCode(0x0000)
- */
+/*---
+info: "EscapeSequence :: 0"
+description: String.fromCharCode(0x0000)
+---*/
 
 //CHECK#1
 if (String.fromCharCode(0x0000) !== "\0") {
   $ERROR('#1: String.fromCharCode(0x0000) === "\\0"');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T2.js
index 06830f080..c438066d4 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: 0
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A5.1_T2.js
- * @description "\u0000"
- */
+/*---
+info: "EscapeSequence :: 0"
+description: "\"\\u0000\""
+---*/
 
 //CHECK#1
 if ("\u0000" !== "\0") {
   $ERROR('#1: "\\u0000" === "\\0"');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T3.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T3.js
index f7a1de6ac..d454ece76 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A5.1_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: 0
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A5.1_T3.js
- * @description "\x00"
- */
+/*---
+info: "EscapeSequence :: 0"
+description: "\"\\x00\""
+---*/
 
 //CHECK#1
 if ("\x00" !== "\0") {
   $ERROR('#1: "\\x00" === "\\0"');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T1.js
index ce8f5dae8..1e6f87c19 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A6.1_T1.js
- * @description HexEscapeSequence ::  HexDigit
- */
+/*---
+info: "EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit"
+description: "HexEscapeSequence ::  HexDigit"
+---*/
 
 //CHECK#0
 if ("\x00" !== String.fromCharCode("0")) {
@@ -87,4 +85,3 @@ if ("\x0E" !== String.fromCharCode("14")) {
 if ("\x0F" !== String.fromCharCode("15")) {
   $ERROR('#F: "\\x0F" === String.fromCharCode("15")');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T2.js
index 64cdc0ebe..6963cb536 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A6.1_T2.js
- * @description HexEscapeSequence ::  ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: "EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit"
+description: "HexEscapeSequence ::  ENGLISH CAPITAL ALPHABET"
+---*/
 
 //CHECK#A-Z
 var hex = ["\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", "\x49", "\x4A", "\x4B", "\x4C", "\x4D", "\x4E", "\x4F", "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", "\x5A"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T3.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T3.js
index c3ef6e4d3..e01ab2dea 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A6.1_T3.js
- * @description HexEscapeSequence ::  ENGLISH SMALL ALPHABET
- */
+/*---
+info: "EscapeSequence :: HexEscapeSequence :: x HexDigit HexDigit"
+description: "HexEscapeSequence ::  ENGLISH SMALL ALPHABET"
+---*/
 
 //CHECK#a-z
 var hex = ["\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x6A", "\x6B", "\x6C", "\x6D", "\x6E", "\x6F", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x79", "\x7A"];
@@ -16,4 +14,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.3_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.3_T1.js
index 4611ba25a..a92cceb4d 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A6.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * \x HexDigit HexDigit SingleStringCharacter
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A6.3_T1.js
- * @description Check similar to ('\x01F' === String.fromCharCode('1') + 'F')
- */
+/*---
+info: \x HexDigit HexDigit SingleStringCharacter
+description: Check similar to ('\x01F' === String.fromCharCode('1') + 'F')
+---*/
 
 //CHECK#1
 if ('\x01F' !== String.fromCharCode('1') + 'F') {
@@ -82,4 +80,3 @@ if ('\x0E2' !== String.fromCharCode('14') + '2') {
 if ('\x0F1' !== String.fromCharCode('15') + '1') {
   $ERROR("#F: '\x0F1' === String.fromCharCode('15') + '1'");
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T1.js
index 512de11f2..5262b44dc 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.1_T1.js
- * @description Check similar to ("\u0000" === String.fromCharCode("0"))
- */
+/*---
+info: >
+    EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: Check similar to ("\u0000" === String.fromCharCode("0"))
+---*/
 
 //CHECK#0
 if ("\u0000" !== String.fromCharCode("0")) {
@@ -87,4 +87,3 @@ if ("\u000E" !== String.fromCharCode("14")) {
 if ("\u000F" !== String.fromCharCode("15")) {
   $ERROR('#F: "\\u000F" === String.fromCharCode("15")');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T2.js
index 32c6c3455..c3f2133d9 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.1_T2.js
- * @description UnicodeEscapeSequence ::  ENGLISH CAPITAL ALPHABET
- */
+/*---
+info: >
+    EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: "UnicodeEscapeSequence ::  ENGLISH CAPITAL ALPHABET"
+---*/
 
 //CHECK#A-Z
 var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
@@ -16,4 +16,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T3.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T3.js
index 7bf3ef85c..8cc1b4e19 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.1_T3.js
- * @description UnicodeEscapeSequence ::  ENGLISH SMALL ALPHABET
- */
+/*---
+info: >
+    EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: "UnicodeEscapeSequence ::  ENGLISH SMALL ALPHABET"
+---*/
 
 //CHECK#a-z
 var unicode = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
@@ -16,4 +16,3 @@ for (var index = 0; index <= 25; index++) {
     $ERROR('#' + character[index] + ' ');
   }
 }
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T4.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T4.js
index 11b4f5620..db734a087 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T4.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.1_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.1_T4.js
- * @description UnicodeEscapeSequence :: u000G is incorrect
- * @negative
- */
+/*---
+info: >
+    EscapeSequence :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: "UnicodeEscapeSequence :: u000G is incorrect"
+flags: [negative]
+---*/
 
 //CHECK#
 "\u000G"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T1.js
index 6c3cff0dd..880a1b22b 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T1.js
- * @description :: HexDigit :: 1
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: 1"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\u1"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T2.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T2.js
index c1918f414..8bd32f221 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T2.js
- * @description :: HexDigit :: A
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: A"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\uA"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T3.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T3.js
index b1eee5923..c4ee16a84 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T3.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T3.js
- * @description :: HexDigit :: 1
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: 1"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\u11"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T4.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T4.js
index 6fe1c8afe..3f3849330 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T4.js
- * @description :: HexDigit :: A
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: A"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\uAA"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T5.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T5.js
index f047e5337..c2de688a1 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T5.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T5.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T5.js
- * @description :: HexDigit :: 1
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: 1"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\u111"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T6.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T6.js
index 5d28d4a5e..691ad6072 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T6.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.2_T6.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.2_T6.js
- * @description :: HexDigit :: A
- * @negative
- */
+/*---
+info: "UnicodeEscapeSequence :: u HexDigit (one, two or three time) is incorrect"
+description: ":: HexDigit :: A"
+flags: [negative]
+---*/
 
 //CHECK#1
 "\uAAA"
-
diff --git a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.3_T1.js b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.3_T1.js
index baaeaae6f..ca1bb0126 100644
--- a/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.4/S7.8.4_A7.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * \u HexDigit HexDigit HexDigit HexDigit DoubleStringCharacter
- *
- * @path ch07/7.8/7.8.4/S7.8.4_A7.3_T1.js
- * @description Check similar to ("\u0001F" === String.fromCharCode("1") + "F")
- */
+/*---
+info: \u HexDigit HexDigit HexDigit HexDigit DoubleStringCharacter
+description: Check similar to ("\u0001F" === String.fromCharCode("1") + "F")
+---*/
 
 //CHECK#1
 if ("\u0001F" !== String.fromCharCode("1") + "F") {
@@ -82,4 +80,3 @@ if ("\u000E2" !== String.fromCharCode("14") + "2") {
 if ("\u000F1" !== String.fromCharCode("15") + "1") {
   $ERROR('#F: "\\u000F1" === String.fromCharCode("15") + "1"');
 }
-
diff --git a/test/suite/ch07/7.8/7.8.5/7.8.5-1.js b/test/suite/ch07/7.8/7.8.5/7.8.5-1.js
index a8fe6e29f..3df19ac0c 100644
--- a/test/suite/ch07/7.8/7.8.5/7.8.5-1.js
+++ b/test/suite/ch07/7.8/7.8.5/7.8.5-1.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch07/7.8/7.8.5/7.8.5-1.js

- * @description Literal RegExp Objects - SyntaxError exception is thrown if the RegularExpressionNonTerminator position of a RegularExpressionBackslashSequence is a LineTerminator.

- */

-

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Literal RegExp Objects - SyntaxError exception is thrown if the
+    RegularExpressionNonTerminator position of a
+    RegularExpressionBackslashSequence is a LineTerminator.
+includes: [runTestCase.js]
+---*/
+
 function testcase() {

         try {

             eval("var regExp = /\\\rn/;");

@@ -17,4 +20,4 @@ function testcase() {
             return e instanceof SyntaxError;

         }

     }

-runTestCase(testcase);

+runTestCase(testcase);
diff --git a/test/suite/ch07/7.8/7.8.5/7.8.5-1gs.js b/test/suite/ch07/7.8/7.8.5/7.8.5-1gs.js
index 4b22a6193..b16359ea1 100644
--- a/test/suite/ch07/7.8/7.8.5/7.8.5-1gs.js
+++ b/test/suite/ch07/7.8/7.8.5/7.8.5-1gs.js
@@ -1,15 +1,13 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch07/7.8/7.8.5/7.8.5-1gs.js

- * @description Empty literal RegExp should result in a SyntaxError

- * @negative ^((?!NotEarlyError).)*$

- */

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Empty literal RegExp should result in a SyntaxError
+negative: ^((?!NotEarlyError).)*$
+---*/
+
 throw NotEarlyError;

-var re = //;

-

+var re = //;
diff --git a/test/suite/ch07/7.8/7.8.5/7.8.5-2gs.js b/test/suite/ch07/7.8/7.8.5/7.8.5-2gs.js
index b67638b03..2e3c50b9e 100644
--- a/test/suite/ch07/7.8/7.8.5/7.8.5-2gs.js
+++ b/test/suite/ch07/7.8/7.8.5/7.8.5-2gs.js
@@ -1,13 +1,11 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch07/7.8/7.8.5/7.8.5-2gs.js

- * @description Empty dynamic RegExp should not result in a SyntaxError

- */

-

-var re = new RegExp("");

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Empty dynamic RegExp should not result in a SyntaxError
+---*/
+
+var re = new RegExp("");
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T1.js
index 638177170..ae66a53bf 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: NonTerminator but not * or \ or /,
- * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.1_T1.js
- * @description Without eval
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: NonTerminator but not * or \ or /,
+    RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
+description: Without eval
+---*/
 
 //CHECK#1
 if (/1/.source !== "1") {
@@ -32,5 +31,4 @@ if (/ /.source !== " ") {
 //CHECK#5
 if (/\u0041/.source !== "\\u0041") {
   $ERROR('#5: /\\u0041/');
-}         
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T2.js
index e46d2e24d..a4f8776fc 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: NonTerminator but not * or \ or /,
- * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.1_T2.js
- * @description Complex test with eval, using syntax pattern
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: NonTerminator but not * or \ or /,
+    RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
+description: Complex test with eval, using syntax pattern
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -52,4 +51,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
 }
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T1.js
index d7013d049..9505c36e3 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: * or \ or / or [empty] is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.2_T1.js
- * @description *
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: * or \\ or / or [empty] is incorrect"
+description: "*"
+flags: [negative]
+---*/
 
 //CHECK#1
 /*/
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T2.js
index b050d8c53..2fe0f7be2 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: * or \ or / or [empty] is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.2_T2.js
- * @description \
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: * or \\ or / or [empty] is incorrect"
+description: \
+flags: [negative]
+---*/
 
 //CHECK#1
 /\/
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T3.js
index abd943bac..be4343bb7 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: * or \ or / or [empty] is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.2_T3.js
- * @description /
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: * or \\ or / or [empty] is incorrect"
+description: /
+flags: [negative]
+---*/
 
 //CHECK#1
 ///
 .source;
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T4.js
index 6d341f991..311736dba 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.2_T4.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: * or \ or / or [empty] is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.2_T4.js
- * @description [empty]
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: * or \\ or / or [empty] is incorrect"
+description: "[empty]"
+flags: [negative]
+---*/
 
 //CHECK#1
 //
 .source;
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T1.js
index 4fdba3e4c..2a051648d 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T1.js
- * @description Line Feed, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Line Feed, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T2.js
index a2ac51235..3590f5153 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T2.js
- * @description Line Feed, with eval
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Line Feed, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: Line Feed is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T3.js
index 95d7ebcd6..e4ae042a1 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T3.js
- * @description Carriage Return, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Carriage Return, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T4.js
index 638eecf69..98f3779f9 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T4.js
- * @description Carriage Return, with eval
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Carriage Return, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: Carriage Return is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T5.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T5.js
index c621df543..9ca16eccd 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T5.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T5.js
- * @description Line separator, with eval
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Line separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: Line separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T6.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T6.js
index 1ad88db22..2abcf2a17 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T6.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.3_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.3_T6.js
- * @description Paragraph separator, with eval
- */
+/*---
+info: "RegularExpressionFirstChar :: LineTerminator is incorrect"
+description: Paragraph separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: Paragraph separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T1.js
index 0c87e0b3d..024da52bd 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \NonTerminator,
- * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.4_T1.js
- * @description Check similar to (/\1/.source === "\\1")
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \NonTerminator,
+    RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
+description: Check similar to (/\1/.source === "\\1")
+---*/
 
 //CHECK#1
 if (/\1/.source !== "\\1") {
@@ -27,5 +26,4 @@ if (/\;/.source !== "\\;") {
 //CHECK#4
 if (/\ /.source !== "\\ ") {
   $ERROR('#4: /\\ /');
-}  
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js
index f17d8332a..3f9950cbb 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \NonTerminator,
- * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.4_T2.js
- * @description Complex test with eval, using syntax pattern
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \NonTerminator,
+    RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty]
+description: Complex test with eval, using syntax pattern
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -52,4 +51,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
 }
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T1.js
index 94a9734d0..a91e1ac83 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T1.js
- * @description Line Feed, without eval
- * @negative
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Line Feed, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /\
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T2.js
index 923e3f737..fdd446580 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T2.js
- * @description Line Feed, with eval
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Line Feed, with eval
+---*/
 
 //CHECK#1
 try {      
@@ -17,5 +17,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: BackslashSequence :: \\Line Feed is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T3.js
index 3c349c10b..edaee4833 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T3.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T3.js
- * @description Carriage Return, without eval
- * @negative
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Carriage Return, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /\
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T4.js
index e5b89920a..d660e5569 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T4.js
- * @description Carriage Return, with eval
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Carriage Return, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +17,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: BackslashSequence :: \\Carriage Return is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T5.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T5.js
index a9b6d9696..ac2c01a36 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T5.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T5.js
- * @description Line separator, with eval
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Line separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +17,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: BackslashSequence :: \\Line separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T6.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T6.js
index 73345ed41..b040fede4 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T6.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A1.5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A1.5_T6.js
- * @description Paragraph separator, with eval
- */
+/*---
+info: >
+    RegularExpressionFirstChar :: BackslashSequence :: \LineTerminator is
+    incorrect
+description: Paragraph separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +17,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionFirstChar :: BackslashSequence :: \\Paragraph separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T1.js
index 5b69da20d..41e6f4443 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: NonTerminator but not \ or /,
- * RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.1_T1.js
- * @description Without eval
- */
+/*---
+info: >
+    RegularExpressionChar :: NonTerminator but not \ or /,
+    RegularExpressionFlags :: [empty]
+description: Without eval
+---*/
 
 //CHECK#1
 if (/1a/.source !== "1a") {
@@ -32,5 +31,4 @@ if (/  /.source !== "  ") {
 //CHECK#5
 if (/a\u0041/.source !== "a\\u0041") {
   $ERROR('#5: /a\\u0041/');
-}  
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T2.js
index b8e66b23e..df80355b3 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: NonTerminator but not \ or /,
- * RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.1_T2.js
- * @description Complex test with eval, using syntax pattern
- */
+/*---
+info: >
+    RegularExpressionChar :: NonTerminator but not \ or /,
+    RegularExpressionFlags :: [empty]
+description: Complex test with eval, using syntax pattern
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -53,4 +52,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
 }
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T1.js
index 8231c0407..25de1eb9e 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: \ or / is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.2_T1.js
- * @description \
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: \\ or / is incorrect"
+description: \
+flags: [negative]
+---*/
 
 //CHECK#1
 /a\/
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T2.js
index b80f21691..32786590e 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: \ or / is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.2_T2.js
- * @description /
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: \\ or / is incorrect"
+description: /
+flags: [negative]
+---*/
 
 //CHECK#1
 /a//.source;
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T1.js
index fd42341e0..397807e54 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T1.js
- * @description Line Feed, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Line Feed, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /a
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T2.js
index 8f3523088..fa5c5fb46 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T2.js
- * @description Line Feed, with eval
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Line Feed, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: Line Feed is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T3.js
index c9debb5c5..ecea8defe 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T3.js
- * @description Carriage Return, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Carriage Return, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /a
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T4.js
index 4c2dda384..198c0ecb6 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T4.js
- * @description Carriage Return, with eval
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Carriage Return, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: Carriage Retur is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T5.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T5.js
index 85d43801f..8092ec0c1 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T5.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T5.js
- * @description Line separator, with eval
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Line separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: Line separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T6.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T6.js
index abf9833c5..c0e5b90ab 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T6.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.3_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.3_T6.js
- * @description Paragraph separator, with eval
- */
+/*---
+info: "RegularExpressionChar :: LineTerminator is incorrect"
+description: Paragraph separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: Paragraph separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T1.js
index 8a67dc42a..f253c89ff 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \NonTerminator,
- * RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.4_T1.js
- * @description Check similar to (/a\1/.source === "a\\1")
- */
+/*---
+info: >
+    RegularExpressionChar :: BackslashSequence :: \NonTerminator,
+    RegularExpressionFlags :: [empty]
+description: Check similar to (/a\1/.source === "a\\1")
+---*/
 
 //CHECK#1
 if (/a\1/.source !== "a\\1") {
@@ -27,5 +26,4 @@ if (/,\;/.source !== ",\\;") {
 //CHECK#4
 if (/ \ /.source !== " \\ ") {
   $ERROR('#4: / \\ /');
-}  
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T2.js
index fa26a976b..8991d25fb 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \NonTerminator,
- * RegularExpressionFlags :: [empty]
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.4_T2.js
- * @description Complex test with eval, using syntax pattern
- */
+/*---
+info: >
+    RegularExpressionChar :: BackslashSequence :: \NonTerminator,
+    RegularExpressionFlags :: [empty]
+description: Complex test with eval, using syntax pattern
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -52,4 +51,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
 }
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T1.js
index a3d5e5b4e..c039a3644 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T1.js
- * @description Line Feed, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Line Feed, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /a\
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T2.js
index 685ada093..9d315b4c4 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T2.js
- * @description Line Feed, with eval
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Line Feed, with eval
+---*/
 
 //CHECK#1
 try {      
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: BackslashSequence :: \\Line Feed is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T3.js
index e85821870..bb25b8d66 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T3.js
- * @description Carriage Return, without eval
- * @negative
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Carriage Return, without eval
+flags: [negative]
+---*/
 
 //CHECK#1
 /a\
 /
-
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T4.js
index 5cdea0817..ddda14f2e 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T4.js
- * @description Carriage Return, with eval
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Carriage Return, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: BackslashSequence :: \\Carriage Return is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T5.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T5.js
index acc1f3080..3d3db241b 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T5.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T5.js
- * @description Line separator, with eval
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Line separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: BackslashSequence :: \\Line separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T6.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T6.js
index d33041021..4cde7f93a 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T6.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A2.5_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionChar :: BackslashSequence :: \LineTerminator is incorrect
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A2.5_T6.js
- * @description Paragraph separator, with eval
- */
+/*---
+info: "RegularExpressionChar :: BackslashSequence :: \\LineTerminator is incorrect"
+description: Paragraph separator, with eval
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +15,4 @@ catch (e) {
   if ((e instanceof SyntaxError) !== true) {
      $ERROR('#1.2: RegularExpressionChar :: BackslashSequence :: \\Paragraph separator is incorrect. Actual: ' + (e));
   }
-}     
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T1.js
index 14ea4d7ea..e5dcfad31 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T1.js
- * @description IdentifierPart :: g
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: g"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/g; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== false) {
 //CHECK#3
 if (regexp.multiline !== false) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === false. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T2.js
index f247140d2..fd0229e7c 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T2.js
- * @description IdentifierPart :: i
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: i"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/i; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== true) {
 //CHECK#3
 if (regexp.multiline !== false) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === false. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T3.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T3.js
index 4f0e6f14d..afc1e93e6 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T3.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T3.js
- * @description IdentifierPart :: m
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: m"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/m; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== false) {
 //CHECK#3
 if (regexp.multiline !== true) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === true. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T4.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T4.js
index fd56ca01c..66b212213 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T4.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T4.js
- * @description IdentifierPart :: gi
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: gi"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/gi; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== true) {
 //CHECK#3
 if (regexp.multiline !== false) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === false. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T5.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T5.js
index 3b45a94ca..494c39042 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T5.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T5.js
- * @description IdentifierPart :: mg
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: mg"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/mg; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== false) {
 //CHECK#3
 if (regexp.multiline !== true) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === true. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T6.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T6.js
index fb188ed6c..667fa1e79 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T6.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T6.js
- * @description IdentifierPart :: mig
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: mig"
+---*/
 
 //CHECK#1
 var regexp = /(?:)/mig; 
@@ -22,5 +20,4 @@ if (regexp.ignoreCase !== true) {
 //CHECK#3
 if (regexp.multiline !== true) {
   $ERROR('#3: var regexp = /(?:)/g; regexp.multiline === true. Actual: ' + (regexp.multiline));
-}                            
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T7.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T7.js
index 299241d4c..5305b6be7 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T7.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T7.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T7.js
- * @description IdentifierPart :: \u0067 (g)
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: \\u0067 (g)"
+---*/
 
 //CHECK#1
 var regexp;
 eval("regexp = /(?:)/\u0067"); 
 if (regexp.global !== true) {
   $ERROR('#1: var regexp = /(?:)/\\u0067; regexp.global === true. Actual: ' + (regexp.global));
-}                        
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T8.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T8.js
index de78b6f23..b81c9d2d1 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T8.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T8.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T8.js
- * @description IdentifierPart :: \u0069 (i)
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: \\u0069 (i)"
+---*/
 
 //CHECK#1
 var regexp;
 eval("regexp = /(?:)/\u0069"); 
 if (regexp.ignoreCase !== true) {
   $ERROR('#1: var regexp = /(?:)/\\u0069; regexp.ignoreCase === true. Actual: ' + (regexp.ignoreCase));
-}                         
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T9.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T9.js
index 132586af4..721a1b07b 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T9.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A3.1_T9.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegularExpressionFlags :: IdentifierPart
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A3.1_T9.js
- * @description IdentifierPart :: \u006D (m)
- */
+/*---
+info: "RegularExpressionFlags :: IdentifierPart"
+description: "IdentifierPart :: \\u006D (m)"
+---*/
 
 //CHECK#1
 var regexp;
 eval("regexp = /(?:)/\u006D");
 if (regexp.multiline !== true) {
   $ERROR('#1: var regexp = /(?:)/\\u006D; regexp.multiline === true. Actual: ' + (regexp.multiline));
-}                             
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.1.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.1.js
index d8f33d67d..b199708d5 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.1.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A regular expression literal is an input element that is converted to
- * a RegExp object when it is scanned
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A4.1.js
- * @description Check ((/(?:)/ instanceof RegExp) === true)
- */
+/*---
+info: >
+    A regular expression literal is an input element that is converted to
+    a RegExp object when it is scanned
+description: "Check ((/(?:)/ instanceof RegExp) === true)"
+---*/
 
 //CHECK#1
 if ((/(?:)/ instanceof RegExp) !== true) {
   $ERROR('#1: (/(?:)/ instanceof RegExp) === true. Actual: ' + ((/(?:)/ instanceof RegExp)));
-}   
-   
-
+}
diff --git a/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.2.js b/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.2.js
index 569e4cbd2..660dad8fa 100644
--- a/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.2.js
+++ b/test/suite/ch07/7.8/7.8.5/S7.8.5_A4.2.js
@@ -1,20 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Two regular expression literals in a program evaluate to
- * regular expression objects that never compare as === to each other even
- * if the two literals' contents are identical
- *
- * @path ch07/7.8/7.8.5/S7.8.5_A4.2.js
- * @description Check equality two regular expression literals
- */
+/*---
+info: >
+    Two regular expression literals in a program evaluate to
+    regular expression objects that never compare as === to each other even
+    if the two literals' contents are identical
+description: Check equality two regular expression literals
+---*/
 
 //CHECK#1
 var regexp1 = /(?:)/;
 var regexp2 = /(?:)/;
 if (regexp1 === regexp2) {
   $ERROR('#1: var regexp1 = /(?:)/; var regexp2 = /(?:)/; regexp1 !== regexp2');
-}   
-   
-
+}
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T1.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T1.js
index 566fbbf47..a2af18a4e 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T1.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T1.js
- * @description { 1 2 } 3 is not a valid sentence in the ECMAScript grammar
- * @negative
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: "{ 1 2 } 3 is not a valid sentence in the ECMAScript grammar"
+flags: [negative]
+---*/
 
 //CHECK#1
 { 1 2 } 3
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T2.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T2.js
index 565d860a2..26969b2a9 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T2.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T2.js
- * @description { 1 \n 2 } 3 is a valid sentence in the ECMAScript grammar with automatic semicolon insertion
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: >
+    { 1 \n 2 } 3 is a valid sentence in the ECMAScript grammar with
+    automatic semicolon insertion
+---*/
 
 //CHECK#1
 { 1
 2 } 3
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T3.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T3.js
index ab0d03265..0a5c58d01 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T3.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T3.js
- * @description for( a ; b \n ) is not a valid sentence in the ECMAScript grammar
- * @negative
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: for( a ; b \n ) is not a valid sentence in the ECMAScript grammar
+flags: [negative]
+---*/
 
 //CHECK#1
 for( a ; b
 )
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T4.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T4.js
index e4c39798a..b2685d08a 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T4.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T4.js
- * @description return \n a+b is a valid sentence in the ECMAScript grammar
- *  with automatic semicolon insertion, but returned undefined
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: >
+    return \n a+b is a valid sentence in the ECMAScript grammar  with
+    automatic semicolon insertion, but returned undefined
+---*/
 
 //CHECK#1
 var a=1,b=2;
@@ -17,4 +16,3 @@ function test(){
 }
 var x=test();
 if (x!==undefined) $ERROR('#1: Automatic semicolon insertion not work with return');
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T5.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T5.js
index 3ca074a17..c6dea2aee 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T5.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T5.js
- * @description a=b \n ++c is a valid sentence in the ECMAScript grammar
- *  with automatic semicolon insertion, but a!==b++c
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: >
+    a=b \n ++c is a valid sentence in the ECMAScript grammar  with
+    automatic semicolon insertion, but a!==b++c
+---*/
 
 //CHECK#1
 var a=1,b=2,c=3;
@@ -15,4 +14,3 @@ a=b
 ++c
 
 if (a!==b) $ERROR('#1: Automatic semicolon insertion not work with ++');
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T6.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T6.js
index 8284f932a..b51fc76f1 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T6.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T6.js
- * @description if(a>b) \n else c=d is not a valid sentence in the ECMAScript grammar
- * @negative
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: >
+    if(a>b) \n else c=d is not a valid sentence in the ECMAScript
+    grammar
+flags: [negative]
+---*/
 
 //CHECK#1
 var a=1,b=2,c=3,d;
 if(a>b)
 else c=d
-
diff --git a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T7.js b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T7.js
index b2e1697bb..6203c7ceb 100644
--- a/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T7.js
+++ b/test/suite/ch07/7.9/7.9.2/S7.9.2_A1_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check examples for automatic semicolon insertion from the Standart
- *
- * @path ch07/7.9/7.9.2/S7.9.2_A1_T7.js
- * @description a=b+c \n (d+e).print() is a valid sentence in the ECMAScript grammar,
- * and automatic semicolon insertion not run
- */
+/*---
+info: Check examples for automatic semicolon insertion from the Standart
+description: >
+    a=b+c \n (d+e).print() is a valid sentence in the ECMAScript
+    grammar,  and automatic semicolon insertion not run
+---*/
 
 //CHECK#1
 function c (a){
@@ -20,4 +19,3 @@ a=b+c
 (d+e)
 
 if (a !== 20) $ERROR('#1: Automatic semicolon insertion work wrong');
-
diff --git a/test/suite/ch07/7.9/S7.9_A1.js b/test/suite/ch07/7.9/S7.9_A1.js
index 47b1453b5..925c5c50f 100644
--- a/test/suite/ch07/7.9/S7.9_A1.js
+++ b/test/suite/ch07/7.9/S7.9_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Continue Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A1.js
- * @description Try use continue \n Label construction
- */
+/*---
+info: Check Continue Statement for automatic semicolon insertion
+description: Try use continue \n Label construction
+---*/
 
 //CHECK#1
 label1: for (var i = 0; i <= 0; i++) {
@@ -35,4 +33,3 @@ label2: for (var i = 0; i <= 1; i++) {
 if (result !== true) {
   $ERROR('#2: Check continue statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T1.js b/test/suite/ch07/7.9/S7.9_A10_T1.js
index 6b884101e..228034056 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T1.js
- * @description Checking if execution of "1 * {}" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "1 * {}" passes
+---*/
 
 //CHECK#1
 1 * {}
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T10.js b/test/suite/ch07/7.9/S7.9_A10_T10.js
index b1fff1247..d537e7aea 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T10.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T10.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T10.js
- * @description Checking if execution of "{a:1 \n} 3" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: "Checking if execution of \"{a:1 \\n} 3\" passes"
+---*/
 
 //CHECK#1
 {a:1
 } 3
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T11.js b/test/suite/ch07/7.9/S7.9_A10_T11.js
index 0b28b5e11..2dd0213f8 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T11.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T11.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T11.js
- * @description Checking if execution of "{a:1 \n} \n 3" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: "Checking if execution of \"{a:1 \\n} \\n 3\" passes"
+---*/
 
 //CHECK#1
 {a:1 
 } 
 3
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T12.js b/test/suite/ch07/7.9/S7.9_A10_T12.js
index 600aaa5ac..fd4c0c789 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T12.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T12.js
- * @description Checking if execution of "{ \n a: \n 1 \n } \n 3" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: "Checking if execution of \"{ \\n a: \\n 1 \\n } \\n 3\" passes"
+---*/
 
 //CHECK#1
 {
@@ -14,4 +12,3 @@ a:
 1 
 } 
 3
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T2.js b/test/suite/ch07/7.9/S7.9_A10_T2.js
index 762a4a910..88dc443c5 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T2.js
- * @description Checking if execution of "{}*1" fails
- * @negative
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "{}*1" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 {} * 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T3.js b/test/suite/ch07/7.9/S7.9_A10_T3.js
index 902631481..9de106bd4 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T3.js
- * @description Checking if execution of "({}) * 1" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "({}) * 1" passes
+---*/
 
 //CHECK#1
 ({}) * 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T4.js b/test/suite/ch07/7.9/S7.9_A10_T4.js
index fcd18b665..0fdc7470f 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T4.js
- * @description Checking if execution of "({};)*1" fails
- * @negative
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "({};)*1" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 ({};) * 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T5.js b/test/suite/ch07/7.9/S7.9_A10_T5.js
index 47b59d8c0..2038207bd 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T5.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T5.js
- * @description Checking if execution of "( \n {} \n ) * 1" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "( \n {} \n ) * 1" passes
+---*/
 
 //CHECK#1
 (
     {}
 ) * 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T6.js b/test/suite/ch07/7.9/S7.9_A10_T6.js
index e900fc8c5..364eb357a 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T6.js
- * @description Checking if execution of "{} \n * 1" fails
- * @negative
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "{} \n * 1" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 {}
  * 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T7.js b/test/suite/ch07/7.9/S7.9_A10_T7.js
index 7cc00a70e..7fbe53d25 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T7.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T7.js
- * @description Checking if execution of "{1} 2" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "{1} 2" passes
+---*/
 
 //CHECK#1
 {1} 2
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T8.js b/test/suite/ch07/7.9/S7.9_A10_T8.js
index 08b3fe564..9c24d68ad 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T8.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T8.js
- * @description Checking if execution of "{1 2} 3" fails
- * @negative
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "{1 2} 3" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 {1 2} 3
-
diff --git a/test/suite/ch07/7.9/S7.9_A10_T9.js b/test/suite/ch07/7.9/S7.9_A10_T9.js
index 03daf8d9d..57bb80c17 100644
--- a/test/suite/ch07/7.9/S7.9_A10_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A10_T9.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check {} for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A10_T9.js
- * @description Checking if execution of "{1 \n 2} 3" passes
- */
+/*---
+info: Check {} for automatic semicolon insertion
+description: Checking if execution of "{1 \n 2} 3" passes
+---*/
 
 //CHECK#1
 {1 
 2} 3
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T1.js b/test/suite/ch07/7.9/S7.9_A11_T1.js
index 7acebb81e..36d0bf6dd 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T1.js
- * @description Use if (false) x = 1 (without semicolon) and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) x = 1 (without semicolon) and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ if (false) x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T10.js b/test/suite/ch07/7.9/S7.9_A11_T10.js
index d7304465b..df445086d 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T10.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T10.js
- * @description Use if (false) {x = 1} else {x=-1} and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) {x = 1} else {x=-1} and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ if (false) {x = 1} else {x = -1}
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T11.js b/test/suite/ch07/7.9/S7.9_A11_T11.js
index 008a365bb..78efb0a48 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T11.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T11.js
- * @description Use if (false) {{x = 1};} \n else x=-1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) {{x = 1};} \n else x=-1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T2.js b/test/suite/ch07/7.9/S7.9_A11_T2.js
index bcb0ccd65..9964dea0b 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T2.js
- * @description Use if (false) \n x = 1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) \n x = 1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T3.js b/test/suite/ch07/7.9/S7.9_A11_T3.js
index 12df0b4a9..2455b0da1 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T3.js
- * @description Use if (false);\n x = 1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false);\n x = 1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ x = 1
 if (x !== 1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T4.js b/test/suite/ch07/7.9/S7.9_A11_T4.js
index d5ab788db..1fba0bce1 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T4.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T4.js
- * @description Checking if execution of "if (false) x = 1 else x = -1" fails
- * @negative
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Checking if execution of "if (false) x = 1 else x = -1" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 var x = 0;
 if (false) x = 1 else x = -1
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T5.js b/test/suite/ch07/7.9/S7.9_A11_T5.js
index 22cfac9cf..8f993bbe1 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T5.js
- * @description Use if (false) x = 1; else x=-1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) x = 1; else x=-1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -14,4 +12,3 @@ if (false) x = 1; else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T6.js b/test/suite/ch07/7.9/S7.9_A11_T6.js
index b5555429c..a6c8d2c7a 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T6.js
- * @description Use if (false) x = 1 \n else x=-1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) x = 1 \n else x=-1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T7.js b/test/suite/ch07/7.9/S7.9_A11_T7.js
index 98fc0aea9..35b087970 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T7.js
- * @description Use if (false) x = 1; \n else x=-1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) x = 1; \n else x=-1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T8.js b/test/suite/ch07/7.9/S7.9_A11_T8.js
index 24d588152..b3ea8b4c7 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T8.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T8.js
- * @description Use if (false) {x = 1}; \n else x=-1 and check x
- * @negative
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) {x = 1}; \n else x=-1 and check x
+flags: [negative]
+---*/
 
 //CHECK#1
 var x = 0;
@@ -16,4 +14,3 @@ else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A11_T9.js b/test/suite/ch07/7.9/S7.9_A11_T9.js
index f0d6878fd..c26254c3e 100644
--- a/test/suite/ch07/7.9/S7.9_A11_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A11_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check If Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A11_T9.js
- * @description Use if (false) {x = 1} \n else x=-1 and check x
- */
+/*---
+info: Check If Statement for automatic semicolon insertion
+description: Use if (false) {x = 1} \n else x=-1 and check x
+---*/
 
 //CHECK#1
 var x = 0;
@@ -15,4 +13,3 @@ else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A2.js b/test/suite/ch07/7.9/S7.9_A2.js
index fdc2189f9..7b9c4de6c 100644
--- a/test/suite/ch07/7.9/S7.9_A2.js
+++ b/test/suite/ch07/7.9/S7.9_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Break Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A2.js
- * @description Try use break \n Label construction
- */
+/*---
+info: Check Break Statement for automatic semicolon insertion
+description: Try use break \n Label construction
+---*/
 
 //CHECK#1
 label1: for (var i = 0; i <= 0; i++) {
@@ -29,4 +27,3 @@ label2: for (var i = 0; i <= 0; i++) {
 if (result !== true) {
   $ERROR('#2: Check break statement for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A3.js b/test/suite/ch07/7.9/S7.9_A3.js
index e52b88760..cb52d215a 100644
--- a/test/suite/ch07/7.9/S7.9_A3.js
+++ b/test/suite/ch07/7.9/S7.9_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Return Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A3.js
- * @description Try use return \n Expression construction
- */
+/*---
+info: Check Return Statement for automatic semicolon insertion
+description: Try use return \n Expression construction
+---*/
 
 //CHECK#1
 function f1()
@@ -25,5 +23,4 @@ function f2()
 }
 if (f2() !== undefined) { 
   $ERROR('#2: Check return statement for automatic semicolon insertion');
-}  
-
+}
diff --git a/test/suite/ch07/7.9/S7.9_A4.js b/test/suite/ch07/7.9/S7.9_A4.js
index d8a5ac607..ba4ecc5d1 100644
--- a/test/suite/ch07/7.9/S7.9_A4.js
+++ b/test/suite/ch07/7.9/S7.9_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Throw Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A4.js
- * @description Try use Throw \n Expression construction
- * @negative
- */
+/*---
+info: Check Throw Statement for automatic semicolon insertion
+description: Try use Throw \n Expression construction
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +14,3 @@ try {
 } catch(e) {  
 }  
 $ERROR('#1: Check throw statement for automatic semicolon insertion');
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.1_T1.js b/test/suite/ch07/7.9/S7.9_A5.1_T1.js
index b0c69d298..7a23201aa 100644
--- a/test/suite/ch07/7.9/S7.9_A5.1_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.1_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Postfix Increment Operator for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.1_T1.js
- * @description Try use Variable \n ++ construction
- * @negative
- */
+/*---
+info: Check Postfix Increment Operator for automatic semicolon insertion
+description: Try use Variable \n ++ construction
+flags: [negative]
+---*/
 
 //CHECK#1
 var x = 0;
 x
 ++;
 $ERROR('#1: Check Postfix Increment Operator for automatic semicolon insertion');
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.2_T1.js b/test/suite/ch07/7.9/S7.9_A5.2_T1.js
index 24fcf4e7c..76032ba5b 100644
--- a/test/suite/ch07/7.9/S7.9_A5.2_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Prefix Increment Operator for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.2_T1.js
- * @description Try use Variable1 \n ++Variable2 construction
- */
+/*---
+info: Check Prefix Increment Operator for automatic semicolon insertion
+description: Try use Variable1 \n ++Variable2 construction
+---*/
 
 //CHECK#1
 var x = 0;
@@ -20,5 +18,3 @@ if (x !== 0) {
     $ERROR('#2: Check Prefix Increment Operator for automatic semicolon insertion');
   }
 }
- 
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.3_T1.js b/test/suite/ch07/7.9/S7.9_A5.3_T1.js
index 283e73879..415737fca 100644
--- a/test/suite/ch07/7.9/S7.9_A5.3_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.3_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Postfix Decrement Operator for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.3_T1.js
- * @description Try use Variable \n -- construction
- * @negative
- */
+/*---
+info: Check Postfix Decrement Operator for automatic semicolon insertion
+description: Try use Variable \n -- construction
+flags: [negative]
+---*/
 
 //CHECK#1
 var x = 1;
 x
 --;
 $ERROR('#1: Check Postfix Decrement Operator for automatic semicolon insertion');
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.4_T1.js b/test/suite/ch07/7.9/S7.9_A5.4_T1.js
index 6d58c1f69..c59df424c 100644
--- a/test/suite/ch07/7.9/S7.9_A5.4_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Prefix Decrement Operator for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.4_T1.js
- * @description Try use Variable1 \n --Variable2 construction
- */
+/*---
+info: Check Prefix Decrement Operator for automatic semicolon insertion
+description: Try use Variable1 \n --Variable2 construction
+---*/
 
 //CHECK#1
 var x = 1;
@@ -20,4 +18,3 @@ if (x !== 1) {
     $ERROR('#1: Check Prefix Decrement Operator for automatic semicolon insertion');
   }
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.5_T1.js b/test/suite/ch07/7.9/S7.9_A5.5_T1.js
index 872803b60..242c9494c 100644
--- a/test/suite/ch07/7.9/S7.9_A5.5_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Function Expression for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.5_T1.js
- * @description Try use 1 + function_name\n(2 + 3) construction
- */
+/*---
+info: Check Function Expression for automatic semicolon insertion
+description: Try use 1 + function_name\n(2 + 3) construction
+---*/
 
 //CHECK#1
 function f(t) {
@@ -16,5 +14,4 @@ var x = 1 + f
 (2 + 3)
 if (x !== 6) {
   $ERROR('#1: Check Function Expression for automatic semicolon insertion');
-} 
-
+}
diff --git a/test/suite/ch07/7.9/S7.9_A5.5_T2.js b/test/suite/ch07/7.9/S7.9_A5.5_T2.js
index be29e1dca..1a014a792 100644
--- a/test/suite/ch07/7.9/S7.9_A5.5_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A5.5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Function Expression for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.5_T2.js
- * @description Try use function f(o) {o.x = 1; return o;}; \n (new Object()).x; construction
- */
+/*---
+info: Check Function Expression for automatic semicolon insertion
+description: >
+    Try use function f(o) {o.x = 1; return o;}; \n (new Object()).x;
+    construction
+---*/
 
 //CHECK#1
 var result = function f(o) {o.x = 1; return o;};
@@ -14,4 +14,3 @@ var result = function f(o) {o.x = 1; return o;};
 if (typeof result !== "function") {
   $ERROR('#1: Check Function Expression for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.5_T3.js b/test/suite/ch07/7.9/S7.9_A5.5_T3.js
index e3dc89b38..87340bdba 100644
--- a/test/suite/ch07/7.9/S7.9_A5.5_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A5.5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Function Expression for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.5_T3.js
- * @description Try use function f(o) {o.x = 1; return o;} \n (new Object()).x; construction
- */
+/*---
+info: Check Function Expression for automatic semicolon insertion
+description: >
+    Try use function f(o) {o.x = 1; return o;} \n (new Object()).x;
+    construction
+---*/
 
 //CHECK#1
 var result = function f(o) {o.x = 1; return o;}
@@ -14,4 +14,3 @@ var result = function f(o) {o.x = 1; return o;}
 if (result !== 1) {
   $ERROR('#1: Check Function Expression for automatic semicolon insertion');
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.5_T4.js b/test/suite/ch07/7.9/S7.9_A5.5_T4.js
index a005f1109..a93d56184 100644
--- a/test/suite/ch07/7.9/S7.9_A5.5_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A5.5_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Function Expression for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.5_T4.js
- * @description Insert some LineTerminators into function body
- */
+/*---
+info: Check Function Expression for automatic semicolon insertion
+description: Insert some LineTerminators into function body
+---*/
 
 //CHECK#1
 var x =
@@ -18,5 +16,4 @@ a
 
 if (x !== 6) {
   $ERROR('#1: Check Function Expression for automatic semicolon insertion');
-} 
-
+}
diff --git a/test/suite/ch07/7.9/S7.9_A5.5_T5.js b/test/suite/ch07/7.9/S7.9_A5.5_T5.js
index 1c1942d73..a12d35a3f 100644
--- a/test/suite/ch07/7.9/S7.9_A5.5_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A5.5_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Function Expression for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A5.5_T5.js
- * @description Insert some LineTerminators into rerutn expression;
- */
+/*---
+info: Check Function Expression for automatic semicolon insertion
+description: Insert some LineTerminators into rerutn expression;
+---*/
 
 //CHECK#1
 var x =
@@ -26,5 +24,4 @@ a
 
 if (x !== 7) {
   $ERROR('#1: Check Function Expression for automatic semicolon insertion');
-} 
-
+}
diff --git a/test/suite/ch07/7.9/S7.9_A5.6_T1.js b/test/suite/ch07/7.9/S7.9_A5.6_T1.js
index 3381c5187..4cc0602a6 100644
--- a/test/suite/ch07/7.9/S7.9_A5.6_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.6_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed but
- * between Prefix I/DO and operand admitted, Postfix I/DO in combination with prefix I/DO after automatic semicolon insertion gives valid result
- *
- * @path ch07/7.9/S7.9_A5.6_T1.js
- * @description Try use Variable1 \n ++ \n Variable2 construction
- */
+/*---
+info: >
+    Since LineTerminator between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed but
+    between Prefix I/DO and operand admitted, Postfix I/DO in combination with prefix I/DO after automatic semicolon insertion gives valid result
+description: Try use Variable1 \n ++ \n Variable2 construction
+---*/
 
 var x=0, y=0;
 
@@ -33,4 +32,3 @@ if ((x!==0)&(y!==2)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.6_T2.js b/test/suite/ch07/7.9/S7.9_A5.6_T2.js
index 6861e96e5..cf732528a 100644
--- a/test/suite/ch07/7.9/S7.9_A5.6_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A5.6_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed but
- * between Prefix I/DO and operand admitted, Postfix I/DO in combination with prefix I/DO after automatic semicolon insertion gives valid result
- *
- * @path ch07/7.9/S7.9_A5.6_T2.js
- * @description Try use Variable1 \n -- \n Variable2 construction
- */
+/*---
+info: >
+    Since LineTerminator between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed but
+    between Prefix I/DO and operand admitted, Postfix I/DO in combination with prefix I/DO after automatic semicolon insertion gives valid result
+description: Try use Variable1 \n -- \n Variable2 construction
+---*/
 
 var x=0, y=2;
 
@@ -33,5 +32,3 @@ if ((x!==0)&(y!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.7_T1.js b/test/suite/ch07/7.9/S7.9_A5.7_T1.js
index 696ba3c32..97dfaa49e 100644
--- a/test/suite/ch07/7.9/S7.9_A5.7_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.7_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed, two IO(just as two DO and their combination)
- * between two references separated by [LT] after automatic semicolon insertion lead to syntax error
- *
- * @path ch07/7.9/S7.9_A5.7_T1.js
- * @description Try use Variable1 \n ++ \n ++ \n Variable2 construction
- * @negative
- */
+/*---
+info: >
+    Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is not allowed, two IO(just as two DO and their combination)
+    between two references separated by [LT] after automatic semicolon insertion lead to syntax error
+description: Try use Variable1 \n ++ \n ++ \n Variable2 construction
+flags: [negative]
+---*/
 
 var x=0, y=0;
 var z=
@@ -16,4 +15,3 @@ x
 ++
 ++
 y
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.8_T1.js b/test/suite/ch07/7.9/S7.9_A5.8_T1.js
index 9f3b7a75d..063db8a90 100644
--- a/test/suite/ch07/7.9/S7.9_A5.8_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.8_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is admitted,
- * Additive/Substract Operator(A/SO) in combination with I/DO separated by LT or white spaces after automatic semicolon insertion gives valid result
- *
- * @path ch07/7.9/S7.9_A5.8_T1.js
- * @description Try use Variable1 \n + \n ++ \n Variable2 construction
- */
+/*---
+info: >
+    Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is admitted,
+    Additive/Substract Operator(A/SO) in combination with I/DO separated by LT or white spaces after automatic semicolon insertion gives valid result
+description: Try use Variable1 \n + \n ++ \n Variable2 construction
+---*/
 
 var x=0, y=0;
 var z=
@@ -49,4 +48,3 @@ if ((z!==3)&&(y!==3)&&(x!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch07/7.9/S7.9_A5.9_T1.js b/test/suite/ch07/7.9/S7.9_A5.9_T1.js
index 98f47ab9a..264cf711e 100644
--- a/test/suite/ch07/7.9/S7.9_A5.9_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A5.9_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Additive/Substract Operator(A/SO) in combination with itself separated by LT or white spaces
- * after automatic semicolon insertion gives valid result
- *
- * @path ch07/7.9/S7.9_A5.9_T1.js
- * @description Try use Variable1 (different combinations of three +) Variable2 construction
- */
+/*---
+info: >
+    Additive/Substract Operator(A/SO) in combination with itself separated by LT or white spaces
+    after automatic semicolon insertion gives valid result
+description: >
+    Try use Variable1 (different combinations of three +) Variable2
+    construction
+---*/
 
 var x=1, y=1;
 var z=
@@ -49,4 +50,3 @@ if ((z!==2)&&(y!==1)&&(x!==1)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T1.js b/test/suite/ch07/7.9/S7.9_A6.1_T1.js
index 65bc94985..702e191ad 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T1.js
- * @description for( Empty two semicolons and \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for( Empty two semicolons and \n)
+---*/
 
 //CHECK#1
 for(;;
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T10.js b/test/suite/ch07/7.9/S7.9_A6.1_T10.js
index 973ac4fe9..a4b7c93ca 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T10.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T10.js
- * @description for (false \n two semicolons false \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false \n two semicolons false \n)
+---*/
 
 //CHECK#1
 for(false
@@ -14,4 +12,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T11.js b/test/suite/ch07/7.9/S7.9_A6.1_T11.js
index 27da10fff..b4bc4002f 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T11.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T11.js
- * @description for (false \n semicolon \n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false \n semicolon \n semicolon \n)
+---*/
 
 //CHECK#1
 for(false
@@ -15,4 +13,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T12.js b/test/suite/ch07/7.9/S7.9_A6.1_T12.js
index b78791194..22987b36b 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T12.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T12.js
- * @description for (false \n semicolon false \n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false \n semicolon false \n semicolon \n)
+---*/
 
 //CHECK#1
 for(false
@@ -15,4 +13,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T13.js b/test/suite/ch07/7.9/S7.9_A6.1_T13.js
index 1762f3182..aff6b7673 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T13.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T13.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T13.js
- * @description for (false \n semicolon false \n semicolon false \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false \n semicolon false \n semicolon false \n)
+---*/
 
 //CHECK#1
 for(false
@@ -15,4 +13,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T2.js b/test/suite/ch07/7.9/S7.9_A6.1_T2.js
index ef2ac4e46..ab43f51ce 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T2.js
- * @description for (semicolon \n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (semicolon \n semicolon \n)
+---*/
 
 //CHECK#1
 for(;
@@ -14,4 +12,3 @@ for(;
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T3.js b/test/suite/ch07/7.9/S7.9_A6.1_T3.js
index 71ee0b4d5..32fdc5656 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T3.js
- * @description for (\n two semicolons \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (\n two semicolons \n)
+---*/
 
 //CHECK#1
 for(
@@ -14,4 +12,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T4.js b/test/suite/ch07/7.9/S7.9_A6.1_T4.js
index 8055a790a..e263fc948 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T4.js
- * @description for( \n semicolon \n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for( \n semicolon \n semicolon \n)
+---*/
 
 //CHECK#1
 for(
@@ -15,4 +13,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T5.js b/test/suite/ch07/7.9/S7.9_A6.1_T5.js
index ce5e585dc..3a6c94852 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T5.js
- * @description for ( \n semicolon \n\n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for ( \n semicolon \n\n semicolon \n)
+---*/
 
 //CHECK#1
 for(
@@ -16,4 +14,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T6.js b/test/suite/ch07/7.9/S7.9_A6.1_T6.js
index 578b88fbe..53b00f861 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T6.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T6.js
- * @description for(false semicolon false semicolon false \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for(false semicolon false semicolon false \n)
+---*/
 
 //CHECK#1
 for(false;false;false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T7.js b/test/suite/ch07/7.9/S7.9_A6.1_T7.js
index ce53a6f9e..405618f44 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T7.js
- * @description for (false semicolon false \n semicolon \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false semicolon false \n semicolon \n)
+---*/
 
 //CHECK#1
 for(false;false
@@ -14,4 +12,3 @@ for(false;false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T8.js b/test/suite/ch07/7.9/S7.9_A6.1_T8.js
index fca8ddc80..16fbda88c 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T8.js
- * @description for (false semicolon false \n semicolon false \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false semicolon false \n semicolon false \n)
+---*/
 
 //CHECK#1
 for(false;false
@@ -14,4 +12,3 @@ for(false;false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.1_T9.js b/test/suite/ch07/7.9/S7.9_A6.1_T9.js
index 977b90b9e..ecf79080a 100644
--- a/test/suite/ch07/7.9/S7.9_A6.1_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A6.1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.1_T9.js
- * @description for (false \n two semicolons \n)
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: for (false \n two semicolons \n)
+---*/
 
 //CHECK#1
 for(false
@@ -14,4 +12,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T1.js b/test/suite/ch07/7.9/S7.9_A6.2_T1.js
index e3461b907..917782d38 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T1.js
- * @description For header is (semicolon \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (semicolon \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(;
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T10.js b/test/suite/ch07/7.9/S7.9_A6.2_T10.js
index 1e65032ca..ef695af37 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T10.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T10.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T10.js
- * @description For header is (\n false \n semicolon)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (\n false \n semicolon)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -17,4 +16,3 @@ for(
 ;) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T2.js b/test/suite/ch07/7.9/S7.9_A6.2_T2.js
index bbe5fb83c..d61fbc1a5 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T2.js
- * @description For header is (\n semicolon \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (\n semicolon \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -17,4 +16,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T3.js b/test/suite/ch07/7.9/S7.9_A6.2_T3.js
index 0dfd55125..ef0ab419d 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T3.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T3.js
- * @description For header is (\n semicolon)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (\n semicolon)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
 ;) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T4.js b/test/suite/ch07/7.9/S7.9_A6.2_T4.js
index d64278972..03afabc5b 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T4.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T4.js
- * @description For header is (\n \n semicolon)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (\n \n semicolon)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -17,4 +16,3 @@ for(
 ;) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T5.js b/test/suite/ch07/7.9/S7.9_A6.2_T5.js
index de9ed973b..19c4f87d8 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T5.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T5.js
- * @description For header is (false semicolon false\n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (false semicolon false\n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false;false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T6.js b/test/suite/ch07/7.9/S7.9_A6.2_T6.js
index 1efe468d2..e6b5b4bc9 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T6.js
- * @description For header is (false semicolon \n false)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (false semicolon \n false)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false;
@@ -17,4 +16,3 @@ false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T7.js b/test/suite/ch07/7.9/S7.9_A6.2_T7.js
index 5050697ac..ad92d67cb 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T7.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T7.js
- * @description For header is (false \n semicolon \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (false \n semicolon \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false
@@ -17,4 +16,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T8.js b/test/suite/ch07/7.9/S7.9_A6.2_T8.js
index 526809c86..bdd5fac64 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T8.js
- * @description For header is (false \n semicolon false \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (false \n semicolon false \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false
@@ -17,4 +16,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.2_T9.js b/test/suite/ch07/7.9/S7.9_A6.2_T9.js
index 21e635ad0..ecbf07703 100644
--- a/test/suite/ch07/7.9/S7.9_A6.2_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A6.2_T9.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Use one semicolon
- *
- * @path ch07/7.9/S7.9_A6.2_T9.js
- * @description For header is (\n semicolon false)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Use one semicolon
+description: For header is (\n semicolon false)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
 ;false) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T1.js b/test/suite/ch07/7.9/S7.9_A6.3_T1.js
index 4089c29ef..85c11e3d0 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T1.js
- * @description For header is (\n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T2.js b/test/suite/ch07/7.9/S7.9_A6.3_T2.js
index 6b54313e2..0b994b5cb 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T2.js
- * @description For header is (\n \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -17,4 +16,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T3.js b/test/suite/ch07/7.9/S7.9_A6.3_T3.js
index ee52d6181..4f15b91c4 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T3.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T3.js
- * @description For header is (\n \n \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n \n \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -18,4 +17,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T4.js b/test/suite/ch07/7.9/S7.9_A6.3_T4.js
index 41b80740a..3cbf5575c 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T4.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T4.js
- * @description For header is (\n false \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n false \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -17,4 +16,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T5.js b/test/suite/ch07/7.9/S7.9_A6.3_T5.js
index 2377faaa5..2ec5566b6 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T5.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T5.js
- * @description For header is (false \n false \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (false \n false \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false
@@ -17,4 +16,3 @@ for(false
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T6.js b/test/suite/ch07/7.9/S7.9_A6.3_T6.js
index b400c9de3..ecf6b2abd 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T6.js
- * @description For header is (\n false \n false \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n false \n false \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -18,4 +17,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.3_T7.js b/test/suite/ch07/7.9/S7.9_A6.3_T7.js
index ec63c02bc..edad1cffb 100644
--- a/test/suite/ch07/7.9/S7.9_A6.3_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A6.3_T7.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion.
- * If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
- * Don`t use semicolons
- *
- * @path ch07/7.9/S7.9_A6.3_T7.js
- * @description For header is (\n false \n false \n false \n)
- * @negative
- */
+/*---
+info: >
+    Check For Statement for automatic semicolon insertion.
+    If automatic insertion semicolon would become one of the two semicolons in the header of a For Statement.
+    Don`t use semicolons
+description: For header is (\n false \n false \n false \n)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(
@@ -19,4 +18,3 @@ for(
 ) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.4_T1.js b/test/suite/ch07/7.9/S7.9_A6.4_T1.js
index 44169a23f..f8d2ac695 100644
--- a/test/suite/ch07/7.9/S7.9_A6.4_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A6.4_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.4_T1.js
- * @description Three semicolons. For header is (false semicolon false semicolon false semicolon)
- * @negative
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: >
+    Three semicolons. For header is (false semicolon false semicolon
+    false semicolon)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false;false;false;) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A6.4_T2.js b/test/suite/ch07/7.9/S7.9_A6.4_T2.js
index f930cf830..e35383625 100644
--- a/test/suite/ch07/7.9/S7.9_A6.4_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A6.4_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check For Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A6.4_T2.js
- * @description Three semicolons. For header is (false semicolon false two semicolons false)
- * @negative
- */
+/*---
+info: Check For Statement for automatic semicolon insertion
+description: >
+    Three semicolons. For header is (false semicolon false two
+    semicolons false)
+flags: [negative]
+---*/
 
 //CHECK#1
 for(false;false;;false) {
   break;
 }
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T1.js b/test/suite/ch07/7.9/S7.9_A7_T1.js
index ac730d59f..ef42c6d88 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T1.js
- * @description Checking if execution of "var x \n = 1" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x \n = 1" passes
+---*/
 
 //CHECK#1
 var x
 = 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T2.js b/test/suite/ch07/7.9/S7.9_A7_T2.js
index 91900bb1f..a6d425d23 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T2.js
- * @description Checking if execution of "var x = \n 1" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x = \n 1" passes
+---*/
 
 //CHECK#1
 var x = 
 1
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T3.js b/test/suite/ch07/7.9/S7.9_A7_T3.js
index bddc5e4d1..78c0da955 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T3.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T3.js
- * @description Checking if execution of "var x \n x = 1" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x \n x = 1" passes
+---*/
 
 //CHECK#1
 var x
 x = 1
-
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T4.js b/test/suite/ch07/7.9/S7.9_A7_T4.js
index 46f17a477..4d9697ba5 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T4.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T4.js
- * @description Checking if execution of "var \n x" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var \n x" passes
+---*/
 
 //CHECK#1
 var
 x
-
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T5.js b/test/suite/ch07/7.9/S7.9_A7_T5.js
index d1e1be650..a31828614 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T5.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T5.js
- * @description Checking if execution of "var \n x \n = \n 1" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var \n x \n = \n 1" passes
+---*/
 
 //CHECK#1
 var
 x 
 = 
 1
-
-
diff --git a/test/suite/ch07/7.9/S7.9_A7_T6.js b/test/suite/ch07/7.9/S7.9_A7_T6.js
index df7911717..4e70904a8 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T6.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T6.js
- * @description Checking if execution of "var x, \n y" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x, \n y" passes
+---*/
 
 //CHECK#1
 var x, 
-y 
-
-
+y
diff --git a/test/suite/ch07/7.9/S7.9_A7_T7.js b/test/suite/ch07/7.9/S7.9_A7_T7.js
index 9beb8822c..089b16ef3 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T7.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T7.js
- * @description Checking if execution of "var x \n y" passes
- * @negative
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x \n y" passes
+flags: [negative]
+---*/
 
 //CHECK#1
 var x 
-y 
-
-
+y
diff --git a/test/suite/ch07/7.9/S7.9_A7_T8.js b/test/suite/ch07/7.9/S7.9_A7_T8.js
index 9b9057ad9..3882b069b 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T8.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T8.js
- * @description Checking if execution of "var x \n ,y" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x \n ,y" passes
+---*/
 
 //CHECK#1
 var x 
-,y 
-
-
+,y
diff --git a/test/suite/ch07/7.9/S7.9_A7_T9.js b/test/suite/ch07/7.9/S7.9_A7_T9.js
index 826ce4651..1733389cf 100644
--- a/test/suite/ch07/7.9/S7.9_A7_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A7_T9.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Var Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A7_T9.js
- * @description Checking if execution of "var x \n ,y = 1" passes
- */
+/*---
+info: Check Var Statement for automatic semicolon insertion
+description: Checking if execution of "var x \n ,y = 1" passes
+---*/
 
 //CHECK#1
 var 
 x 
 ,y = 1
-
-
diff --git a/test/suite/ch07/7.9/S7.9_A8_T1.js b/test/suite/ch07/7.9/S7.9_A8_T1.js
index d708cb3f6..527c9691a 100644
--- a/test/suite/ch07/7.9/S7.9_A8_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A8_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Empty Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A8_T1.js
- * @description Checking if execution of one semicolon passes
- */
+/*---
+info: Check Empty Statement for automatic semicolon insertion
+description: Checking if execution of one semicolon passes
+---*/
 
 //CHECK#1
 ;
-
diff --git a/test/suite/ch07/7.9/S7.9_A8_T2.js b/test/suite/ch07/7.9/S7.9_A8_T2.js
index 8cf2691f8..4eb8b3bfd 100644
--- a/test/suite/ch07/7.9/S7.9_A8_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A8_T2.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Empty Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A8_T2.js
- * @description Checking if execution of some semicolons with LineTerminators pases
- */
+/*---
+info: Check Empty Statement for automatic semicolon insertion
+description: Checking if execution of some semicolons with LineTerminators pases
+---*/
 
 //CHECK#1
 ;
 ;
 ;
 ;
-
diff --git a/test/suite/ch07/7.9/S7.9_A8_T3.js b/test/suite/ch07/7.9/S7.9_A8_T3.js
index 4a91d79f2..f5a88a5a0 100644
--- a/test/suite/ch07/7.9/S7.9_A8_T3.js
+++ b/test/suite/ch07/7.9/S7.9_A8_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Empty Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A8_T3.js
- * @description Checking if execution of some semicolons without LineTerminators passes
- */
+/*---
+info: Check Empty Statement for automatic semicolon insertion
+description: >
+    Checking if execution of some semicolons without LineTerminators
+    passes
+---*/
 
 //CHECK#1
 ;;;;
-
diff --git a/test/suite/ch07/7.9/S7.9_A8_T4.js b/test/suite/ch07/7.9/S7.9_A8_T4.js
index 6017d8221..8882554b6 100644
--- a/test/suite/ch07/7.9/S7.9_A8_T4.js
+++ b/test/suite/ch07/7.9/S7.9_A8_T4.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Empty Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A8_T4.js
- * @description Checking if execution of some semicolons with LineTerminators and numbers passes
- */
+/*---
+info: Check Empty Statement for automatic semicolon insertion
+description: >
+    Checking if execution of some semicolons with LineTerminators and
+    numbers passes
+---*/
 
 //CHECK#1
 ;1;
 ;1
 ;1;
 ;1
-
diff --git a/test/suite/ch07/7.9/S7.9_A8_T5.js b/test/suite/ch07/7.9/S7.9_A8_T5.js
index 339d7e24d..04a59e4e9 100644
--- a/test/suite/ch07/7.9/S7.9_A8_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A8_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Empty Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A8_T5.js
- * @description Checking if execution of some semicolons without LineTerminators but with numbers passes
- */
+/*---
+info: Check Empty Statement for automatic semicolon insertion
+description: >
+    Checking if execution of some semicolons without LineTerminators
+    but with numbers passes
+---*/
 
 //CHECK#1
 ;;1;;1;;1
-
diff --git a/test/suite/ch07/7.9/S7.9_A9_T1.js b/test/suite/ch07/7.9/S7.9_A9_T1.js
index 0ee175bc3..c99447e6f 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T1.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T1.js
- * @description Execute do { \n }while(false)
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do { \n }while(false)
+---*/
 
 //CHECK#1
 do {  
 } while (false)
-
diff --git a/test/suite/ch07/7.9/S7.9_A9_T2.js b/test/suite/ch07/7.9/S7.9_A9_T2.js
index 3417ff15d..bf8751073 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T2.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T2.js
- * @description Execute do; while(false) \n true
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do; while(false) \n true
+---*/
 
 //CHECK#1
 do ; while (false)
 true
-
diff --git a/test/suite/ch07/7.9/S7.9_A9_T5.js b/test/suite/ch07/7.9/S7.9_A9_T5.js
index 0e0be2ee9..07b8cdd61 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T5.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T5.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T5.js
- * @description Execute do { \n ; \n }while((false) \n )
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do { \n ; \n }while((false) \n )
+---*/
 
 //CHECK#1
 do {
   ;
 } while ((false) 
 )
-
diff --git a/test/suite/ch07/7.9/S7.9_A9_T6.js b/test/suite/ch07/7.9/S7.9_A9_T6.js
index dfff034d7..7687b2d93 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T6.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T6.js
- * @description Execute do \n while(false)
- * @negative
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do \n while(false)
+flags: [negative]
+---*/
 
 //CHECK#1
 do
-while (false) 
-
+while (false)
diff --git a/test/suite/ch07/7.9/S7.9_A9_T7.js b/test/suite/ch07/7.9/S7.9_A9_T7.js
index 853144bc2..7bcc2a265 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T7.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T7.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T7.js
- * @description Execute do \n\n while(false)
- * @negative
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do \n\n while(false)
+flags: [negative]
+---*/
 
 //CHECK#1
 do
   
-while (false) 
-
+while (false)
diff --git a/test/suite/ch07/7.9/S7.9_A9_T8.js b/test/suite/ch07/7.9/S7.9_A9_T8.js
index 398a75efc..873235560 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T8.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T8.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T8.js
- * @description Execute do {}; \n while(false)
- * @negative
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do {}; \n while(false)
+flags: [negative]
+---*/
 
 //CHECK#1
 do {}; 
-while (false) 
-
+while (false)
diff --git a/test/suite/ch07/7.9/S7.9_A9_T9.js b/test/suite/ch07/7.9/S7.9_A9_T9.js
index cc5948759..12af60876 100644
--- a/test/suite/ch07/7.9/S7.9_A9_T9.js
+++ b/test/suite/ch07/7.9/S7.9_A9_T9.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check Do-While Statement for automatic semicolon insertion
- *
- * @path ch07/7.9/S7.9_A9_T9.js
- * @description Execute do {} \n while(false)
- */
+/*---
+info: Check Do-While Statement for automatic semicolon insertion
+description: Execute do {} \n while(false)
+---*/
 
 //CHECK#1
 do {} 
-while (false) 
-
+while (false)
diff --git a/test/suite/ch08/8.1/S8.1_A1_T1.js b/test/suite/ch08/8.1/S8.1_A1_T1.js
index cadea188d..b1228bede 100644
--- a/test/suite/ch08/8.1/S8.1_A1_T1.js
+++ b/test/suite/ch08/8.1/S8.1_A1_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Undefined type has one value, called undefined
- *
- * @path ch08/8.1/S8.1_A1_T1.js
- * @description Checking if execution of "var x = undefined" passes
- */
+/*---
+info: The Undefined type has one value, called undefined
+description: Checking if execution of "var x = undefined" passes
+---*/
 
 // CHECK#1
 var x = undefined;
-
diff --git a/test/suite/ch08/8.1/S8.1_A1_T2.js b/test/suite/ch08/8.1/S8.1_A1_T2.js
index eeea0b7da..0ea4ee7b9 100644
--- a/test/suite/ch08/8.1/S8.1_A1_T2.js
+++ b/test/suite/ch08/8.1/S8.1_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Undefined type has one value, called undefined
- *
- * @path ch08/8.1/S8.1_A1_T2.js
- * @description Check typeof(undefined) and typeof(void 0)
- */
+/*---
+info: The Undefined type has one value, called undefined
+description: Check typeof(undefined) and typeof(void 0)
+---*/
 
 // CHECK#1
 if (!(typeof(undefined) === "undefined")) { 
@@ -22,4 +20,3 @@ if (!(typeof(void 0) === "undefined")) {
 if (!(undefined === void 0)) {  
 	ERROR('#3: undefined === void 0');  
 }
-
diff --git a/test/suite/ch08/8.1/S8.1_A2_T1.js b/test/suite/ch08/8.1/S8.1_A2_T1.js
index 5fd35b2dc..ea312546b 100644
--- a/test/suite/ch08/8.1/S8.1_A2_T1.js
+++ b/test/suite/ch08/8.1/S8.1_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Any variable that has not been assigned a value has the value undefined
- *
- * @path ch08/8.1/S8.1_A2_T1.js
- * @description Check that var x have value and type undefined
- */
+/*---
+info: Any variable that has not been assigned a value has the value undefined
+description: Check that var x have value and type undefined
+---*/
 
 var x;
 
@@ -33,4 +31,3 @@ if (!(x === void 0)) {
 }
 //
 ///////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.1/S8.1_A2_T2.js b/test/suite/ch08/8.1/S8.1_A2_T2.js
index 1c03d668f..eb6dcd7db 100644
--- a/test/suite/ch08/8.1/S8.1_A2_T2.js
+++ b/test/suite/ch08/8.1/S8.1_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Any variable that has not been assigned a value has the value undefined
- *
- * @path ch08/8.1/S8.1_A2_T2.js
- * @description Function return undefined
- */
+/*---
+info: Any variable that has not been assigned a value has the value undefined
+description: Function return undefined
+---*/
 
 // CHECK#1
 function test1(x) {
@@ -24,4 +22,3 @@ function test2() {
 if (!(test2() === void 0)) {
   $ERROR('#2: function test2(){} test2() === void 0. Actual: ' + (test2()));
 }
-
diff --git a/test/suite/ch08/8.1/S8.1_A3.js b/test/suite/ch08/8.1/S8.1_A3.js
index 056a136a9..2c8910a83 100644
--- a/test/suite/ch08/8.1/S8.1_A3.js
+++ b/test/suite/ch08/8.1/S8.1_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * undefined is not a keyword
- *
- * @path ch08/8.1/S8.1_A3.js
- * @description Create variable named undefined
- */
+/*---
+info: undefined is not a keyword
+description: Create variable named undefined
+---*/
 
 //////////////////////////////////////////////////////////
 // CHECK1#
 var undefined = 1;
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.1/S8.1_A4.js b/test/suite/ch08/8.1/S8.1_A4.js
index 9d8a256d0..051af6f1e 100644
--- a/test/suite/ch08/8.1/S8.1_A4.js
+++ b/test/suite/ch08/8.1/S8.1_A4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If property of object not exist, return undefined
- *
- * @path ch08/8.1/S8.1_A4.js
- * @description Check value of not existed property
- */
+/*---
+info: If property of object not exist, return undefined
+description: Check value of not existed property
+---*/
 
 // CHECK#1 
 if ((new Object()).newProperty !== undefined) {
   $ERROR('#1: (new Object()).newProperty === undefined. Actual: ' + ((new Object()).newProperty));
-} 
-
-
+}
diff --git a/test/suite/ch08/8.1/S8.1_A5.js b/test/suite/ch08/8.1/S8.1_A5.js
index 89539ea89..91abffcbf 100644
--- a/test/suite/ch08/8.1/S8.1_A5.js
+++ b/test/suite/ch08/8.1/S8.1_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function argument that isn't provided has a value of undefined
- *
- * @path ch08/8.1/S8.1_A5.js
- * @description Call function without provided argument
- */
+/*---
+info: Function argument that isn't provided has a value of undefined
+description: Call function without provided argument
+---*/
 
 ///////////////////////////////////////
 //
@@ -20,4 +18,3 @@ function test(arg) {
 test();
 //
 ////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_1.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_1.js
index fc417c8d8..bf2909d69 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_1.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_1.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_1.js

- * @description Properties - [[HasOwnProperty]] (property does not exist)

- */

-

-function testcase() {

-

-    var o = {};

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (property does not exist)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_10.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_10.js
index 88dd4d998..18e784354 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_10.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_10.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_10.js

- * @description Properties - [[HasOwnProperty]] (writable, configurable, non-enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, writable:true, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, configurable,
+    non-enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, writable:true, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_11.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_11.js
index c000d0861..a6c7c243c 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_11.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_11.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_11.js

- * @description Properties - [[HasOwnProperty]] (writable, configurable, enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, configurable,
+    enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_12.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_12.js
index 41bc3b61b..4fbc30016 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_12.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_12.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_12.js

- * @description Properties - [[HasOwnProperty]] (non-writable, non-configurable, non-enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, non-configurable,
+    non-enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_13.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_13.js
index a07ec849f..2f242f8dc 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_13.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_13.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_13.js

- * @description Properties - [[HasOwnProperty]] (non-writable, non-configurable, enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, non-configurable,
+    enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_14.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_14.js
index 923e64cb2..752ad805b 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_14.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_14.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_14.js

- * @description Properties - [[HasOwnProperty]] (non-writable, configurable, non-enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, configurable,
+    non-enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_15.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_15.js
index 9cfa1640b..549c38625 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_15.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_15.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_15.js

- * @description Properties - [[HasOwnProperty]] (writable, non-configurable, non-enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, writable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, non-configurable,
+    non-enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, writable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_16.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_16.js
index 1115e6ee5..1e580d3b8 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_16.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_16.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_16.js

- * @description Properties - [[HasOwnProperty]] (non-writable, configurable, enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, configurable:true, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, configurable,
+    enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, configurable:true, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_17.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_17.js
index 09bf0f6df..88271164f 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_17.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_17.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_17.js

- * @description Properties - [[HasOwnProperty]] (writable, non-configurable, enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, non-configurable,
+    enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_18.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_18.js
index 14c1f8c65..ede4eb9b1 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_18.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_18.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_18.js

- * @description Properties - [[HasOwnProperty]] (writable, configurable, non-enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, writable:true, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, configurable,
+    non-enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, writable:true, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_19.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_19.js
index ef0a55559..ad5ee9cd7 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_19.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_19.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_19.js

- * @description Properties - [[HasOwnProperty]] (writable, configurable, enumerable inherited value property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, configurable,
+    enumerable inherited value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {value: 42, writable:true, enumerable:true, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_2.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_2.js
index 0314123aa..5a66490b9 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_2.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_2.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_2.js

- * @description Properties - [[HasOwnProperty]] (old style own property)

- */

-

-function testcase() {

-

-    var o = {foo: 42};

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (old style own property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {foo: 42};
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_20.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_20.js
index a4cb6f5f2..c65fefba8 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_20.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_20.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_20.js

- * @description Properties - [[HasOwnProperty]] (literal own getter property)

- */

-

-function testcase() {

-

-    var o = { get foo() { return 42;} };

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (literal own getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = { get foo() { return 42;} };
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_21.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_21.js
index e52f6e691..02c917921 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_21.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_21.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_21.js

- * @description Properties - [[HasOwnProperty]] (literal own setter property)

- */

-

-function testcase() {

-

-    var o = { set foo(x) {;} };

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (literal own setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = { set foo(x) {;} };
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_22.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_22.js
index c5a836d52..7e9b1d313 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_22.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_22.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_22.js

- * @description Properties - [[HasOwnProperty]] (literal own getter/setter property)

- */

-

-function testcase() {

-

-    var o = { get foo() { return 42;}, set foo(x) {;} };

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (literal own getter/setter
+    property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = { get foo() { return 42;}, set foo(x) {;} };
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_23.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_23.js
index 9e2bc5cf1..6f82796b9 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_23.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_23.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_23.js

- * @description Properties - [[HasOwnProperty]] (literal inherited getter property)

- */

-

-function testcase() {

-

-    var base = { get foo() { return 42;} };

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (literal inherited getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = { get foo() { return 42;} };
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_24.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_24.js
index 2bc8e3264..9ae905d40 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_24.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_24.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_24.js

- * @description Properties - [[HasOwnProperty]] (literal inherited setter property)

- */

-

-function testcase() {

-

-    var base = { set foo(x) {;} };

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (literal inherited setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = { set foo(x) {;} };
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_25.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_25.js
index b735c28d0..4cbd9a514 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_25.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_25.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_25.js

- * @description Properties - [[HasOwnProperty]] (literal inherited getter/setter property)

- */

-

-function testcase() {

-

-    var base = { get foo() { return 42;}, set foo(x) {;} };

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (literal inherited getter/setter
+    property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = { get foo() { return 42;}, set foo(x) {;} };
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_26.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_26.js
index fb3555966..03a348f6a 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_26.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_26.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_26.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable own getter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    own getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_27.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_27.js
index ff95ff414..025bef0d7 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_27.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_27.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_27.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable own getter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable own
+    getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_28.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_28.js
index 5b177ded6..814610ed0 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_28.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_28.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_28.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable own getter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable own
+    getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_29.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_29.js
index b9b2bd5ea..5614cce8e 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_29.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_29.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_29.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable own getter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable own
+    getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_3.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_3.js
index 742077a2b..eca1c840f 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_3.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_3.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_3.js

- * @description Properties - [[HasOwnProperty]] (old style inherited property)

- */

-

-function testcase() {

-

-    var base = {foo:42};

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Properties - [[HasOwnProperty]] (old style inherited property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {foo:42};
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_30.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_30.js
index db063f6f6..47c544939 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_30.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_30.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_30.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable own setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {set: function() {;}});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    own setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {set: function() {;}});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_31.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_31.js
index 4555da40e..7d399004b 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_31.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_31.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_31.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable own setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable own
+    setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_32.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_32.js
index 7fcff86a2..7f8886fa5 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_32.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_32.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_32.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable own setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {set: function() {;}, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable own
+    setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {set: function() {;}, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_33.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_33.js
index fb0294127..eb1c1ce36 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_33.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_33.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_33.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable own setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable own
+    setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {set: function() {;}, enumerable:true, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_34.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_34.js
index e72c99496..f8b844587 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_34.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_34.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_34.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable own getter/setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    own getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_35.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_35.js
index 7f56d79ae..17a567dd2 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_35.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_35.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_35.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable own getter/setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable own
+    getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_36.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_36.js
index 5d6a1162b..498e7413b 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_36.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_36.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_36.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable own getter/setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable own
+    getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_37.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_37.js
index c58438ef7..fd21638af 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_37.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_37.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_37.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable own getter/setter property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable own
+    getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_38.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_38.js
index 986059292..94a5aed09 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_38.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_38.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_38.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable inherited getter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    inherited getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_39.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_39.js
index 2ec9acd72..22dd3ee79 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_39.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_39.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_39.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable inherited getter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable
+    inherited getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_4.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_4.js
index cb67d3f39..25ffad0e9 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_4.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_4.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_4.js

- * @description Properties - [[HasOwnProperty]] (non-writable, non-configurable, non-enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, non-configurable,
+    non-enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_40.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_40.js
index f0aad260e..0c50698a3 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_40.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_40.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_40.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable inherited getter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable
+    inherited getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_41.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_41.js
index b3e3ecdff..302cd34c4 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_41.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_41.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_41.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable inherited getter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable
+    inherited getter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, enumerable:true, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_42.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_42.js
index 5f4679697..76aeb602f 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_42.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_42.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_42.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable inherited setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {set: function() {;}});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    inherited setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {set: function() {;}});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_43.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_43.js
index 52632881f..96091049d 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_43.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_43.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_43.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable inherited setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable
+    inherited setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_44.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_44.js
index e76b7ffa2..95ee7e7c0 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_44.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_44.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_44.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable inherited setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {set: function() {;}, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable
+    inherited setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {set: function() {;}, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_45.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_45.js
index c1dda50f5..5ba900a5c 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_45.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_45.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_45.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable inherited setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable
+    inherited setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {set: function() {;}, enumerable:true, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_46.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_46.js
index 2f2cb4a6d..188b5f7fb 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_46.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_46.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_46.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, non-enumerable inherited getter/setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, non-enumerable
+    inherited getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_47.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_47.js
index 032dcff5b..4497204a3 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_47.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_47.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_47.js

- * @description Properties - [[HasOwnProperty]] (non-configurable, enumerable inherited getter/setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-configurable, enumerable
+    inherited getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_48.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_48.js
index f7901fbca..1251530a2 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_48.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_48.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_48.js

- * @description Properties - [[HasOwnProperty]] (configurable, non-enumerable inherited getter/setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, non-enumerable
+    inherited getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_49.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_49.js
index c43be6a73..be0c9d936 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_49.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_49.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_49.js

- * @description Properties - [[HasOwnProperty]] (configurable, enumerable inherited getter/setter property)

- */

-

-function testcase() {

-

-    var base = {};

-    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});

-    var o = Object.create(base);

-    return o.hasOwnProperty("foo")===false;

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (configurable, enumerable
+    inherited getter/setter property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var base = {};
+    Object.defineProperty(base, "foo", {get: function() {return 42;}, set: function() {;}, enumerable:true, configurable:true});
+    var o = Object.create(base);
+    return o.hasOwnProperty("foo")===false;
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_5.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_5.js
index 2c6ff4643..a50c4c6f9 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_5.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_5.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_5.js

- * @description Properties - [[HasOwnProperty]] (non-writable, non-configurable, enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, non-configurable,
+    enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_6.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_6.js
index 02b14b206..ee918be10 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_6.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_6.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_6.js

- * @description Properties - [[HasOwnProperty]] (non-writable, configurable, non-enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, configurable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, configurable,
+    non-enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, configurable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_7.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_7.js
index 4b7845365..7dd4c12d6 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_7.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_7.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_7.js

- * @description Properties - [[HasOwnProperty]] (writable, non-configurable, non-enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, writable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, non-configurable,
+    non-enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, writable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_8.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_8.js
index d462883fa..051acecee 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_8.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_8.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_8.js

- * @description Properties - [[HasOwnProperty]] (non-writable, configurable, enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, configurable:true, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (non-writable, configurable,
+    enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, configurable:true, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.1/8.12.1-1_9.js b/test/suite/ch08/8.12/8.12.1/8.12.1-1_9.js
index 5fe54362c..5df5bcee9 100644
--- a/test/suite/ch08/8.12/8.12.1/8.12.1-1_9.js
+++ b/test/suite/ch08/8.12/8.12.1/8.12.1-1_9.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.1/8.12.1-1_9.js

- * @description Properties - [[HasOwnProperty]] (writable, non-configurable, enumerable own value property)

- */

-

-function testcase() {

-

-    var o = {};

-    Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true});

-    return o.hasOwnProperty("foo");

-

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Properties - [[HasOwnProperty]] (writable, non-configurable,
+    enumerable own value property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var o = {};
+    Object.defineProperty(o, "foo", {value: 42, writable:true, enumerable:true});
+    return o.hasOwnProperty("foo");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.3/S8.12.3_A1.js b/test/suite/ch08/8.12/8.12.3/S8.12.3_A1.js
index 4bf7b4590..96be4f051 100644
--- a/test/suite/ch08/8.12/8.12.3/S8.12.3_A1.js
+++ b/test/suite/ch08/8.12/8.12.3/S8.12.3_A1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]](P) method should return value when property P does not exist in instance but prototype contain it
- *
- * @path ch08/8.12/8.12.3/S8.12.3_A1.js
- * @description Try to get P when property P does not exist in instance but prototype contain it
- */
+/*---
+info: >
+    [[Get]](P) method should return value when property P does not exist in
+    instance but prototype contain it
+description: >
+    Try to get P when property P does not exist in instance but
+    prototype contain it
+---*/
 
 //Establish foo object 
 function FooObj(){}; FooObj.prototype.propFoo="some";
@@ -29,4 +31,3 @@ if (__obj['propFoo'] !== "some"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.3/S8.12.3_A2.js b/test/suite/ch08/8.12/8.12.3/S8.12.3_A2.js
index 8f261da8e..2c82574cf 100644
--- a/test/suite/ch08/8.12/8.12.3/S8.12.3_A2.js
+++ b/test/suite/ch08/8.12/8.12.3/S8.12.3_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]](P) method should return undefined when property P does not exist both in instance and prototype
- *
- * @path ch08/8.12/8.12.3/S8.12.3_A2.js
- * @description Try to get P when property P does not exist both in instance and prototype
- */
+/*---
+info: >
+    [[Get]](P) method should return undefined when property P does not exist
+    both in instance and prototype
+description: >
+    Try to get P when property P does not exist both in instance and
+    prototype
+---*/
 
 var __obj={};
 
@@ -25,4 +27,3 @@ if (__obj['propFoo'] !== undefined){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.3/S8.12.3_A3.js b/test/suite/ch08/8.12/8.12.3/S8.12.3_A3.js
index dbe1250ad..951793df0 100644
--- a/test/suite/ch08/8.12/8.12.3/S8.12.3_A3.js
+++ b/test/suite/ch08/8.12/8.12.3/S8.12.3_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Get]] method of O is called with property name P value of P returns
- *
- * @path ch08/8.12/8.12.3/S8.12.3_A3.js
- * @description Try to get P property P exist in instance
- */
+/*---
+info: >
+    When the [[Get]] method of O is called with property name P value of P
+    returns
+description: Try to get P property P exist in instance
+---*/
 
 var __map={shape:"cube", 5:"five", "6":"six"};
 
@@ -57,4 +57,3 @@ if (__map[6] !== "six"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_1.js b/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_1.js
index 38249d056..fe7798c43 100644
--- a/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_1.js
+++ b/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_1.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.4/8.14.4-8-b_1.js

- * @description Non-writable property on a prototype written to.

- */

-

-function testcase() {   

-    function foo() {};

-    Object.defineProperty(foo.prototype, "bar", {value: "unwritable"}); 

-    

-    var o = new foo(); 

-    o.bar = "overridden"; 

-    return o.hasOwnProperty("bar")===false && o.bar==="unwritable";

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Non-writable property on a prototype written to.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {   
+    function foo() {};
+    Object.defineProperty(foo.prototype, "bar", {value: "unwritable"}); 
+    
+    var o = new foo(); 
+    o.bar = "overridden"; 
+    return o.hasOwnProperty("bar")===false && o.bar==="unwritable";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_2.js b/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_2.js
index f6b5f1c14..4db543086 100644
--- a/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_2.js
+++ b/test/suite/ch08/8.12/8.12.4/8.14.4-8-b_2.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.4/8.14.4-8-b_2.js

- * @description Non-writable property on a prototype written to in strict mode.

- * @onlyStrict

- */

-

-function testcase() {

-    "use strict";

-    

-    function foo() {};

-    Object.defineProperty(foo.prototype, "bar", {value: "unwritable"}); 

-    

-    var o = new foo(); 

-    try {

-        o.bar = "overridden"; 

-        return false;

-    } catch(e) {

-        return (e instanceof TypeError) && (o.bar==="unwritable");

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Non-writable property on a prototype written to in strict mode.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    "use strict";
+    
+    function foo() {};
+    Object.defineProperty(foo.prototype, "bar", {value: "unwritable"}); 
+    
+    var o = new foo(); 
+    try {
+        o.bar = "overridden"; 
+        return false;
+    } catch(e) {
+        return (e instanceof TypeError) && (o.bar==="unwritable");
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.4/S8.12.4_A1.js b/test/suite/ch08/8.12/8.12.4/S8.12.4_A1.js
index cbe11f0f7..958f1607d 100644
--- a/test/suite/ch08/8.12/8.12.4/S8.12.4_A1.js
+++ b/test/suite/ch08/8.12/8.12.4/S8.12.4_A1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the property has the ReadOnly attribute, [[CanPut]](P) return false
- *
- * @path ch08/8.12/8.12.4/S8.12.4_A1.js
- * @description Try put other value for Math.E property
- * @noStrict
- */
+/*---
+info: If the property has the ReadOnly attribute, [[CanPut]](P) return false
+description: Try put other value for Math.E property
+flags: [noStrict]
+---*/
 
 var __e = Math.E;
 Math.E = 1;
 if (Math.E !== __e){
   $ERROR('#1: __e = Math.E; Math.E = 1; Math.E === __e. Actual: ' + (Math.E));
 }
-
diff --git a/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_1.js b/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_1.js
index 0ed875ef4..65fafff91 100644
--- a/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_1.js
+++ b/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_1.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.5/8.12.5-3-b_1.js

- * @description Changing the value of a data property should not affect it's non-value property descriptor attributes.

- */

-

-

-function testcase() {

-    var origReduce = Array.prototype.reduce;

-    var origDesc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");

-    var newDesc;

-    

-    try {

-        Array.prototype.reduce = function () {;};

-        newDesc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");

-        var descArray = [origDesc, newDesc];

-        

-        for (var j in descArray) {  //Ensure no attributes are magically added to newDesc

-            for (var i in descArray[j]) {

-                if (i==="value") {

-                    if (origDesc[i]===newDesc[i]) {

-                        return false;

-                    }

-                }

-                else if (origDesc[i]!==newDesc[i]) {

-                    return false;

-                }

-            }

-        }

-        return true;        

-    

-    } finally {

-        Array.prototype.reduce = origReduce;

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Changing the value of a data property should not affect it's
+    non-value property descriptor attributes.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var origReduce = Array.prototype.reduce;
+    var origDesc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");
+    var newDesc;
+    
+    try {
+        Array.prototype.reduce = function () {;};
+        newDesc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");
+        var descArray = [origDesc, newDesc];
+        
+        for (var j in descArray) {  //Ensure no attributes are magically added to newDesc
+            for (var i in descArray[j]) {
+                if (i==="value") {
+                    if (origDesc[i]===newDesc[i]) {
+                        return false;
+                    }
+                }
+                else if (origDesc[i]!==newDesc[i]) {
+                    return false;
+                }
+            }
+        }
+        return true;        
+    
+    } finally {
+        Array.prototype.reduce = origReduce;
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_2.js b/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_2.js
index f6b760ce3..fe4bb7550 100644
--- a/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_2.js
+++ b/test/suite/ch08/8.12/8.12.5/8.12.5-3-b_2.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.5/8.12.5-3-b_2.js

- * @description Changing the value of a data property should not affect it's non-value property descriptor attributes.

- */

-

-

-function testcase() {

-    var tempObj = {};

-    

-    Object.defineProperty(tempObj, "reduce", { value:456, enumerable:false, writable:true});

-    var origReduce = tempObj.reduce;

-    var origDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");

-

-    var newDesc;

-    

-    try {

-        tempObj.reduce = 123;

-        newDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");

-        var descArray = [origDesc, newDesc];

-        

-        for (var j in descArray) {

-            for (var i in descArray[j]) {

-                if (i==="value") {

-                    if (origDesc[i]===newDesc[i]) {

-                        return false;

-                    }

-                }

-                else if (origDesc[i]!==newDesc[i]) {

-                    return false;

-                }

-            }

-        }

-        return true;

-    

-    } finally {

-        tempObj.reduce = origReduce;

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Changing the value of a data property should not affect it's
+    non-value property descriptor attributes.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var tempObj = {};
+    
+    Object.defineProperty(tempObj, "reduce", { value:456, enumerable:false, writable:true});
+    var origReduce = tempObj.reduce;
+    var origDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");
+
+    var newDesc;
+    
+    try {
+        tempObj.reduce = 123;
+        newDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");
+        var descArray = [origDesc, newDesc];
+        
+        for (var j in descArray) {
+            for (var i in descArray[j]) {
+                if (i==="value") {
+                    if (origDesc[i]===newDesc[i]) {
+                        return false;
+                    }
+                }
+                else if (origDesc[i]!==newDesc[i]) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    
+    } finally {
+        tempObj.reduce = origReduce;
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.5/8.12.5-5-b_1.js b/test/suite/ch08/8.12/8.12.5/8.12.5-5-b_1.js
index b3c013ef5..c5730d330 100644
--- a/test/suite/ch08/8.12/8.12.5/8.12.5-5-b_1.js
+++ b/test/suite/ch08/8.12/8.12.5/8.12.5-5-b_1.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.5/8.12.5-5-b_1.js

- * @description Changing the value of an accessor property should not affect it's property descriptor attributes.

- */

-

-

-function testcase() {

-    var tempObj = {};

-    

-    Object.defineProperty(tempObj, "reduce", { get: function() {return 456;}, enumerable:false, set: function() {;}});

-    var origReduce = tempObj.reduce;

-    var origDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");

-

-    var newDesc;

-    

-    try {

-        tempObj.reduce = 123;

-        newDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");

-        var descArray = [origDesc, newDesc];

-        

-        for (var j in descArray) {

-            for (var i in descArray[j]) {

-                if (origDesc[i]!==newDesc[i]) {

-                    return false;

-                }

-            }

-        }

-        return tempObj.reduce===456;        

-    

-    } finally {

-        tempObj.reduce = origReduce;

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Changing the value of an accessor property should not affect it's
+    property descriptor attributes.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var tempObj = {};
+    
+    Object.defineProperty(tempObj, "reduce", { get: function() {return 456;}, enumerable:false, set: function() {;}});
+    var origReduce = tempObj.reduce;
+    var origDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");
+
+    var newDesc;
+    
+    try {
+        tempObj.reduce = 123;
+        newDesc = Object.getOwnPropertyDescriptor(tempObj, "reduce");
+        var descArray = [origDesc, newDesc];
+        
+        for (var j in descArray) {
+            for (var i in descArray[j]) {
+                if (origDesc[i]!==newDesc[i]) {
+                    return false;
+                }
+            }
+        }
+        return tempObj.reduce===456;        
+    
+    } finally {
+        tempObj.reduce = origReduce;
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.5/S8.12.5_A1.js b/test/suite/ch08/8.12/8.12.5/S8.12.5_A1.js
index e6f4bba20..3ca129cb4 100644
--- a/test/suite/ch08/8.12/8.12.5/S8.12.5_A1.js
+++ b/test/suite/ch08/8.12/8.12.5/S8.12.5_A1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Put]] method of O is called with property P and value V,
- * and If O doesn't have a property with name P, then
- * creates a property with name P, set its value to V and give it empty attributes
- *
- * @path ch08/8.12/8.12.5/S8.12.5_A1.js
- * @description Put to not existent properties
- */
+/*---
+info: >
+    When the [[Put]] method of O is called with property P and value V,
+    and If O doesn't have a property with name P, then
+    creates a property with name P, set its value to V and give it empty attributes
+description: Put to not existent properties
+---*/
 
 var __map={}; __map[1]="one"; __map["two"]=2; __map["3"]="tre";
 
@@ -35,4 +34,3 @@ if (__map["3"] !== "tre") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.5/S8.12.5_A2.js b/test/suite/ch08/8.12/8.12.5/S8.12.5_A2.js
index 02f67e0b8..e11e64ce0 100644
--- a/test/suite/ch08/8.12/8.12.5/S8.12.5_A2.js
+++ b/test/suite/ch08/8.12/8.12.5/S8.12.5_A2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Put]] method of O is called with property P and value V,
- * then set the value of the property to V. The attributes of the property are not changed
- *
- * @path ch08/8.12/8.12.5/S8.12.5_A2.js
- * @description Put to existent properties
- */
+/*---
+info: >
+    When the [[Put]] method of O is called with property P and value V,
+    then set the value of the property to V. The attributes of the property are not changed
+description: Put to existent properties
+---*/
 
 var _map={1:"one",two:2};
 
@@ -46,4 +45,3 @@ if (_map.two !== "duo") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.6/S8.12.6_A1.js b/test/suite/ch08/8.12/8.12.6/S8.12.6_A1.js
index 20a2676f7..f0cad9dc5 100644
--- a/test/suite/ch08/8.12/8.12.6/S8.12.6_A1.js
+++ b/test/suite/ch08/8.12/8.12.6/S8.12.6_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[HasProperty]] method of O is called with property name P and if O has a property with name P, return true
- *
- * @path ch08/8.12/8.12.6/S8.12.6_A1.js
- * @description Try find existent property of any Object
- */
+/*---
+info: >
+    When the [[HasProperty]] method of O is called with property name P and
+    if O has a property with name P, return true
+description: Try find existent property of any Object
+---*/
 
 var __obj={fooProp:"fooooooo"};
 
@@ -17,4 +17,3 @@ if (!("fooProp" in __obj)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T1.js b/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T1.js
index 4a2eac8a3..4242c79a7 100644
--- a/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T1.js
+++ b/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[HasProperty]] method of O is called with property name P and if O has not a property with name P
- * then If the [[Prototype]] of O is null, return false or call the [[HasProperty]] method of [[Prototype]] with property name P
- *
- * @path ch08/8.12/8.12.6/S8.12.6_A2_T1.js
- * @description Try find not existent property of any Object
- */
+/*---
+info: >
+    When the [[HasProperty]] method of O is called with property name P and if O has not a property with name P
+    then If the [[Prototype]] of O is null, return false or call the [[HasProperty]] method of [[Prototype]] with property name P
+description: Try find not existent property of any Object
+---*/
 
 var __obj={};
 
@@ -18,4 +17,3 @@ if (!("valueOf" in __obj)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T2.js b/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T2.js
index 536b8ceb4..162e5421d 100644
--- a/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T2.js
+++ b/test/suite/ch08/8.12/8.12.6/S8.12.6_A2_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[HasProperty]] method of O is called with property name P and if O has not a property with name P
- * then If the [[Prototype]] of O is null, return false or call the [[HasProperty]] method of [[Prototype]] with property name P
- *
- * @path ch08/8.12/8.12.6/S8.12.6_A2_T2.js
- * @description Try find not existent property of any Object, but existent property of this Object prototype
- */
+/*---
+info: >
+    When the [[HasProperty]] method of O is called with property name P and if O has not a property with name P
+    then If the [[Prototype]] of O is null, return false or call the [[HasProperty]] method of [[Prototype]] with property name P
+description: >
+    Try find not existent property of any Object, but existent
+    property of this Object prototype
+---*/
 
 var __proto={phylum:"avis"};
 
@@ -40,4 +41,3 @@ if (__my__robin.hasOwnProperty("phylum")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.6/S8.12.6_A3.js b/test/suite/ch08/8.12/8.12.6/S8.12.6_A3.js
index c2c34fa2c..c1ff0d360 100644
--- a/test/suite/ch08/8.12/8.12.6/S8.12.6_A3.js
+++ b/test/suite/ch08/8.12/8.12.6/S8.12.6_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[hasProperty]] is sensitive to property existence but [[Get]] is not
- *
- * @path ch08/8.12/8.12.6/S8.12.6_A3.js
- * @description Use [[hasProperty]] and [[Get]] for existent and not existent properties
- */
+/*---
+info: "[[hasProperty]] is sensitive to property existence but [[Get]] is not"
+description: >
+    Use [[hasProperty]] and [[Get]] for existent and not existent
+    properties
+---*/
 
 var __obj={}; __obj.hole=undefined;
 
@@ -41,4 +41,3 @@ if (("notexist" in __obj)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.7/S8.12.7_A1.js b/test/suite/ch08/8.12/8.12.7/S8.12.7_A1.js
index b6944fd48..cb4c3e843 100644
--- a/test/suite/ch08/8.12/8.12.7/S8.12.7_A1.js
+++ b/test/suite/ch08/8.12/8.12.7/S8.12.7_A1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Delete]] method of O is called with property name P,
- * and If the property has the DontDelete attribute, return false
- *
- * @path ch08/8.12/8.12.7/S8.12.7_A1.js
- * @description Try to delete Math.E, that has the DontDelete attribute
- * @noStrict
- */
+/*---
+info: >
+    When the [[Delete]] method of O is called with property name P,
+    and If the property has the DontDelete attribute, return false
+description: Try to delete Math.E, that has the DontDelete attribute
+flags: [noStrict]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -25,5 +24,3 @@ if (Math.E === undefined){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T1.js b/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T1.js
index 6c416b525..53dd8e86b 100644
--- a/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T1.js
+++ b/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Delete]] method of O is called with property name P,
- * and if O doesn't have a property with name P, return true
- *
- * @path ch08/8.12/8.12.7/S8.12.7_A2_T1.js
- * @description Try to delete not existent properties
- */
+/*---
+info: >
+    When the [[Delete]] method of O is called with property name P,
+    and if O doesn't have a property with name P, return true
+description: Try to delete not existent properties
+---*/
 
 var __color__map = {};
 
@@ -35,5 +34,3 @@ if (delete __color__map[blue] !== true){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T2.js b/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T2.js
index e3182463a..ab1a89be1 100644
--- a/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T2.js
+++ b/test/suite/ch08/8.12/8.12.7/S8.12.7_A2_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Delete]] method of O is called with property name P,
- * and if O doesn't have a property with name P, return true
- *
- * @path ch08/8.12/8.12.7/S8.12.7_A2_T2.js
- * @description Try to delete not existent properties of O, but existent property of prototype
- */
+/*---
+info: >
+    When the [[Delete]] method of O is called with property name P,
+    and if O doesn't have a property with name P, return true
+description: >
+    Try to delete not existent properties of O, but existent property
+    of prototype
+---*/
 
 function Palette(){};
 Palette.prototype = {red:0xFF0000, green:0x00FF00};
@@ -36,5 +37,3 @@ if (__palette.red !== 0xFF0000){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.12/8.12.7/S8.12.7_A3.js b/test/suite/ch08/8.12/8.12.7/S8.12.7_A3.js
index c9abe19d9..1938f1b69 100644
--- a/test/suite/ch08/8.12/8.12.7/S8.12.7_A3.js
+++ b/test/suite/ch08/8.12/8.12.7/S8.12.7_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Delete]] method of O is called with property name P,
- * removes the property with name P from O and return true
- *
- * @path ch08/8.12/8.12.7/S8.12.7_A3.js
- * @description Delete existent properties
- */
+/*---
+info: >
+    When the [[Delete]] method of O is called with property name P,
+    removes the property with name P from O and return true
+description: Delete existent properties
+---*/
 
 var BLUE_NUM=1;
 var BLUE_STR="1";
@@ -46,4 +45,3 @@ if (__color__map[BLUE_NUM] !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.12/8.12.8/S8.12.8_A1.js b/test/suite/ch08/8.12/8.12.8/S8.12.8_A1.js
index 9fa13f537..e54f3dcc0 100644
--- a/test/suite/ch08/8.12/8.12.8/S8.12.8_A1.js
+++ b/test/suite/ch08/8.12/8.12.8/S8.12.8_A1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * This should generate a TypeError,
- * Cause we overload toString method so it return non Primitive value
- * See ECMA reference at http://bugzilla.mozilla.org/show_bug.cgi?id=167325
- *
- * @path ch08/8.12/8.12.8/S8.12.8_A1.js
- * @description Try to overload toString method
- */
+/*---
+info: >
+    This should generate a TypeError,
+    Cause we overload toString method so it return non Primitive value
+    See ECMA reference at http://bugzilla.mozilla.org/show_bug.cgi?id=167325
+description: Try to overload toString method
+---*/
 
 try
 {
@@ -21,6 +20,4 @@ catch(e)
 	if ((e instanceof TypeError) !== true) {
 	  $ERROR('#1.2: var __obj = {toString: function() {return new Object();}}; String(__obj) throw TypeError. Actual: ' + (e));
 	}  
-}  
-
-
+}
diff --git a/test/suite/ch08/8.12/8.12.8/S8.12.8_A2.js b/test/suite/ch08/8.12/8.12.8/S8.12.8_A2.js
index 1a4cd4f91..e5bc92328 100644
--- a/test/suite/ch08/8.12/8.12.8/S8.12.8_A2.js
+++ b/test/suite/ch08/8.12/8.12.8/S8.12.8_A2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * This should generate no TypeError,
- * Cause we overload toString method so it return non Primitive value
- * but we overloaded valueOf method too.
- * See ECMA reference at http://bugzilla.mozilla.org/show_bug.cgi?id=167325
- *
- * @path ch08/8.12/8.12.8/S8.12.8_A2.js
- * @description Try to overload toString, that returned new Object, and valueOf methods
- */
+/*---
+info: >
+    This should generate no TypeError,
+    Cause we overload toString method so it return non Primitive value
+    but we overloaded valueOf method too.
+    See ECMA reference at http://bugzilla.mozilla.org/show_bug.cgi?id=167325
+description: >
+    Try to overload toString, that returned new Object, and valueOf
+    methods
+---*/
 
 try
 {
@@ -21,6 +22,4 @@ try
 catch(e)
 {
   $ERROR('#1.2: var __obj = {toString: function() {return new Object();}, valueOf: function() {return 1;}}; String(__obj) === "1". Actual: ' + (e));
-}  
-
-
+}
diff --git a/test/suite/ch08/8.12/8.12.8/S8.12.8_A3.js b/test/suite/ch08/8.12/8.12.8/S8.12.8_A3.js
index a54d3c2a8..8ec7cad41 100644
--- a/test/suite/ch08/8.12/8.12.8/S8.12.8_A3.js
+++ b/test/suite/ch08/8.12/8.12.8/S8.12.8_A3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * We overload valueOf method so it return non Primitive value
- * Thus [[DefaultValue]] must return Object.toString() value
- *
- * @path ch08/8.12/8.12.8/S8.12.8_A3.js
- * @description Try to overload toString method, that returned Primitive, and valueOf method, that returned new Object
- */
+/*---
+info: >
+    We overload valueOf method so it return non Primitive value
+    Thus [[DefaultValue]] must return Object.toString() value
+description: >
+    Try to overload toString method, that returned Primitive, and
+    valueOf method, that returned new Object
+---*/
 
 try
 {
@@ -19,10 +20,4 @@ try
 catch(e)
 {
   $ERROR('#1.2: var __obj = {toNumber: function() {return "1"}, valueOf: function() {return new Object();}}; Number(__obj) === 1. Actual: ' + (e));
-}  
-
-
-
-  
-
-
+}
diff --git a/test/suite/ch08/8.12/8.12.8/S8.12.8_A4.js b/test/suite/ch08/8.12/8.12.8/S8.12.8_A4.js
index cec14497b..8771c2ad4 100644
--- a/test/suite/ch08/8.12/8.12.8/S8.12.8_A4.js
+++ b/test/suite/ch08/8.12/8.12.8/S8.12.8_A4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * We overload valueOf method so it return non Primitive value and toString method so it return non Primitive value too
- * Thus [[DefaultValue]] must generate TypeError error
- *
- * @path ch08/8.12/8.12.8/S8.12.8_A4.js
- * @description Try to overload toString and valueOf methods, they returned new Objects
- */
+/*---
+info: >
+    We overload valueOf method so it return non Primitive value and toString method so it return non Primitive value too
+    Thus [[DefaultValue]] must generate TypeError error
+description: >
+    Try to overload toString and valueOf methods, they returned new
+    Objects
+---*/
 
 try
 {
@@ -20,5 +21,4 @@ catch(e)
   if ((e instanceof TypeError) !== true) {
     $ERROR('#1.2: var __obj = {valueOf:function(){return new Object;},toNumber: function() {return new Object();}}; Number(__obj) throw TypeError. Actual: ' + (e));
   }  
-}  
-
+}
diff --git a/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_1.js b/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_1.js
index 84ea47532..a2ae85d6a 100644
--- a/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_1.js
+++ b/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.9/8.12.9-9-b-i_1.js

- * @description Redefine a configurable data property to be an accessor property on a newly non-extensible object

- */

-

-

-function testcase() {

-    var o = {};

-    Object.defineProperty(o, "foo", 

-                          { value: "hello", 

-                            configurable: true});

-    Object.preventExtensions(o);

-    Object.defineProperty(o, "foo", { get: function() { return 5;} });

-

-    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");

-    return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===undefined;

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Redefine a configurable data property to be an accessor property
+    on a newly non-extensible object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    Object.defineProperty(o, "foo", 
+                          { value: "hello", 
+                            configurable: true});
+    Object.preventExtensions(o);
+    Object.defineProperty(o, "foo", { get: function() { return 5;} });
+
+    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");
+    return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===undefined;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_2.js b/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_2.js
index f7ba3048a..ccc02b43e 100644
--- a/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_2.js
+++ b/test/suite/ch08/8.12/8.12.9/8.12.9-9-b-i_2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.9/8.12.9-9-b-i_2.js

- * @description Redefine a configurable data property to be an accessor property on a newly non-extensible object

- */

-

-

-function testcase() {

-    var o = {};

-    Object.defineProperty(o, "foo", 

-                          { value: "hello", 

-                            configurable: true,

-                            enumerable: true,

-                            writable: true});

-    Object.preventExtensions(o);

-    Object.defineProperty(o, "foo", { get: function() { return 5;} });

-

-    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");

-    return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===true && fooDescrip.writable===undefined;

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Redefine a configurable data property to be an accessor property
+    on a newly non-extensible object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    Object.defineProperty(o, "foo", 
+                          { value: "hello", 
+                            configurable: true,
+                            enumerable: true,
+                            writable: true});
+    Object.preventExtensions(o);
+    Object.defineProperty(o, "foo", { get: function() { return 5;} });
+
+    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");
+    return o.foo===5 && fooDescrip.get!==undefined && fooDescrip.set===undefined && fooDescrip.value===undefined && fooDescrip.configurable===true && fooDescrip.enumerable===true && fooDescrip.writable===undefined;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_1.js b/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_1.js
index bef7ddc7d..81bda3003 100644
--- a/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_1.js
+++ b/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.9/8.12.9-9-c-i_1.js

- * @description Redefine a configurable accessor property to be a data property on a non-extensible object

- */

-

-

-function testcase() {

-    var o = {};

-    Object.defineProperty(o, "foo", 

-                          { get: function() { return 5;}, 

-                            configurable: true});

-    Object.preventExtensions(o);

-    Object.defineProperty(o, "foo", { value: "hello"});

-

-    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");

-    return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===false;

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Redefine a configurable accessor property to be a data property on
+    a non-extensible object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    Object.defineProperty(o, "foo", 
+                          { get: function() { return 5;}, 
+                            configurable: true});
+    Object.preventExtensions(o);
+    Object.defineProperty(o, "foo", { value: "hello"});
+
+    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");
+    return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===false;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_2.js b/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_2.js
index 0c4833ab6..ef04aa907 100644
--- a/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_2.js
+++ b/test/suite/ch08/8.12/8.12.9/8.12.9-9-c-i_2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.12/8.12.9/8.12.9-9-c-i_2.js

- * @description Redefine a configurable accessor property to be a data property on a non-extensible object

- */

-

-

-function testcase() {

-    var o = {};

-    Object.defineProperty(o, "foo", 

-                          { get: function() { return 5;}, 

-                            configurable: true});

-    Object.preventExtensions(o);

-    Object.defineProperty(o, "foo", 

-                          { value: "hello",

-                            writable: true});

-

-    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");

-    return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===true;

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Redefine a configurable accessor property to be a data property on
+    a non-extensible object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    Object.defineProperty(o, "foo", 
+                          { get: function() { return 5;}, 
+                            configurable: true});
+    Object.preventExtensions(o);
+    Object.defineProperty(o, "foo", 
+                          { value: "hello",
+                            writable: true});
+
+    var fooDescrip = Object.getOwnPropertyDescriptor(o, "foo");
+    return o.foo==="hello" && fooDescrip.get===undefined && fooDescrip.set===undefined && fooDescrip.value==="hello" && fooDescrip.configurable===true && fooDescrip.enumerable===false && fooDescrip.writable===true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.2/S8.2_A1_T1.js b/test/suite/ch08/8.2/S8.2_A1_T1.js
index bf67b16cc..784dc920d 100644
--- a/test/suite/ch08/8.2/S8.2_A1_T1.js
+++ b/test/suite/ch08/8.2/S8.2_A1_T1.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Null Type has one value, called null
- *
- * @path ch08/8.2/S8.2_A1_T1.js
- * @description Checking if execution of "var x = null" passes
- */
+/*---
+info: The Null Type has one value, called null
+description: Checking if execution of "var x = null" passes
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x = null;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.2/S8.2_A1_T2.js b/test/suite/ch08/8.2/S8.2_A1_T2.js
index e0bcda72a..3d579ee5f 100644
--- a/test/suite/ch08/8.2/S8.2_A1_T2.js
+++ b/test/suite/ch08/8.2/S8.2_A1_T2.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Null Type has one value, called null
- *
- * @path ch08/8.2/S8.2_A1_T2.js
- * @description Checking if execution of "x = null" passes
- */
+/*---
+info: The Null Type has one value, called null
+description: Checking if execution of "x = null" passes
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x = null;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.2/S8.2_A2.js b/test/suite/ch08/8.2/S8.2_A2.js
index 8cecf3cf8..eb4e2a8a4 100644
--- a/test/suite/ch08/8.2/S8.2_A2.js
+++ b/test/suite/ch08/8.2/S8.2_A2.js
@@ -1,15 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The null is resrved word
- *
- * @path ch08/8.2/S8.2_A2.js
- * @description Checking if execution of "var null" fails
- * @negative
- */
+/*---
+info: The null is resrved word
+description: Checking if execution of "var null" fails
+flags: [negative]
+---*/
 
 var null;
-
-
-
diff --git a/test/suite/ch08/8.2/S8.2_A3.js b/test/suite/ch08/8.2/S8.2_A3.js
index 2d5d49bdf..c11d8b584 100644
--- a/test/suite/ch08/8.2/S8.2_A3.js
+++ b/test/suite/ch08/8.2/S8.2_A3.js
@@ -1,17 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For the keyword null the typeof operator returns the "object"
- * See also
- * http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Operators:Special_Operators:typeof_Operator
- * and
- * http://bugs.ecmascript.org/ticket/250
- * for example
- *
- * @path ch08/8.2/S8.2_A3.js
- * @description Check type of null
- */
+/*---
+info: >
+    For the keyword null the typeof operator returns the "object"
+    See also
+    http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Operators:Special_Operators:typeof_Operator
+    and
+    http://bugs.ecmascript.org/ticket/250
+    for example
+description: Check type of null
+---*/
 
 //////////////////////////////////////////////////////////////
 // CHECK#1
@@ -20,4 +19,3 @@ if (typeof(null) !== "object") {
 }
 //
 /////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.3/S8.3_A1_T1.js b/test/suite/ch08/8.3/S8.3_A1_T1.js
index 3c4868526..b63bd5ea0 100644
--- a/test/suite/ch08/8.3/S8.3_A1_T1.js
+++ b/test/suite/ch08/8.3/S8.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Boolean type have two values, called true and false
- *
- * @path ch08/8.3/S8.3_A1_T1.js
- * @description Assign true and false to variables
- */
+/*---
+info: The Boolean type have two values, called true and false
+description: Assign true and false to variables
+---*/
 
 if (x !== undefined) {
     $ERROR("#0 x !== undefined, but actual is "+ x);
@@ -27,4 +25,3 @@ if (y !== false) {
 
 //
 ////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.3/S8.3_A1_T2.js b/test/suite/ch08/8.3/S8.3_A1_T2.js
index b5740852e..8af4f047c 100644
--- a/test/suite/ch08/8.3/S8.3_A1_T2.js
+++ b/test/suite/ch08/8.3/S8.3_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Boolean type have two values, called true and false
- *
- * @path ch08/8.3/S8.3_A1_T2.js
- * @description Check type of true/false and it`s equality
- */
+/*---
+info: The Boolean type have two values, called true and false
+description: Check type of true/false and it`s equality
+---*/
 
 //////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -71,5 +69,3 @@ if (false == true) {
 }
 //
 //////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.3/S8.3_A2.1.js b/test/suite/ch08/8.3/S8.3_A2.1.js
index e8dfba19d..9a5228f8a 100644
--- a/test/suite/ch08/8.3/S8.3_A2.1.js
+++ b/test/suite/ch08/8.3/S8.3_A2.1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The true is reserved word
- *
- * @path ch08/8.3/S8.3_A2.1.js
- * @description Checking if execution of "true=1" fails
- * @negative
- */
+/*---
+info: The true is reserved word
+description: Checking if execution of "true=1" fails
+flags: [negative]
+---*/
 
 true = 1;
-
diff --git a/test/suite/ch08/8.3/S8.3_A2.2.js b/test/suite/ch08/8.3/S8.3_A2.2.js
index a3ab639cb..232f99755 100644
--- a/test/suite/ch08/8.3/S8.3_A2.2.js
+++ b/test/suite/ch08/8.3/S8.3_A2.2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The false is reserved word
- *
- * @path ch08/8.3/S8.3_A2.2.js
- * @description Checking if execution of "false=0" fails
- * @negative
- */
+/*---
+info: The false is reserved word
+description: Checking if execution of "false=0" fails
+flags: [negative]
+---*/
 
 false = 0;
-
diff --git a/test/suite/ch08/8.3/S8.3_A3.js b/test/suite/ch08/8.3/S8.3_A3.js
index a3aa585c8..7838cf2de 100644
--- a/test/suite/ch08/8.3/S8.3_A3.js
+++ b/test/suite/ch08/8.3/S8.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Applaing negation to boolean works well
- *
- * @path ch08/8.3/S8.3_A3.js
- * @description Check not false equals true, not true equals false
- */
+/*---
+info: Applaing negation to boolean works well
+description: Check not false equals true, not true equals false
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -39,4 +37,3 @@ if (!true != false){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A1.js b/test/suite/ch08/8.4/S8.4_A1.js
index eb27fc3b3..5f15b4250 100644
--- a/test/suite/ch08/8.4/S8.4_A1.js
+++ b/test/suite/ch08/8.4/S8.4_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Any variable that has been assigned with string literal has the type string
- *
- * @path ch08/8.4/S8.4_A1.js
- * @description Check type of variable that has been assigned with string literal
- */
+/*---
+info: >
+    Any variable that has been assigned with string literal has the type
+    string
+description: Check type of variable that has been assigned with string literal
+---*/
 
 /////////////////////////////////////////////////////////
 // CHECK#1
@@ -43,4 +43,3 @@ if (typeof(str__)!=="string"){
 }
 //
 ////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A10.js b/test/suite/ch08/8.4/S8.4_A10.js
index fa2906fcf..02aa46744 100644
--- a/test/suite/ch08/8.4/S8.4_A10.js
+++ b/test/suite/ch08/8.4/S8.4_A10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Both unicode and ascii chars are allowed
- *
- * @path ch08/8.4/S8.4_A10.js
- * @description Create string using both unicode and ascii chars
- */
+/*---
+info: Both unicode and ascii chars are allowed
+description: Create string using both unicode and ascii chars
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -34,4 +32,3 @@ if (str__ !== "ABCABC"){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A11.js b/test/suite/ch08/8.4/S8.4_A11.js
index 8293382ec..f7f441bdf 100644
--- a/test/suite/ch08/8.4/S8.4_A11.js
+++ b/test/suite/ch08/8.4/S8.4_A11.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Presence of reserved words in string literal are allowed
- *
- * @path ch08/8.4/S8.4_A11.js
- * @description Create string variable, thet include all reserved words
- */
+/*---
+info: Presence of reserved words in string literal are allowed
+description: Create string variable, thet include all reserved words
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var __delete=" break else new var case finally return void catch for switch while continue function this with default if throw delete in try do instanceof typeof ";
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A12.js b/test/suite/ch08/8.4/S8.4_A12.js
index 6073e08a3..0166f5110 100644
--- a/test/suite/ch08/8.4/S8.4_A12.js
+++ b/test/suite/ch08/8.4/S8.4_A12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assignment to string literal calls String constructor
- *
- * @path ch08/8.4/S8.4_A12.js
- * @description Check constructor of simple assigned variable
- */
+/*---
+info: Assignment to string literal calls String constructor
+description: Check constructor of simple assigned variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (str.constructor !== String){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A13_T1.js b/test/suite/ch08/8.4/S8.4_A13_T1.js
index cefef0d81..62a0147d7 100644
--- a/test/suite/ch08/8.4/S8.4_A13_T1.js
+++ b/test/suite/ch08/8.4/S8.4_A13_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed single-quote program failes
- *
- * @path ch08/8.4/S8.4_A13_T1.js
- * @description Try to create variable using 3 single-quote
- * @negative
- */
+/*---
+info: When appears not closed single-quote program failes
+description: Try to create variable using 3 single-quote
+flags: [negative]
+---*/
 
 var str = ''';
-
diff --git a/test/suite/ch08/8.4/S8.4_A13_T2.js b/test/suite/ch08/8.4/S8.4_A13_T2.js
index 085b17a3d..d91fd3408 100644
--- a/test/suite/ch08/8.4/S8.4_A13_T2.js
+++ b/test/suite/ch08/8.4/S8.4_A13_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed single-quote program failes
- *
- * @path ch08/8.4/S8.4_A13_T2.js
- * @description Try to create variable using 1 single-quote
- * @negative
- */
+/*---
+info: When appears not closed single-quote program failes
+description: Try to create variable using 1 single-quote
+flags: [negative]
+---*/
 
 var str = ';
-
diff --git a/test/suite/ch08/8.4/S8.4_A13_T3.js b/test/suite/ch08/8.4/S8.4_A13_T3.js
index c777d754a..a592d7cbe 100644
--- a/test/suite/ch08/8.4/S8.4_A13_T3.js
+++ b/test/suite/ch08/8.4/S8.4_A13_T3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed single-quote program failes
- *
- * @path ch08/8.4/S8.4_A13_T3.js
- * @description Try to create variable using 4 single-quote
- * @negative
- */
+/*---
+info: When appears not closed single-quote program failes
+description: Try to create variable using 4 single-quote
+flags: [negative]
+---*/
 
 var str = '''';
-
diff --git a/test/suite/ch08/8.4/S8.4_A14_T1.js b/test/suite/ch08/8.4/S8.4_A14_T1.js
index 309704fef..5ebdd3f1f 100644
--- a/test/suite/ch08/8.4/S8.4_A14_T1.js
+++ b/test/suite/ch08/8.4/S8.4_A14_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed double-quote program failes
- *
- * @path ch08/8.4/S8.4_A14_T1.js
- * @description Try to create variable using 1 double-quote
- * @negative
- */
+/*---
+info: When appears not closed double-quote program failes
+description: Try to create variable using 1 double-quote
+flags: [negative]
+---*/
 
 var str = ";
-
diff --git a/test/suite/ch08/8.4/S8.4_A14_T2.js b/test/suite/ch08/8.4/S8.4_A14_T2.js
index ee16cbd73..978618a2a 100644
--- a/test/suite/ch08/8.4/S8.4_A14_T2.js
+++ b/test/suite/ch08/8.4/S8.4_A14_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed double-quote program failes
- *
- * @path ch08/8.4/S8.4_A14_T2.js
- * @description Try to create variable using 3 double-quote
- * @negative
- */
+/*---
+info: When appears not closed double-quote program failes
+description: Try to create variable using 3 double-quote
+flags: [negative]
+---*/
 
 var str = """;
-
diff --git a/test/suite/ch08/8.4/S8.4_A14_T3.js b/test/suite/ch08/8.4/S8.4_A14_T3.js
index 85a5ba9bc..e40f0fc6a 100644
--- a/test/suite/ch08/8.4/S8.4_A14_T3.js
+++ b/test/suite/ch08/8.4/S8.4_A14_T3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When appears not closed double-quote program failes
- *
- * @path ch08/8.4/S8.4_A14_T3.js
- * @description Try to create variable using 4 double-quote
- * @negative
- */
+/*---
+info: When appears not closed double-quote program failes
+description: Try to create variable using 4 double-quote
+flags: [negative]
+---*/
 
 var str = """";
-
diff --git a/test/suite/ch08/8.4/S8.4_A2.js b/test/suite/ch08/8.4/S8.4_A2.js
index f18e343a9..0983c4c0e 100644
--- a/test/suite/ch08/8.4/S8.4_A2.js
+++ b/test/suite/ch08/8.4/S8.4_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Empty string has type string
- *
- * @path ch08/8.4/S8.4_A2.js
- * @description Create empty string and check it type
- */
+/*---
+info: Empty string has type string
+description: Create empty string and check it type
+---*/
 
 /////////////////////////////////////////////////////////
 // CHECK#1
@@ -25,4 +23,3 @@ if (typeof(str) !== "string"){
 }
 //
 ////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A3.js b/test/suite/ch08/8.4/S8.4_A3.js
index 8b3e18034..f00a7b7a4 100644
--- a/test/suite/ch08/8.4/S8.4_A3.js
+++ b/test/suite/ch08/8.4/S8.4_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String type has a length property
- *
- * @path ch08/8.4/S8.4_A3.js
- * @description Try read length property of string variable
- */
+/*---
+info: String type has a length property
+description: Try read length property of string variable
+---*/
 
 var __str = "ABCDEFGH";
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (__str.length !== 8) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A4.js b/test/suite/ch08/8.4/S8.4_A4.js
index a89314fdb..5ee41d3b2 100644
--- a/test/suite/ch08/8.4/S8.4_A4.js
+++ b/test/suite/ch08/8.4/S8.4_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Empty string variable has a length property
- *
- * @path ch08/8.4/S8.4_A4.js
- * @description Try read length property of empty string variable
- */
+/*---
+info: Empty string variable has a length property
+description: Try read length property of empty string variable
+---*/
 
 var __str = "";
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (__str.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A5.js b/test/suite/ch08/8.4/S8.4_A5.js
index 178891c3b..7e68da34b 100644
--- a/test/suite/ch08/8.4/S8.4_A5.js
+++ b/test/suite/ch08/8.4/S8.4_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Zero "\0" not terminates the string(C string)
- *
- * @path ch08/8.4/S8.4_A5.js
- * @description Insert "\0" into string
- */
+/*---
+info: Zero "\0" not terminates the string(C string)
+description: Insert "\0" into string
+---*/
 
 // CHECK#1
 if ("x\0y" === "x") {
@@ -17,4 +15,3 @@ if ("x\0y" === "x") {
 if (!(("x\0a" < "x\0b") && ("x\0b" < "x\0c"))) {
   $ERROR('#2: (("x\\0a" < "x\\0b") && ("x\\0b" < "x\\0c")) === true');
 }
-
diff --git a/test/suite/ch08/8.4/S8.4_A6.1.js b/test/suite/ch08/8.4/S8.4_A6.1.js
index 29a8691e1..8c6a640b0 100644
--- a/test/suite/ch08/8.4/S8.4_A6.1.js
+++ b/test/suite/ch08/8.4/S8.4_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Large string 4096 bytes
- *
- * @path ch08/8.4/S8.4_A6.1.js
- * @description Assign variable by large string
- */
+/*---
+info: Large string 4096 bytes
+description: Assign variable by large string
+---*/
 
 ////////////////////////////////////////////////////
 // Check#1
@@ -16,4 +14,3 @@ if(largeStr !== 'Standard ECMA-2623r d Edition - December 1999S t a n d a r d i
 }
 //
 ////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A6.2.js b/test/suite/ch08/8.4/S8.4_A6.2.js
index 5794b030d..d27251d92 100644
--- a/test/suite/ch08/8.4/S8.4_A6.2.js
+++ b/test/suite/ch08/8.4/S8.4_A6.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Large string 8192 bytes
- *
- * @path ch08/8.4/S8.4_A6.2.js
- * @description Assign variable by large string
- */
+/*---
+info: Large string 8192 bytes
+description: Assign variable by large string
+---*/
 
 ////////////////////////////////////////////////////
 // Check#2
@@ -16,4 +14,3 @@ if(largeStr !== 'Standard ECMA-2623r d Edition - December 1999S t a n d a r d i
 }
 //
 ////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A7.1.js b/test/suite/ch08/8.4/S8.4_A7.1.js
index 137cf30bf..605a21205 100644
--- a/test/suite/ch08/8.4/S8.4_A7.1.js
+++ b/test/suite/ch08/8.4/S8.4_A7.1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * <LF> between chunks of one string not allowed
- *
- * @path ch08/8.4/S8.4_A7.1.js
- * @description Insert <LF> between chunks of one string
- * @negative
- */
+/*---
+info: <LF> between chunks of one string not allowed
+description: Insert <LF> between chunks of one string
+flags: [negative]
+---*/
 
 eval("var x = asdf\u000Aghjk");
-
diff --git a/test/suite/ch08/8.4/S8.4_A7.2.js b/test/suite/ch08/8.4/S8.4_A7.2.js
index bd2cfd25f..754eceb8b 100644
--- a/test/suite/ch08/8.4/S8.4_A7.2.js
+++ b/test/suite/ch08/8.4/S8.4_A7.2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * <CR> between chunks of one string not allowed
- *
- * @path ch08/8.4/S8.4_A7.2.js
- * @description Insert <CR> between chunks of one string
- * @negative
- */
+/*---
+info: <CR> between chunks of one string not allowed
+description: Insert <CR> between chunks of one string
+flags: [negative]
+---*/
 
 eval("var x = asdf\u000Dghjk");
-
diff --git a/test/suite/ch08/8.4/S8.4_A7.3.js b/test/suite/ch08/8.4/S8.4_A7.3.js
index 37ee22cae..16ac716c7 100644
--- a/test/suite/ch08/8.4/S8.4_A7.3.js
+++ b/test/suite/ch08/8.4/S8.4_A7.3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * <PS> between chunks of one string not allowed
- *
- * @path ch08/8.4/S8.4_A7.3.js
- * @description Insert <PS> between chunks of one string
- * @negative
- */
+/*---
+info: <PS> between chunks of one string not allowed
+description: Insert <PS> between chunks of one string
+flags: [negative]
+---*/
 
 eval("var x = asdf\u2028ghjk");
-
diff --git a/test/suite/ch08/8.4/S8.4_A7.4.js b/test/suite/ch08/8.4/S8.4_A7.4.js
index 7c8373c54..011ad60a5 100644
--- a/test/suite/ch08/8.4/S8.4_A7.4.js
+++ b/test/suite/ch08/8.4/S8.4_A7.4.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * <LS> between chunks of one string not allowed
- *
- * @path ch08/8.4/S8.4_A7.4.js
- * @description Insert <LS> between chunks of one string
- * @negative
- */
+/*---
+info: <LS> between chunks of one string not allowed
+description: Insert <LS> between chunks of one string
+flags: [negative]
+---*/
 
 eval("var x = asdf\u2029ghjk");
-
diff --git a/test/suite/ch08/8.4/S8.4_A8.js b/test/suite/ch08/8.4/S8.4_A8.js
index 89872cd4c..b5718921b 100644
--- a/test/suite/ch08/8.4/S8.4_A8.js
+++ b/test/suite/ch08/8.4/S8.4_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Empty string, 0, false are all equal (==) to each other, since they all evaluate to 0
- *
- * @path ch08/8.4/S8.4_A8.js
- * @description Compare empty string with undefined, null, 0 and false
- */
+/*---
+info: >
+    Empty string, 0, false are all equal (==) to each other, since they all
+    evaluate to 0
+description: Compare empty string with undefined, null, 0 and false
+---*/
 
 var str='';
 
@@ -41,4 +41,3 @@ if (str != false){
 }
 //
 /////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A9_T1.js b/test/suite/ch08/8.4/S8.4_A9_T1.js
index 736648079..725af3df4 100644
--- a/test/suite/ch08/8.4/S8.4_A9_T1.js
+++ b/test/suite/ch08/8.4/S8.4_A9_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assignment to string literals calls String constructor
- *
- * @path ch08/8.4/S8.4_A9_T1.js
- * @description Simple string variable compare with object String
- */
+/*---
+info: Assignment to string literals calls String constructor
+description: Simple string variable compare with object String
+---*/
 
 var str='ABC';
 var strObj=new String('ABC');
@@ -34,4 +32,3 @@ if (str === strObj){
 }
 //
 /////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A9_T2.js b/test/suite/ch08/8.4/S8.4_A9_T2.js
index a32f5b146..610704c61 100644
--- a/test/suite/ch08/8.4/S8.4_A9_T2.js
+++ b/test/suite/ch08/8.4/S8.4_A9_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assignment to string literals calls String constructor
- *
- * @path ch08/8.4/S8.4_A9_T2.js
- * @description Compare empty string variable, object String('') and object String()
- */
+/*---
+info: Assignment to string literals calls String constructor
+description: >
+    Compare empty string variable, object String('') and object
+    String()
+---*/
 
 var str="";
 var strObj=new String("");
@@ -59,4 +59,3 @@ if (str === strObj_){
 }
 //
 /////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.4/S8.4_A9_T3.js b/test/suite/ch08/8.4/S8.4_A9_T3.js
index 300883957..1013aac5f 100644
--- a/test/suite/ch08/8.4/S8.4_A9_T3.js
+++ b/test/suite/ch08/8.4/S8.4_A9_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assignment to string literals calls String constructor
- *
- * @path ch08/8.4/S8.4_A9_T3.js
- * @description Simple empty string variable compare with empty object String
- */
+/*---
+info: Assignment to string literals calls String constructor
+description: Simple empty string variable compare with empty object String
+---*/
 
 var str="";
 var strObj=new String;
@@ -42,5 +40,3 @@ if (typeof str == typeof strObj){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.5/8.5.1.js b/test/suite/ch08/8.5/8.5.1.js
index 076eebfba..d51bf45df 100644
--- a/test/suite/ch08/8.5/8.5.1.js
+++ b/test/suite/ch08/8.5/8.5.1.js
@@ -1,12 +1,12 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch08/8.5/8.5.1.js
- * @description Valid Number ranges
- */
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Valid Number ranges
+---*/
 
 // Check range support for Number values (IEEE 754 64-bit floats having the form s*m*2**e)
 //
diff --git a/test/suite/ch08/8.5/S8.5_A1.js b/test/suite/ch08/8.5/S8.5_A1.js
index 23a14a325..85a614d19 100644
--- a/test/suite/ch08/8.5/S8.5_A1.js
+++ b/test/suite/ch08/8.5/S8.5_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NaN !== NaN
- *
- * @path ch08/8.5/S8.5_A1.js
- * @description Compare NaN with NaN
- */
+/*---
+info: NaN !== NaN
+description: Compare NaN with NaN
+---*/
 
 var x = Number.NaN;
 var x_ = Number.NaN;
@@ -18,4 +16,3 @@ if (x === x_){
 }
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A10.js b/test/suite/ch08/8.5/S8.5_A10.js
index 436c920c5..5069a0f8c 100644
--- a/test/suite/ch08/8.5/S8.5_A10.js
+++ b/test/suite/ch08/8.5/S8.5_A10.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Infinity is not a keyword
- *
- * @path ch08/8.5/S8.5_A10.js
- * @description Create variable entitled Infinity
- */
+/*---
+info: Infinity is not a keyword
+description: Create variable entitled Infinity
+---*/
 
 var Infinity=1.0;
 Infinity='asdf';
 Infinity=true;
-
diff --git a/test/suite/ch08/8.5/S8.5_A11_T1.js b/test/suite/ch08/8.5/S8.5_A11_T1.js
index e298d32ea..e3b391b19 100644
--- a/test/suite/ch08/8.5/S8.5_A11_T1.js
+++ b/test/suite/ch08/8.5/S8.5_A11_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The integer 0 has two representations, +0 and -0
- *
- * @path ch08/8.5/S8.5_A11_T1.js
- * @description Check 1.0/p_zero !== 1.0/n_zero
- */
+/*---
+info: The integer 0 has two representations, +0 and -0
+description: Check 1.0/p_zero !== 1.0/n_zero
+---*/
 
 var p_zero=+0;
 var n_zero=-0;
@@ -14,4 +12,3 @@ var n_zero=-0;
 if (1.0/p_zero === 1.0/n_zero){
   $ERROR('#1: var p_zero=+0; var n_zero=-0; 1.0/p_zero !== 1.0/n_zero');
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A11_T2.js b/test/suite/ch08/8.5/S8.5_A11_T2.js
index 122c345ed..896e1d688 100644
--- a/test/suite/ch08/8.5/S8.5_A11_T2.js
+++ b/test/suite/ch08/8.5/S8.5_A11_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The integer 0 has two representations, +0 and -0
- *
- * @path ch08/8.5/S8.5_A11_T2.js
- * @description Compare positive_zero and negative_zero
- */
+/*---
+info: The integer 0 has two representations, +0 and -0
+description: Compare positive_zero and negative_zero
+---*/
 
 var p_zero=+0;
 var n_zero=-0;
@@ -35,4 +33,3 @@ if ((p_zero === 0) !== true){
 if ((n_zero === -0) !== true){
   $ERROR('#5: var p_zero=+0; var n_zero=-0; n_zero === -0');
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A12.1.js b/test/suite/ch08/8.5/S8.5_A12.1.js
index 846aab24d..52a4aaa13 100644
--- a/test/suite/ch08/8.5/S8.5_A12.1.js
+++ b/test/suite/ch08/8.5/S8.5_A12.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * +Infinity and Infinity are the same as Number.POSITIVE_INFINITY
- *
- * @path ch08/8.5/S8.5_A12.1.js
- * @description Compare Infinity and +Infinity with Number.POSITIVE_INFINITY
- */
+/*---
+info: +Infinity and Infinity are the same as Number.POSITIVE_INFINITY
+description: Compare Infinity and +Infinity with Number.POSITIVE_INFINITY
+---*/
 
 var p_inf=+Infinity;
 var inf=Infinity;
@@ -20,4 +18,3 @@ if (p_inf!==Number.POSITIVE_INFINITY){
 if (inf!==Number.POSITIVE_INFINITY){
   $ERROR('#2: Infinity is the same as Number.POSITIVE_INFINITY');
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A12.2.js b/test/suite/ch08/8.5/S8.5_A12.2.js
index e1397ed1d..1914f0fb4 100644
--- a/test/suite/ch08/8.5/S8.5_A12.2.js
+++ b/test/suite/ch08/8.5/S8.5_A12.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * -Infinity is the same as Number.NEGATIVE_INFINITY
- *
- * @path ch08/8.5/S8.5_A12.2.js
- * @description Compare -Infinity with Number.NEGATIVE_INFINITY
- */
+/*---
+info: -Infinity is the same as Number.NEGATIVE_INFINITY
+description: Compare -Infinity with Number.NEGATIVE_INFINITY
+---*/
 
 var n_inf=-Infinity;
 
@@ -14,4 +12,3 @@ var n_inf=-Infinity;
 if (n_inf !== Number.NEGATIVE_INFINITY){
   $ERROR('#1: -Infinity is the same as Number.NEGATIVE_INFINITY');
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A13_T2.js b/test/suite/ch08/8.5/S8.5_A13_T2.js
index ef7e2a5ca..9293aab80 100644
--- a/test/suite/ch08/8.5/S8.5_A13_T2.js
+++ b/test/suite/ch08/8.5/S8.5_A13_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Finite nonzero values  that are Normalised having the form s*m*2**e
- *  where s is +1 or -1, m is a positive integer less than 2**53 but not
- *  less than s**52 and e is an integer ranging from -1074 to 971
- *
- * @path ch08/8.5/S8.5_A13_T2.js
- * @description Finite Non zero values where e is 971
- */
+/*---
+info: >
+    Finite nonzero values  that are Normalised having the form s*m*2**e
+    where s is +1 or -1, m is a positive integer less than 2**53 but not
+    less than s**52 and e is an integer ranging from -1074 to 971
+description: Finite Non zero values where e is 971
+---*/
 
 //CHECK #1 
 if ((1*(Math.pow(2,52))*(Math.pow(2,971))) !== 8.98846567431158e+307){
@@ -24,4 +23,3 @@ if ((1*((Math.pow(2,53))-1)*(Math.pow(2,971))) !== 1.7976931348623157e+308){
 if ((-1*(Math.pow(2,52))*(Math.pow(2,971))) !== -8.98846567431158e+307){
   $ERROR('#3: (-1*(Math.pow(2,52))*(Math.pow(2,971))) === -8.98846567431158e+307. Actual: ' + ((-1*(Math.pow(2,52))*(Math.pow(2,971)))));
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A14_T1.js b/test/suite/ch08/8.5/S8.5_A14_T1.js
index 0b5e87b3e..591da225a 100644
--- a/test/suite/ch08/8.5/S8.5_A14_T1.js
+++ b/test/suite/ch08/8.5/S8.5_A14_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When number absolute value is bigger of 2**1024 should convert to Infinity
- *
- * @path ch08/8.5/S8.5_A14_T1.js
- * @description Create number bigger of 2**1024
- */
+/*---
+info: When number absolute value is bigger of 2**1024 should convert to Infinity
+description: Create number bigger of 2**1024
+---*/
 
 //CHECK #1 
 if (1e+308*2 !== Infinity){
@@ -17,4 +15,3 @@ if (1e+308*2 !== Infinity){
 if ((1*(Math.pow(2,53))*(Math.pow(2,971))) !== Infinity){
   $ERROR('#2: (1*(Math.pow(2,53))*(Math.pow(2,971))) === Infinity. Actual: ' + ((1*(Math.pow(2,53))*(Math.pow(2,971)))));
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A14_T2.js b/test/suite/ch08/8.5/S8.5_A14_T2.js
index 37dc8cd5f..aff85f902 100644
--- a/test/suite/ch08/8.5/S8.5_A14_T2.js
+++ b/test/suite/ch08/8.5/S8.5_A14_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When number absolute value is bigger of 2**1024 should convert to Infinity
- *
- * @path ch08/8.5/S8.5_A14_T2.js
- * @description Create number smaller of -2**1024
- */
+/*---
+info: When number absolute value is bigger of 2**1024 should convert to Infinity
+description: Create number smaller of -2**1024
+---*/
 
 //CHECK #1 
 if (-1e+308*3 !== -Infinity){
@@ -17,4 +15,3 @@ if (-1e+308*3 !== -Infinity){
 if ((-1*(Math.pow(2,53))*(Math.pow(2,971))) !== -Infinity){
   $ERROR('#2: (-1*(Math.pow(2,53))*(Math.pow(2,971))) === Infinity. Actual: ' + ((-1*(Math.pow(2,53))*(Math.pow(2,971)))));
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A2.1.js b/test/suite/ch08/8.5/S8.5_A2.1.js
index 0baca20f9..96fea6eb4 100644
--- a/test/suite/ch08/8.5/S8.5_A2.1.js
+++ b/test/suite/ch08/8.5/S8.5_A2.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number type represented as the double precision 64-bit format IEEE 754
- *
- * @path ch08/8.5/S8.5_A2.1.js
- * @description Use 2^53 + 2 number and do some operation with it
- */
+/*---
+info: Number type represented as the double precision 64-bit format IEEE 754
+description: Use 2^53 + 2 number and do some operation with it
+---*/
 
 var x = 9007199254740994.0; /* 2^53 + 2 */
 var y = 1.0 - 1/65536.0;
@@ -16,4 +14,3 @@ var d = z - x;
 if (d !== 0){
   $ERROR('#1: var x = 9007199254740994.0; var y = 1.0 - 1/65536.0; var z = x + y; var d = z - x; d === 0. Actual: ' + (d));
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A2.2.js b/test/suite/ch08/8.5/S8.5_A2.2.js
index eec062201..e395d86bb 100644
--- a/test/suite/ch08/8.5/S8.5_A2.2.js
+++ b/test/suite/ch08/8.5/S8.5_A2.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number type represented as the extended precision 64-bit format IEEE 754
- *
- * @path ch08/8.5/S8.5_A2.2.js
- * @description Use 2^53 + 2 number and do some operation with it
- */
+/*---
+info: Number type represented as the extended precision 64-bit format IEEE 754
+description: Use 2^53 + 2 number and do some operation with it
+---*/
 
 var x = 9007199254740994.0; /* 2^53 + 2 */
 var y = 1.0 - 1/65536.0;
@@ -16,4 +14,3 @@ var d = z - x;
 if (d === 2){
   $ERROR('#1: var x = 9007199254740994.0; var y = 1.0 - 1/65536.0; var z = x + y; var d = z - x; d !== 2');
 }
-
diff --git a/test/suite/ch08/8.5/S8.5_A3.js b/test/suite/ch08/8.5/S8.5_A3.js
index 89f1299a6..1df05247d 100644
--- a/test/suite/ch08/8.5/S8.5_A3.js
+++ b/test/suite/ch08/8.5/S8.5_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NaN expression has a type Number
- *
- * @path ch08/8.5/S8.5_A3.js
- * @description Check type of NaN
- */
+/*---
+info: NaN expression has a type Number
+description: Check type of NaN
+---*/
 
 var x=NaN;
 
@@ -25,4 +23,3 @@ if (typeof(NaN) !== "number"){
 }
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A4.js b/test/suite/ch08/8.5/S8.5_A4.js
index b54f8dbef..cb115e5be 100644
--- a/test/suite/ch08/8.5/S8.5_A4.js
+++ b/test/suite/ch08/8.5/S8.5_A4.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NaN is not a keyword
- *
- * @path ch08/8.5/S8.5_A4.js
- * @description Create variable entitled NaN
- */
+/*---
+info: NaN is not a keyword
+description: Create variable entitled NaN
+---*/
 
 var NaN=1.0;
 NaN='asdf';
 NaN=true;
 NaN=Number.NaN;
-
diff --git a/test/suite/ch08/8.5/S8.5_A5.js b/test/suite/ch08/8.5/S8.5_A5.js
index 6587609c2..dccf7e033 100644
--- a/test/suite/ch08/8.5/S8.5_A5.js
+++ b/test/suite/ch08/8.5/S8.5_A5.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * NaN not greater or equal zero
- *
- * @path ch08/8.5/S8.5_A5.js
- * @description Compare NaN with zero
- */
+/*---
+info: NaN not greater or equal zero
+description: Compare NaN with zero
+includes: [$PRINT.js]
+---*/
 
 var x = NaN;
 var x_geq_0=(x >= 0.0);
@@ -54,4 +53,3 @@ if (x_geq_0_ADD_leq_0){
 }
 //
 ///////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A6.js b/test/suite/ch08/8.5/S8.5_A6.js
index e621f7563..8d5ead660 100644
--- a/test/suite/ch08/8.5/S8.5_A6.js
+++ b/test/suite/ch08/8.5/S8.5_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * -Infinity expression has a type Number
- *
- * @path ch08/8.5/S8.5_A6.js
- * @description Check type of -Infinity
- */
+/*---
+info: -Infinity expression has a type Number
+description: Check type of -Infinity
+---*/
 
 var x=-Infinity;
 
@@ -25,4 +23,3 @@ if (typeof(-Infinity) !== "number"){
 }
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A7.js b/test/suite/ch08/8.5/S8.5_A7.js
index 0f17e85f0..d3c2a4f71 100644
--- a/test/suite/ch08/8.5/S8.5_A7.js
+++ b/test/suite/ch08/8.5/S8.5_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * +Infinity expression has a type Number
- *
- * @path ch08/8.5/S8.5_A7.js
- * @description Check type of +Infinity
- */
+/*---
+info: +Infinity expression has a type Number
+description: Check type of +Infinity
+---*/
 
 var x=+Infinity;
 
@@ -25,4 +23,3 @@ if (typeof(+Infinity) !== "number"){
 }
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A8.js b/test/suite/ch08/8.5/S8.5_A8.js
index 95c87824b..d5c16c4e4 100644
--- a/test/suite/ch08/8.5/S8.5_A8.js
+++ b/test/suite/ch08/8.5/S8.5_A8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Infinity is the same as +Infinity
- *
- * @path ch08/8.5/S8.5_A8.js
- * @description Compare Infinity and +Infinity
- */
+/*---
+info: Infinity is the same as +Infinity
+description: Compare Infinity and +Infinity
+---*/
 
 var p_inf=+Infinity;
 var inf=Infinity;
@@ -18,4 +16,3 @@ if (p_inf!==inf){
 }
 //
 //////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.5/S8.5_A9.js b/test/suite/ch08/8.5/S8.5_A9.js
index ff783d50f..92fe91f48 100644
--- a/test/suite/ch08/8.5/S8.5_A9.js
+++ b/test/suite/ch08/8.5/S8.5_A9.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Globally defined variable NaN has not been altered by program execution
- *
- * @path ch08/8.5/S8.5_A9.js
- * @description Try alter globally defined variable NaN
- * @noStrict
- */
+/*---
+info: Globally defined variable NaN has not been altered by program execution
+description: Try alter globally defined variable NaN
+flags: [noStrict]
+---*/
 
 Number.NaN = 1;
 
 if (Number.NaN === 1) {
   $ERROR('#1: Globally defined variable NaN has not been altered by program execution');
 }
-
diff --git a/test/suite/ch08/8.6/8.6.1/S8.6.1_A1.js b/test/suite/ch08/8.6/8.6.1/S8.6.1_A1.js
index df5609b38..b7dbc5c39 100644
--- a/test/suite/ch08/8.6/8.6.1/S8.6.1_A1.js
+++ b/test/suite/ch08/8.6/8.6.1/S8.6.1_A1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property can have attribute ReadOnly like E in Math
- *
- * @path ch08/8.6/8.6.1/S8.6.1_A1.js
- * @description Try change Math.E property
- * @noStrict
- */
+/*---
+info: A property can have attribute ReadOnly like E in Math
+description: Try change Math.E property
+flags: [noStrict]
+---*/
 
 var __e = Math.E;
 Math.E=1;
 if (Math.E !==__e){
   $ERROR('#1: __e = Math.E; Math.E=1; Math.E ===__e');
 }
-
diff --git a/test/suite/ch08/8.6/8.6.1/S8.6.1_A2.js b/test/suite/ch08/8.6/8.6.1/S8.6.1_A2.js
index c8fe932c5..d7ed69568 100644
--- a/test/suite/ch08/8.6/8.6.1/S8.6.1_A2.js
+++ b/test/suite/ch08/8.6/8.6.1/S8.6.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property can have attribute DontEnum like all properties of Number
- *
- * @path ch08/8.6/8.6.1/S8.6.1_A2.js
- * @description Try to enumerate properties of Number
- */
+/*---
+info: A property can have attribute DontEnum like all properties of Number
+description: Try to enumerate properties of Number
+---*/
 
 //CHECK#1
 var count=0;
@@ -14,4 +12,3 @@ for (p in Number) count++;
 if (count > 0){
   $ERROR('#1: count=0; for (p in Number) count++; count > 0. Actual: ' + (count));
 }
-
diff --git a/test/suite/ch08/8.6/8.6.1/S8.6.1_A3.js b/test/suite/ch08/8.6/8.6.1/S8.6.1_A3.js
index 099dc46c9..4657b42ef 100644
--- a/test/suite/ch08/8.6/8.6.1/S8.6.1_A3.js
+++ b/test/suite/ch08/8.6/8.6.1/S8.6.1_A3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property can have attribute DontDelete like NaN propertie of Number object
- *
- * @path ch08/8.6/8.6.1/S8.6.1_A3.js
- * @description Try to delete Number.NaN
- * @noStrict
- */
+/*---
+info: >
+    A property can have attribute DontDelete like NaN propertie of Number
+    object
+description: Try to delete Number.NaN
+flags: [noStrict]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -24,4 +24,3 @@ if (typeof(Number.NaN) === "undefined"){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js
index 371d16848..3f69b007c 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Native ECMAScript objects have an internal property called [[Prototype]]. The value of this property is
- * either null or an object and is used for implementing inheritance
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A1.js
- * @description Check [[Prototype]] property of object
- */
+/*---
+info: >
+    Native ECMAScript objects have an internal property called [[Prototype]]. The value of this property is
+    either null or an object and is used for implementing inheritance
+description: Check [[Prototype]] property of object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -70,4 +69,3 @@ if (!protoObj.isPrototypeOf(__foo)){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js
index 5d4ccbd3e..073388613 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Properties of the [[Prototype]] object
- * are visible as properties of the child object for the purposes of get access, but not for put access
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A2.js
- * @description Check visibility properties of the child object for the purposes of get access, but not for put access
- */
+/*---
+info: >
+    Properties of the [[Prototype]] object
+    are visible as properties of the child object for the purposes of get access, but not for put access
+description: >
+    Check visibility properties of the child object for the purposes
+    of get access, but not for put access
+---*/
 
 //Establish foo object
 function FooObj(){};
@@ -34,4 +35,3 @@ if (foo__.prop !== "some"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js
index 506471148..e41a47ea4 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The specification does not provide any means for a program to access [[class]] value except through Object.prototype.toString
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A3.js
- * @description Get [[class]] value except through Object.prototype.toString
- */
+/*---
+info: >
+    The specification does not provide any means for a program to access
+    [[class]] value except through Object.prototype.toString
+description: Get [[class]] value except through Object.prototype.toString
+---*/
 
 var __obj={};
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +16,3 @@ if (__obj.toString() !== "[object " + 'Object' + "]"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js
index f147e6aaa..731e7fd92 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[HasInstance]] returns a boolean value indicating whether Value delegates behaviour to this object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A4.js
- * @description Check that the obj instance of Object, but not instance
- *  of Function, String, Number, Array
- */
+/*---
+info: >
+    [[HasInstance]] returns a boolean value indicating whether Value
+    delegates behaviour to this object
+description: >
+    Check that the obj instance of Object, but not instance  of
+    Function, String, Number, Array
+---*/
 
 var __obj={};
 
@@ -50,4 +51,3 @@ if (__obj instanceof Array) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js
index 47fa0ef6f..a5a32e273 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T1.js
- * @description Call function-property of object, property defined
- *  as testScreen = {touch:function(){count++}}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of object, property defined  as testScreen
+    = {touch:function(){count++}}
+---*/
 
 this.count=0;
 
@@ -29,4 +28,3 @@ if (count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js
index 391122473..56b608e26 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T2.js
- * @description Call function-property of object, property defined
- *  as seat['move']=function(){position++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of object, property defined  as
+    seat['move']=function(){position++}
+---*/
 
 this.position=0;
 var seat = {};
@@ -29,4 +28,3 @@ if (position !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js
index bbd603e4c..1aa0c610b 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T3.js
- * @description Call function-property of global object, property defined
- *  as knock=function(){count++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of global object, property defined  as
+    knock=function(){count++}
+---*/
 
 var count=0;
 var knock=function(){count++};
@@ -28,4 +27,3 @@ if (count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js
index 7f38b27a0..23d402995 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T4.js
- * @description Call function-property of global object, property defined
- *  as this['beep']=function(){__count++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of global object, property defined  as
+    this['beep']=function(){__count++}
+---*/
 
 var __count=0;
 
@@ -29,4 +28,3 @@ if (__count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js
index d62d34b47..69c2fa9e2 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Construct]] constructs an object. Invoked via the new operator. Objects that implement this internal method are called constructors
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A6.js
- * @description Create a few Objects via the new operator
- */
+/*---
+info: >
+    [[Construct]] constructs an object. Invoked via the new operator. Objects
+    that implement this internal method are called constructors
+description: Create a few Objects via the new operator
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -25,4 +25,3 @@ if (numInstance.constructor !== Number){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
index 6e996d779..587665131 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
@@ -1,17 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects that implement internal method [[Construct]] are called constructors. Math object is NOT constructor
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A7.js
- * @description Checking if execution of "var objMath=new Math" passes
- * @negative
- */
+/*---
+info: >
+    Objects that implement internal method [[Construct]] are called
+    constructors. Math object is NOT constructor
+description: Checking if execution of "var objMath=new Math" passes
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var objMath=new Math;
 
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
index d57a56132..28f8ae033 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
@@ -1,11 +1,11 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch08/8.6/8.6.2/S8.6.2_A8.js
- * @description It should not be possible to change the [[Prototype]]
- * of a non-extensible object
- */
+/*---
+description: >
+    It should not be possible to change the [[Prototype]]  of a
+    non-extensible object
+---*/
 
 var x = Object.preventExtensions({});
 var y = {};
@@ -19,4 +19,3 @@ try {
 if (Object.getPrototypeOf(x) !== Object.prototype) {
   $ERROR("Prototype of non-extensible object mutated");
 }
-
diff --git a/test/suite/ch08/8.6/S8.6_A2_T1.js b/test/suite/ch08/8.6/S8.6_A2_T1.js
index 4e13df667..2a756ce96 100644
--- a/test/suite/ch08/8.6/S8.6_A2_T1.js
+++ b/test/suite/ch08/8.6/S8.6_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Do not crash with postincrement custom property
- *
- * @path ch08/8.6/S8.6_A2_T1.js
- * @description Try to implement postincrement for custom property
- */
+/*---
+info: Do not crash with postincrement custom property
+description: Try to implement postincrement for custom property
+---*/
 
 var __map={foo:"bar"};
 
@@ -20,4 +18,3 @@ if (!isNaN(__map.foo)) {
 
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/S8.6_A2_T2.js b/test/suite/ch08/8.6/S8.6_A2_T2.js
index b96be42ad..43dc0c60d 100644
--- a/test/suite/ch08/8.6/S8.6_A2_T2.js
+++ b/test/suite/ch08/8.6/S8.6_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Do not crash with postincrement custom property
- *
- * @path ch08/8.6/S8.6_A2_T2.js
- * @description Try to implement postincrement for not declared custom property
- */
+/*---
+info: Do not crash with postincrement custom property
+description: Try to implement postincrement for not declared custom property
+---*/
 
 var __map={};
 
@@ -25,4 +23,3 @@ if (!("foo" in __map)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/S8.6_A3_T1.js b/test/suite/ch08/8.6/S8.6_A3_T1.js
index 431148520..e6f704203 100644
--- a/test/suite/ch08/8.6/S8.6_A3_T1.js
+++ b/test/suite/ch08/8.6/S8.6_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Do not crash with pefixincrement custom property
- *
- * @path ch08/8.6/S8.6_A3_T1.js
- * @description Try to implement pefixincrement for custom property
- */
+/*---
+info: Do not crash with pefixincrement custom property
+description: Try to implement pefixincrement for custom property
+---*/
 
 var __map={foo:'bar'};
 
@@ -20,4 +18,3 @@ if (!isNaN(__map.foo)) {
 
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/S8.6_A3_T2.js b/test/suite/ch08/8.6/S8.6_A3_T2.js
index 08a425a13..e079c33af 100644
--- a/test/suite/ch08/8.6/S8.6_A3_T2.js
+++ b/test/suite/ch08/8.6/S8.6_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Do not crash with pefixincrement custom property
- *
- * @path ch08/8.6/S8.6_A3_T2.js
- * @description Try to implement pefixincrement for not declared custom property
- */
+/*---
+info: Do not crash with pefixincrement custom property
+description: Try to implement pefixincrement for not declared custom property
+---*/
 
 var __map={};
 
@@ -25,4 +23,3 @@ if (!("foo" in __map)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/S8.6_A4_T1.js b/test/suite/ch08/8.6/S8.6_A4_T1.js
index 94424118a..573a4c337 100644
--- a/test/suite/ch08/8.6/S8.6_A4_T1.js
+++ b/test/suite/ch08/8.6/S8.6_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Object is an unordered collection of properties
- *
- * @path ch08/8.6/S8.6_A4_T1.js
- * @description Simple using a few custom properties
- */
+/*---
+info: An Object is an unordered collection of properties
+description: Simple using a few custom properties
+---*/
 
 ///////////////////////////////////////////////////////
 // CHECK#1
@@ -54,4 +52,3 @@ if (count !== 3){
 }
 //
 ////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-1-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-1-s.js
index a7f5f5b2c..f94ec3e43 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-1-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-1-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-1-s.js

- * @description Strict Mode - ReferenceError is thrown if LeftHandSide evaluates to an unresolvable Reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_8_7_2_1 = 11;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if LeftHandSide evaluates
+    to an unresolvable Reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_8_7_2_1 = 11;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-2-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-2-s.js
index abbfbc7fe..65f2fcddd 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-2-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-2-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-2-s.js

- * @description Strict Mode - ReferenceError isn't thrown if LeftHandSide evaluates to a resolvable Reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var b = 11;

-        return b === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if LeftHandSide
+    evaluates to a resolvable Reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var b = 11;
+        return b === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-3-1-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-3-1-s.js
index 7695a3cb8..c3ccf5875 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-3-1-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-3-1-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-3-1-s.js

- * @description eval - a property named 'eval' is permitted

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  var o = { eval: 42};

-  return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: eval - a property named 'eval' is permitted
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  var o = { eval: 42};
+  return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-1gs.js b/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-1gs.js
index 88dc77f61..e9ae69021 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-1gs.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-1gs.js
@@ -1,15 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch08/8.7/8.7.2/8.7.2-3-a-1gs.js

- * @description Strict Mode - ReferenceError is thrown if LeftHandSide evaluate to an unresolvable Reference

- * @onlyStrict

- * @negative .

- */

-

-"use strict";

-b = 11;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if LeftHandSide evaluate to
+    an unresolvable Reference
+negative: .
+flags: [onlyStrict]
+---*/
+
+"use strict";
+b = 11;
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-2gs.js b/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-2gs.js
index 402e7dcfb..336e1da0c 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-2gs.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-3-a-2gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch08/8.7/8.7.2/8.7.2-3-a-2gs.js

- * @description Strict Mode - 'runtime' error is thrown before LeftHandSide evaluates to an unresolvable Reference

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-throw NotEarlyError;

-b = 11;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'runtime' error is thrown before LeftHandSide
+    evaluates to an unresolvable Reference
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+b = 11;
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-3-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-3-s.js
index b61a53046..21a7c5f6c 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-3-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-3-s.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-3-s.js

- * @description Strict Mode - TypeError is thrown if LeftHandSide is a reference to a non-writable data property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_3 = {};

-        Object.defineProperty(_8_7_2_3, "b", {

-            writable: false

-        });

-

-        try {

-            _8_7_2_3.b = 11;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if LeftHandSide is a reference
+    to a non-writable data property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_3 = {};
+        Object.defineProperty(_8_7_2_3, "b", {
+            writable: false
+        });
+
+        try {
+            _8_7_2_3.b = 11;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-4-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-4-s.js
index f8bb3cfc2..f1bdbc500 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-4-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-4-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-4-s.js

- * @description Strict Mode - TypeError is thrown if LeftHandSide is a reference to an accessor property with no setter

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_4 = {};

-        var _8_7_2_4_bValue = 1;

-        Object.defineProperty(_8_7_2_4, "b", {

-            get: function () { return _8_7_2_4_bValue; }

-        });

-

-        try {

-            _8_7_2_4.b = 11;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if LeftHandSide is a reference
+    to an accessor property with no setter
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_4 = {};
+        var _8_7_2_4_bValue = 1;
+        Object.defineProperty(_8_7_2_4, "b", {
+            get: function () { return _8_7_2_4_bValue; }
+        });
+
+        try {
+            _8_7_2_4.b = 11;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-5-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-5-s.js
index ece372934..c61c42878 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-5-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-5-s.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-5-s.js

- * @description Strict Mode - TypeError is thrown if LeftHandSide is a reference to a non-existent property of an non-extensible object

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_5 = {};

-        Object.preventExtensions(_8_7_2_5);

-

-        try {

-            _8_7_2_5.b = 11;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if LeftHandSide is a reference
+    to a non-existent property of an non-extensible object
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_5 = {};
+        Object.preventExtensions(_8_7_2_5);
+
+        try {
+            _8_7_2_5.b = 11;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-6-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-6-s.js
index 298485f94..184ee4b56 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-6-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-6-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-6-s.js

- * @description Strict Mode - TypeError isn't thrown if LeftHandSide is a reference to a writable data property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_6 = {};

-        Object.defineProperty(_8_7_2_6, "b", {

-            writable: true

-        });

-

-        _8_7_2_6.b = 11;

-

-        return _8_7_2_6.b === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError isn't thrown if LeftHandSide is a
+    reference to a writable data property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_6 = {};
+        Object.defineProperty(_8_7_2_6, "b", {
+            writable: true
+        });
+
+        _8_7_2_6.b = 11;
+
+        return _8_7_2_6.b === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-7-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-7-s.js
index bc2f19543..965d5f66a 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-7-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-7-s.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-7-s.js

- * @description Strict Mode - TypeError isn't thrown if LeftHandSide is a reference to an accessor property with setter

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_7 = {};

-        var _8_7_2_7_bValue = 1;

-        Object.defineProperty(_8_7_2_7, "b", {

-            get: function () { return _8_7_2_7_bValue; },

-            set: function (value) { _8_7_2_7_bValue = value; }

-        });

-

-        _8_7_2_7.b = 11;

-        return _8_7_2_7.b === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError isn't thrown if LeftHandSide is a
+    reference to an accessor property with setter
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_7 = {};
+        var _8_7_2_7_bValue = 1;
+        Object.defineProperty(_8_7_2_7, "b", {
+            get: function () { return _8_7_2_7_bValue; },
+            set: function (value) { _8_7_2_7_bValue = value; }
+        });
+
+        _8_7_2_7.b = 11;
+        return _8_7_2_7.b === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/8.7.2/8.7.2-8-s.js b/test/suite/ch08/8.7/8.7.2/8.7.2-8-s.js
index 1e69c3305..224150f61 100644
--- a/test/suite/ch08/8.7/8.7.2/8.7.2-8-s.js
+++ b/test/suite/ch08/8.7/8.7.2/8.7.2-8-s.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch08/8.7/8.7.2/8.7.2-8-s.js

- * @description Strict Mode - TypeError isn't thrown if LeftHandSide is a reference to a property of an extensible object

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _8_7_2_8 = {};

-

-        _8_7_2_8.b = 11;

-

-        return _8_7_2_8.b === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError isn't thrown if LeftHandSide is a
+    reference to a property of an extensible object
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _8_7_2_8 = {};
+
+        _8_7_2_8.b = 11;
+
+        return _8_7_2_8.b === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch08/8.7/S8.7.1_A1.js b/test/suite/ch08/8.7/S8.7.1_A1.js
index 624b2d71f..608fdbcb2 100644
--- a/test/suite/ch08/8.7/S8.7.1_A1.js
+++ b/test/suite/ch08/8.7/S8.7.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Delete operator deletes pure property, so it returns true to be applyed to this.property
- *
- * @path ch08/8.7/S8.7.1_A1.js
- * @description Try to delete this.y, where y is this.y=1
- */
+/*---
+info: >
+    Delete operator deletes pure property, so it returns true to be applyed
+    to this.property
+description: Try to delete this.y, where y is this.y=1
+---*/
 
 this.y = 1;
 //////////////////////////////////////////////////////////////////////////////
@@ -25,4 +25,3 @@ if (this.y !== undefined){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7.1_A2.js b/test/suite/ch08/8.7/S8.7.1_A2.js
index eb9c4caff..3b367b6bc 100644
--- a/test/suite/ch08/8.7/S8.7.1_A2.js
+++ b/test/suite/ch08/8.7/S8.7.1_A2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Delete operator can't delete reference, so it returns false to be applyed to reference
- *
- * @path ch08/8.7/S8.7.1_A2.js
- * @description Try to delete y, where y is var y=1
- * @noStrict
- */
+/*---
+info: >
+    Delete operator can't delete reference, so it returns false to be applyed
+    to reference
+description: Try to delete y, where y is var y=1
+flags: [noStrict]
+---*/
 
 var y = 1;
 
@@ -26,4 +26,3 @@ if (y !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7.2_A1_T1.js b/test/suite/ch08/8.7/S8.7.2_A1_T1.js
index c7908106d..e59dd08e2 100644
--- a/test/suite/ch08/8.7/S8.7.2_A1_T1.js
+++ b/test/suite/ch08/8.7/S8.7.2_A1_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * GetValue(V) mast fail
- *
- * @path ch08/8.7/S8.7.2_A1_T1.js
- * @description Checking if execution of "'litera'=1;" fails
- * @negative
- */
+/*---
+info: GetValue(V) mast fail
+description: Checking if execution of "'litera'=1;" fails
+flags: [negative]
+---*/
 
 'litera'=1;
-
diff --git a/test/suite/ch08/8.7/S8.7.2_A1_T2.js b/test/suite/ch08/8.7/S8.7.2_A1_T2.js
index 97a38cc0b..40f3194e0 100644
--- a/test/suite/ch08/8.7/S8.7.2_A1_T2.js
+++ b/test/suite/ch08/8.7/S8.7.2_A1_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * GetValue(V) mast fail
- *
- * @path ch08/8.7/S8.7.2_A1_T2.js
- * @description Checking if execution of "1=1" fails
- * @negative
- */
+/*---
+info: GetValue(V) mast fail
+description: Checking if execution of "1=1" fails
+flags: [negative]
+---*/
 
 1=1;
-
diff --git a/test/suite/ch08/8.7/S8.7.2_A2.js b/test/suite/ch08/8.7/S8.7.2_A2.js
index 53f3a8d5b..69471e5f3 100644
--- a/test/suite/ch08/8.7/S8.7.2_A2.js
+++ b/test/suite/ch08/8.7/S8.7.2_A2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * x++ calls GetValue then PutValue so after applying postfix increment(actually conrete operator type is unimportant)
- * we must have reference to defined value
- *
- * @path ch08/8.7/S8.7.2_A2.js
- * @description Execute x++, where x is var x
- */
+/*---
+info: >
+    x++ calls GetValue then PutValue so after applying postfix increment(actually conrete operator type is unimportant)
+    we must have reference to defined value
+description: Execute x++, where x is var x
+---*/
 
 var x;
 //////////////////////////////////////////////////////////////////////////////
@@ -25,4 +24,3 @@ if (x === undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7.2_A3.js b/test/suite/ch08/8.7/S8.7.2_A3.js
index 7877e4e2b..315eaa19f 100644
--- a/test/suite/ch08/8.7/S8.7.2_A3.js
+++ b/test/suite/ch08/8.7/S8.7.2_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * this.x++ calls GetValue then PutValue so after applying postfix increment(actually conrete operator type is unimportan)
- * we must have reference to defined value
- *
- * @path ch08/8.7/S8.7.2_A3.js
- * @description Execute this.x++, where this.x is undefined
- */
+/*---
+info: >
+    this.x++ calls GetValue then PutValue so after applying postfix increment(actually conrete operator type is unimportan)
+    we must have reference to defined value
+description: Execute this.x++, where this.x is undefined
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -24,4 +23,3 @@ if (x === undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A1.js b/test/suite/ch08/8.7/S8.7_A1.js
index 7743600bb..a5ce3fa97 100644
--- a/test/suite/ch08/8.7/S8.7_A1.js
+++ b/test/suite/ch08/8.7/S8.7_A1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multiple Variables should Referring to a Single Object
- *
- * @path ch08/8.7/S8.7_A1.js
- * @description Create object and refers to the other object, modify a property in the original object.
- *  We now see that that change is represented in both variables
- */
+/*---
+info: Multiple Variables should Referring to a Single Object
+description: >
+    Create object and refers to the other object, modify a property in
+    the original object.  We now see that that change is represented
+    in both variables
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -27,4 +27,3 @@ if(objRef.oneProperty !== true){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A2.js b/test/suite/ch08/8.7/S8.7_A2.js
index 8e1e1e933..09e9fedfb 100644
--- a/test/suite/ch08/8.7/S8.7_A2.js
+++ b/test/suite/ch08/8.7/S8.7_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Reference to Self-Modifying Object remain the integrity
- *
- * @path ch08/8.7/S8.7_A2.js
- * @description Create a reference to the array, and change original array
- */
+/*---
+info: Reference to Self-Modifying Object remain the integrity
+description: Create a reference to the array, and change original array
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -39,4 +37,3 @@ if( itemsRef[1] !== "duo"){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A3.js b/test/suite/ch08/8.7/S8.7_A3.js
index b7266bee7..0af98c812 100644
--- a/test/suite/ch08/8.7/S8.7_A3.js
+++ b/test/suite/ch08/8.7/S8.7_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing the Reference of an Object While Maintaining Integrity
- *
- * @path ch08/8.7/S8.7_A3.js
- * @description Create a reference to the array, and redefine original array with new array
- */
+/*---
+info: Changing the Reference of an Object While Maintaining Integrity
+description: >
+    Create a reference to the array, and redefine original array with
+    new array
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -26,4 +26,3 @@ if( items == itemsRef ){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A4.js b/test/suite/ch08/8.7/S8.7_A4.js
index f2c7b4562..bc36b9497 100644
--- a/test/suite/ch08/8.7/S8.7_A4.js
+++ b/test/suite/ch08/8.7/S8.7_A4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object Modification Resulting in a New Object for Not a Self-Modified Object leads to loss of integrity
- *
- * @path ch08/8.7/S8.7_A4.js
- * @description Create a reference to the string, and Concatenate some new text onto the string object
- */
+/*---
+info: >
+    Object Modification Resulting in a New Object for Not a Self-Modified
+    Object leads to loss of integrity
+description: >
+    Create a reference to the string, and Concatenate some new text
+    onto the string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -25,4 +27,3 @@ if( item == itemRef ){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A5_T1.js b/test/suite/ch08/8.7/S8.7_A5_T1.js
index 32796bdd3..4a2032c9f 100644
--- a/test/suite/ch08/8.7/S8.7_A5_T1.js
+++ b/test/suite/ch08/8.7/S8.7_A5_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Delete unary operator can't delete object to be referenced
- *
- * @path ch08/8.7/S8.7_A5_T1.js
- * @description Delete referenced object, var __ref = obj
- * @noStrict
- */
+/*---
+info: Delete unary operator can't delete object to be referenced
+description: Delete referenced object, var __ref = obj
+flags: [noStrict]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -51,4 +49,3 @@ if (typeof(obj) !== "object"){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A5_T2.js b/test/suite/ch08/8.7/S8.7_A5_T2.js
index a76b36c19..6fd34c3c2 100644
--- a/test/suite/ch08/8.7/S8.7_A5_T2.js
+++ b/test/suite/ch08/8.7/S8.7_A5_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Delete unary operator can't delete object to be referenced
- *
- * @path ch08/8.7/S8.7_A5_T2.js
- * @description Delete referenced object, __ref = obj
- * @noStrict
- */
+/*---
+info: Delete unary operator can't delete object to be referenced
+description: Delete referenced object, __ref = obj
+flags: [noStrict]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -51,4 +49,3 @@ if (typeof(obj) !== "object"){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.7/S8.7_A6.js b/test/suite/ch08/8.7/S8.7_A6.js
index 40882f1a5..05fd81dd4 100644
--- a/test/suite/ch08/8.7/S8.7_A6.js
+++ b/test/suite/ch08/8.7/S8.7_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Passing arguments by value differs from by reference and do not change values to be passed
- *
- * @path ch08/8.7/S8.7_A6.js
- * @description Adding original variable with referenced one inside function
- */
+/*---
+info: >
+    Passing arguments by value differs from by reference and do not change
+    values to be passed
+description: Adding original variable with referenced one inside function
+---*/
 
 var n = 1;
 var m = n;
@@ -23,5 +23,3 @@ if (m !== 1) {
 
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.7/S8.7_A7.js b/test/suite/ch08/8.7/S8.7_A7.js
index 17e8eb59c..1fb94632b 100644
--- a/test/suite/ch08/8.7/S8.7_A7.js
+++ b/test/suite/ch08/8.7/S8.7_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Passing arguments by reference do change values of reference to be passed
- *
- * @path ch08/8.7/S8.7_A7.js
- * @description Add new property to original variable inside function
- */
+/*---
+info: Passing arguments by reference do change values of reference to be passed
+description: Add new property to original variable inside function
+---*/
 
 var n = {};
 var m = n;
@@ -31,5 +29,3 @@ if (n.age !== 50) {
 
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch08/8.8/S8.8_A2_T1.js b/test/suite/ch08/8.8/S8.8_A2_T1.js
index ed9f8c10d..38c40bf0b 100644
--- a/test/suite/ch08/8.8/S8.8_A2_T1.js
+++ b/test/suite/ch08/8.8/S8.8_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Values of the List type are simply ordered sequences of values
- *
- * @path ch08/8.8/S8.8_A2_T1.js
- * @description Call function __mFunc(1,2,3) with 3 arguments
- */
+/*---
+info: Values of the List type are simply ordered sequences of values
+description: Call function __mFunc(1,2,3) with 3 arguments
+---*/
 
 function __mFunc(){return arguments.length;};
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (__mFunc(1,2,3) !== 3){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.8/S8.8_A2_T2.js b/test/suite/ch08/8.8/S8.8_A2_T2.js
index 4ab032de0..2c467703b 100644
--- a/test/suite/ch08/8.8/S8.8_A2_T2.js
+++ b/test/suite/ch08/8.8/S8.8_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Values of the List type are simply ordered sequences of values
- *
- * @path ch08/8.8/S8.8_A2_T2.js
- * @description Call function __mFunc([,,]) with 1 arguments
- */
+/*---
+info: Values of the List type are simply ordered sequences of values
+description: Call function __mFunc([,,]) with 1 arguments
+---*/
 
 function __mFunc(){return arguments.length;};
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (__mFunc([,,]) !== 1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.8/S8.8_A2_T3.js b/test/suite/ch08/8.8/S8.8_A2_T3.js
index 281c0397c..50347a727 100644
--- a/test/suite/ch08/8.8/S8.8_A2_T3.js
+++ b/test/suite/ch08/8.8/S8.8_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Values of the List type are simply ordered sequences of values
- *
- * @path ch08/8.8/S8.8_A2_T3.js
- * @description Call function, that concatenate all it`s arguments
- */
+/*---
+info: Values of the List type are simply ordered sequences of values
+description: Call function, that concatenate all it`s arguments
+---*/
 
 function __mFunc(){var __accum=""; for (var i = 0; i < arguments.length; ++i){__accum += arguments[i]};return __accum;};
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (__mFunc("A","B","C","D","E","F") !== "ABCDEF"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch09/9.1/S9.1_A1_T1.js b/test/suite/ch09/9.1/S9.1_A1_T1.js
index 662591054..2965d91ef 100644
--- a/test/suite/ch09/9.1/S9.1_A1_T1.js
+++ b/test/suite/ch09/9.1/S9.1_A1_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of primitive conversion from object is a default value for the Object
- *
- * @path ch09/9.1/S9.1_A1_T1.js
- * @description Using operator Number. The operator calls ToPrimitive with hint Number
- */
+/*---
+info: >
+    Result of primitive conversion from object is a default value for the
+    Object
+description: >
+    Using operator Number. The operator calls ToPrimitive with hint
+    Number
+---*/
 
 // CHECK#1
 var object = {valueOf: function() {return "1"}, toString: function() {return 0}};
@@ -19,5 +21,3 @@ var object = {valueOf: function() {return {}}, toString: function() {return "0"}
 if (Number(object) !== 0) {
   $ERROR('#2: var object = {valueOf: function() {return {}}, toString: function() {return "0"}}; Number(object) === 0. Actual: ' + (Number(object)));
 }
-
-
diff --git a/test/suite/ch09/9.1/S9.1_A1_T2.js b/test/suite/ch09/9.1/S9.1_A1_T2.js
index 636591dab..f0951f79d 100644
--- a/test/suite/ch09/9.1/S9.1_A1_T2.js
+++ b/test/suite/ch09/9.1/S9.1_A1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of primitive conversion from object is a default value for the Object
- *
- * @path ch09/9.1/S9.1_A1_T2.js
- * @description Using operator Number. This operator calls ToPrimitive with hint Number
- */
+/*---
+info: >
+    Result of primitive conversion from object is a default value for the
+    Object
+description: >
+    Using operator Number. This operator calls ToPrimitive with hint
+    Number
+---*/
 
 // CHECK#1
 var object = {valueOf: function() {return 0}, toString: function() {return 1}};
@@ -19,5 +21,3 @@ var object = {valueOf: function() {return 0}, toString: function() {return {}}};
 if (String(object) !== "0") {
   $ERROR('#2: var object = {valueOf: function() {return 0}, toString: function() {return {}}}; String(object) === "0". Actual: ' + (String(object)));
 }
-
-
diff --git a/test/suite/ch09/9.1/S9.1_A1_T3.js b/test/suite/ch09/9.1/S9.1_A1_T3.js
index cf418eeef..c5ff0581b 100644
--- a/test/suite/ch09/9.1/S9.1_A1_T3.js
+++ b/test/suite/ch09/9.1/S9.1_A1_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of primitive conversion from object is a default value for the Object
- *
- * @path ch09/9.1/S9.1_A1_T3.js
- * @description Using operator "+". This operator firstly calls ToPrimitive and then calls ToString or ToNumber
- */
+/*---
+info: >
+    Result of primitive conversion from object is a default value for the
+    Object
+description: >
+    Using operator "+". This operator firstly calls ToPrimitive and
+    then calls ToString or ToNumber
+---*/
 
 // CHECK#1
 var object = {valueOf: function() {return 1}, toString: function() {return 0}};
@@ -19,5 +21,3 @@ var object = {valueOf: function() {return "1"}, toString: function() {return 0}}
 if (object + 0 !== "10") {
   $ERROR('#2: var object = {valueOf: function() {return "1"}, toString: function() {return 0}}; object + 0 === "10". Actual: ' + (object + 0));
 }
-
-
diff --git a/test/suite/ch09/9.1/S9.1_A1_T4.js b/test/suite/ch09/9.1/S9.1_A1_T4.js
index 9dcd88f50..dedb26b32 100644
--- a/test/suite/ch09/9.1/S9.1_A1_T4.js
+++ b/test/suite/ch09/9.1/S9.1_A1_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of primitive conversion from object is a default value for the Object
- *
- * @path ch09/9.1/S9.1_A1_T4.js
- * @description Using operator "<". The operator firstly calls ToPrimitive and then calls ToString or ToNumber
- */
+/*---
+info: >
+    Result of primitive conversion from object is a default value for the
+    Object
+description: >
+    Using operator "<". The operator firstly calls ToPrimitive and
+    then calls ToString or ToNumber
+---*/
 
 // CHECK#1
 var object = {valueOf: function() {return -2}, toString: function() {return "-2"}};
@@ -19,5 +21,3 @@ var object = {valueOf: function() {return "-2"}, toString: function() {return -2
 if (object < "-1") {
   $ERROR('#2: var object = {valueOf: function() {return "-2"}, toString: function() {return -2}}; object < "-1"');
 }
-
-
diff --git a/test/suite/ch09/9.2/S9.2_A1_T1.js b/test/suite/ch09/9.2/S9.2_A1_T1.js
index 44bbaae6a..3f3ca80e9 100644
--- a/test/suite/ch09/9.2/S9.2_A1_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from undefined value is false
- *
- * @path ch09/9.2/S9.2_A1_T1.js
- * @description Undefined, void and others are converted to Boolean by explicit transformation
- */
+/*---
+info: Result of boolean conversion from undefined value is false
+description: >
+    Undefined, void and others are converted to Boolean by explicit
+    transformation
+---*/
 
 // CHECK#1
 if (Boolean(undefined) !== false) {
@@ -27,4 +27,3 @@ if (Boolean(eval("var x")) !== false) {
 if (Boolean() !== false) {
   $ERROR('#4: Boolean() === false. Actual: ' + (Boolean()));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A1_T2.js b/test/suite/ch09/9.2/S9.2_A1_T2.js
index 0700b8da6..b407a9004 100644
--- a/test/suite/ch09/9.2/S9.2_A1_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from undefined value is false
- *
- * @path ch09/9.2/S9.2_A1_T2.js
- * @description Undefined, void and others are converted to Boolean by implicit transformation
- */
+/*---
+info: Result of boolean conversion from undefined value is false
+description: >
+    Undefined, void and others are converted to Boolean by implicit
+    transformation
+---*/
 
 // CHECK#1
 if (!(undefined) !== true) {
@@ -22,4 +22,3 @@ if (!(void 0) !== true) {
 if (!(eval("var x")) !== true) {
   $ERROR('#3: !(eval("var x")) === true. Actual: ' + (!(eval("var x"))));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A2_T1.js b/test/suite/ch09/9.2/S9.2_A2_T1.js
index c53da91bf..4c46bd6f1 100644
--- a/test/suite/ch09/9.2/S9.2_A2_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A2_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from null value is false
- *
- * @path ch09/9.2/S9.2_A2_T1.js
- * @description null convert to Boolean by explicit transformation
- */
+/*---
+info: Result of boolean conversion from null value is false
+description: null convert to Boolean by explicit transformation
+---*/
 
 // CHECK#1
 if (Boolean(null) !== false) {
   $ERROR('#1: Boolean(null) === false. Actual: ' + (Boolean(null))); 
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A2_T2.js b/test/suite/ch09/9.2/S9.2_A2_T2.js
index ffd391b90..3ea5a92e6 100644
--- a/test/suite/ch09/9.2/S9.2_A2_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A2_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from null value is false
- *
- * @path ch09/9.2/S9.2_A2_T2.js
- * @description null convert to Boolean by implicit transformation
- */
+/*---
+info: Result of boolean conversion from null value is false
+description: null convert to Boolean by implicit transformation
+---*/
 
 // CHECK#1
 if (!(null) !== true) {
   $ERROR('#1: !(null) === true. Actual: ' + (!(null))); 
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A3_T1.js b/test/suite/ch09/9.2/S9.2_A3_T1.js
index 103f4eab3..696c7fe32 100644
--- a/test/suite/ch09/9.2/S9.2_A3_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from boolean value is no conversion
- *
- * @path ch09/9.2/S9.2_A3_T1.js
- * @description true and false convert to Boolean by explicit transformation
- */
+/*---
+info: Result of boolean conversion from boolean value is no conversion
+description: true and false convert to Boolean by explicit transformation
+---*/
 
 // CHECK#1 
 if (Boolean(true) !== true) {
@@ -17,4 +15,3 @@ if (Boolean(true) !== true) {
 if (Boolean(false) !== false) {
   $ERROR('#2: Boolean(false) === false. Actual: ' + (Boolean(false)));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A3_T2.js b/test/suite/ch09/9.2/S9.2_A3_T2.js
index d1ede1c6d..6342e3115 100644
--- a/test/suite/ch09/9.2/S9.2_A3_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from boolean value is no conversion
- *
- * @path ch09/9.2/S9.2_A3_T2.js
- * @description true and false convert to Boolean by implicit transformation
- */
+/*---
+info: Result of boolean conversion from boolean value is no conversion
+description: true and false convert to Boolean by implicit transformation
+---*/
 
 // CHECK#1 
 if (!(true) !== false) {
@@ -17,4 +15,3 @@ if (!(true) !== false) {
 if (!(false) !== true) {
   $ERROR('#2: !(false) === true. Actual: ' + (!(false)));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A4_T1.js b/test/suite/ch09/9.2/S9.2_A4_T1.js
index 71860cac8..a0e1f4a1a 100644
--- a/test/suite/ch09/9.2/S9.2_A4_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from number value is false if the argument is +0, -0, or NaN; otherwise, is true
- *
- * @path ch09/9.2/S9.2_A4_T1.js
- * @description +0, -0 and NaN convert to Boolean by explicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from number value is false if the argument
+    is +0, -0, or NaN; otherwise, is true
+description: +0, -0 and NaN convert to Boolean by explicit transformation
+---*/
 
 // CHECK#1
 if (Boolean(+0) !== false) {
@@ -22,4 +22,3 @@ if (Boolean(-0) !== false) {
 if (Boolean(Number.NaN) !== false) {
   $ERROR('#3: Boolean(Number.NaN) === false. Actual: ' + (Boolean(Number.NaN)));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A4_T2.js b/test/suite/ch09/9.2/S9.2_A4_T2.js
index 66047bea5..6979819c1 100644
--- a/test/suite/ch09/9.2/S9.2_A4_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from number value is false if the argument is +0, -0, or NaN; otherwise, is true
- *
- * @path ch09/9.2/S9.2_A4_T2.js
- * @description +0, -0 and NaN convert to Boolean by implicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from number value is false if the argument
+    is +0, -0, or NaN; otherwise, is true
+description: +0, -0 and NaN convert to Boolean by implicit transformation
+---*/
 
 // CHECK#1
 if (!(+0) !== true) {
@@ -22,4 +22,3 @@ if (!(-0) !== true) {
 if (!(Number.NaN) !== true) {
   $ERROR('#3: !(Number.NaN) === true. Actual: ' + (!(Number.NaN)));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A4_T3.js b/test/suite/ch09/9.2/S9.2_A4_T3.js
index 9a16966d6..9ccb678c1 100644
--- a/test/suite/ch09/9.2/S9.2_A4_T3.js
+++ b/test/suite/ch09/9.2/S9.2_A4_T3.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from number value is false if the argument is +0, -0, or NaN; otherwise, is true
- *
- * @path ch09/9.2/S9.2_A4_T3.js
- * @description Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
- * Number.MAX_VALUE, Number.MIN_VALUE and some numbers convert to Boolean by explicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from number value is false if the argument
+    is +0, -0, or NaN; otherwise, is true
+description: >
+    Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
+    Number.MAX_VALUE, Number.MIN_VALUE and some numbers convert to
+    Boolean by explicit transformation
+---*/
 
 // CHECK#1
 if (Boolean(Number.POSITIVE_INFINITY) !== true) {
@@ -47,5 +49,4 @@ if (Boolean(1.3) !== true) {
 // CHECK#8
 if (Boolean(-1.3) !== true) {
   $ERROR('#8: Boolean(-1.3) === true. Actual: ' + (Boolean(-1.3)));	
-}	
-
+}
diff --git a/test/suite/ch09/9.2/S9.2_A4_T4.js b/test/suite/ch09/9.2/S9.2_A4_T4.js
index 692ab77bf..dd4af6256 100644
--- a/test/suite/ch09/9.2/S9.2_A4_T4.js
+++ b/test/suite/ch09/9.2/S9.2_A4_T4.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from number value is false if the argument is +0, -0, or NaN; otherwise, is true
- *
- * @path ch09/9.2/S9.2_A4_T4.js
- * @description Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
- * Number.MAX_VALUE, Number.MIN_VALUE and some other numbers are converted to Boolean by implicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from number value is false if the argument
+    is +0, -0, or NaN; otherwise, is true
+description: >
+    Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
+    Number.MAX_VALUE, Number.MIN_VALUE and some other numbers are
+    converted to Boolean by implicit transformation
+---*/
 
 // CHECK#1
 if (!(Number.POSITIVE_INFINITY) !== false) {
@@ -47,5 +49,4 @@ if (!(1.3) !== false) {
 // CHECK#8
 if (!(-1.3) !== false) {
   $ERROR('#8: !(-1.3) === false. Actual: ' + (!(-1.3)));	
-}	
-
+}
diff --git a/test/suite/ch09/9.2/S9.2_A5_T1.js b/test/suite/ch09/9.2/S9.2_A5_T1.js
index 293ee2375..6c998df45 100644
--- a/test/suite/ch09/9.2/S9.2_A5_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A5_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from nonempty string value (length is not zero) is true; from empty String (length is zero) is false
- *
- * @path ch09/9.2/S9.2_A5_T1.js
- * @description "" is converted to Boolean by explicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from nonempty string value (length is not
+    zero) is true; from empty String (length is zero) is false
+description: "\"\" is converted to Boolean by explicit transformation"
+---*/
 
 // CHECK#1
 if (Boolean("") !== false) {
   $ERROR('#1: Boolean("") === false. Actual: ' + (Boolean("")));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A5_T2.js b/test/suite/ch09/9.2/S9.2_A5_T2.js
index de391a329..7700f7646 100644
--- a/test/suite/ch09/9.2/S9.2_A5_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A5_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from nonempty string value (length is not zero) is true; from empty String (length is zero) is false
- *
- * @path ch09/9.2/S9.2_A5_T2.js
- * @description "" convert to Boolean by implicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from nonempty string value (length is not
+    zero) is true; from empty String (length is zero) is false
+description: "\"\" convert to Boolean by implicit transformation"
+---*/
 
 // CHECK#1
 if (!("") !== true) {
   $ERROR('#1: !("") === true. Actual: ' + (!("")));
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A5_T3.js b/test/suite/ch09/9.2/S9.2_A5_T3.js
index f8f185c59..41ae46707 100644
--- a/test/suite/ch09/9.2/S9.2_A5_T3.js
+++ b/test/suite/ch09/9.2/S9.2_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from nonempty string value (length is not zero) is true; from empty String (length is zero) is false
- *
- * @path ch09/9.2/S9.2_A5_T3.js
- * @description Any nonempty string convert to Boolean by explicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from nonempty string value (length is not
+    zero) is true; from empty String (length is zero) is false
+description: Any nonempty string convert to Boolean by explicit transformation
+---*/
 
 // CHECK#1
 if (Boolean(" ") !== true) {
@@ -17,4 +17,3 @@ if (Boolean(" ") !== true) {
 if (Boolean("Nonempty String") !== true) {
   $ERROR('#2: Boolean("Nonempty String") === true. Actual: ' + (Boolean("Nonempty String")));	
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A5_T4.js b/test/suite/ch09/9.2/S9.2_A5_T4.js
index c8ea44e9d..d0139e9df 100644
--- a/test/suite/ch09/9.2/S9.2_A5_T4.js
+++ b/test/suite/ch09/9.2/S9.2_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from nonempty string value (length is not zero) is true; from empty String (length is zero) is false
- *
- * @path ch09/9.2/S9.2_A5_T4.js
- * @description Any nonempty string convert to Boolean by implicit transformation
- */
+/*---
+info: >
+    Result of boolean conversion from nonempty string value (length is not
+    zero) is true; from empty String (length is zero) is false
+description: Any nonempty string convert to Boolean by implicit transformation
+---*/
 
 // CHECK#1
 if (!(" ") !== false) {
@@ -17,4 +17,3 @@ if (!(" ") !== false) {
 if (!("Nonempty String") !== false) {
   $ERROR('#2: !("Nonempty String") === false. Actual: ' + (!("Nonempty String")));	
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A6_T1.js b/test/suite/ch09/9.2/S9.2_A6_T1.js
index 72bb34e26..65ebc1d62 100644
--- a/test/suite/ch09/9.2/S9.2_A6_T1.js
+++ b/test/suite/ch09/9.2/S9.2_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from object is true
- *
- * @path ch09/9.2/S9.2_A6_T1.js
- * @description Different objects convert to Boolean by explicit transformation
- */
+/*---
+info: Result of boolean conversion from object is true
+description: Different objects convert to Boolean by explicit transformation
+---*/
 
 // CHECK#1
 if (Boolean(new Object()) !== true) {
@@ -102,4 +100,3 @@ if (Boolean(new Date()) !== true) {
 if (Boolean(new Date(0)) !== true) {
   $ERROR('#19: Boolean(new Date(0)) === true. Actual: ' + (Boolean(new Date(0))));	
 }
-
diff --git a/test/suite/ch09/9.2/S9.2_A6_T2.js b/test/suite/ch09/9.2/S9.2_A6_T2.js
index 54dbbb6f3..4d62b4094 100644
--- a/test/suite/ch09/9.2/S9.2_A6_T2.js
+++ b/test/suite/ch09/9.2/S9.2_A6_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of boolean conversion from object is true
- *
- * @path ch09/9.2/S9.2_A6_T2.js
- * @description Different objects convert to Boolean by implicit transformation
- */
+/*---
+info: Result of boolean conversion from object is true
+description: Different objects convert to Boolean by implicit transformation
+---*/
 
 // CHECK#1
 if (!(new Object()) !== false) {
@@ -102,4 +100,3 @@ if (!(new Date()) !== false) {
 if (!(new Date(0)) !== false) {
   $ERROR('#19: !(new Date(0)) === false. Actual: ' + (!(new Date(0))));	
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A1.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A1.js
index 35b235fa3..cc5a7644f 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A1.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StringNumericLiteral ::: [empty] is 0
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A1.js
- * @description Number('') convert to Number by explicit transformation
- */
+/*---
+info: "The MV of StringNumericLiteral ::: [empty] is 0"
+description: Number('') convert to Number by explicit transformation
+---*/
 
 // CHECK#1
 if (Number("") !== 0) {
@@ -16,4 +14,3 @@ if (Number("") !== 0) {
     $ERROR('#1.2: Number("") == +0. Actual: -0');
   }
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A10.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A10.js
index 1f7d3f958..f9652d4f1 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A10.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A10.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral:::. DecimalDigits is the
- * MV of DecimalDigits times 10<sup><small>-n</small></sup>, where n is the
- * number of characters in DecimalDigits
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A10.js
- * @description Compare Number('.12345') with +('12345')*1e-5
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral:::. DecimalDigits is the
+    MV of DecimalDigits times 10<sup><small>-n</small></sup>, where n is the
+    number of characters in DecimalDigits
+description: Compare Number('.12345') with +('12345')*1e-5
+---*/
 
 // CHECK#1
 if (Number(".12345") !== +("12345")*1e-5) {
   $ERROR('#1: Number(".12345") === +("12345")*1e-5');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A11.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A11.js
index 9f58e16f2..b087f180b 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A11.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A11.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral:::. DecimalDigits ExponentPart
- * is the MV of DecimalDigits times 10<sup><small>e-n</small></sup>, where n is
- * the number of characters in DecimalDigits and e is the MV of ExponentPart
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A11.js
- * @description Compare Number('.12345e6') with +('12345')*1e1,
- * and Number('.12345e-3') !== Number('12345')*1e-8
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral:::. DecimalDigits ExponentPart
+    is the MV of DecimalDigits times 10<sup><small>e-n</small></sup>, where n is
+    the number of characters in DecimalDigits and e is the MV of ExponentPart
+description: >
+    Compare Number('.12345e6') with +('12345')*1e1,  and
+    Number('.12345e-3') !== Number('12345')*1e-8
+---*/
 
 // CHECK#1
 if (Number(".12345e6") !== +("12345")*1e1)  {
@@ -20,4 +20,3 @@ if (Number(".12345e6") !== +("12345")*1e1)  {
 if (Number(".12345e-3") !== Number("12345")*1e-8)  {
   $ERROR('#2: Number(".12345e-3") === Number("12345")*1e-8');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A12.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A12.js
index 201040946..cf642f4dd 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A12.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A12.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: DecimalDigits ExponentPart
- * is the MV of DecimalDigits times 10<sup><small>e</small></sup>, where e is the MV of ExponentPart
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A12.js
- * @description Compare Number('12345e6') with +('12345')*1e1,
- * and Number('12345e-6') !== Number('12345')*1e-6
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: DecimalDigits ExponentPart
+    is the MV of DecimalDigits times 10<sup><small>e</small></sup>, where e is the MV of ExponentPart
+description: >
+    Compare Number('12345e6') with +('12345')*1e1,  and
+    Number('12345e-6') !== Number('12345')*1e-6
+---*/
 
 // CHECK#1
 if (Number("12345e6") !== +("12345")*1e6)  {
@@ -19,4 +19,3 @@ if (Number("12345e6") !== +("12345")*1e6)  {
 if (Number("12345e-6") !== Number("12345")*1e-6)  {
   $ERROR('#2: Number("12345e-6") === Number("12345")*1e-6');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A13.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A13.js
index 8d51f4b02..0ce6a4aca 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A13.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigits ::: DecimalDigits DecimalDigit is
- * (the MV of DecimalDigits times 10) plus the MV of DecimalDigit
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A13.js
- * @description Compare '12' with Number("1")*10+Number("2") and analogous
- */
+/*---
+info: >
+    The MV of DecimalDigits ::: DecimalDigits DecimalDigit is
+    (the MV of DecimalDigits times 10) plus the MV of DecimalDigit
+description: Compare '12' with Number("1")*10+Number("2") and analogous
+---*/
 
 // CHECK#1
 if (+("12") !== Number("1")*10+Number("2"))  {
@@ -23,4 +22,3 @@ if (Number("123") !== Number("12")*10+Number("3"))  {
 if (Number("1234") !== Number("123")*10+Number("4"))  {
   $ERROR('#2: Number("1234") === Number("123")*10+Number("4")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A14.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A14.js
index 4ed80b082..96de392c6 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A14.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A14.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of SignedInteger ::: + DecimalDigits is the MV of DecimalDigits
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A14.js
- * @description Compare Number('+1234567890') with +('1234567890')
- */
+/*---
+info: "The MV of SignedInteger ::: + DecimalDigits is the MV of DecimalDigits"
+description: Compare Number('+1234567890') with +('1234567890')
+---*/
 
 // CHECK#1
 if (Number("+1234567890") !== +("1234567890"))  {
   $ERROR('#1: Number("+1234567890") === +("1234567890")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A15.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A15.js
index d0ba80b6e..2d69b10ce 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A15.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A15.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of SignedInteger ::: - DecimalDigits is the negative of the MV of DecimalDigits
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A15.js
- * @description Compare -Number('1234567890') with ('-1234567890')
- */
+/*---
+info: >
+    The MV of SignedInteger ::: - DecimalDigits is the negative of the MV of
+    DecimalDigits
+description: Compare -Number('1234567890') with ('-1234567890')
+---*/
 
 // CHECK#1
 if (+("-1234567890") !== -Number("1234567890"))  {
   $ERROR('#1: +("-1234567890") === -Number("1234567890")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A16.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A16.js
index 6163fbb4a..6ca56acaf 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A16.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A16.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 0 or of HexDigit ::: 0 is 0
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A16.js
- * @description Compare Number('0x0') and Number('0X0') with 0
- */
+/*---
+info: "The MV of DecimalDigit ::: 0 or of HexDigit ::: 0 is 0"
+description: Compare Number('0x0') and Number('0X0') with 0
+---*/
 
 // CHECK#1
 if (Number("0") !== 0) {
@@ -22,4 +20,3 @@ if (+("0x0") !== 0) {
 if (Number("0X0") !== 0) {
   $ERROR('#3: Number("0X0") === 0. Actual: ' + (Number("0X0")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A17.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A17.js
index d4b72bbf5..e97e056f6 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A17.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 1 or of HexDigit ::: 1 is 1
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A17.js
- * @description Compare Number('0x1') and Number('0X1') with 1
- */
+/*---
+info: "The MV of DecimalDigit ::: 1 or of HexDigit ::: 1 is 1"
+description: Compare Number('0x1') and Number('0X1') with 1
+---*/
 
 // CHECK#1
 if (Number("1") !== 1)  {
@@ -22,4 +20,3 @@ if (Number("0x1") !== 1)  {
 if (+("0X1") !== 1)  {
   $ERROR('#3: +("0X1") === 1. Actual: ' + (+("0X1")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A18.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A18.js
index b4375494c..b84445b7b 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A18.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A18.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 2 or of HexDigit ::: 2 is 2
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A18.js
- * @description Compare Number('0x2') and Number('0X2') with 2
- */
+/*---
+info: "The MV of DecimalDigit ::: 2 or of HexDigit ::: 2 is 2"
+description: Compare Number('0x2') and Number('0X2') with 2
+---*/
 
 // CHECK#1
 if (+("2") !== 2)  {
@@ -22,4 +20,3 @@ if (Number("0x2") !== 2)  {
 if (Number("0X2") !== 2)  {
   $ERROR('#3: Number("0X2") === 2. Actual: ' + (Number("0X2")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A19.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A19.js
index 0abc0200a..fe7f31015 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A19.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A19.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 3 or of HexDigit ::: 3 is 3
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A19.js
- * @description Compare Number('0x3') and Number('0X3') with 3
- */
+/*---
+info: "The MV of DecimalDigit ::: 3 or of HexDigit ::: 3 is 3"
+description: Compare Number('0x3') and Number('0X3') with 3
+---*/
 
 // CHECK#1
 if (Number("3") !== 3)  {
@@ -22,4 +20,3 @@ if (+("0x3") !== 3)  {
 if (Number("0X3") !== 3)  {
   $ERROR('#3: Number("0X3") === 3. Actual: ' + (Number("0X3")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A2.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A2.js
index f9bb01465..25ce57f32 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A2.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StringNumericLiteral ::: StrWhiteSpace is 0
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A2.js
- * @description Strings with various WhiteSpaces convert to Number by explicit transformation
- */
+/*---
+info: "The MV of StringNumericLiteral ::: StrWhiteSpace is 0"
+description: >
+    Strings with various WhiteSpaces convert to Number by explicit
+    transformation
+---*/
 
 // CHECK#1
 if (Number("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000") !== 0) {
@@ -286,4 +286,3 @@ if (Number("\u3000") !== 0) {
     $ERROR('#31.2: Number("\\u3000") === +0. Actual: -0');
   }	
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A20.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A20.js
index 78689d42d..cec898d2e 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A20.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A20.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 4 or of HexDigit ::: 4 is 4
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A20.js
- * @description Compare Number('0x4') and Number('0X4') with 4
- */
+/*---
+info: "The MV of DecimalDigit ::: 4 or of HexDigit ::: 4 is 4"
+description: Compare Number('0x4') and Number('0X4') with 4
+---*/
 
 // CHECK#1
 if (Number("4") !== 4)  {
@@ -22,4 +20,3 @@ if (Number("0x4") !== 4)  {
 if (+("0X4") !== 4)  {
   $ERROR('#3: +("0X4") === 4. Actual: ' + (+("0X4")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A21.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A21.js
index de8fe9fe1..3902945a7 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A21.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A21.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 5 or of HexDigit ::: 5 is 5
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A21.js
- * @description Compare Number('0x5') and Number('0X5') with 5
- */
+/*---
+info: "The MV of DecimalDigit ::: 5 or of HexDigit ::: 5 is 5"
+description: Compare Number('0x5') and Number('0X5') with 5
+---*/
 
 // CHECK#1
 if (+("5") !== 5)  {
@@ -22,4 +20,3 @@ if (Number("0x5") !== 5)  {
 if (Number("0X5") !== 5)  {
   $ERROR('#3: Number("0X5") === 5. Actual: ' + (Number("0X5")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A22.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A22.js
index 02aa703a3..6ac471bcb 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A22.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A22.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 6 or of HexDigit ::: 6 is 6
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A22.js
- * @description Compare Number('0x6') and Number('0X6') with 6
- */
+/*---
+info: "The MV of DecimalDigit ::: 6 or of HexDigit ::: 6 is 6"
+description: Compare Number('0x6') and Number('0X6') with 6
+---*/
 
 // CHECK#1
 if (Number("6") !== 6)  {
@@ -22,4 +20,3 @@ if (+("0x6") !== 6)  {
 if (Number("0X6") !== 6)  {
   $ERROR('#3: Number("0X6") === 6. Actual: ' + (Number("0X6")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A23.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A23.js
index d1745156d..c2e60f21e 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A23.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A23.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 7 or of HexDigit ::: 7 is 7
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A23.js
- * @description Compare Number('0x7') and Number('0X7') with 7
- */
+/*---
+info: "The MV of DecimalDigit ::: 7 or of HexDigit ::: 7 is 7"
+description: Compare Number('0x7') and Number('0X7') with 7
+---*/
 
 // CHECK#1
 if (Number("7") !== 7)  {
@@ -22,4 +20,3 @@ if (Number("0x7") !== 7)  {
 if (+("0X7") !== 7)  {
   $ERROR('#3: +("0X7") === 7. Actual: ' + (+("0X7")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A24.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A24.js
index 91409bead..b6c056c3a 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A24.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A24.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 8 or of HexDigit ::: 8 is 8
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A24.js
- * @description Compare Number('0x8') and Number('0X8') with 8
- */
+/*---
+info: "The MV of DecimalDigit ::: 8 or of HexDigit ::: 8 is 8"
+description: Compare Number('0x8') and Number('0X8') with 8
+---*/
 
 // CHECK#1
 if (+("8") !== 8)  {
@@ -22,4 +20,3 @@ if (Number("0x8") !== 8)  {
 if (Number("0X8") !== 8)  {
   $ERROR('#3: Number("0X8") === 8. Actual: ' + (Number("0X8")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A25.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A25.js
index 761ceb443..c76ef6754 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A25.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A25.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of DecimalDigit ::: 9 or of HexDigit ::: 9 is 9
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A25.js
- * @description Compare Number('0x9') and Number('0X9') with 9
- */
+/*---
+info: "The MV of DecimalDigit ::: 9 or of HexDigit ::: 9 is 9"
+description: Compare Number('0x9') and Number('0X9') with 9
+---*/
 
 // CHECK#1
 if (Number("9") !== 9)  {
@@ -22,4 +20,3 @@ if (+("0x9") !== 9)  {
 if (Number("0X9") !== 9)  {
   $ERROR('#3: Number("0X9") === 9. Actual: ' + (Number("0X9")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A26.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A26.js
index 404203f59..097364d13 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A26.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A26.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: a or of HexDigit ::: A is 10
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A26.js
- * @description Compare Number('0xA'), Number('0XA'), Number('0xa') and Number('0Xa') with 10
- */
+/*---
+info: "The MV of HexDigit ::: a or of HexDigit ::: A is 10"
+description: >
+    Compare Number('0xA'), Number('0XA'), Number('0xa') and
+    Number('0Xa') with 10
+---*/
 
 // CHECK#1
 if (Number("0xa") !== 10)  {
@@ -27,4 +27,3 @@ if (Number("0Xa") !== 10)  {
 if (+("0XA") !== 10)  {
   $ERROR('#4: +("0XA") === 10. Actual: ' + (+("0XA")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A27.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A27.js
index 67e6a6e5f..a1188bfff 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A27.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A27.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: b or of HexDigit ::: B is 11
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A27.js
- * @description Compare Number('0xB'), Number('0XB'), Number('0xb') and Number('0Xb') with 11
- */
+/*---
+info: "The MV of HexDigit ::: b or of HexDigit ::: B is 11"
+description: >
+    Compare Number('0xB'), Number('0XB'), Number('0xb') and
+    Number('0Xb') with 11
+---*/
 
 // CHECK#1
 if (Number("0xb") !== 11)  {
@@ -27,4 +27,3 @@ if (+("0Xb") !== 11)  {
 if (Number("0XB") !== 11)  {
   $ERROR('#4: Number("0XB") === 11. Actual: ' + (Number("0XB")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A28.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A28.js
index d29b8c289..26d3f9f5a 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A28.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A28.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: c or of HexDigit ::: C is 12
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A28.js
- * @description Compare Number('0xC'), Number('0XC'), Number('0xc') and Number('0Xc') with 12
- */
+/*---
+info: "The MV of HexDigit ::: c or of HexDigit ::: C is 12"
+description: >
+    Compare Number('0xC'), Number('0XC'), Number('0xc') and
+    Number('0Xc') with 12
+---*/
 
 // CHECK#1
 if (Number("0xc") !== 12)  {
@@ -27,4 +27,3 @@ if (Number("0Xc") !== 12)  {
 if (Number("0XC") !== 12)  {
   $ERROR('#4: Number("0XC") === 12. Actual: ' + (Number("0XC")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A29.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A29.js
index 88473af85..018544dd1 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A29.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A29.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: d or of HexDigit ::: D is 13
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A29.js
- * @description Compare Number('0xD'), Number('0XD'), Number('0xd') and Number('0Xd') with 13
- */
+/*---
+info: "The MV of HexDigit ::: d or of HexDigit ::: D is 13"
+description: >
+    Compare Number('0xD'), Number('0XD'), Number('0xd') and
+    Number('0Xd') with 13
+---*/
 
 // CHECK#1
 if (+("0xd") !== 13)  {
@@ -27,4 +27,3 @@ if (Number("0Xd") !== 13)  {
 if (Number("0XD") !== 13)  {
   $ERROR('#4: Number("0XD") === 13. Actual: ' + (Number("0XD")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A30.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A30.js
index b94bacbd7..24c7de18c 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A30.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A30.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: e or of HexDigit ::: E is 14
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A30.js
- * @description Compare Number('0xE'), Number('0XE'), Number('0xe') and Number('0Xe') with 14
- */
+/*---
+info: "The MV of HexDigit ::: e or of HexDigit ::: E is 14"
+description: >
+    Compare Number('0xE'), Number('0XE'), Number('0xe') and
+    Number('0Xe') with 14
+---*/
 
 // CHECK#1
 if (Number("0xe") !== 14)  {
@@ -27,4 +27,3 @@ if (Number("0Xe") !== 14)  {
 if (+("0XE") !== 14)  {
   $ERROR('#4: +("0XE") === 14. Actual: ' + (+("0XE")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A31.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A31.js
index f5f151b76..453940784 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A31.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A31.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of HexDigit ::: f or of HexDigit ::: F is 15
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A31.js
- * @description Compare Number('0xF'), Number('0XF'), Number('0xf') and Number('0Xf') with 15
- */
+/*---
+info: "The MV of HexDigit ::: f or of HexDigit ::: F is 15"
+description: >
+    Compare Number('0xF'), Number('0XF'), Number('0xf') and
+    Number('0Xf') with 15
+---*/
 
 // CHECK#1
 if (Number("0xf") !== 15)  {
@@ -27,4 +27,3 @@ if (+("0Xf") !== 15)  {
 if (Number("0XF") !== 15)  {
   $ERROR('#4: Number("0XF") === 15. Actual: ' + (Number("0XF")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A32.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A32.js
index 700feb717..5c29066f7 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A32.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A32.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Once the exact MV for a string numeric literal has been
- * determined, it is then rounded to a value of the Number type with 20
- * significant digits by replacing each significant digit after the 20th
- * with a 0 digit or the number value
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A32.js
- * @description Use various long numbers, for example, 1234567890.1234567890
- */
+/*---
+info: >
+    Once the exact MV for a string numeric literal has been
+    determined, it is then rounded to a value of the Number type with 20
+    significant digits by replacing each significant digit after the 20th
+    with a 0 digit or the number value
+description: Use various long numbers, for example, 1234567890.1234567890
+---*/
 
 // CHECK#1
 if (Number("1234567890.1234567890") !== 1234567890.1234567890)  {
@@ -35,4 +34,3 @@ if (Number("0.12345678901234567890") !== 0.123456789012345678)  {
 if (Number("00.12345678901234567890") !== 0.123456789012345678)  {
   $ERROR('#4: Number("00.12345678901234567890") === 0.123456789012345678. Actual: ' + (Number("00.12345678901234567890")));
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T1.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T1.js
index 304f5ba4e..de508381c 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T1.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StringNumericLiteral ::: StrWhiteSpaceopt StrNumericLiteral StrWhiteSpaceopt is the MV of StrNumericLiteral, no matter whether white space is present or not
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A3_T1.js
- * @description static string
- */
+/*---
+info: >
+    The MV of StringNumericLiteral ::: StrWhiteSpaceopt StrNumericLiteral
+    StrWhiteSpaceopt is the MV of StrNumericLiteral, no matter whether white
+    space is present or not
+description: static string
+---*/
 
 // CHECK#1
 if (Number("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000") !== Number("")) {
@@ -27,4 +28,3 @@ if (!(+("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u200
 if (!(Number("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000-Infinity\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000") == Number(-"Infinity"))) {
   $ERROR('#4: Number("\\u0009\\u000C\\u0020\\u00A0\\u000B\\u000A\\u000D\\u2028\\u2029\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000-Infinity\\u0009\\u000C\\u0020\\u00A0\\u000B\\u000A\\u000D\\u2028\\u2029\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000") == Number("-Infinity")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T2.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T2.js
index 0969dd9bb..42b007473 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T2.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StringNumericLiteral ::: StrWhiteSpaceopt StrNumericLiteral StrWhiteSpaceopt is the MV of StrNumericLiteral, no matter whether white space is present or not
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A3_T2.js
- * @description dynamic string
- */
+/*---
+info: >
+    The MV of StringNumericLiteral ::: StrWhiteSpaceopt StrNumericLiteral
+    StrWhiteSpaceopt is the MV of StrNumericLiteral, no matter whether white
+    space is present or not
+description: dynamic string
+---*/
 
 function dynaString(s1, s2){
   return String(s1)+String(s2);
@@ -31,4 +32,3 @@ if (!(Number(dynaString("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029I
 if (!(Number(dynaString("\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029-Infi", "nity\u0009\u000C\u0020\u00A0\u000B\u000A\u000D\u2028\u2029\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000")) == Number(-"Infinity"))) {
   $ERROR('#4: Number("\\u0009\\u000C\\u0020\\u00A0\\u000B\\u000A\\u000D\\u2028\\u2029-Infi"+"nity\\u0009\\u000C\\u0020\\u00A0\\u000B\\u000A\\u000D\\u2028\\u2029\\u1680\\u180E\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200A\\u202F\\u205F\\u3000") == Number("-Infinity")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T1.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T1.js
index 8d2051140..fdb0c5051 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T1.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrDecimalLiteral::: + StrUnsignedDecimalLiteral is the MV of StrUnsignedDecimalLiteral
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A4_T1.js
- * @description Compare Number('+any_number') with Number('any_number')
- */
+/*---
+info: >
+    The MV of StrDecimalLiteral::: + StrUnsignedDecimalLiteral is the MV of
+    StrUnsignedDecimalLiteral
+description: Compare Number('+any_number') with Number('any_number')
+---*/
 
 // CHECK#1
 if (Number("+0") !== Number("0")) {
@@ -47,4 +47,3 @@ if (Number("+1234.5678e-90") !== Number("1234.5678e-90")) {
 if (Number("+1234.5678E-90") !== Number("1234.5678E-90")) {
   $ERROR('#8: Number("+1234.5678E-90") === Number("1234.5678E-90")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T2.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T2.js
index e10d517ce..92517cdc3 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T2.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrDecimalLiteral::: + StrUnsignedDecimalLiteral is the MV of StrUnsignedDecimalLiteral
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A4_T2.js
- * @description Compare Number('+' + 'any_number') with Number('any_number')
- */
+/*---
+info: >
+    The MV of StrDecimalLiteral::: + StrUnsignedDecimalLiteral is the MV of
+    StrUnsignedDecimalLiteral
+description: Compare Number('+' + 'any_number') with Number('any_number')
+---*/
 
 function dynaString(s1, s2){
   return String(s1)+String(s2);
@@ -51,4 +51,3 @@ if (Number(dynaString("+1234.", "5678e-90")) !== Number("1234.5678e-90")) {
 if (Number(dynaString("+1234.", "5678E-90")) !== Number("1234.5678E-90")) {
   $ERROR('#8: Number("+1234."+"5678E-90") === Number("1234.5678E-90")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T1.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T1.js
index b6bb8137d..5f8abc8bc 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T1.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
- * of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A5_T1.js
- * @description Compare Number('-any_number') with -Number('any_number')
- */
+/*---
+info: >
+    The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
+    of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
+description: Compare Number('-any_number') with -Number('any_number')
+---*/
 
 // CHECK#1
 if (Number("-0") !== -Number("0")) {
@@ -58,4 +57,3 @@ if (Number("-1234.5678E-90") !== -Number("1234.5678E-90")) {
 if (Number("-Infinity") !== Number.NEGATIVE_INFINITY) {
   $ERROR('#3: Number("-Infinity") === Number.NEGATIVE_INFINITY');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T2.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T2.js
index 47bc6549e..d2f6576c6 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T2.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
- * of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A5_T2.js
- * @description Compare Number('-[or +]any_number') with -[or without -]any_number)
- */
+/*---
+info: >
+    The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
+    of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
+description: Compare Number('-[or +]any_number') with -[or without -]any_number)
+---*/
 
 // CHECK#1
 if (Number("1") !== 1) {
@@ -143,4 +142,3 @@ if (Number("+9") !== 9) {
 if (Number("-9") !== -9) {
   $ERROR('#27: Number("-9") === -9');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T3.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T3.js
index c062e198f..71a9a0c60 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T3.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A5_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
- * of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A5_T3.js
- * @description Compare Number('-' + 'any_number') with -Number('any_number')
- */
+/*---
+info: >
+    The MV of StrDecimalLiteral::: - StrUnsignedDecimalLiteral is the negative
+    of the MV of StrUnsignedDecimalLiteral. (the negative of this 0 is also 0)
+description: Compare Number('-' + 'any_number') with -Number('any_number')
+---*/
 
 function dynaString(s1, s2){
   return String(s1)+String(s2);
@@ -62,4 +61,3 @@ if (Number(dynaString("-1234.", "5678E-90")) !== -Number("1234.5678E-90")) {
 if (Number(dynaString("-Infi", "nity")) !== Number.NEGATIVE_INFINITY) {
   $ERROR('#3: Number("-Infi"+"nity") === Number.NEGATIVE_INFINITY');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T1.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T1.js
index 6aeeef242..7d026112b 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T1.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: Infinity is 10<sup><small>10000</small></sup>
- * (a value so large that it will round to <b><tt>+&infin;</tt></b>)
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A6_T1.js
- * @description Compare Number('Infinity') with Number.POSITIVE_INFINITY, 10e10000, 10E10000 and Number("10e10000")
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: Infinity is 10<sup><small>10000</small></sup>
+    (a value so large that it will round to <b><tt>+&infin;</tt></b>)
+description: >
+    Compare Number('Infinity') with Number.POSITIVE_INFINITY,
+    10e10000, 10E10000 and Number("10e10000")
+---*/
 
 // CHECK#1
 if (Number("Infinity") !== Number.POSITIVE_INFINITY) {
@@ -28,4 +29,3 @@ if (Number("Infinity") !== 10E10000) {
 if (Number("Infinity") !== Number("10e10000")) {
   $ERROR('#4: Number("Infinity") === Number("10e10000")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T2.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T2.js
index 9e4659873..ee6507333 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T2.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A6_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: Infinity is 10<sup><small>10000</small></sup>
- * (a value so large that it will round to <b><tt>+&infin;</tt></b>)
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A6_T2.js
- * @description Compare Number('Infi'+'nity') with Number.POSITIVE_INFINITY, 10e10000, 10E10000 and Number("10e10000")
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: Infinity is 10<sup><small>10000</small></sup>
+    (a value so large that it will round to <b><tt>+&infin;</tt></b>)
+description: >
+    Compare Number('Infi'+'nity') with Number.POSITIVE_INFINITY,
+    10e10000, 10E10000 and Number("10e10000")
+---*/
 
 function dynaString(s1, s2){
   return String(s1)+String(s2);
@@ -33,4 +34,3 @@ if (Number(dynaString("Infi", "nity")) !== 10E10000) {
 if (Number(dynaString("Infi", "nity")) !== Number("10e10000")) {
   $ERROR('#4: Number("Infi"+"nity") === Number("10e10000")');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A7.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A7.js
index 50a7f357f..a47bc90df 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A7.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A7.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: DecimalDigits. DecimalDigits
- * is the MV of the first DecimalDigits plus the MV of the second DecimalDigits times
- * 10<sup><small>-n</small></sup>, where n is the number of characters in the second DecimalDigits
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A7.js
- * @description Compare Number('1234.5678') with Number('1234')+(+('5678')*1e-4)
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: DecimalDigits. DecimalDigits
+    is the MV of the first DecimalDigits plus the MV of the second DecimalDigits times
+    10<sup><small>-n</small></sup>, where n is the number of characters in the second DecimalDigits
+description: Compare Number('1234.5678') with Number('1234')+(+('5678')*1e-4)
+---*/
 
 // CHECK#1
 if (Number("1234.5678") !== Number("1234")+(+("5678")*1e-4))  {
   $ERROR('#1: Number("1234.5678") === Number("1234")+(+("5678")*1e-4)');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A8.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A8.js
index 6b7a5d4a3..da4ac86a1 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A8.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: DecimalDigits. ExponentPart
- * is the MV of DecimalDigits times 10<sup><small>e</small></sup> , where e is the MV of ExponentPart
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A8.js
- * @description Compare Number('1234e5') and Number('1234.e5') with Number('1234')*1e5
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: DecimalDigits. ExponentPart
+    is the MV of DecimalDigits times 10<sup><small>e</small></sup> , where e is the MV of ExponentPart
+description: >
+    Compare Number('1234e5') and Number('1234.e5') with
+    Number('1234')*1e5
+---*/
 
 // CHECK#1
 if (Number("1234e5") !== Number("1234")*1e5)  {
@@ -18,4 +19,3 @@ if (Number("1234e5") !== Number("1234")*1e5)  {
 if (Number("1234.e5") !== +("1234")*1e5)  {
   $ERROR('#2: Number("1234.e5") === +("1234")*1e5');
 }
-
diff --git a/test/suite/ch09/9.3/9.3.1/S9.3.1_A9.js b/test/suite/ch09/9.3/9.3.1/S9.3.1_A9.js
index 1c88a5322..3961abe13 100644
--- a/test/suite/ch09/9.3/9.3.1/S9.3.1_A9.js
+++ b/test/suite/ch09/9.3/9.3.1/S9.3.1_A9.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The MV of StrUnsignedDecimalLiteral::: DecimalDigits. DecimalDigits ExponentPart
- * is (the MV of the first DecimalDigits plus (the MV of the second DecimalDigits times
- * 10<sup><small>-n</small></sup>)) times 10<sup><small>e</small></sup>, where n is the number
- * of characters in the second DecimalDigits and e is the MV of ExponentPart
- *
- * @path ch09/9.3/9.3.1/S9.3.1_A9.js
- * @description Compare Number('1234.5678e9') with (Number('1234')+(Number('5678')*1e-4))*1e9,
- * and +('1234.5678e-9') with (Number('1234')+(Number('5678')*1e-4))*1e-9
- */
+/*---
+info: >
+    The MV of StrUnsignedDecimalLiteral::: DecimalDigits. DecimalDigits ExponentPart
+    is (the MV of the first DecimalDigits plus (the MV of the second DecimalDigits times
+    10<sup><small>-n</small></sup>)) times 10<sup><small>e</small></sup>, where n is the number
+    of characters in the second DecimalDigits and e is the MV of ExponentPart
+description: >
+    Compare Number('1234.5678e9') with
+    (Number('1234')+(Number('5678')*1e-4))*1e9,  and +('1234.5678e-9')
+    with (Number('1234')+(Number('5678')*1e-4))*1e-9
+---*/
 
 // CHECK#1
 if (Number("1234.5678e9") !== (Number("1234")+(Number("5678")*1e-4))*1e9)  {
@@ -21,4 +22,3 @@ if (Number("1234.5678e9") !== (Number("1234")+(Number("5678")*1e-4))*1e9)  {
 if (+("1234.5678e-9") !== (Number("1234")+(Number("5678")*1e-4))*1e-9)  {
   $ERROR('#2: +("1234.5678e-9") === (Number("1234")+(Number("5678")*1e-4))*1e-9');
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A1_T1.js b/test/suite/ch09/9.3/S9.3_A1_T1.js
index bd7869f1e..e8bf07f9d 100644
--- a/test/suite/ch09/9.3/S9.3_A1_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from undefined value is NaN
- *
- * @path ch09/9.3/S9.3_A1_T1.js
- * @description Undefined convert to Number by explicit transformation
- */
+/*---
+info: Result of number conversion from undefined value is NaN
+description: Undefined convert to Number by explicit transformation
+---*/
 
 // CHECK#1
 if (isNaN(Number(undefined)) !== true) {
@@ -22,4 +20,3 @@ if (isNaN(Number(void 0)) !== true) {
 if (isNaN(Number(eval("var x"))) !== true) {
   $ERROR('#3: Number(eval("var x")) === Not-a-Number. Actual: ' + (Number(eval("var x"))));
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A1_T2.js b/test/suite/ch09/9.3/S9.3_A1_T2.js
index 930e96919..2ac4d44e5 100644
--- a/test/suite/ch09/9.3/S9.3_A1_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from undefined value is NaN
- *
- * @path ch09/9.3/S9.3_A1_T2.js
- * @description Undefined convert to Number by implicit transformation
- */
+/*---
+info: Result of number conversion from undefined value is NaN
+description: Undefined convert to Number by implicit transformation
+---*/
 
 // CHECK#1
 if (isNaN(+(undefined)) !== true) {
@@ -22,4 +20,3 @@ if (isNaN(+(void 0)) !== true) {
 if (isNaN(+(eval("var x"))) !== true) {
   $ERROR('#3: +(eval("var x")) === Not-a-Number. Actual: ' + (+(eval("var x"))));
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A2_T1.js b/test/suite/ch09/9.3/S9.3_A2_T1.js
index 2be743bc7..c95cc439e 100644
--- a/test/suite/ch09/9.3/S9.3_A2_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from null value is +0
- *
- * @path ch09/9.3/S9.3_A2_T1.js
- * @description null convert to Number by explicit transformation
- */
+/*---
+info: Result of number conversion from null value is +0
+description: null convert to Number by explicit transformation
+---*/
 
 // CHECK #1
 if (Number(null) !== 0) {
@@ -16,4 +14,3 @@ if (Number(null) !== 0) {
     $ERROR('#1.2: Number(null) === +0. Actual: -0');
   }	
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A2_T2.js b/test/suite/ch09/9.3/S9.3_A2_T2.js
index ce035b90a..4f9593935 100644
--- a/test/suite/ch09/9.3/S9.3_A2_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from null value is +0
- *
- * @path ch09/9.3/S9.3_A2_T2.js
- * @description null convert to Number by implicit transformation
- */
+/*---
+info: Result of number conversion from null value is +0
+description: null convert to Number by implicit transformation
+---*/
 
 // CHECK #1
 if (+(null) !== 0) {
@@ -16,4 +14,3 @@ if (+(null) !== 0) {
     $ERROR('#1.2: +(null) === +0. Actual: -0');
   }	
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A3_T1.js b/test/suite/ch09/9.3/S9.3_A3_T1.js
index 1feee2b6b..5ee2e84b2 100644
--- a/test/suite/ch09/9.3/S9.3_A3_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from boolean value is 1 if the argument is true, else is +0
- *
- * @path ch09/9.3/S9.3_A3_T1.js
- * @description False and true convert to Number by explicit transformation
- */
+/*---
+info: >
+    Result of number conversion from boolean value is 1 if the argument is
+    true, else is +0
+description: False and true convert to Number by explicit transformation
+---*/
 
 // CHECK#1
 if (Number(false) !== +0) {
@@ -21,4 +21,3 @@ if (Number(false) !== +0) {
 if (Number(true) !== 1) {
   $ERROR('#2: Number(true) === 1. Actual: ' + (Number(true)));	
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A3_T2.js b/test/suite/ch09/9.3/S9.3_A3_T2.js
index 4b7f30539..bd85cf7b4 100644
--- a/test/suite/ch09/9.3/S9.3_A3_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from boolean value is 1 if the argument is true, else is +0
- *
- * @path ch09/9.3/S9.3_A3_T2.js
- * @description False and true convert to Number by implicit transformation
- */
+/*---
+info: >
+    Result of number conversion from boolean value is 1 if the argument is
+    true, else is +0
+description: False and true convert to Number by implicit transformation
+---*/
 
 // CHECK#1
 if (+(false) !== +0) {
@@ -21,4 +21,3 @@ if (+(false) !== +0) {
 if (+(true) !== 1) {
   $ERROR('#2: +(true) === 1. Actual: ' + (+(true)));	
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A4.1_T1.js b/test/suite/ch09/9.3/S9.3_A4.1_T1.js
index 96d24be9f..a1dfd39c2 100644
--- a/test/suite/ch09/9.3/S9.3_A4.1_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A4.1_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from number value equals to the input argument (no conversion)
- *
- * @path ch09/9.3/S9.3_A4.1_T1.js
- * @description Some numbers including Number.MAX_VALUE and Number.MIN_VALUE are converted to Number with explicit transformation
- */
+/*---
+info: >
+    Result of number conversion from number value equals to the input
+    argument (no conversion)
+description: >
+    Some numbers including Number.MAX_VALUE and Number.MIN_VALUE are
+    converted to Number with explicit transformation
+---*/
 
 // CHECK#1
 if (Number(13) !== 13) {
@@ -36,5 +38,4 @@ if (Number(Number.MAX_VALUE) !== 1.7976931348623157e308) {
 // CHECK#6
 if (Number(Number.MIN_VALUE) !== 5e-324) {
   $ERROR('#6: Number(Number.MIN_VALUE) === 5e-324. Actual: ' + (Number(Number.MIN_VALUE)));
-}	
-
+}
diff --git a/test/suite/ch09/9.3/S9.3_A4.1_T2.js b/test/suite/ch09/9.3/S9.3_A4.1_T2.js
index 6c1c28b3d..5682851c7 100644
--- a/test/suite/ch09/9.3/S9.3_A4.1_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A4.1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from number value equals to the input argument (no conversion)
- *
- * @path ch09/9.3/S9.3_A4.1_T2.js
- * @description Some numbers including Number.MAX_VALUE and Number.MIN_VALUE are converted to Number with implicit transformation
- */
+/*---
+info: >
+    Result of number conversion from number value equals to the input
+    argument (no conversion)
+description: >
+    Some numbers including Number.MAX_VALUE and Number.MIN_VALUE are
+    converted to Number with implicit transformation
+---*/
 
 // CHECK#1
 if (+(13) !== 13) {
@@ -36,5 +38,4 @@ if (+(Number.MAX_VALUE) !== 1.7976931348623157e308) {
 // CHECK#6
 if (+(Number.MIN_VALUE) !== 5e-324) {
   $ERROR('#6: +(Number.MIN_VALUE) === 5e-324. Actual: ' + (+(Number.MIN_VALUE)));
-}	
-
+}
diff --git a/test/suite/ch09/9.3/S9.3_A4.2_T1.js b/test/suite/ch09/9.3/S9.3_A4.2_T1.js
index 788f20cb9..d4beae180 100644
--- a/test/suite/ch09/9.3/S9.3_A4.2_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A4.2_T1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from number value equals to the input argument (no conversion)
- *
- * @path ch09/9.3/S9.3_A4.2_T1.js
- * @description Number.NaN, +0, -0, Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
- * Number.MAX_VALUE and Number.MIN_VALUE convert to Number by explicit transformation
- */
+/*---
+info: >
+    Result of number conversion from number value equals to the input
+    argument (no conversion)
+description: >
+    Number.NaN, +0, -0, Number.POSITIVE_INFINITY,
+    Number.NEGATIVE_INFINITY,  Number.MAX_VALUE and Number.MIN_VALUE
+    convert to Number by explicit transformation
+---*/
 
 // CHECK#1
 if (isNaN(Number(Number.NaN)) !== true) {
@@ -51,4 +53,3 @@ if (Number(Number.MAX_VALUE) !== Number.MAX_VALUE) {
 if (Number(Number.MIN_VALUE) !== Number.MIN_VALUE) {
   $ERROR('#7: Number(Number.MIN_VALUE) === Number.MIN_VALUE. Actual: ' + (Number(Number.MIN_VALUE))); 
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A4.2_T2.js b/test/suite/ch09/9.3/S9.3_A4.2_T2.js
index 3e4d8ad4a..886274c58 100644
--- a/test/suite/ch09/9.3/S9.3_A4.2_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A4.2_T2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from number value equals to the input argument (no conversion)
- *
- * @path ch09/9.3/S9.3_A4.2_T2.js
- * @description Number.NaN, +0, -0, Number.POSITIVE_INFINITY, Number.NEGATIVE_INFINITY,
- * Number.MAX_VALUE and Number.MIN_VALUE convert to Number by implicit transformation
- */
+/*---
+info: >
+    Result of number conversion from number value equals to the input
+    argument (no conversion)
+description: >
+    Number.NaN, +0, -0, Number.POSITIVE_INFINITY,
+    Number.NEGATIVE_INFINITY,  Number.MAX_VALUE and Number.MIN_VALUE
+    convert to Number by implicit transformation
+---*/
 
 // CHECK#1
 if (isNaN(+(Number.NaN)) !== true) {
@@ -51,4 +53,3 @@ if (+(Number.MAX_VALUE) !== Number.MAX_VALUE) {
 if (+(Number.MIN_VALUE) !== Number.MIN_VALUE) {
   $ERROR('#7: +(Number.MIN_VALUE) === Number.MIN_VALUE. Actual: ' + (+(Number.MIN_VALUE))); 
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A5_T1.js b/test/suite/ch09/9.3/S9.3_A5_T1.js
index a76f65b1d..4cf6479c1 100644
--- a/test/suite/ch09/9.3/S9.3_A5_T1.js
+++ b/test/suite/ch09/9.3/S9.3_A5_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from object value is the result
- * of conversion from primitive value
- *
- * @path ch09/9.3/S9.3_A5_T1.js
- * @description new Number(), new Number(0), new Number(Number.NaN), new Number(null),
- * new Number(void 0) and others convert to Number by explicit transformation
- */
+/*---
+info: >
+    Result of number conversion from object value is the result
+    of conversion from primitive value
+description: >
+    new Number(), new Number(0), new Number(Number.NaN), new
+    Number(null),  new Number(void 0) and others convert to Number by
+    explicit transformation
+---*/
 
 // CHECK#1
 if (Number(new Number()) !== 0) {
@@ -123,4 +124,3 @@ var myobj5 = {
 if (isNaN(Number(myobj5)) !== true){
   $ERROR("#15: Number(myobj5) calls ToPrimitive with hint Number. Exptected: Not-a-Number.  Actual: " + (Number(myobj5)));
 }
-
diff --git a/test/suite/ch09/9.3/S9.3_A5_T2.js b/test/suite/ch09/9.3/S9.3_A5_T2.js
index b4ebb5422..252c96b39 100644
--- a/test/suite/ch09/9.3/S9.3_A5_T2.js
+++ b/test/suite/ch09/9.3/S9.3_A5_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of number conversion from object value is the result
- * of conversion from primitive value
- *
- * @path ch09/9.3/S9.3_A5_T2.js
- * @description new Number(), new Number(0), new Number(Number.NaN), new Number(null),
- * new Number(void 0) and others convert to Number by implicit transformation
- */
+/*---
+info: >
+    Result of number conversion from object value is the result
+    of conversion from primitive value
+description: >
+    new Number(), new Number(0), new Number(Number.NaN), new
+    Number(null),  new Number(void 0) and others convert to Number by
+    implicit transformation
+---*/
 
 // CHECK#1
 if (+(new Number()) !== 0) {
@@ -123,4 +124,3 @@ var myobj5 = {
 if (isNaN(+(myobj5)) !== true){
   $ERROR("#15: +(myobj5) calls ToPrimitive with hint +. Exptected: 12345. Actual: " + (+(myobj5)));
 }
-
diff --git a/test/suite/ch09/9.4/S9.4_A1.js b/test/suite/ch09/9.4/S9.4_A1.js
index 6c1b354c4..98f3c6126 100644
--- a/test/suite/ch09/9.4/S9.4_A1.js
+++ b/test/suite/ch09/9.4/S9.4_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToNumber(value) is NaN, ToInteger(value) returns +0
- *
- * @path ch09/9.4/S9.4_A1.js
- * @description Check what position is defined by Number.NaN in string "abc": "abc".charAt(Number.NaN)
- */
+/*---
+info: If ToNumber(value) is NaN, ToInteger(value) returns +0
+description: >
+    Check what position is defined by Number.NaN in string "abc":
+    "abc".charAt(Number.NaN)
+---*/
 
 // CHECK#1
 if ("abc".charAt(Number.NaN) !== "a") {
@@ -17,4 +17,3 @@ if ("abc".charAt(Number.NaN) !== "a") {
 if ("abc".charAt("x") !== "a") {
   $ERROR('#2: "abc".charAt("x") === "a". Actual: ' + ("abc".charAt("x")));
 }
-
diff --git a/test/suite/ch09/9.4/S9.4_A2.js b/test/suite/ch09/9.4/S9.4_A2.js
index 6b0ac54ac..45642e631 100644
--- a/test/suite/ch09/9.4/S9.4_A2.js
+++ b/test/suite/ch09/9.4/S9.4_A2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToNumber(value) is +0, -0, +Infinity, or -Infinity,
- * return ToNumber(value)
- *
- * @path ch09/9.4/S9.4_A2.js
- * @description Check what position is defined by Number.NaN in string "abc": "abc".charAt(Number.NaN)
- */
+/*---
+info: >
+    If ToNumber(value) is +0, -0, +Infinity, or -Infinity,
+    return ToNumber(value)
+description: >
+    Check what position is defined by Number.NaN in string "abc":
+    "abc".charAt(Number.NaN)
+---*/
 
 // CHECK#1
 if ("abc".charAt(0.0) !== "a") {
@@ -18,4 +19,3 @@ if ("abc".charAt(0.0) !== "a") {
 if ("abc".charAt(-0.0) !== "a") {
   $ERROR('#2: "abc".charAt(-0.0) === "a". Actual: ' + ("abc".charAt(-0.0)));
 }
-
diff --git a/test/suite/ch09/9.4/S9.4_A3_T1.js b/test/suite/ch09/9.4/S9.4_A3_T1.js
index d16c30b38..cbbfb4bcc 100644
--- a/test/suite/ch09/9.4/S9.4_A3_T1.js
+++ b/test/suite/ch09/9.4/S9.4_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToInteger(value) conversion is the result of computing
- * sign(ToNumber(value)) * floor(abs(ToNumber(value)))
- *
- * @path ch09/9.4/S9.4_A3_T1.js
- * @description For testing constructor Date(Number) is used
- */
+/*---
+info: >
+    Result of ToInteger(value) conversion is the result of computing
+    sign(ToNumber(value)) * floor(abs(ToNumber(value)))
+description: For testing constructor Date(Number) is used
+---*/
 
 // CHECK#1
 var d1 = new Date(6.54321);
@@ -80,4 +79,3 @@ var d12 = new Date(-1.23e-15);
 if (d12.valueOf() !== -0) {
   $ERROR('#12: var d12 = new Date(-1.23e-15); d12.valueOf() === -0;');
 }
-
diff --git a/test/suite/ch09/9.4/S9.4_A3_T2.js b/test/suite/ch09/9.4/S9.4_A3_T2.js
index f3a9796e8..e6faa5c4f 100644
--- a/test/suite/ch09/9.4/S9.4_A3_T2.js
+++ b/test/suite/ch09/9.4/S9.4_A3_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToInteger(value) conversion is the result of computing
- * sign(ToNumber(value)) * floor(abs(ToNumber(value)))
- *
- * @path ch09/9.4/S9.4_A3_T2.js
- * @description For testing constructor Date(NaN, Infinity, Infinity, +0 and -0) is used
- */
+/*---
+info: >
+    Result of ToInteger(value) conversion is the result of computing
+    sign(ToNumber(value)) * floor(abs(ToNumber(value)))
+description: >
+    For testing constructor Date(NaN, Infinity, Infinity, +0 and -0)
+    is used
+---*/
 
 // CHECK#1
 var d1 = new Date(Number.NaN);
@@ -38,4 +39,3 @@ var d5 = new Date(-0);
 if (d5.valueOf() !== -0) {
   $ERROR('#5: var d5 = new Date(-0); d5.valueOf() === -0;');
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A1_T1.js b/test/suite/ch09/9.5/S9.5_A1_T1.js
index 76296a3a9..abebe98ad 100644
--- a/test/suite/ch09/9.5/S9.5_A1_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
- *
- * @path ch09/9.5/S9.5_A1_T1.js
- * @description For testing use operator <<0
- */
+/*---
+info: If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
+description: For testing use operator <<0
+---*/
 
 // CHECK#1
 if ((Number.NaN << 0) !== +0) {
@@ -49,4 +47,3 @@ if ((Number.NEGATIVE_INFINITY << 0) !== +0) {
 } else if (1/(Number.NEGATIVE_INFINITY << 0) !== Number.POSITIVE_INFINITY) {
   $ERROR("#6.2: (Number.NEGATIVE_INFINITY << 0) === +0. Actual: -0");
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.1_T1.js b/test/suite/ch09/9.5/S9.5_A2.1_T1.js
index 943425e85..a70864ebf 100644
--- a/test/suite/ch09/9.5/S9.5_A2.1_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A2.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToInt32 returns values between -2^31 and 2^31-1
- *
- * @path ch09/9.5/S9.5_A2.1_T1.js
- * @description Converting some numbers, which are in\outside of Int32 scopes, with <<0 operator
- */
+/*---
+info: ToInt32 returns values between -2^31 and 2^31-1
+description: >
+    Converting some numbers, which are in\outside of Int32 scopes,
+    with <<0 operator
+---*/
 
 // CHECK#1
 if ((-2147483647 << 0) !== -2147483647) {
@@ -47,4 +47,3 @@ if ((2147483648 << 0) !== -2147483648) {
 if ((4294967296 << 0) !== 0) {
   $ERROR('#8: (4294967296 << 0) === 0. Actual: ' + ((4294967296 << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.1_T2.js b/test/suite/ch09/9.5/S9.5_A2.1_T2.js
index 9037035c8..6e3e99cb8 100644
--- a/test/suite/ch09/9.5/S9.5_A2.1_T2.js
+++ b/test/suite/ch09/9.5/S9.5_A2.1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToInt32 returns values between -2^31 and 2^31-1
- *
- * @path ch09/9.5/S9.5_A2.1_T2.js
- * @description Converting some numbers, which are in\outside of Int32 scopes, with  ~ operator
- */
+/*---
+info: ToInt32 returns values between -2^31 and 2^31-1
+description: >
+    Converting some numbers, which are in\outside of Int32 scopes,
+    with  ~ operator
+---*/
 
 // CHECK#1
 if (~-2147483649 !== ~2147483647) {
@@ -27,4 +27,3 @@ if (~2147483648 !== ~-2147483648) {
 if (~4294967296 !== ~0) {
   $ERROR('#4: ~4294967296 === ~0');
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.2_T1.js b/test/suite/ch09/9.5/S9.5_A2.2_T1.js
index e8c454498..cf68b598d 100644
--- a/test/suite/ch09/9.5/S9.5_A2.2_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute result modulo 2^32
- *
- * @path ch09/9.5/S9.5_A2.2_T1.js
- * @description Use operator <<0
- */
+/*---
+info: Compute result modulo 2^32
+description: Use operator <<0
+---*/
 
 // CHECK#1
 if ((-2147483647 << 0) !== -2147483647) {
@@ -67,4 +65,3 @@ if ((8589934592 << 0) !== 0) {
 if ((8589934593 << 0) !== 1) {
   $ERROR('#12: (8589934593 << 0) === 1. Actual: ' + ((8589934593 << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.2_T2.js b/test/suite/ch09/9.5/S9.5_A2.2_T2.js
index a138d03d7..7d1b7e5ce 100644
--- a/test/suite/ch09/9.5/S9.5_A2.2_T2.js
+++ b/test/suite/ch09/9.5/S9.5_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute result modulo 2^32
- *
- * @path ch09/9.5/S9.5_A2.2_T2.js
- * @description Use operator ~
- */
+/*---
+info: Compute result modulo 2^32
+description: Use operator ~
+---*/
 
 // CHECK#1
 if (~-2147483647 !== 2147483646) {
@@ -67,4 +65,3 @@ if ((~8589934592 << 0) !== ~0) {
 if ((~8589934593 << 0) !== ~1) {
   $ERROR('#12: (~8589934593 << 0) === ~1)');
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.3_T1.js b/test/suite/ch09/9.5/S9.5_A2.3_T1.js
index af0e3702e..a4c65c453 100644
--- a/test/suite/ch09/9.5/S9.5_A2.3_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If result is greater than or equal to 2^31, return result -2^32
- *
- * @path ch09/9.5/S9.5_A2.3_T1.js
- * @description Use operator <<0
- */
+/*---
+info: If result is greater than or equal to 2^31, return result -2^32
+description: Use operator <<0
+---*/
 
 // CHECK#1
 if ((2147483647 << 0) !== 2147483647) {
@@ -37,6 +35,3 @@ if ((4294967296 << 0) !== 0) {
 if ((4294967297 << 0) !== 1) {
   $ERROR('#6: (4294967297 << 0) === 1. Actual: ' + ((4294967297 << 0)));
 }
-
-
-
diff --git a/test/suite/ch09/9.5/S9.5_A2.3_T2.js b/test/suite/ch09/9.5/S9.5_A2.3_T2.js
index 70c23270b..4afa689c4 100644
--- a/test/suite/ch09/9.5/S9.5_A2.3_T2.js
+++ b/test/suite/ch09/9.5/S9.5_A2.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If result is greater than or equal to 2^31, return result -2^32
- *
- * @path ch09/9.5/S9.5_A2.3_T2.js
- * @description Use operator ~
- */
+/*---
+info: If result is greater than or equal to 2^31, return result -2^32
+description: Use operator ~
+---*/
 
 // CHECK#1
 if (~2147483647 !== -2147483648) {
@@ -37,4 +35,3 @@ if (~4294967296 !== ~0) {
 if (~4294967297 !== ~1) {
   $ERROR('#6: ~4294967297 ==== ~1)');
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.1_T1.js b/test/suite/ch09/9.5/S9.5_A3.1_T1.js
index ea9cc2048..d334dcc8c 100644
--- a/test/suite/ch09/9.5/S9.5_A3.1_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.5/S9.5_A3.1_T1.js
- * @description Type(x) is Boolean
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Boolean
+---*/
 
 // CHECK#1
 if ((new Boolean(true) << 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new Boolean(true) << 0) !== 1) {
 if ((false << 0) !== 0) {
   $ERROR('#2: (false << 0) === 0. Actual: ' + ((false << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.1_T2.js b/test/suite/ch09/9.5/S9.5_A3.1_T2.js
index 0a8769ba8..192569929 100644
--- a/test/suite/ch09/9.5/S9.5_A3.1_T2.js
+++ b/test/suite/ch09/9.5/S9.5_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.5/S9.5_A3.1_T2.js
- * @description Type(x) is Number
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Number
+---*/
 
 // CHECK#1
 if ((new Number(1) << 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new Number(1) << 0) !== 1) {
 if ((-1.234 << 0) !== -1) {
   $ERROR('#2: (-1.234 << 0) === -1. Actual: ' + ((-1.234 << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.1_T3.js b/test/suite/ch09/9.5/S9.5_A3.1_T3.js
index 5886b0daf..a31cc461f 100644
--- a/test/suite/ch09/9.5/S9.5_A3.1_T3.js
+++ b/test/suite/ch09/9.5/S9.5_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.5/S9.5_A3.1_T3.js
- * @description Type(x) is String
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is String
+---*/
 
 // CHECK#1
 if ((new String(1) << 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new String(1) << 0) !== 1) {
 if (("-1.234" << 0) !== -1) {
   $ERROR('#2: ("-1.234" << 0) === -1. Actual: ' + (("-1.234" << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.1_T4.js b/test/suite/ch09/9.5/S9.5_A3.1_T4.js
index a4a701fc5..700d92f1a 100644
--- a/test/suite/ch09/9.5/S9.5_A3.1_T4.js
+++ b/test/suite/ch09/9.5/S9.5_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.5/S9.5_A3.1_T4.js
- * @description Type(x) is Object
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Object
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; ~object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.2_T1.js b/test/suite/ch09/9.5/S9.5_A3.2_T1.js
index 6a53855b4..ce7835362 100644
--- a/test/suite/ch09/9.5/S9.5_A3.2_T1.js
+++ b/test/suite/ch09/9.5/S9.5_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses floor, abs
- *
- * @path ch09/9.5/S9.5_A3.2_T1.js
- * @description Use operator <<0
- */
+/*---
+info: Operator uses floor, abs
+description: Use operator <<0
+---*/
 
 // CHECK#1
 if ((1.2345 << 0) !== 1) {
@@ -17,4 +15,3 @@ if ((1.2345 << 0) !== 1) {
 if ((-5.4321 << 0) !== -5) {
   $ERROR('#2: (-5.4321 << 0) === -5. Actual: ' + ((-5.4321 << 0)));
 }
-
diff --git a/test/suite/ch09/9.5/S9.5_A3.2_T2.js b/test/suite/ch09/9.5/S9.5_A3.2_T2.js
index 47838f6a1..54245fd8b 100644
--- a/test/suite/ch09/9.5/S9.5_A3.2_T2.js
+++ b/test/suite/ch09/9.5/S9.5_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses floor, abs
- *
- * @path ch09/9.5/S9.5_A3.2_T2.js
- * @description Use operator ~
- */
+/*---
+info: Operator uses floor, abs
+description: Use operator ~
+---*/
 
 // CHECK#1
 if (~1.2345 !== ~1) {
@@ -17,4 +15,3 @@ if (~1.2345 !== ~1) {
 if (~-5.4321 !== ~-5) {
   $ERROR('#2: ~-5.4321 === ~-5)');
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A1.js b/test/suite/ch09/9.6/S9.6_A1.js
index 6e370541b..d5e13a05c 100644
--- a/test/suite/ch09/9.6/S9.6_A1.js
+++ b/test/suite/ch09/9.6/S9.6_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
- *
- * @path ch09/9.6/S9.6_A1.js
- * @description For testing use operator >>>0
- */
+/*---
+info: If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
+description: For testing use operator >>>0
+---*/
 
 // CHECK#1
 if ((Number.NaN >>> 0) !== +0) {
@@ -49,6 +47,3 @@ if ((Number.NEGATIVE_INFINITY >>> 0) !== +0) {
 } else if (1/(Number.NEGATIVE_INFINITY >>> 0) !== Number.POSITIVE_INFINITY) {
   $ERROR("#6.2: (Number.NEGATIVE_INFINITY >>> 0) === +0. Actual: -0");
 }
-
-
-
diff --git a/test/suite/ch09/9.6/S9.6_A2.1.js b/test/suite/ch09/9.6/S9.6_A2.1.js
index cc2f38c85..5fc7afe61 100644
--- a/test/suite/ch09/9.6/S9.6_A2.1.js
+++ b/test/suite/ch09/9.6/S9.6_A2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToUint32 returns values between 0 and 2^32-1
- *
- * @path ch09/9.6/S9.6_A2.1.js
- * @description Converting numbers, which are in\outside of Uint32 scopes, with >>>0 operator
- */
+/*---
+info: ToUint32 returns values between 0 and 2^32-1
+description: >
+    Converting numbers, which are in\outside of Uint32 scopes, with
+    >>>0 operator
+---*/
 
 // CHECK#1
 if ((0 >>> 0) !== 0) {
@@ -37,4 +37,3 @@ if ((4294967294 >>> 0) !== 4294967294) {
 if ((4294967296 >>> 0) !== 0) {
   $ERROR('#6: (4294967296 >>> 0) === 0. Actual: ' + ((4294967296 >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A2.2.js b/test/suite/ch09/9.6/S9.6_A2.2.js
index 7438cbe95..c4cf17a49 100644
--- a/test/suite/ch09/9.6/S9.6_A2.2.js
+++ b/test/suite/ch09/9.6/S9.6_A2.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute result modulo 2^32
- *
- * @path ch09/9.6/S9.6_A2.2.js
- * @description Use operator >>>0
- */
+/*---
+info: Compute result modulo 2^32
+description: Use operator >>>0
+---*/
 
 // CHECK#1
 if ((-2147483647 >>> 0) !== 2147483649) {
@@ -67,4 +65,3 @@ if ((8589934592 >>> 0) !== 0) {
 if ((8589934593 >>> 0) !== 1) {
   $ERROR('#12: (8589934593 >>> 0) === 1. Actual: ' + ((8589934593 >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A3.1_T1.js b/test/suite/ch09/9.6/S9.6_A3.1_T1.js
index d73f715b9..8638903a1 100644
--- a/test/suite/ch09/9.6/S9.6_A3.1_T1.js
+++ b/test/suite/ch09/9.6/S9.6_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.6/S9.6_A3.1_T1.js
- * @description Type(x) is Boolean
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Boolean
+---*/
 
 // CHECK#1
 if ((new Boolean(true) >>> 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new Boolean(true) >>> 0) !== 1) {
 if ((false >>> 0) !== 0) {
   $ERROR('#2: (false >>> 0) === 0. Actual: ' + ((false >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A3.1_T2.js b/test/suite/ch09/9.6/S9.6_A3.1_T2.js
index 5e99b13b3..3cebc536a 100644
--- a/test/suite/ch09/9.6/S9.6_A3.1_T2.js
+++ b/test/suite/ch09/9.6/S9.6_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.6/S9.6_A3.1_T2.js
- * @description Type(x) is Number
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Number
+---*/
 
 // CHECK#1
 if ((new Number(1) >>> 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new Number(1) >>> 0) !== 1) {
 if ((-1.234 >>> 0) !== 4294967295) {
   $ERROR('#2: (-1.234 >>> 0) === 4294967295. Actual: ' + ((-1.234 >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A3.1_T3.js b/test/suite/ch09/9.6/S9.6_A3.1_T3.js
index 480ffd0cc..2e5ee393f 100644
--- a/test/suite/ch09/9.6/S9.6_A3.1_T3.js
+++ b/test/suite/ch09/9.6/S9.6_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.6/S9.6_A3.1_T3.js
- * @description Type(x) is String
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is String
+---*/
 
 // CHECK#1
 if ((new String(1) >>> 0) !== 1) {
@@ -17,4 +15,3 @@ if ((new String(1) >>> 0) !== 1) {
 if (("-1.234" >>> 0) !== 4294967295) {
   $ERROR('#2: ("-1.234" >>> 0) === 4294967295. Actual: ' + (("-1.234" >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A3.1_T4.js b/test/suite/ch09/9.6/S9.6_A3.1_T4.js
index 65381fd0d..5f59c2dfa 100644
--- a/test/suite/ch09/9.6/S9.6_A3.1_T4.js
+++ b/test/suite/ch09/9.6/S9.6_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.6/S9.6_A3.1_T4.js
- * @description Type(x) is Object
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Object
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch09/9.6/S9.6_A3.2_T1.js b/test/suite/ch09/9.6/S9.6_A3.2_T1.js
index 87d0b2a84..7ebdf6d08 100644
--- a/test/suite/ch09/9.6/S9.6_A3.2_T1.js
+++ b/test/suite/ch09/9.6/S9.6_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses floor, abs
- *
- * @path ch09/9.6/S9.6_A3.2_T1.js
- * @description Use operator >>>0
- */
+/*---
+info: Operator uses floor, abs
+description: Use operator >>>0
+---*/
 
 // CHECK#1
 if ((1.2345 >>> 0) !== 1) {
@@ -17,4 +15,3 @@ if ((1.2345 >>> 0) !== 1) {
 if ((-5.4321 >>> 0) !== 4294967291) {
   $ERROR('#2: (-5.4321 >>> 0) === 4294967291. Actual: ' + ((-5.4321 >>> 0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A1.js b/test/suite/ch09/9.7/S9.7_A1.js
index 443711768..69d733ba8 100644
--- a/test/suite/ch09/9.7/S9.7_A1.js
+++ b/test/suite/ch09/9.7/S9.7_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
- *
- * @path ch09/9.7/S9.7_A1.js
- * @description For testing use String.fromCharCode(Number).charCodeAt(0) construction
- */
+/*---
+info: If value is NaN, +0, -0, +Infinity, or -Infinity, return +0
+description: >
+    For testing use String.fromCharCode(Number).charCodeAt(0)
+    construction
+---*/
 
 // CHECK#1
 if (String.fromCharCode(Number.NaN).charCodeAt(0) !== +0) {
@@ -49,6 +49,3 @@ if (String.fromCharCode(Number.NEGATIVE_INFINITY).charCodeAt(0) !== +0) {
 } else if (1/String.fromCharCode(Number.NEGATIVE_INFINITY).charCodeAt(0) !== Number.POSITIVE_INFINITY) {
   $ERROR("#6.2: String.fromCharCode(Number.NEGATIVE_INFINITY).charCodeAt(0) === +0. Actual: -0");
 }
-
-
-
diff --git a/test/suite/ch09/9.7/S9.7_A2.1.js b/test/suite/ch09/9.7/S9.7_A2.1.js
index 5073f9c87..ab8a529b1 100644
--- a/test/suite/ch09/9.7/S9.7_A2.1.js
+++ b/test/suite/ch09/9.7/S9.7_A2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToUint16 returns values between 0 and 2^16-1
- *
- * @path ch09/9.7/S9.7_A2.1.js
- * @description Converting numbers, which are in\outside of Uint16 scopes, with String.fromCharCode(Number).charCodeAt(0) construction
- */
+/*---
+info: ToUint16 returns values between 0 and 2^16-1
+description: >
+    Converting numbers, which are in\outside of Uint16 scopes, with
+    String.fromCharCode(Number).charCodeAt(0) construction
+---*/
 
 // CHECK#1
 if (String.fromCharCode(0).charCodeAt(0) !== 0) {
@@ -52,4 +52,3 @@ if (String.fromCharCode(4294967294).charCodeAt(0) !== 65534) {
 if (String.fromCharCode(4294967296).charCodeAt(0) !== 0) {
   $ERROR('#9: String.fromCharCode(4294967296).charCodeAt(0) === 0. Actual: ' + (String.fromCharCode(4294967296).charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A2.2.js b/test/suite/ch09/9.7/S9.7_A2.2.js
index d631bd912..9121ea57b 100644
--- a/test/suite/ch09/9.7/S9.7_A2.2.js
+++ b/test/suite/ch09/9.7/S9.7_A2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute result modulo 2^16
- *
- * @path ch09/9.7/S9.7_A2.2.js
- * @description For testing use String.fromCharCode(Number).charCodeAt(0) construction
- */
+/*---
+info: Compute result modulo 2^16
+description: >
+    For testing use String.fromCharCode(Number).charCodeAt(0)
+    construction
+---*/
 
 // CHECK#1
 if (String.fromCharCode(-32767).charCodeAt(0) !== 32769) {
@@ -67,4 +67,3 @@ if (String.fromCharCode(131072).charCodeAt(0) !== 0) {
 if (String.fromCharCode(131073).charCodeAt(0) !== 1) {
   $ERROR('#12: String.fromCharCode(131073).charCodeAt(0) === 1. Actual: ' + (String.fromCharCode(131073).charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A3.1_T1.js b/test/suite/ch09/9.7/S9.7_A3.1_T1.js
index 315b133d2..7af4349f1 100644
--- a/test/suite/ch09/9.7/S9.7_A3.1_T1.js
+++ b/test/suite/ch09/9.7/S9.7_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.7/S9.7_A3.1_T1.js
- * @description Type(x) is Boolean
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Boolean
+---*/
 
 // CHECK#1
 if (String.fromCharCode(new Boolean(true)).charCodeAt(0) !== 1) {
@@ -17,4 +15,3 @@ if (String.fromCharCode(new Boolean(true)).charCodeAt(0) !== 1) {
 if (String.fromCharCode(false).charCodeAt(0) !== 0) {
   $ERROR('#2: String.fromCharCode(false).charCodeAt(0) === 0. Actual: ' + (String.fromCharCode(false).charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A3.1_T2.js b/test/suite/ch09/9.7/S9.7_A3.1_T2.js
index 613229333..f8980d42a 100644
--- a/test/suite/ch09/9.7/S9.7_A3.1_T2.js
+++ b/test/suite/ch09/9.7/S9.7_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.7/S9.7_A3.1_T2.js
- * @description Type(x) is Number
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Number
+---*/
 
 // CHECK#1
 if (String.fromCharCode(new Number(1)).charCodeAt(0) !== 1) {
@@ -17,4 +15,3 @@ if (String.fromCharCode(new Number(1)).charCodeAt(0) !== 1) {
 if (String.fromCharCode(-1.234).charCodeAt(0) !== 65535) {
   $ERROR('#2: String.fromCharCode(-1.234).charCodeAt(0) === 65535. Actual: ' + (String.fromCharCode(-1.234).charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A3.1_T3.js b/test/suite/ch09/9.7/S9.7_A3.1_T3.js
index ff66475ca..f7da03f4b 100644
--- a/test/suite/ch09/9.7/S9.7_A3.1_T3.js
+++ b/test/suite/ch09/9.7/S9.7_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.7/S9.7_A3.1_T3.js
- * @description Type(x) is String
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is String
+---*/
 
 // CHECK#1
 if (String.fromCharCode(new String(1)).charCodeAt(0) !== 1) {
@@ -17,4 +15,3 @@ if (String.fromCharCode(new String(1)).charCodeAt(0) !== 1) {
 if (String.fromCharCode("-1.234").charCodeAt(0) !== 65535) {
   $ERROR('#2: String.fromCharCode("-1.234").charCodeAt(0) === 65535. Actual: ' + (String.fromCharCode("-1.234").charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A3.1_T4.js b/test/suite/ch09/9.7/S9.7_A3.1_T4.js
index 49627e759..5aa116548 100644
--- a/test/suite/ch09/9.7/S9.7_A3.1_T4.js
+++ b/test/suite/ch09/9.7/S9.7_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses ToNumber
- *
- * @path ch09/9.7/S9.7_A3.1_T4.js
- * @description Type(x) is Object
- */
+/*---
+info: Operator uses ToNumber
+description: Type(x) is Object
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch09/9.7/S9.7_A3.2_T1.js b/test/suite/ch09/9.7/S9.7_A3.2_T1.js
index b7b6ecbbe..31c475d83 100644
--- a/test/suite/ch09/9.7/S9.7_A3.2_T1.js
+++ b/test/suite/ch09/9.7/S9.7_A3.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses floor, abs
- *
- * @path ch09/9.7/S9.7_A3.2_T1.js
- * @description For testing use String.fromCharCode(Number).charCodeAt(0) construction
- */
+/*---
+info: Operator uses floor, abs
+description: >
+    For testing use String.fromCharCode(Number).charCodeAt(0)
+    construction
+---*/
 
 // CHECK#1
 if (String.fromCharCode(1.2345).charCodeAt(0) !== 1) {
@@ -17,4 +17,3 @@ if (String.fromCharCode(1.2345).charCodeAt(0) !== 1) {
 if (String.fromCharCode(-5.4321).charCodeAt(0) !== 65531) {
   $ERROR('#2: String.fromCharCode(-5.4321).charCodeAt(0) === 65531. Actual: ' + (String.fromCharCode(-5.4321).charCodeAt(0)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A1.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A1.js
index b51e4cca1..df5ae0ac1 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A1.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If m is NaN, return the string "NaN"
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A1.js
- * @description NaN convert to String by explicit transformation
- */
+/*---
+info: If m is NaN, return the string "NaN"
+description: NaN convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(NaN) !== "NaN") {
@@ -22,4 +20,3 @@ if (String(Number.NaN) !== "NaN") {
 if (String(Number("asasa")) !== "NaN") {
   $ERROR('#3: String(Number("asasa")) === Not-a-Number Actual: ' + (String(Number("asasa"))));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A10.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A10.js
index 17fa40697..e397e876e 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A10.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A10.js
@@ -1,17 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the string consisting of the most significant
- * digit of the decimal representation of s, followed by a decimal point '.',
- * followed by the remaining k-1 digits of the decimal representation of s,
- * followed by the lowercase character 'e', followed by a plus sign '+' or
- * minus sign '-' according to whether n-1 is positive or negative, followed
- * by the decimal representation of the integer abs(n-1) (with no leading zeros)
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A10.js
- * @description Various float numbers convert to String by explicit transformation
- */
+/*---
+info: >
+    Return the string consisting of the most significant
+    digit of the decimal representation of s, followed by a decimal point '.',
+    followed by the remaining k-1 digits of the decimal representation of s,
+    followed by the lowercase character 'e', followed by a plus sign '+' or
+    minus sign '-' according to whether n-1 is positive or negative, followed
+    by the decimal representation of the integer abs(n-1) (with no leading zeros)
+description: Various float numbers convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(1.2345) !== "1.2345") {
@@ -57,4 +56,3 @@ if (String(.0000012345) !== "0.0000012345") {
 if (String(.00000012345) !== "1.2345e-7") {
   $ERROR('#9: String(.00000012345) === "1.2345e-7". Actual: ' + (String(.00000012345)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A2.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A2.js
index adc8e1f5e..74bd079f3 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A2.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If m is +0 or -0, return the string "0"
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A2.js
- * @description +0 and -0 convert to String by explicit transformation
- */
+/*---
+info: If m is +0 or -0, return the string "0"
+description: +0 and -0 convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(+0) !== "0") {
@@ -17,4 +15,3 @@ if (String(+0) !== "0") {
 if (String(-0) !== "0") {
   $ERROR('#2: String(-0) === "0". Actual: ' + (String(-0)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A3.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A3.js
index 3945f2279..4dfc646c7 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A3.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If m is less than zero, return the string concatenation of the
- * string "-" and ToString(-m)
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A3.js
- * @description -1234567890 convert to String by explicit transformation
- */
+/*---
+info: >
+    If m is less than zero, return the string concatenation of the
+    string "-" and ToString(-m)
+description: -1234567890 convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(-1234567890) !== "-1234567890") {
@@ -18,4 +17,3 @@ if (String(-1234567890) !== "-1234567890") {
 if ("-"+String(-(-1234567890)) !== "-1234567890") {
   $ERROR('#2: "-"+String(-(-1234567890)) === "-1234567890". Actual: ' + ("-"+String(-(-1234567890))));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A4.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A4.js
index f71ac7557..65bb144ad 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A4.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If m is infinity, return the string "Infinity"
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A4.js
- * @description +/-Infinity convert to String by explicit transformation
- */
+/*---
+info: If m is infinity, return the string "Infinity"
+description: +/-Infinity convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(Infinity) !== "Infinity") {
@@ -27,4 +25,3 @@ if (String(-Infinity) !== "-Infinity") {
 if (String(Number.NEGATIVE_INFINITY) !== "-Infinity") {
   $ERROR('#4: String(Number.NEGATIVE_INFINITY) === "-Infinity". Actual: ' + (String(Number.NEGATIVE_INFINITY)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A6.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A6.js
index 8b9ddf42e..c1c8a714d 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A6.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A6.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If 1 <= s < 1e21 or -1e21 s < -1, return the string
- * consisting of the k digits of the decimal representation of s (in order,
- * with no leading zeroes), followed by n-k occurrences of the character '0'
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A6.js
- * @description Various integer numbers convert to String by explicit transformation
- */
+/*---
+info: >
+    If 1 <= s < 1e21 or -1e21 s < -1, return the string
+    consisting of the k digits of the decimal representation of s (in order,
+    with no leading zeroes), followed by n-k occurrences of the character '0'
+description: >
+    Various integer numbers convert to String by explicit
+    transformation
+---*/
 
 // CHECK#1
 if (String(1) !== "1") {
@@ -89,5 +90,3 @@ if (String(1E20) !== "100000000000000000000") {
 if (String(-1E20) !== "-100000000000000000000") {
   $ERROR('#15: String(-1E20) === "-100000000000000000000". Actual: ' + (String(-1E20)));
 }
-
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A7.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A7.js
index 5ad14c25d..506d362e6 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A7.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A7.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If 1 <= s < 1e21 or -1e21 s < -1 and s has a fractional
- * component, return the string consisting of the most significant n digits of
- * the decimal representation of s, followed by a decimal point '.',
- * followed by the remaining k-n digits of the decimal representation of s
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A7.js
- * @description 1.0000001 and -1.0000001 convert to String by explicit transformation
- */
+/*---
+info: >
+    If 1 <= s < 1e21 or -1e21 s < -1 and s has a fractional
+    component, return the string consisting of the most significant n digits of
+    the decimal representation of s, followed by a decimal point '.',
+    followed by the remaining k-n digits of the decimal representation of s
+description: >
+    1.0000001 and -1.0000001 convert to String by explicit
+    transformation
+---*/
 
 // CHECK#1
 if (String(1.0000001) !== "1.0000001") {
@@ -20,4 +21,3 @@ if (String(1.0000001) !== "1.0000001") {
 if (String(-1.0000001) !== "-1.0000001") {
   $ERROR('#2: String(-1.0000001) === "-1.0000001". Actual: ' + (String(-1.0000001)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A8.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A8.js
index 91efe0b52..9132dd96f 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A8.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If 1 > s > -1, and -6 < n <= 0, return the string consisting of the
- * character '0', followed by a decimal point '.', followed by -n occurrences
- * of the character '0', followed by the k digits of the decimal
- * representation of s
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A8.js
- * @description Various float numbers convert to String by explicit transformation
- */
+/*---
+info: >
+    If 1 > s > -1, and -6 < n <= 0, return the string consisting of the
+    character '0', followed by a decimal point '.', followed by -n occurrences
+    of the character '0', followed by the k digits of the decimal
+    representation of s
+description: Various float numbers convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(0.1) !== "0.1") {
@@ -50,5 +49,3 @@ if (String(-1e-6) !== "-0.000001") {
 if (String(-1E-6) !== "-0.000001") {
   $ERROR('#8: String(-1E-6) === "0.000001". Actual: ' + (String(-1E-6)));
 }
-
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T1.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T1.js
index d4614194b..e52a49b68 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T1.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the string consisting of the single digit of s,
- * followed by lowercase character 'e', followed by a plus sign '+' or minus
- * sign '-' according to whether n-1 is positive or negative, followed by the
- * decimal representation of the integer abs(n-1) (with no leading zeros)
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A9_T1.js
- * @description Various big numbers convert to String by explicit transformation
- */
+/*---
+info: >
+    Return the string consisting of the single digit of s,
+    followed by lowercase character 'e', followed by a plus sign '+' or minus
+    sign '-' according to whether n-1 is positive or negative, followed by the
+    decimal representation of the integer abs(n-1) (with no leading zeros)
+description: Various big numbers convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(1000000000000000000000) !== "1e+21") {
@@ -70,4 +69,3 @@ if (String(-1E21) !== "-1e+21") {
 if (String(-1.0E22) !== "-1e+22") {
   $ERROR('#12: String(-1.0E22) === "-1e+22". Actual: ' + (String(-1.0E22)));
 }
-
diff --git a/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T2.js b/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T2.js
index 79ca7873e..ea211313d 100644
--- a/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T2.js
+++ b/test/suite/ch09/9.8/9.8.1/S9.8.1_A9_T2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the string consisting of the single digit of s,
- * followed by lowercase character 'e', followed by a plus sign '+' or minus
- * sign '-' according to whether n-1 is positive or negative, followed by the
- * decimal representation of the integer abs(n-1) (with no leading zeros)
- *
- * @path ch09/9.8/9.8.1/S9.8.1_A9_T2.js
- * @description Various float numbers with many zeros convert to String by explicit transformation
- */
+/*---
+info: >
+    Return the string consisting of the single digit of s,
+    followed by lowercase character 'e', followed by a plus sign '+' or minus
+    sign '-' according to whether n-1 is positive or negative, followed by the
+    decimal representation of the integer abs(n-1) (with no leading zeros)
+description: >
+    Various float numbers with many zeros convert to String by
+    explicit transformation
+---*/
 
 // CHECK#1
 if (String(0.0000001) !== "1e-7") {
@@ -70,4 +71,3 @@ if (String(-1E-7) !== "-1e-7") {
 if (String(-1.0E-10) !== "-1e-10") {
   $ERROR('#12: String(-1.0E-10) === "-1e-10". Actual: ' + (String(-1.0E-10)));
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A1_T1.js b/test/suite/ch09/9.8/S9.8_A1_T1.js
index efce3a546..5623aa37f 100644
--- a/test/suite/ch09/9.8/S9.8_A1_T1.js
+++ b/test/suite/ch09/9.8/S9.8_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from undefined value is "undefined"
- *
- * @path ch09/9.8/S9.8_A1_T1.js
- * @description Undefined values is undefined, void 0 and eval("var x"). Use explicit transformation
- */
+/*---
+info: Result of ToString conversion from undefined value is "undefined"
+description: >
+    Undefined values is undefined, void 0 and eval("var x"). Use
+    explicit transformation
+---*/
 
 // CHECK#1
 if (String(undefined) !== "undefined") {
@@ -22,4 +22,3 @@ if (String(void 0) !== "undefined") {
 if (String(eval("var x")) !== "undefined") {
   $ERROR('#3: String(eval("var x")) === "undefined" . Actual: ' + (String(eval("var x"))));
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A1_T2.js b/test/suite/ch09/9.8/S9.8_A1_T2.js
index dd26c11b4..0e639f25c 100644
--- a/test/suite/ch09/9.8/S9.8_A1_T2.js
+++ b/test/suite/ch09/9.8/S9.8_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from undefined value is "undefined"
- *
- * @path ch09/9.8/S9.8_A1_T2.js
- * @description Undefined values is undefined, void 0 and eval("var x"). Use implicit transformation
- */
+/*---
+info: Result of ToString conversion from undefined value is "undefined"
+description: >
+    Undefined values is undefined, void 0 and eval("var x"). Use
+    implicit transformation
+---*/
 
 // CHECK#1
 if (undefined + "" !== "undefined") {
@@ -22,4 +22,3 @@ if (void 0 + "" !== "undefined") {
 if (eval("var x") + "" !== "undefined") {
   $ERROR('#3: eval("var x") + "" === "undefined". Actual: ' + (eval("var x") + ""));
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A2_T1.js b/test/suite/ch09/9.8/S9.8_A2_T1.js
index 0a1b982b7..5e309553f 100644
--- a/test/suite/ch09/9.8/S9.8_A2_T1.js
+++ b/test/suite/ch09/9.8/S9.8_A2_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from null value is "null"
- *
- * @path ch09/9.8/S9.8_A2_T1.js
- * @description null convert to String by explicit transformation
- */
+/*---
+info: Result of ToString conversion from null value is "null"
+description: null convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(null) !== "null") {
   $ERROR('#1: String(null) === "null". Actual: ' + (String(null))); 
-} 
-
+}
diff --git a/test/suite/ch09/9.8/S9.8_A2_T2.js b/test/suite/ch09/9.8/S9.8_A2_T2.js
index 3b760909b..846477638 100644
--- a/test/suite/ch09/9.8/S9.8_A2_T2.js
+++ b/test/suite/ch09/9.8/S9.8_A2_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from null value is "null"
- *
- * @path ch09/9.8/S9.8_A2_T2.js
- * @description null convert to String by implicit transformation
- */
+/*---
+info: Result of ToString conversion from null value is "null"
+description: null convert to String by implicit transformation
+---*/
 
 // CHECK#1
 if (null + "" !== "null") {
   $ERROR('#1: null + "" === "null". Actual: ' + (null + "")); 
-} 
-
+}
diff --git a/test/suite/ch09/9.8/S9.8_A3_T1.js b/test/suite/ch09/9.8/S9.8_A3_T1.js
index cc267edc8..55d7bc7f9 100644
--- a/test/suite/ch09/9.8/S9.8_A3_T1.js
+++ b/test/suite/ch09/9.8/S9.8_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from boolean value is "true" if
- * the argument is "true", else is "false"
- *
- * @path ch09/9.8/S9.8_A3_T1.js
- * @description True and false convert to String by explicit transformation
- */
+/*---
+info: >
+    Result of ToString conversion from boolean value is "true" if
+    the argument is "true", else is "false"
+description: True and false convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(false) !== "false") {
@@ -18,4 +17,3 @@ if (String(false) !== "false") {
 if (String(true) !== "true") {
   $ERROR('#2: String(true) === "true". Actual: ' + (String(true)));	
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A3_T2.js b/test/suite/ch09/9.8/S9.8_A3_T2.js
index 788bcb58d..ca74c57af 100644
--- a/test/suite/ch09/9.8/S9.8_A3_T2.js
+++ b/test/suite/ch09/9.8/S9.8_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of ToString conversion from boolean value is "true" if
- * the argument is "true", else is "false"
- *
- * @path ch09/9.8/S9.8_A3_T2.js
- * @description True and false convert to String by implicit transformation
- */
+/*---
+info: >
+    Result of ToString conversion from boolean value is "true" if
+    the argument is "true", else is "false"
+description: True and false convert to String by implicit transformation
+---*/
 
 // CHECK#1
 if (false + "" !== "false") {
@@ -18,4 +17,3 @@ if (false + "" !== "false") {
 if (true + "" !== "true") {
   $ERROR('#2: true + "" === "true". Actual: ' + (true + ""));	
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A4_T1.js b/test/suite/ch09/9.8/S9.8_A4_T1.js
index 064458461..bbe3952f1 100644
--- a/test/suite/ch09/9.8/S9.8_A4_T1.js
+++ b/test/suite/ch09/9.8/S9.8_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of String conversion from string value is the input argument (no conversion)
- *
- * @path ch09/9.8/S9.8_A4_T1.js
- * @description Some strings convert to String with explicit transformation
- */
+/*---
+info: >
+    Result of String conversion from string value is the input argument (no
+    conversion)
+description: Some strings convert to String with explicit transformation
+---*/
 
 // CHECK#1
 var x1 = "abc";
@@ -19,4 +19,3 @@ var x2 = "abc";
 if (typeof String(x2) !== typeof x2) { 
   $ERROR('#2: typeof String("abc") === "string". Actual: ' + (typeof String("abc")));
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A4_T2.js b/test/suite/ch09/9.8/S9.8_A4_T2.js
index fdde4c38e..0a2bce555 100644
--- a/test/suite/ch09/9.8/S9.8_A4_T2.js
+++ b/test/suite/ch09/9.8/S9.8_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of String conversion from string value is the input argument (no conversion)
- *
- * @path ch09/9.8/S9.8_A4_T2.js
- * @description Some strings convert to String by implicit transformation
- */
+/*---
+info: >
+    Result of String conversion from string value is the input argument (no
+    conversion)
+description: Some strings convert to String by implicit transformation
+---*/
 
 // CHECK#1
 var x1 = "abc";
@@ -19,4 +19,3 @@ var x2 = "abc";
 if (typeof x2 + "" !== typeof x2) { 
   $ERROR('#2: typeof "abc" + "" === "string". Actual: ' + (typeof "abc" + ""));
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A5_T1.js b/test/suite/ch09/9.8/S9.8_A5_T1.js
index 55d88c102..fe580a351 100644
--- a/test/suite/ch09/9.8/S9.8_A5_T1.js
+++ b/test/suite/ch09/9.8/S9.8_A5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of String conversion from Object value is conversion
- * from primitive value
- *
- * @path ch09/9.8/S9.8_A5_T1.js
- * @description Some objects convert to String by explicit transformation
- */
+/*---
+info: >
+    Result of String conversion from Object value is conversion
+    from primitive value
+description: Some objects convert to String by explicit transformation
+---*/
 
 // CHECK#1
 if (String(new Number()) !== "0") {
@@ -90,4 +89,3 @@ var myobj3 = {
 if (String(myobj3) !== "[object Object]"){
   $ERROR("#13: String(myobj) calls ToPrimitive with hint String");
 }
-
diff --git a/test/suite/ch09/9.8/S9.8_A5_T2.js b/test/suite/ch09/9.8/S9.8_A5_T2.js
index 7911adaee..ed5571de5 100644
--- a/test/suite/ch09/9.8/S9.8_A5_T2.js
+++ b/test/suite/ch09/9.8/S9.8_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of String conversion from Object value is conversion
- * from primitive value
- *
- * @path ch09/9.8/S9.8_A5_T2.js
- * @description Some objects convert to String by implicit transformation
- */
+/*---
+info: >
+    Result of String conversion from Object value is conversion
+    from primitive value
+description: Some objects convert to String by implicit transformation
+---*/
 
 // CHECK#1
 if (new Number() + "" !== "0") {
@@ -89,4 +88,3 @@ var myobj3 = {
 if (myobj3 + "" !== "[object Object]"){
   $ERROR('#13: myobj3 + "" calls ToPrimitive with hint Number.  Exptected: "[object Object]". Actual: ' + (myobj3 + ""));
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A1.js b/test/suite/ch09/9.9/S9.9_A1.js
index a1d36aabd..0f07a66cd 100644
--- a/test/suite/ch09/9.9/S9.9_A1.js
+++ b/test/suite/ch09/9.9/S9.9_A1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from undefined value must throw TypeError
- *
- * @path ch09/9.9/S9.9_A1.js
- * @description Trying to convert undefined to Object
- * @noStrict
- */
+/*---
+info: ToObject conversion from undefined value must throw TypeError
+description: Trying to convert undefined to Object
+flags: [noStrict]
+---*/
 
 // CHECK#1
 try{
@@ -30,4 +28,3 @@ catch(e){
     $ERROR('#2.2: with(undefined) x = 2 must throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A2.js b/test/suite/ch09/9.9/S9.9_A2.js
index 42e1980e7..c03a29bc0 100644
--- a/test/suite/ch09/9.9/S9.9_A2.js
+++ b/test/suite/ch09/9.9/S9.9_A2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from null value must throw TypeError
- *
- * @path ch09/9.9/S9.9_A2.js
- * @description Trying to convert null to Object
- * @noStrict
- */
+/*---
+info: ToObject conversion from null value must throw TypeError
+description: Trying to convert null to Object
+flags: [noStrict]
+---*/
 
 // CHECK#1
 try{
@@ -30,4 +28,3 @@ catch(e){
     $ERROR('#2.2: with(null) x = 2 must throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A3.js b/test/suite/ch09/9.9/S9.9_A3.js
index f91cd8e82..d20dd7b7a 100644
--- a/test/suite/ch09/9.9/S9.9_A3.js
+++ b/test/suite/ch09/9.9/S9.9_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from Boolean: create a new Boolean object
- * whose [[value]] property is set to the value of the boolean
- *
- * @path ch09/9.9/S9.9_A3.js
- * @description Trying to convert from Boolean to Object
- */
+/*---
+info: >
+    ToObject conversion from Boolean: create a new Boolean object
+    whose [[value]] property is set to the value of the boolean
+description: Trying to convert from Boolean to Object
+---*/
 
 // CHECK#1
 if (Object(true).valueOf() !== true){
@@ -38,4 +37,3 @@ if (typeof Object(false) !== "object"){
 if (Object(false).constructor.prototype !== Boolean.prototype){
   $ERROR('#6: Object(false).constructor.prototype === Boolean.prototype. Actual: ' + (Object(false).constructor.prototype));
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A4.js b/test/suite/ch09/9.9/S9.9_A4.js
index 2f08bf52c..d046accc6 100644
--- a/test/suite/ch09/9.9/S9.9_A4.js
+++ b/test/suite/ch09/9.9/S9.9_A4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from Number: create a new Number object
- * whose [[value]] property is set to the value of the number
- *
- * @path ch09/9.9/S9.9_A4.js
- * @description Converting from various numbers to Object
- */
+/*---
+info: >
+    ToObject conversion from Number: create a new Number object
+    whose [[value]] property is set to the value of the number
+description: Converting from various numbers to Object
+---*/
 
 // CHECK#1
 if (Object(0).valueOf() !== 0){
@@ -175,4 +174,3 @@ if (typeof Object(-1.2345) !== "object"){
 if (Object(-1.2345).constructor.prototype !== Number.prototype){
   $ERROR('#33: Object(-1.2345).constructor.prototype === Number.prototype. Actual: ' + (Object(-1.2345).constructor.prototype));
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A5.js b/test/suite/ch09/9.9/S9.9_A5.js
index 2f59c1182..ef7054137 100644
--- a/test/suite/ch09/9.9/S9.9_A5.js
+++ b/test/suite/ch09/9.9/S9.9_A5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from String: create a new String object
- * whose [[value]] property is set to the value of the string
- *
- * @path ch09/9.9/S9.9_A5.js
- * @description Converting from various strings to Object
- */
+/*---
+info: >
+    ToObject conversion from String: create a new String object
+    whose [[value]] property is set to the value of the string
+description: Converting from various strings to Object
+---*/
 
 // CHECK#1
 if (Object("some string").valueOf() !== "some string"){
@@ -68,4 +67,3 @@ if (typeof Object(String(10)) !== "object"){
 if (Object(String(10)).constructor.prototype !== String.prototype){
   $ERROR('#12: Object(String(10)).constructor.prototype === String.prototype. Actual: ' + (Object(String(10)).constructor.prototype));
 }
-
diff --git a/test/suite/ch09/9.9/S9.9_A6.js b/test/suite/ch09/9.9/S9.9_A6.js
index a25679016..1660caefa 100644
--- a/test/suite/ch09/9.9/S9.9_A6.js
+++ b/test/suite/ch09/9.9/S9.9_A6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToObject conversion from Object: The result is the input
- * argument (no conversion)
- *
- * @path ch09/9.9/S9.9_A6.js
- * @description Converting from Objects to Object
- */
+/*---
+info: >
+    ToObject conversion from Object: The result is the input
+    argument (no conversion)
+description: Converting from Objects to Object
+---*/
 
 function MyObject( val ) {
     this.value = val;
@@ -37,4 +36,3 @@ if (y.constructor.prototype !== x.constructor.prototype){
 if (y !== x){
   $ERROR('#4: Object(obj) === obj');
 }
-
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-1-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-1-s.js
index a9cf025bc..7c9d5821d 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-1-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-1-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-1-s.js

- * @description Strict Mode - Use Strict Directive Prologue is 'use  strict'; which contains two space between 'use' and 'strict'

- * @noStrict

- */

-

-

-function testcase() {

-        "use  strict";

-        var public = 1;

-        return public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is 'use  strict';
+    which contains two space between 'use' and 'strict'
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use  strict";
+        var public = 1;
+        return public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-10-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-10-s.js
index 51aa8ca73..2dc76e92e 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-10-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-10-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-10-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''USE STRICT';' in which all characters are uppercase

- * @noStrict

- */

-

-

-function testcase() {

-        "USE STRICT";

-        var public = 1;

-        return public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''USE STRICT';' in
+    which all characters are uppercase
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "USE STRICT";
+        var public = 1;
+        return public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-11-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-11-s.js
index 6d7794d97..2f4a89696 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-11-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-11-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-11-s.js

- * @description Strict Mode - Eval code is strict code with a Use Strict Directive at the beginning of the block

- * @noStrict

- */

-

-

-function testcase() {

-        try {

-            eval("'use strict'; var public = 1; var anotherVariableNotReserveWord = 2;");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && typeof public === "undefined" &&

-                typeof anotherVariableNotReserveWord === "undefined";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Eval code is strict code with a Use Strict Directive
+    at the beginning of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("'use strict'; var public = 1; var anotherVariableNotReserveWord = 2;");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && typeof public === "undefined" &&
+                typeof anotherVariableNotReserveWord === "undefined";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-12-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-12-s.js
index 09fdffe84..f566553af 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-12-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-12-s.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-12-s.js

- * @description Strict Mode - Eval code is strict eval code with a Use Strict Directive in the middle of the block

- * @noStrict

- */

-

-

-function testcase() {

-        eval("var public = 1; 'use strict'; var anotherVariableNotReserveWord = 2;");

-        return public === 1 && anotherVariableNotReserveWord === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Eval code is strict eval code with a Use Strict
+    Directive in the middle of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        eval("var public = 1; 'use strict'; var anotherVariableNotReserveWord = 2;");
+        return public === 1 && anotherVariableNotReserveWord === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-13-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-13-s.js
index 0a4ba30ff..068a52e64 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-13-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-13-s.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-13-s.js

- * @description Strict Mode - Eval code is strict eval code with a Use Strict Directive at the end of the block

- * @noStrict

- */

-

-

-function testcase() {

-        eval("var public = 1; var anotherVariableNotReserveWord = 2; 'use strict';");

-        return public === 1 && anotherVariableNotReserveWord === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Eval code is strict eval code with a Use Strict
+    Directive at the end of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        eval("var public = 1; var anotherVariableNotReserveWord = 2; 'use strict';");
+        return public === 1 && anotherVariableNotReserveWord === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-14-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-14-s.js
index dff413366..fe8c9a21a 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-14-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-14-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-14-s.js

- * @description Strict Mode - The call to eval function is contained in a Strict Mode block

- * @noStrict

- */

-

-

-function testcase() {

-        'use strict';

-        try {

-            eval("var public = 1;");

-            return false;

-        } catch (e) {

-            return true;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - The call to eval function is contained in a Strict
+    Mode block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        'use strict';
+        try {
+            eval("var public = 1;");
+            return false;
+        } catch (e) {
+            return true;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-15-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-15-s.js
index b7f7664f5..e46632380 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-15-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-15-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-15-s.js

- * @description Strict Mode - Function code that is part of a FunctionDeclaration is strict function code if FunctionDeclaration is contained in use strict

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            try {

-                eval("var public = 1;");

-                return false;

-            } catch (e) {

-                return e instanceof SyntaxError;

-            }

-        }

-

-        return fun();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code that is part of a FunctionDeclaration
+    is strict function code if FunctionDeclaration is contained in use
+    strict
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            try {
+                eval("var public = 1;");
+                return false;
+            } catch (e) {
+                return e instanceof SyntaxError;
+            }
+        }
+
+        return fun();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-16-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-16-s.js
index 35ef8803f..b14a45708 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-16-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-16-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-16-s.js

- * @description Strict Mode - Function code that is part of a FunctionExpression is strict function code if FunctionExpression is contained in use strict

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        return function () {

-            try {

-                eval("var public = 1;");

-                return false;

-            } catch (e) {

-                return e instanceof SyntaxError;

-            }

-        } ();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code that is part of a FunctionExpression
+    is strict function code if FunctionExpression is contained in use
+    strict
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        return function () {
+            try {
+                eval("var public = 1;");
+                return false;
+            } catch (e) {
+                return e instanceof SyntaxError;
+            }
+        } ();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-17-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-17-s.js
index 976e644fe..00bbb93e3 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-17-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-17-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-17-s.js

- * @description Strict Mode - Function code that is part of a Accessor PropertyAssignment is in Strict Mode if Accessor PropertyAssignment is contained in use strict(getter)

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            var obj = {};

-            Object.defineProperty(obj, "accProperty", {

-                get: function () {

-                    eval("public = 1;");

-                    return 11;

-                }

-            });

-

-            var temp = obj.accProperty === 11;

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code that is part of a Accessor
+    PropertyAssignment is in Strict Mode if Accessor
+    PropertyAssignment is contained in use strict(getter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            var obj = {};
+            Object.defineProperty(obj, "accProperty", {
+                get: function () {
+                    eval("public = 1;");
+                    return 11;
+                }
+            });
+
+            var temp = obj.accProperty === 11;
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-18-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-18-s.js
index b384ebfe5..0e8626215 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-18-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-18-s.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-18-s.js

- * @description Strict Mode - Function code that is part of a Accessor PropertyAssignment is in Strict Mode if Accessor PropertyAssignment is contained in use strict(setter)

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            var obj = {};

-            var data = "data";

-            Object.defineProperty(obj, "accProperty", {

-                set: function (value) {

-                    eval("var public = 1;");

-                    data = value;

-                }

-            });

-

-            obj.accProperty = "overrideData";

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && data === "data";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code that is part of a Accessor
+    PropertyAssignment is in Strict Mode if Accessor
+    PropertyAssignment is contained in use strict(setter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            var obj = {};
+            var data = "data";
+            Object.defineProperty(obj, "accProperty", {
+                set: function (value) {
+                    eval("var public = 1;");
+                    data = value;
+                }
+            });
+
+            obj.accProperty = "overrideData";
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && data === "data";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-19-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-19-s.js
index 6643ec7f1..ecf08f6a2 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-19-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-19-s.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-19-s.js

- * @description Strict Mode - Function code of a FunctionDeclaration contains Use Strict Directive which appears at the start of the block

- * @noStrict

- */

-

-

-function testcase() {

-        function fun() {

-            "use strict";

-            try {

-                eval("var public = 1;");

-                return false;

-            } catch (e) {

-                return e instanceof SyntaxError;

-            }

-        }

-        return fun();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionDeclaration contains Use
+    Strict Directive which appears at the start of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function fun() {
+            "use strict";
+            try {
+                eval("var public = 1;");
+                return false;
+            } catch (e) {
+                return e instanceof SyntaxError;
+            }
+        }
+        return fun();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-2-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-2-s.js
index 42e6bce78..11f8dbe56 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-2-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-2-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict'' which lost the last character ';'

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict"

-        try {

-            eval("var public = 1;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict''
+    which lost the last character ';'
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict"
+        try {
+            eval("var public = 1;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-20-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-20-s.js
index cc30e88e6..e30ca5fe2 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-20-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-20-s.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-20-s.js

- * @description Strict Mode - Function code of a FunctionDeclaration contains Use Strict Directive which appears in the middle of the block

- * @noStrict

- */

-

-

-function testcase() {

-        function fun() {

-            eval("var public = 1;");

-            "use strict";

-            return public === 1;

-        }

-        return fun();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionDeclaration contains Use
+    Strict Directive which appears in the middle of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function fun() {
+            eval("var public = 1;");
+            "use strict";
+            return public === 1;
+        }
+        return fun();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-21-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-21-s.js
index 6c0245461..8238fa5f9 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-21-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-21-s.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-21-s.js

- * @description Strict Mode - Function code of a FunctionDeclaration contains Use Strict Directive which appears at the end of the block

- * @noStrict

- */

-

-

-function testcase() {

-        function fun() {

-            eval("var public = 1;");

-            return public === 1;

-            "use strict";

-        }

-        return fun();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionDeclaration contains Use
+    Strict Directive which appears at the end of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function fun() {
+            eval("var public = 1;");
+            return public === 1;
+            "use strict";
+        }
+        return fun();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-22-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-22-s.js
index 875ad9780..b5e64c969 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-22-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-22-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-22-s.js

- * @description Strict Mode - Function code of a FunctionExpression contains Use Strict Directive which appears at the start of the block

- * @noStrict

- */

-

-

-function testcase() {

-        return function () {

-            "use strict";

-            try {

-                eval("var public = 1;");

-                return false;

-            } catch (e) {

-                return e instanceof SyntaxError;

-            }

-        } ();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionExpression contains Use
+    Strict Directive which appears at the start of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return function () {
+            "use strict";
+            try {
+                eval("var public = 1;");
+                return false;
+            } catch (e) {
+                return e instanceof SyntaxError;
+            }
+        } ();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-23-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-23-s.js
index 680e928cd..467a60a8a 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-23-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-23-s.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-23-s.js

- * @description Strict Mode - Function code of a FunctionExpression contains Use Strict Directive which appears in the middle of the block

- * @noStrict

- */

-

-

-function testcase() {

-        return function () {

-            eval("var public = 1;");

-            return public === 1;

-            "use strict";

-        } ();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionExpression contains Use
+    Strict Directive which appears in the middle of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return function () {
+            eval("var public = 1;");
+            return public === 1;
+            "use strict";
+        } ();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-24-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-24-s.js
index ef67dbe59..6c9361d4b 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-24-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-24-s.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-24-s.js

- * @description Strict Mode - Function code of a FunctionExpression contains Use Strict Directive which appears at the end of the block

- * @noStrict

- */

-

-

-function testcase() {

-        return function () {

-            eval("var public = 1;");

-            "use strict";

-            return public === 1;

-        } ();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of a FunctionExpression contains Use
+    Strict Directive which appears at the end of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return function () {
+            eval("var public = 1;");
+            "use strict";
+            return public === 1;
+        } ();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-25-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-25-s.js
index 206518f72..cc33c0d3b 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-25-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-25-s.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-25-s.js

- * @description Strict Mode - Function code of Accessor PropertyAssignment contains Use Strict Directive which appears at the start of the block(getter)

- * @noStrict

- */

-

-

-function testcase() {

-        try {

-            var obj = {};

-            Object.defineProperty(obj, "accProperty", {

-                get: function () {

-                    "use strict";

-                    eval("var public = 1;");

-                    return 11;

-                }

-            });

-            var temp = obj.accProperty === 11;

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of Accessor PropertyAssignment
+    contains Use Strict Directive which appears at the start of the
+    block(getter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var obj = {};
+            Object.defineProperty(obj, "accProperty", {
+                get: function () {
+                    "use strict";
+                    eval("var public = 1;");
+                    return 11;
+                }
+            });
+            var temp = obj.accProperty === 11;
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-26-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-26-s.js
index 9da18136b..963491d7e 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-26-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-26-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-26-s.js

- * @description Strict Mode - Function code of Accessor PropertyAssignment contains Use Strict Directive which appears at the start of the block(setter)

- * @noStrict

- */

-

-

-function testcase() {

-        try {

-            var obj = {};

-            var data = "data";

-            Object.defineProperty(obj, "accProperty", {

-                set: function (value) {

-                    "use strict";

-                    eval("var public = 1;");

-                    data = value;

-                }

-            });

-

-            obj.accProperty = "overrideData";

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && data === "data";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of Accessor PropertyAssignment
+    contains Use Strict Directive which appears at the start of the
+    block(setter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var obj = {};
+            var data = "data";
+            Object.defineProperty(obj, "accProperty", {
+                set: function (value) {
+                    "use strict";
+                    eval("var public = 1;");
+                    data = value;
+                }
+            });
+
+            obj.accProperty = "overrideData";
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && data === "data";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-27-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-27-s.js
index 94b01f5af..f76b97111 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-27-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-27-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-27-s.js

- * @description Strict Mode - Function code of Accessor PropertyAssignment contains Use Strict Directive which appears in the middle of the block(getter)

- * @noStrict

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "accProperty", {

-            get: function () {

-                eval("public = 1;");

-                "use strict";

-                return 11;

-            }

-        });

-        return obj.accProperty === 11 && public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of Accessor PropertyAssignment
+    contains Use Strict Directive which appears in the middle of the
+    block(getter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "accProperty", {
+            get: function () {
+                eval("public = 1;");
+                "use strict";
+                return 11;
+            }
+        });
+        return obj.accProperty === 11 && public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-28-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-28-s.js
index f3ebe7d11..4faf8073f 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-28-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-28-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-28-s.js

- * @description Strict Mode - Function code of Accessor PropertyAssignment contains Use Strict Directive which appears at the end of the block(setter)

- * @noStrict

- */

-

-

-function testcase() {

-        var obj = {};

-        var data;

-

-        Object.defineProperty(obj, "accProperty", {

-            set: function (value) {

-                var _10_1_1_28_s = {a:1, a:2};

-                data = value;

-                "use strict";

-            }

-        });

-        obj.accProperty = "overrideData";

-        return data==="overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of Accessor PropertyAssignment
+    contains Use Strict Directive which appears at the end of the
+    block(setter)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data;
+
+        Object.defineProperty(obj, "accProperty", {
+            set: function (value) {
+                var _10_1_1_28_s = {a:1, a:2};
+                data = value;
+                "use strict";
+            }
+        });
+        obj.accProperty = "overrideData";
+        return data==="overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-29-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-29-s.js
index 9745777b1..ec8219cf2 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-29-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-29-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-29-s.js

- * @description Strict Mode - The built-in Function constructor is contained in use strict code

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var funObj = new Function("a", "eval('public = 1;');");

-        funObj();

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - The built-in Function constructor is contained in
+    use strict code
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var funObj = new Function("a", "eval('public = 1;');");
+        funObj();
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-2gs.js b/test/suite/ch10/10.1/10.1.1/10.1.1-2gs.js
index dd30cb215..87626ae71 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-2gs.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-2gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.1/10.1.1/10.1.1-2gs.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict'' which lost the last character ';'

- * @noStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict"

-throw NotEarlyError;

-var public = 1;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict''
+    which lost the last character ';'
+negative: ^((?!NotEarlyError).)*$
+flags: [noStrict]
+---*/
+
+"use strict"
+throw NotEarlyError;
+var public = 1;
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-3-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-3-s.js
index 8c4e4fb5d..a4fc5555e 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-3-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-3-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-3-s.js

- * @description Strict Mode - Use Strict Directive Prologue is '' use strict';' which the first character is space

- * @noStrict

- */

-

-

-function testcase() {

-        " use strict";

-        var public = 1;

-

-        return public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is '' use strict';'
+    which the first character is space
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        " use strict";
+        var public = 1;
+
+        return public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-30-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-30-s.js
index 79c68e7c2..4a523416c 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-30-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-30-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-30-s.js

- * @description Strict Mode - Function code of built-in Function constructor contains Use Strict Directive which appears at the start of the block

- * @noStrict

- */

-

-

-function testcase() {

-        try {

-            var funObj = new Function("a", "'use strict'; eval('public = 1;');");

-            funObj();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of built-in Function constructor
+    contains Use Strict Directive which appears at the start of the
+    block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var funObj = new Function("a", "'use strict'; eval('public = 1;');");
+            funObj();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-31-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-31-s.js
index 21c84976b..c513308fc 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-31-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-31-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-31-s.js

- * @description Strict Mode - Function code of built-in Function constructor contains Use Strict Directive which appears in the middle of the block

- * @noStrict

- */

-

-

-function testcase() {

-        var funObj = new Function("a", "eval('public = 1;'); 'use strict'; anotherVariable = 2;");

-        funObj();

-        return public === 1 && anotherVariable === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of built-in Function constructor
+    contains Use Strict Directive which appears in the middle of the
+    block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = new Function("a", "eval('public = 1;'); 'use strict'; anotherVariable = 2;");
+        funObj();
+        return public === 1 && anotherVariable === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-32-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-32-s.js
index a7cbc1d8c..5df7c281a 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-32-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-32-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-32-s.js

- * @description Strict Mode - Function code of built-in Function constructor contains Use Strict Directive which appears at the end of the block

- * @noStrict

- */

-

-

-function testcase() {

-        var funObj = new Function("a", "eval('public = 1;'); anotherVariable = 2; 'use strict';");

-        funObj();

-        return public === 1 && anotherVariable === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Function code of built-in Function constructor
+    contains Use Strict Directive which appears at the end of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = new Function("a", "eval('public = 1;'); anotherVariable = 2; 'use strict';");
+        funObj();
+        return public === 1 && anotherVariable === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-4-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-4-s.js
index 3d7db1862..63e6324e4 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-4-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-4-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-4-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict ';' which the last character is space

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict ";

-        var public = 1;

-        return public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict ';'
+    which the last character is space
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict ";
+        var public = 1;
+        return public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-5-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-5-s.js
index 6a9f07af4..7ddade325 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-5-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-5-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-5-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears at the beginning of the block

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("var public = 1;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears at the beginning of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("var public = 1;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-5gs.js b/test/suite/ch10/10.1/10.1.1/10.1.1-5gs.js
index 63698e5e6..468a4ca97 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-5gs.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-5gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.1/10.1.1/10.1.1-5gs.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears at the start of the code

- * @noStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-var public = 1;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears at the start of the code
+negative: ^((?!NotEarlyError).)*$
+flags: [noStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var public = 1;
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-6-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-6-s.js
index 6434c2515..295cb01db 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-6-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-6-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-6-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears in the middle of the block

- * @noStrict

- */

-

-

-function testcase() {

-        var interface = 2;

-        "use strict";

-        var public = 1;

-        return public === 1 && interface === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears in the middle of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var interface = 2;
+        "use strict";
+        var public = 1;
+        return public === 1 && interface === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-7-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-7-s.js
index 42b5e1ee2..10af2e43d 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-7-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-7-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-7-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears at the end of the block

- * @noStrict

- */

-

-

-function testcase() {

-        var public = 1;

-        return public === 1;

-        "use strict";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears at the end of the block
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var public = 1;
+        return public === 1;
+        "use strict";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-8-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-8-s.js
index 3fc4df80e..33e058fb7 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-8-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-8-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-8-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears twice in the directive prologue

- * @noStrict

- */

-

-

-function testcase() {

-        "use strict";

-        "use strict";

-        try {

-            eval("var public = 1;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears twice in the directive prologue
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        "use strict";
+        try {
+            eval("var public = 1;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-8gs.js b/test/suite/ch10/10.1/10.1.1/10.1.1-8gs.js
index 88476ac4a..6c0359f06 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-8gs.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-8gs.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.1/10.1.1/10.1.1-8gs.js

- * @description Strict Mode - Use Strict Directive Prologue is ''use strict';' which appears twice in the code

- * @noStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-"use strict";

-throw NotEarlyError;

-var public = 1;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''use strict';'
+    which appears twice in the code
+negative: ^((?!NotEarlyError).)*$
+flags: [noStrict]
+---*/
+
+"use strict";
+"use strict";
+throw NotEarlyError;
+var public = 1;
diff --git a/test/suite/ch10/10.1/10.1.1/10.1.1-9-s.js b/test/suite/ch10/10.1/10.1.1/10.1.1-9-s.js
index b294ef146..f4067d64e 100644
--- a/test/suite/ch10/10.1/10.1.1/10.1.1-9-s.js
+++ b/test/suite/ch10/10.1/10.1.1/10.1.1-9-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.1/10.1.1/10.1.1-9-s.js

- * @description Strict Mode - Use Strict Directive Prologue is ''Use strict';' in which the first character is uppercase

- * @noStrict

- */

-

-

-function testcase() {

-        "Use strict";

-        var public = 1;

-        return public === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Use Strict Directive Prologue is ''Use strict';' in
+    which the first character is uppercase
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "Use strict";
+        var public = 1;
+        return public === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.1/S10.1.1_A1_T1.js b/test/suite/ch10/10.1/S10.1.1_A1_T1.js
index 4085aa5ac..16ddde281 100644
--- a/test/suite/ch10/10.1/S10.1.1_A1_T1.js
+++ b/test/suite/ch10/10.1/S10.1.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Program functions are defined in source text by a FunctionDeclaration or created dynamically either
- * by using a FunctionExpression or by using the built-in Function object as a constructor
- *
- * @path ch10/10.1/S10.1.1_A1_T1.js
- * @description Defining function by a FunctionDeclaration
- */
+/*---
+info: >
+    Program functions are defined in source text by a FunctionDeclaration or created dynamically either
+    by using a FunctionExpression or by using the built-in Function object as a constructor
+description: Defining function by a FunctionDeclaration
+---*/
 
 //CHECK#1
 function f1(){
@@ -15,4 +14,3 @@ function f1(){
 }
 if(typeof(f1)!=="function")
   $ERROR('#1: typeof(f1)!=="function"');
-
diff --git a/test/suite/ch10/10.1/S10.1.1_A1_T2.js b/test/suite/ch10/10.1/S10.1.1_A1_T2.js
index d453d6e59..b3ff66591 100644
--- a/test/suite/ch10/10.1/S10.1.1_A1_T2.js
+++ b/test/suite/ch10/10.1/S10.1.1_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Program functions are defined in source text by a FunctionDeclaration or created dynamically either
- * by using a FunctionExpression or by using the built-in Function object as a constructor
- *
- * @path ch10/10.1/S10.1.1_A1_T2.js
- * @description Creating function dynamically by using a FunctionExpression
- */
+/*---
+info: >
+    Program functions are defined in source text by a FunctionDeclaration or created dynamically either
+    by using a FunctionExpression or by using the built-in Function object as a constructor
+description: Creating function dynamically by using a FunctionExpression
+---*/
 
 //CHECK#1
 var x=function f1(){return 1;}();
@@ -25,4 +24,3 @@ var z = (function(){return 3;})();
 if(z!==3){
   $ERROR('#3: Create an anonymous function dynamically either by using a FunctionExpression wrapped in a group operator');
 }
-
diff --git a/test/suite/ch10/10.1/S10.1.1_A1_T3.js b/test/suite/ch10/10.1/S10.1.1_A1_T3.js
index 5e49dcd59..5c149d038 100644
--- a/test/suite/ch10/10.1/S10.1.1_A1_T3.js
+++ b/test/suite/ch10/10.1/S10.1.1_A1_T3.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Program functions are defined in source text by a FunctionDeclaration or created dynamically either
- * by using a FunctionExpression or by using the built-in Function object as a constructor
- *
- * @path ch10/10.1/S10.1.1_A1_T3.js
- * @description Creating function dynamically by using the built-in Function object as a constructor
- */
+/*---
+info: >
+    Program functions are defined in source text by a FunctionDeclaration or created dynamically either
+    by using a FunctionExpression or by using the built-in Function object as a constructor
+description: >
+    Creating function dynamically by using the built-in Function
+    object as a constructor
+---*/
 
 //CHECK#1
 var x=new function f1(){return 1;};
 if(typeof(x.constructor)!=="function")
   $ERROR('#1: typeof(x.constructor)!=="function"');
-
diff --git a/test/suite/ch10/10.1/S10.1.1_A2_T1.js b/test/suite/ch10/10.1/S10.1.1_A2_T1.js
index aa5701155..25a12bb76 100644
--- a/test/suite/ch10/10.1/S10.1.1_A2_T1.js
+++ b/test/suite/ch10/10.1/S10.1.1_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * There are two types of Function objects. Internal functions
- * are built-in objects of the language, such as parseInt and Math.exp
- *
- * @path ch10/10.1/S10.1.1_A2_T1.js
- * @description Checking types of parseInt and Math.exp
- */
+/*---
+info: >
+    There are two types of Function objects. Internal functions
+    are built-in objects of the language, such as parseInt and Math.exp
+description: Checking types of parseInt and Math.exp
+---*/
 
 //CHECK#1
 if(typeof(Math.exp)!=="function")
@@ -16,5 +15,3 @@ if(typeof(Math.exp)!=="function")
 //CHECK#2
 if(typeof(parseInt)!=="function")
   $ERROR('#2: typeof(parseInt())!=="function" '+typeof(parseInt()));
-  
-
diff --git a/test/suite/ch10/10.1/S10.1.6_A1_T1.js b/test/suite/ch10/10.1/S10.1.6_A1_T1.js
index 5dee9bf43..ccc84b8ea 100644
--- a/test/suite/ch10/10.1/S10.1.6_A1_T1.js
+++ b/test/suite/ch10/10.1/S10.1.6_A1_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The activation object is initialised with a property with name arguments and attributes {DontDelete}
- *
- * @path ch10/10.1/S10.1.6_A1_T1.js
- * @description Checking if deleting function parameter is possible
- * @noStrict
- */
+/*---
+info: >
+    The activation object is initialised with a property with name arguments
+    and attributes {DontDelete}
+description: Checking if deleting function parameter is possible
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(a){
@@ -16,5 +16,3 @@ function f1(a){
 }
 if (f1(1) !== 1)
   $ERROR('#1: Function parameter was deleted');
-
-
diff --git a/test/suite/ch10/10.1/S10.1.6_A1_T2.js b/test/suite/ch10/10.1/S10.1.6_A1_T2.js
index 8747b2f11..374f52f8c 100644
--- a/test/suite/ch10/10.1/S10.1.6_A1_T2.js
+++ b/test/suite/ch10/10.1/S10.1.6_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The activation object is initialised with a property with name arguments and attributes {DontDelete}
- *
- * @path ch10/10.1/S10.1.6_A1_T2.js
- * @description Checking funtion which returns property "arguments"
- */
+/*---
+info: >
+    The activation object is initialised with a property with name arguments
+    and attributes {DontDelete}
+description: Checking funtion which returns property "arguments"
+---*/
 
 var ARG_STRING = "value of the argument property";
 
@@ -30,4 +30,3 @@ if (delete x[3] !== true)
   
 if (x[3] === 4)
   $ERROR('#3.2: Function parameters have attribute {DontDelete}');
-
diff --git a/test/suite/ch10/10.1/S10.1.6_A1_T3.js b/test/suite/ch10/10.1/S10.1.6_A1_T3.js
index 95e1bf2ef..27b1026f7 100644
--- a/test/suite/ch10/10.1/S10.1.6_A1_T3.js
+++ b/test/suite/ch10/10.1/S10.1.6_A1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The activation object is initialised with a property with name arguments and attributes {DontDelete}
- *
- * @path ch10/10.1/S10.1.6_A1_T3.js
- * @description Checking function which returns "this"
- * @noStrict
- */
+/*---
+info: >
+    The activation object is initialised with a property with name arguments
+    and attributes {DontDelete}
+description: Checking function which returns "this"
+flags: [noStrict]
+---*/
 
 function f1() {
   if (delete arguments) {
@@ -17,4 +17,3 @@ function f1() {
 }
 
 f1();
-
diff --git a/test/suite/ch10/10.1/S10.1.7_A1_T1.js b/test/suite/ch10/10.1/S10.1.7_A1_T1.js
index f7e7a0b0c..7238e3583 100644
--- a/test/suite/ch10/10.1/S10.1.7_A1_T1.js
+++ b/test/suite/ch10/10.1/S10.1.7_A1_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The this value associated with an executioncontext is immutable
- *
- * @path ch10/10.1/S10.1.7_A1_T1.js
- * @description Checking if deleting "this" fails
- */
+/*---
+info: The this value associated with an executioncontext is immutable
+description: Checking if deleting "this" fails
+---*/
 
 //CHECK#1
 if (delete this !== true)
   $ERROR('#1: The this value associated with an executioncontext is immutable. Actual: this was deleted');
-  
-
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
index bfc1f5ece..52e18362c 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js

- * @description Strict Mode - TypeError is thrown when changing the value of a Value Property of the Global Object under strict mode (NaN)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            NaN = 12;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when changing the value of a
+    Value Property of the Global Object under strict mode (NaN)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            NaN = 12;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
index e60836978..d117d9f67 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js

- * @description Strict Mode - TypeError is thrown when changing the value of a Value Property of the Global Object under strict mode (undefined)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            undefined = 12;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when changing the value of a
+    Value Property of the Global Object under strict mode (undefined)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            undefined = 12;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
index 9303b79b5..d072356e6 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js

- * @description Strict Mode - TypeError is not thrown when changing the value of the Constructor Properties of the Global Object under strict mode (Object)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var objBak = Object;

-

-        try {

-            Object = 12;

-            return true;

-        } finally {

-            Object = objBak;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is not thrown when changing the value of
+    the Constructor Properties of the Global Object under strict mode
+    (Object)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var objBak = Object;
+
+        try {
+            Object = 12;
+            return true;
+        } finally {
+            Object = objBak;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
index 9ecdf64a5..cd36539a2 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js

- * @description Strict Mode - TypeError is not thrown when changing the value of the Constructor Properties of the Global Object under strict mode (Number)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var numBak = Number;

-        try {

-            Number = 12;

-            return true;

-        } finally {

-            Number = numBak;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is not thrown when changing the value of
+    the Constructor Properties of the Global Object under strict mode
+    (Number)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var numBak = Number;
+        try {
+            Number = 12;
+            return true;
+        } finally {
+            Number = numBak;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
index 6206633b2..e697a8afb 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the caller supplies fewer parameter values than there are
- * formal parameters, the extra formal parameters have value undefined
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A1.js
- * @description Calling function excluding a few parameters
- */
+/*---
+info: >
+    If the caller supplies fewer parameter values than there are
+    formal parameters, the extra formal parameters have value undefined
+description: Calling function excluding a few parameters
+---*/
 
 //CHECK#1
 function f1(a, b){
@@ -26,4 +25,3 @@ function f2(a, b, c){
 if(!(f2(1) === true)){
   $ERROR('#2: f2(1, 2) === true');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
index e622c5462..3b8e89a2f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If two or more formal parameters share the same name, hence
- * the same property, the corresponding property is given the value that was
- * supplied for the last parameter with this name
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A2.js
- * @description Creating functions initialized with two or more formal parameters, which have the same name
- * @noStrict
- */
+/*---
+info: >
+    If two or more formal parameters share the same name, hence
+    the same property, the corresponding property is given the value that was
+    supplied for the last parameter with this name
+description: >
+    Creating functions initialized with two or more formal parameters,
+    which have the same name
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(x, x) {
@@ -34,4 +35,3 @@ function f3(x, x) {
 if(!(f3(1, 2) === 'a2')){
   $ERROR("#3: f3(1, 2) === 'a2'");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
index 1c15c0621..8da07b12f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the value of this last parameter (which has the same
- * name as some previous parameters do) was not supplied by the
- * caller, the value of the corresponding property is undefined
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A3.js
- * @description Creating functions with two or more formal parameters,
- * that have the same name. Calling this function excluding a few last parameters
- */
+/*---
+info: >
+    If the value of this last parameter (which has the same
+    name as some previous parameters do) was not supplied by the
+    caller, the value of the corresponding property is undefined
+description: >
+    Creating functions with two or more formal parameters,  that have
+    the same name. Calling this function excluding a few last
+    parameters
+---*/
 
 //CHECK#1
 function f1(x, a, b, x){
@@ -18,4 +19,3 @@ function f1(x, a, b, x){
 if(!(f1(1, 2) === undefined)){
   $ERROR('#1: f1(1, 2) === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
index a153af430..346f3a27f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration in function code - If the variable object
- * already has a property with the name of Function Identifier, replace its
- * value and attributes. Semantically, this step must follow the creation of
- * FormalParameterList properties
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A4_T1.js
- * @description Checking existence of a function with passed parameter
- * @noStrict
- */
+/*---
+info: >
+    Function declaration in function code - If the variable object
+    already has a property with the name of Function Identifier, replace its
+    value and attributes. Semantically, this step must follow the creation of
+    FormalParameterList properties
+description: Checking existence of a function with passed parameter
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -46,4 +45,3 @@ function f3() {
 if (!(f3() === "function")){
   $ERROR('#3: f3() === "function"');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
index 16661df91..4c84ac9e3 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration in function code - If the variable object
- * already has a property with the name of Function Identifier, replace its
- * value and attributes. Semantically, this step must follow the creation of
- * FormalParameterList properties
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A4_T2.js
- * @description Checking existence of a function with declared variable
- */
+/*---
+info: >
+    Function declaration in function code - If the variable object
+    already has a property with the name of Function Identifier, replace its
+    value and attributes. Semantically, this step must follow the creation of
+    FormalParameterList properties
+description: Checking existence of a function with declared variable
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(){
@@ -38,4 +38,3 @@ function f2(){
 if(!(f2() === "function")){
   $PRINT('#2: f2() === "function"');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
index 824aedeee..e0b73a85a 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For each VariableDeclaration or VariableDeclarationNoIn in the
- * code, create a property of the variable object whose name is the Identifier
- * in the VariableDeclaration or VariableDeclarationNoIn, whose value is
- * undefined and whose attributes are determined by the type of code
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
- * @description Checking variable existence only
- */
+/*---
+info: >
+    For each VariableDeclaration or VariableDeclarationNoIn in the
+    code, create a property of the variable object whose name is the Identifier
+    in the VariableDeclaration or VariableDeclarationNoIn, whose value is
+    undefined and whose attributes are determined by the type of code
+description: Checking variable existence only
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(){
@@ -32,4 +32,3 @@ function f2(){
 if(!(f2() === undefined)){
   $PRINT('#1: f2() === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
index adef8b5c5..8cca24147 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For each VariableDeclaration or VariableDeclarationNoIn in the
- * code, create a property of the variable object whose name is the Identifier
- * in the VariableDeclaration or VariableDeclarationNoIn, whose value is
- * undefined and whose attributes are determined by the type of code
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
- * @description Checking existence of the variable object property with formal parameter
- */
+/*---
+info: >
+    For each VariableDeclaration or VariableDeclarationNoIn in the
+    code, create a property of the variable object whose name is the Identifier
+    in the VariableDeclaration or VariableDeclarationNoIn, whose value is
+    undefined and whose attributes are determined by the type of code
+description: >
+    Checking existence of the variable object property with formal
+    parameter
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -32,4 +34,3 @@ function f2(x){
 if(!(f2() === undefined)){
   $PRINT('#1: f2(1) === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
index d5321c907..743e289e6 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If there is already a property of the variable object with the
- * name of a declared variable, the value of the property and its attributes
- * are not changed
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
- * @description Checking existence of the variable object property with formal parameter
- */
+/*---
+info: >
+    If there is already a property of the variable object with the
+    name of a declared variable, the value of the property and its attributes
+    are not changed
+description: >
+    Checking existence of the variable object property with formal
+    parameter
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -31,4 +33,3 @@ function f2(x){
 if(!(f2(1) === 1)){
   $PRINT('#1: f2(1) === 1');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
index 7aba918d1..1f03ee6ae 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T1.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -23,4 +22,3 @@ function f1(){
 if(!(f1() === 1)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
index 33b472418..06ec5a4ac 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T2.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -22,4 +21,3 @@ function f1(){
 if(!(f1() === 0)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
index a9a85deff..350f662dd 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T3.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -24,5 +23,3 @@ function f1(){
 if(!(f1() === undefined)){
   $ERROR("#1: Scope chain disturbed");
 }
-
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
index e32ffac35..fdd3a3de4 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T4.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -24,4 +23,3 @@ function f1(){
 if(!(f1() === 1)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
index c71654f6f..c761ef6f6 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T5.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -28,4 +27,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
index 990c27ef3..4e55face7 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T6.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -27,4 +26,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
index cc719b504..4b6de1a67 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T7.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -29,4 +28,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
index 3aaefcf14..e13f22581 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T8.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -29,4 +28,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
index c03fdd1cf..bfb8fc5af 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T9.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -24,4 +23,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
index 6a133d788..6acdb8c14 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Value Properties
+---*/
 
 //CHECK#1
 if ( NaN === null ) {
@@ -23,4 +22,3 @@ if ( Infinity === null ) {
 if ( undefined === null ) {
   $ERROR("#3: undefined === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
index 1fafadc99..49d6bfa17 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Function Properties
+---*/
 
 //CHECK#4
 if ( eval === null ) {
@@ -53,4 +52,3 @@ if ( encodeURI === null ) {
 if ( encodeURIComponent === null ) {
   $ERROR("#12: encodeURIComponent === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
index 3407039e8..f586fc681 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Constructor Properties
+---*/
 
 //CHECK#13
 if ( Object === null ) {
@@ -83,5 +82,3 @@ if ( TypeError === null ) {
 if ( URIError === null ) {
   $ERROR("#26: URIError === null");
 }
-
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
index f59cc646e..1173976df 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Other Properties
+---*/
 
 //CHECK#27
 if ( Math === null ) {
   $ERROR("#27: Math === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
index a6b6c4bbf..d69865b32 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
- * @description Function execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Value Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -27,4 +26,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
index 45ca89f36..211149fb7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
- * @description Function execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Function Properties
+---*/
 
 function test() {
   //CHECK#4
@@ -57,4 +56,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
index 295943cb7..a49262bbc 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
- * @description Function execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Constructor Properties
+---*/
 
 function test() {
   //CHECK#13
@@ -87,4 +86,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
index 01d02fb39..a1d0451d0 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
- * @description Function execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Other Properties
+---*/
 
 function test() {
   //CHECK#27
@@ -17,4 +16,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
index 695f0acf5..d5fb931c8 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
- * @description Eval execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Value Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -27,4 +26,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
index 5afd0ef93..17ea0a4d6 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
- * @description Eval execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Function Properties
+---*/
 
 var evalStr = 
 '//CHECK#4\n'+
@@ -57,4 +56,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
index b34b1e252..55280ae16 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
- * @description Eval execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Constructor Properties
+---*/
 
 var evalStr = 
 '//CHECK#13\n'+
@@ -87,4 +86,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
index 054969ce2..73fb3c2f1 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
- * @description Eval execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Other Properties
+---*/
 
 var evalStr = 
 '//CHECK#27\n'+
@@ -17,4 +16,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
index db57ad5ba..4d3f3f882 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Value Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -18,4 +16,3 @@ for (var x in this) {
     $ERROR("#1: 'undefined' have attribute DontEnum");
   } 
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
index 6a39d43a1..6c25317e6 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Function Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -30,4 +28,3 @@ for (var x in this) {
     $ERROR("#1: 'encodeURIComponent' have attribute DontEnum");
   } 
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
index c684a649a..56146684e 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Constructor Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -42,4 +40,3 @@ for (var x in this) {
     $ERROR("#1: 'URIError' have attribute DontEnum");
   }
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
index cb575c533..5ae5c15d7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Other Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -14,4 +12,3 @@ for (var x in this) {
     $ERROR("#1: 'Math' have attribute DontEnum");
   }
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
index 808cc1b60..7e9482a05 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
- * @description Function execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Value Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -22,4 +20,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
index ac87a58ef..4dfb563c9 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
- * @description Function execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Function Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -34,4 +32,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
index e6f5f4ac7..65d7f29d7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
- * @description Function execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Constructor Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -46,4 +44,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
index 3a6afa5cc..695530429 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
- * @description Function execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Other Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -18,4 +16,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
index f7f32c563..c6c90bdd4 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Value Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -21,4 +19,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
index 8d3cfe7ee..d4a3c5b36 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Function Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -33,4 +31,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
index 9ae75beb9..b70facd01 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Constructor Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -45,4 +43,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
index ed60835c9..335f3852c 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Other Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -17,4 +15,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
index 04abf8bef..c5c8fe848 100644
--- a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
+++ b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variable instantiation is performed using the global object as
- * the variable object and using property attributes { DontDelete }
- *
- * @path ch10/10.4/10.4.1/S10.4.1_A1_T1.js
- * @description Checking if deleting variable x, that is defined as var x = 1, fails
- * @noStrict
- */
+/*---
+info: >
+    Variable instantiation is performed using the global object as
+    the variable object and using property attributes { DontDelete }
+description: >
+    Checking if deleting variable x, that is defined as var x = 1,
+    fails
+flags: [noStrict]
+---*/
 
 var x = 1;
 
@@ -19,4 +20,3 @@ if (this.x !== 1) {
 if(delete this.x !== false){
   $ERROR("#2: variable x has property attribute DontDelete");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
index 107381f2d..78ab8fabf 100644
--- a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
+++ b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variable instantiation is performed using the global object as
- * the variable object and using property attributes { DontDelete }
- *
- * @path ch10/10.4/10.4.1/S10.4.1_A1_T2.js
- * @description Checking if deleting variable x, that is defined as x = 1, fails
- * @noStrict
- */
+/*---
+info: >
+    Variable instantiation is performed using the global object as
+    the variable object and using property attributes { DontDelete }
+description: Checking if deleting variable x, that is defined as x = 1, fails
+flags: [noStrict]
+---*/
 
 x = 1;
 
@@ -19,4 +18,3 @@ if (this.x !== 1) {
 if(delete this.x !== true){
   $ERROR("#2: variable x has property attribute DontDelete");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js
index 233eac2c8..bda0d51aa 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-1.js

- * @description Indirect call to eval has context set to global context

- */

-

-var __10_4_2_1_1_1 = "str";

-function testcase() {

-  try {

-

-    var _eval = eval;

-    var __10_4_2_1_1_1 = "str1";

-    if(_eval("\'str\' === __10_4_2_1_1_1") === true &&  // indirect eval

-       eval("\'str1\' === __10_4_2_1_1_1") === true) {   // direct eval

-       return true;

-    }

-    return false;

-  } finally {

-    delete this.__10_4_2_1_1_1;

-  }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Indirect call to eval has context set to global context
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_1_1 = "str";
+function testcase() {
+  try {
+
+    var _eval = eval;
+    var __10_4_2_1_1_1 = "str1";
+    if(_eval("\'str\' === __10_4_2_1_1_1") === true &&  // indirect eval
+       eval("\'str1\' === __10_4_2_1_1_1") === true) {   // direct eval
+       return true;
+    }
+    return false;
+  } finally {
+    delete this.__10_4_2_1_1_1;
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
index 7c144f552..4105bb2b6 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-2.js

- * @description Indirect call to eval has context set to global context (nested function)

- */

-

-var __10_4_2_1_2 = "str";

-function testcase() {

-        try {

-

-            var _eval = eval;

-            var __10_4_2_1_2 = "str1";

-            function foo() {

-                var __10_4_2_1_2 = "str2";

-                if(_eval("\'str\' === __10_4_2_1_2") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_2") === true) {   // direct eval

-                    return true;

-                } else {

-                    return false;

-                }

-            }

-            return foo();

-        } finally {

-            delete this.__10_4_2_1_1_2;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Indirect call to eval has context set to global context (nested
+    function)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_2 = "str";
+function testcase() {
+        try {
+
+            var _eval = eval;
+            var __10_4_2_1_2 = "str1";
+            function foo() {
+                var __10_4_2_1_2 = "str2";
+                if(_eval("\'str\' === __10_4_2_1_2") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_2") === true) {   // direct eval
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            return foo();
+        } finally {
+            delete this.__10_4_2_1_1_2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
index 078ea21ab..beca1c852 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-3.js

- * @description Indirect call to eval has context set to global context (catch block)

- */

-

-var __10_4_2_1_3 = "str";

-function testcase() {

-

-        try {

-

-            var _eval = eval;

-            var __10_4_2_1_3 = "str1";

-            try {

-                throw "error";

-            }

-            catch (e) {

-                var __10_4_2_1_3 = "str2";

-                if (_eval("\'str\' === __10_4_2_1_3") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_3") === true) {  // direct eval

-                    return true;

-                } else {

-                    return false;

-                }

-            }

-        } finally {

-            delete this.__10_4_2_1_3;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Indirect call to eval has context set to global context (catch
+    block)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_3 = "str";
+function testcase() {
+
+        try {
+
+            var _eval = eval;
+            var __10_4_2_1_3 = "str1";
+            try {
+                throw "error";
+            }
+            catch (e) {
+                var __10_4_2_1_3 = "str2";
+                if (_eval("\'str\' === __10_4_2_1_3") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_3") === true) {  // direct eval
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } finally {
+            delete this.__10_4_2_1_3;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js
index 8a025f0d9..b4b9f7527 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-4.js

- * @description Indirect call to eval has context set to global context (with block)

- */

-

-var __10_4_2_1_4 = "str";

-function testcase() {

-        try {

-            var o = new Object();

-            o.__10_4_2_1_4 = "str2";

-            var _eval = eval;

-            var __10_4_2_1_4 = "str1";

-            with (o) {

-                if (_eval("\'str\' === __10_4_2_1_4") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_4") === true) {  // direct eval

-                    return true;

-                }

-            }

-            return false;

-        } finally {

-            delete this.__10_4_2_1_4;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Indirect call to eval has context set to global context (with
+    block)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_4 = "str";
+function testcase() {
+        try {
+            var o = new Object();
+            o.__10_4_2_1_4 = "str2";
+            var _eval = eval;
+            var __10_4_2_1_4 = "str1";
+            with (o) {
+                if (_eval("\'str\' === __10_4_2_1_4") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_4") === true) {  // direct eval
+                    return true;
+                }
+            }
+            return false;
+        } finally {
+            delete this.__10_4_2_1_4;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js
index 3808a9988..62a90877a 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-5.js

- * @description Indirect call to eval has context set to global context (inside another eval)

- */

-

-var __10_4_2_1_5 = "str";

-function testcase() {

-        try {

-

-            var __10_4_2_1_5 = "str1";

-            var r = eval("\

-                          var _eval = eval; \

-                          var __10_4_2_1_5 = \'str2\'; \

-                          _eval(\"\'str\' === __10_4_2_1_5 \") && \

-                          eval(\"\'str2\' === __10_4_2_1_5\")\

-                        ");

-            return r;

-        } finally {

-            delete this.__10_4_2_1_5;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Indirect call to eval has context set to global context (inside
+    another eval)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_5 = "str";
+function testcase() {
+        try {
+
+            var __10_4_2_1_5 = "str1";
+            var r = eval("\
+                          var _eval = eval; \
+                          var __10_4_2_1_5 = \'str2\'; \
+                          _eval(\"\'str\' === __10_4_2_1_5 \") && \
+                          eval(\"\'str2\' === __10_4_2_1_5\")\
+                        ");
+            return r;
+        } finally {
+            delete this.__10_4_2_1_5;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js b/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js
index 61d85cec0..308f5b01f 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-2-c-1.js

- * @description Direct val code in non-strict mode - can instantiate variable in calling context

- */

-

-

-function testcase() {

-  var x = 0;

-  return function inner() {

-     eval("var x = 1");

-     if (x === 1)

-        return true;

-     } ();

-   }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Direct val code in non-strict mode - can instantiate variable in
+    calling context
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var x = 0;
+  return function inner() {
+     eval("var x = 1");
+     if (x === 1)
+        return true;
+     } ();
+   }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js
index fb00b04f5..a2bc24fbc 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-2-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        eval("(function fun(x){ return x })(10)");

-        return typeof (fun) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        eval("(function fun(x){ return x })(10)");
+        return typeof (fun) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js
index 57ee1912d..590dd21ed 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-3-c-1-s.js

- * @description Direct eval code in strict mode - cannot instantiate variable in the variable environment of the calling context

- * @onlyStrict

- */

-

-

-function testcase() {

-  var _10_4_2_3_c_1_s = 0;

-  function _10_4_2_3_c_1_sFunc() {

-     eval("'use strict';var _10_4_2_3_c_1_s = 1");

-     return _10_4_2_3_c_1_s===0;

-  } 

-  return _10_4_2_3_c_1_sFunc();

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Direct eval code in strict mode - cannot instantiate variable in
+    the variable environment of the calling context
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _10_4_2_3_c_1_s = 0;
+  function _10_4_2_3_c_1_sFunc() {
+     eval("'use strict';var _10_4_2_3_c_1_s = 1");
+     return _10_4_2_3_c_1_s===0;
+  } 
+  return _10_4_2_3_c_1_sFunc();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js
index 91caa626b..7df57db62 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-3-c-2-s.js

- * @description Calling code in strict mode - eval cannot instantiate variable in the variable environment of the calling context

- * @onlyStrict

- */

-

-

-function testcase() {

-  var _10_4_2_3_c_2_s = 0;

-  function _10_4_2_3_c_2_sFunc() {

-     'use strict';

-     eval("var _10_4_2_3_c_2_s = 1");

-     return _10_4_2_3_c_2_s===0;

-  }

-  return _10_4_2_3_c_2_sFunc();

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Calling code in strict mode - eval cannot instantiate variable in
+    the variable environment of the calling context
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _10_4_2_3_c_2_s = 0;
+  function _10_4_2_3_c_2_sFunc() {
+     'use strict';
+     eval("var _10_4_2_3_c_2_s = 1");
+     return _10_4_2_3_c_2_s===0;
+  }
+  return _10_4_2_3_c_2_sFunc();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js
index e0d77031f..e601d510a 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.4/10.4.2/10.4.2.1-1gs.js

- * @description Strict Mode - eval code cannot instantiate variable in the variable environment of the calling context that invoked the eval if the code of the calling context is strict code

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-eval("var x = 7;");

-x = 9;

-throw NotEarlyError;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - eval code cannot instantiate variable in the
+    variable environment of the calling context that invoked the eval
+    if the code of the calling context is strict code
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+eval("var x = 7;");
+x = 9;
+throw NotEarlyError;
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js
index 5fc76cb35..894fa3cf5 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2.1-2-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        eval("function _10_4_2_1_2_fun(){}");

-        return typeof _10_4_2_1_2_fun === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        eval("function _10_4_2_1_2_fun(){}");
+        return typeof _10_4_2_1_2_fun === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
index 89ce85399..06dcc1c21 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.2/10.4.2.1-4-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval which is contained in strict mode code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        eval("'use strict'; function _10_4_2_1_4_fun(){}");

-        return typeof _10_4_2_1_4_fun === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval which is
+    contained in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        eval("'use strict'; function _10_4_2_1_4_fun(){}");
+        return typeof _10_4_2_1_4_fun === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
index 3a3690ce9..09644ea81 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch10/10.4/10.4.2/S10.4.2.1_A1.js
- * @description Strict indirect eval should not leak top level
- * declarations into the global scope
- * @onlyStrict
- */
+/*---
+description: >
+    Strict indirect eval should not leak top level  declarations into
+    the global scope
+flags: [onlyStrict]
+---*/
 
 "use strict";
 if (!('foo' in this)) {
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
index 077ae7be1..b37957b30 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
index 4903b5b3b..b598e1d6b 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
index fb7b1690e..c8b782950 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 this.x = 1;
 this.y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
index b7eb20df0..d08fffb78 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 var x = 1;
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
index 3b32b2bc2..5f1be6800 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
index c5e5d0a04..367abb89a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
index 927a8007d..3df5588b8 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
index b9fb461f6..6ad227206 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 this.y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
index 93160490c..73e02d71a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
index 5376140af..2ce15cbe4 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
index 76d75b8f9..9ae52f34f 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 x = 1;
 y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
index 229cfc63f..f13a63967 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -28,4 +27,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
index 1707379cf..59be72d28 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
index b94f2aa56..e0c6e68e4 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
- * @description eval within global execution context
- * @noStrict
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+flags: [noStrict]
+---*/
 
 function f(){
   var i;
@@ -31,4 +30,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
index 72611dc49..f128a6611 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
index f3cd1b0bf..b13f0e87f 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
index cebe8f3a2..e2a672f54 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,4 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
index 802434849..21c3c097a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
index 275f8ce98..ee0b953ff 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
index 1870bc1fd..47cc6087b 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,6 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
index 8f1282460..08d3b58ec 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
index e77ca4323..ba5568f0a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js
index 9ed7152e4..9f07e3faa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-1-s.js

- * @description this is not coerced to an object in strict mode (Number)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call(1) === 'number' && bar.call(1) === 'object';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: this is not coerced to an object in strict mode (Number)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call(1) === 'number' && bar.call(1) === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js
index d737cff1a..c82fb4d9f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-10-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = function () {

-    "use strict";

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = function () {
+    "use strict";
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
index 98deb941e..971841336 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-100-s.js

- * @description Strict Mode - checking 'this' (strict function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 3;

-

-function f() {

-    "use strict";

-    x = this;

-    return "a";

-}

-return ("ab".replace("b", f)==="aa") && (x===undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function passed as arg to
+    String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 3;
+
+function f() {
+    "use strict";
+    x = this;
+    return "a";
+}
+return ("ab".replace("b", f)==="aa") && (x===undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js
index b78f81660..8ca4fbfc5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-100gs.js

- * @description Strict Mode - checking 'this' (strict function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-var x = 3;

-

-function f() {

-    "use strict";

-    x = this;

-    return "a";

-}

-if (("ab".replace("b", f)!=="aa") || (x!==undefined)) {

-        throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function passed as arg to
+    String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+---*/
+
+var x = 3;
+
+function f() {
+    "use strict";
+    x = this;
+    return "a";
+}
+if (("ab".replace("b", f)!=="aa") || (x!==undefined)) {
+        throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
index bb7c2c7a9..8fa335df0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-101-s.js

- * @description Strict Mode - checking 'this' (non-strict function passed as arg to String.prototype.replace from strict context)

- * @noStrict

- */

-    

-function testcase() {

-var x = 3;

-

-function f() {

-    x = this;

-    return "a";

-}

-

-return (function() {"use strict"; return "ab".replace("b", f)==="aa";}()) && (x===fnGlobalObject());

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function passed as arg
+    to String.prototype.replace from strict context)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var x = 3;
+
+function f() {
+    x = this;
+    return "a";
+}
+
+return (function() {"use strict"; return "ab".replace("b", f)==="aa";}()) && (x===fnGlobalObject());
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js
index bc6eba526..e846d812b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-101gs.js

- * @description Strict Mode - checking 'this' (non-strict function passed as arg to String.prototype.replace from strict context)

- * @noStrict

- */

-var x = 3;

-

-function f() {

-    x = this;

-    return "a";

-}

-

-if ( (!(function() {"use strict"; return "ab".replace("b", f)==="aa";}())) || (x!==fnGlobalObject())) {

-     throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function passed as arg
+    to String.prototype.replace from strict context)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var x = 3;
+
+function f() {
+    x = this;
+    return "a";
+}
+
+if ( (!(function() {"use strict"; return "ab".replace("b", f)==="aa";}())) || (x!==fnGlobalObject())) {
+     throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js
index 0a11390ef..98807e688 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-102-s.js

- * @description Strict Mode - checking 'this' (strict anonymous function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 3;

-

-return ("ab".replace("b", (function () { 

-                                "use strict";

-                                return function () {

-                                    x = this;

-                                    return "a";

-                                }

-                           })())==="aa") && (x===undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict anonymous function passed as
+    arg to String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 3;
+
+return ("ab".replace("b", (function () { 
+                                "use strict";
+                                return function () {
+                                    x = this;
+                                    return "a";
+                                }
+                           })())==="aa") && (x===undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js
index 90505a2fd..1eb1186b3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-102gs.js

- * @description Strict Mode - checking 'this' (strict anonymous function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-var x = 3;

-if ( ("ab".replace("b", (function () { 

-                                "use strict";

-                                return function () {

-                                    x = this;

-                                    return "a";

-                                }

-                           })())!=="aa") || (x!==undefined)) {

-     throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict anonymous function passed as
+    arg to String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+---*/
+
+var x = 3;
+if ( ("ab".replace("b", (function () { 
+                                "use strict";
+                                return function () {
+                                    x = this;
+                                    return "a";
+                                }
+                           })())!=="aa") || (x!==undefined)) {
+     throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
index a0bc90873..044348b6d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-103.js

- * @description Non strict mode should ToObject thisArg if not an object.  Abstract equality operator should succeed.

- */

-

-function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 

-  if((5).x == 0) return false;

-  if(!((5).x == 5)) return false;

-  return true;

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Non strict mode should ToObject thisArg if not an object.
+    Abstract equality operator should succeed.
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
+  if((5).x == 0) return false;
+  if(!((5).x == 5)) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js
index 42f89deb3..37b1191a4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- *

- * @path ch10/10.4/10.4.3/10.4.3-1-104.js

- * @onlyStrict

- * @description Strict mode should not ToObject thisArg if not an object.  Strict equality operator should succeed.

- */

- 

- 

-function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 

-  if(!((5).x === 5)) return false;

-  return true;

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode should not ToObject thisArg if not an object.  Strict
+    equality operator should succeed.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 
+  if(!((5).x === 5)) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js
index a66b850cf..3467792b5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Created based on feedback in https://bugs.ecmascript.org/show_bug.cgi?id=333 

- *

- * @path ch10/10.4/10.4.3/10.4.3-1-105.js

- * @description Non strict mode should ToObject thisArg if not an object.  Return type should be object and strict equality should fail.

- */

- 

- function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 

-  if((5).x === 5) return false;

-  if(!(typeof (5).x === "object")) return false;

-  return true;

-}

-

-runTestCase(testcase);

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Created based on feedback in
+    https://bugs.ecmascript.org/show_bug.cgi?id=333
+description: >
+    Non strict mode should ToObject thisArg if not an object.  Return
+    type should be object and strict equality should fail.
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
+  if((5).x === 5) return false;
+  if(!(typeof (5).x === "object")) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js
index 36afbda2a..8a1b63f8c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Created based on feedback in https://bugs.ecmascript.org/show_bug.cgi?id=333 

- *

- * @path ch10/10.4/10.4.3/10.4.3-1-106.js

- * @onlyStrict

- * @description Strict mode should not ToObject thisArg if not an object.  Return type should be 'number'.

- */

- 

- function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 

-  if(!(typeof (5).x === "number")) return false;

-  return true;

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Created based on feedback in
+    https://bugs.ecmascript.org/show_bug.cgi?id=333
+description: >
+    Strict mode should not ToObject thisArg if not an object.  Return
+    type should be 'number'.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 
+  if(!(typeof (5).x === "number")) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js
index 74ee475ae..50ca536d3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-10gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = function () {

-    "use strict";

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
index 8f7813338..9d1047e11 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-11-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    return typeof this;

-})() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    return typeof this;
+})() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
index 3be7db62a..8bd814301 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-11gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if ((function () {

-    return typeof this;

-})() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if ((function () {
+    return typeof this;
+})() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
index a88b4c03f..727b12dc9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-12-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    return typeof this;

-})() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    return typeof this;
+})() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js
index 0bb4a9781..89a79fab1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-12gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-if ((function () {

-    "use strict";

-    return typeof this;

-})() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+if ((function () {
+    "use strict";
+    return typeof this;
+})() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
index c4ebc9d39..9f562a446 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-13-s.js

- * @description Strict Mode - checking 'this' (Function constructor defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = Function("return typeof this;");

-return f() !== "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Function constructor defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = Function("return typeof this;");
+return f() !== "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js
index d6c4d550a..c23774f00 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-13gs.js

- * @description Strict - checking 'this' from a global scope (Function constructor defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = Function("return typeof this;");

-if (f() === "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Function constructor
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = Function("return typeof this;");
+if (f() === "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
index fe45b6931..9935be2f5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-14-s.js

- * @description Strict Mode - checking 'this' (Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = Function("\"use strict\";\nreturn typeof this;");

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Function constructor includes
+    strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = Function("\"use strict\";\nreturn typeof this;");
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js
index cec5e66d8..a823be7a9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-14gs.js

- * @description Strict - checking 'this' from a global scope (Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = Function("\"use strict\";\nreturn typeof this;");

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Function constructor
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = Function("\"use strict\";\nreturn typeof this;");
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
index 961d55b6d..2df598ee7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-15-s.js

- * @description Strict Mode - checking 'this' (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = new Function("return typeof this;");

-return f() !== "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed Function constructor defined
+    within strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = new Function("return typeof this;");
+return f() !== "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js
index 26d75fa64..aecf7b19b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-15gs.js

- * @description Strict - checking 'this' from a global scope (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = new Function("return typeof this;");

-if (f() === "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed Function
+    constructor defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = new Function("return typeof this;");
+if (f() === "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
index 6167f4c4a..175d2c3e2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-16-s.js

- * @description Strict Mode - checking 'this' (New'ed Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = new Function("\"use strict\";\nreturn typeof this;");

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed Function constructor
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = new Function("\"use strict\";\nreturn typeof this;");
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js
index b7a2287e7..74a82fc46 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-16gs.js

- * @description Strict - checking 'this' from a global scope (New'ed Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = new Function("\"use strict\";\nreturn typeof this;");

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed Function
+    constructor includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = new Function("\"use strict\";\nreturn typeof this;");
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
index 4d2caf063..21b806d45 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-17-s.js

- * @description Strict Mode - checking 'this' (eval used within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (eval("typeof this") === "undefined") && (eval("this") !== fnGlobalObject());

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - checking 'this' (eval used within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+return (eval("typeof this") === "undefined") && (eval("this") !== fnGlobalObject());
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
index f583c6e89..bd52f0fe4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-17gs.js

- * @description Strict - checking 'this' from a global scope (eval used within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (eval("this") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (eval used within
+    strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+if (eval("this") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
index e1d35e497..c4e75abc8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-18gs.js

- * @description Strict - checking 'this' from a global scope (eval includes strict directive prologue)

- * @onlyStrict

- */

-

-if (eval("\"use strict\";\nthis") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (eval includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (eval("\"use strict\";\nthis") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
index c2d412838..489ae9b68 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
@@ -1,17 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-19-s.js

- * @description Strict Mode - checking 'this' (indirect eval used within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var my_eval = eval;

-return my_eval("this") === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (indirect eval used within strict
+    mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var my_eval = eval;
+return my_eval("this") === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
index 2d1c35edc..1647a9f8d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-19gs.js

- * @description Strict - checking 'this' from a global scope (indirect eval used within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var my_eval = eval;

-if (my_eval("this") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (indirect eval used
+    within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var my_eval = eval;
+if (my_eval("this") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js
index 0efe7fd65..3c25a997a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-2-s.js

- * @description this is not coerced to an object in strict mode (string)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call('1') === 'string' && bar.call('1') === 'object';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: this is not coerced to an object in strict mode (string)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call('1') === 'string' && bar.call('1') === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
index 869bc53e4..6c151716d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-20-s.js

- * @description Strict Mode - checking 'this' (indirect eval includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var my_eval = eval;

-return my_eval("\"use strict\";\nthis") === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (indirect eval includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var my_eval = eval;
+return my_eval("\"use strict\";\nthis") === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
index 48544cb0e..b346e6bc2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-20gs.js

- * @description Strict - checking 'this' from a global scope (indirect eval includes strict directive prologue)

- * @onlyStrict

- */

-

-var my_eval = eval;

-if (my_eval("\"use strict\";\nthis") !== fnGlobalObject() ) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (indirect eval
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var my_eval = eval;
+if (my_eval("\"use strict\";\nthis") !== fnGlobalObject() ) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
index 915f54ce8..a31f2b402 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
@@ -1,19 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-21-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f() {

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from
+    FunctionDeclaration defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+function f() {
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js
index b12634049..43faca4f9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-21gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f() {

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    FunctionDeclaration defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+function f() {
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
index 55d66e60c..8fd9e72cf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-22-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() {

-    "use strict";

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from
+    FunctionDeclaration includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() {
+    "use strict";
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js
index 1abde0e2f..f5f05df61 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-22gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-function f() {

-    "use strict";

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    FunctionDeclaration includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() {
+    "use strict";
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
index b2c40be4f..358fee765 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-23-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = function () {

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var f = function () {
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
index 4aab84291..c472375c2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-23gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = function () {

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var f = function () {
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
index 3499abe4d..1c2b3e3c4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
@@ -1,19 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-24-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = function () {

-    "use strict";

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f = function () {
+    "use strict";
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
index 38d5e1490..5f941c5ae 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-24gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = function () {

-    "use strict";

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f = function () {
+    "use strict";
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
index 138802f64..196837e0a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
@@ -1,19 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-25-s.js

- * @description Strict Mode - checking 'this' (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var obj = new (function () {

-    return this;

-});

-return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from Anonymous
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var obj = new (function () {
+    return this;
+});
+return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js
index 30ac917cb..2bbcb6ca1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-25gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var obj = new (function () {

-    return this;

-});

-if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    Anonymous FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var obj = new (function () {
+    return this;
+});
+if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
index a015f4082..55d67f778 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
@@ -1,19 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-26-s.js

- * @description Strict Mode - checking 'this' (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var obj = new (function () {

-    "use strict";

-    return this;

-});

-return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (New'ed object from Anonymous
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var obj = new (function () {
+    "use strict";
+    return this;
+});
+return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
index e19bce342..d660f7415 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-26gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var obj = new (function () {

-    "use strict";

-    return this;

-});

-if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (New'ed object from
+    Anonymous FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var obj = new (function () {
+    "use strict";
+    return this;
+});
+if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
index 54eda820f..1c5b0eae3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-27-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js
index 0cb1cb4f2..6d44954ab 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-27gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
index c2a5578a8..32294dccd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-28-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js
index 663a18e00..f5cfefebc 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-28gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js
index 87ea431d7..926949c12 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-29-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js
index 416f1b4f3..e26c0e43b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-29gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionDeclaration inside
+    strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
index 19bafdcff..0ef7107e2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-3-s.js

- * @description this is not coerced to an object in strict mode (undefined)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-  return foo.call(undefined) === 'undefined' && bar.call() === 'object';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: this is not coerced to an object in strict mode (undefined)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+  return foo.call(undefined) === 'undefined' && bar.call() === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
index b4085931b..0d9aec5c0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-30-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js
index ab3c6222d..d868e21b1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-30gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
index dc32ca19e..ef2892469 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-31-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js
index 1bbb2d161..2827d21a4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-31gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js
index 4ba988920..0a2b5f7ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-32-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js
index 1cd2ad05a..16a2d55fa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-32gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionExpression inside
+    strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js
index 6c4d66e2e..6a71187ac 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-33-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js
index c288566cb..beaac2a32 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-33gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js
index 9cf25b53d..e09ad0e27 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-34-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within
+    an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js
index 72980aa41..7fcc11dac 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-34gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js
index 8f7abb36f..fc40fe852 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-35-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js
index ecee18fe3..06fc8dde1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-35gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within an Anonymous FunctionExpression
+    inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
index 08bea7cc4..35de15a39 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-36-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    a FunctionDeclaration with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js
index 88fab9f20..6593aa279 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-36gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
index 93e7fde28..dbacec527 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-37-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js
index 795b6032d..91ab8f2dd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-37gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
index f496d4ed0..929ad8696 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-38-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js
index 1c00b742e..fe33ec217 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-38gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionDeclaration with a
+    strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
index 22478bc26..b07803e54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-39-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    a FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js
index 7ec3adf91..c00fb8ece 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-39gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js
index 28bd8f059..f84fea34d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-4-s.js

- * @description this is not coerced to an object in strict mode (boolean)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call(true) === 'boolean' && bar.call(true) === 'object';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: this is not coerced to an object in strict mode (boolean)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call(true) === 'boolean' && bar.call(true) === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
index b90817f63..cae158a6f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-40-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js
index 2d8fbf0ba..e28429002 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-40gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
index 48495e392..3546cffc9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-41-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js
index 43cba61c8..3c00f0076 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-41gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionExpression with a
+    strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js
index c4f705857..ff7922a69 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-42-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js
index b1802bf16..41f4ed3e5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-42gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js
index 6575e56b9..0d2b490da 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-43-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js
index 0da4b7871..2f54d562c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-43gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js
index b7ac11d8d..a10ded2f0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-44-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js
index 2300e4acb..2011deb9d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-44gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within an Anonymous FunctionExpression
+    with a strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
index e23f9fef0..b842ddd4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-45-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration with a strict
+    directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
index ce99d6574..726690214 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-45gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within a
+    FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
index 5945b2b21..0ca914625 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-46-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression with a strict
+    directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
index 3d0ddd895..c424f491e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-46gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within a
+    FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
index 6a5fe9d40..6852fc0e5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
@@ -1,21 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-47-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js
index 78884f8c6..ce6ef21f9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-47gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    a FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
index 3c4d49af4..281288e49 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-48-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration with a strict
+    directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
index b6d619176..bfd715d30 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-48gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within a
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
index 3ae616eaa..4d521496f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-49-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression with a strict
+    directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
index d6aee3a91..1b6a45563 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-49gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within a
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
index 5d64cea6b..fdf1fa1dd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
@@ -1,32 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-5-s.js

- * @description this is not coerced to an object in strict mode (function)

- * @onlyStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  } 

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-  function foobar()

-  {

-  }

-

-  return foo.call(foobar) === 'function' && bar.call(foobar) === 'function';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: this is not coerced to an object in strict mode (function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  } 
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+  function foobar()
+  {
+  }
+
+  return foo.call(foobar) === 'function' && bar.call(foobar) === 'function';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
index ad273ecb1..feb2bde58 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
@@ -1,21 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-50-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js
index 21cd879ef..508990195 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-50gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    a FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
index e8935366e..c4c28f331 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
@@ -1,21 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-51-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js
index 52f8e35a6..68736ba0e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-51gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
index b2c3a0082..85ce0c23d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
@@ -1,21 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-52-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js
index cc617750d..36773a758 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-52gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
index 2324bf44f..69e0338a2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-53-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js
index 0c6581f2e..b0bc6861f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js
@@ -1,19 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-53gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    an Anonymous FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
index ac481d610..d4b5f48fa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-54-s.js

- * @description Strict Mode - checking 'this' (Literal getter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = { get foo() { return this; } }

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Literal getter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = { get foo() { return this; } }
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js
index 571ad634e..c2f04093a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-54gs.js

- * @description Strict - checking 'this' from a global scope (Literal getter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = { get foo() { return this; } }

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Literal getter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { get foo() { return this; } }
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
index 49acc2d11..f25c6bc4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-55-s.js

- * @description Strict Mode - checking 'this' (Literal getter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = { get foo() { "use strict"; return this; } }

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Literal getter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = { get foo() { "use strict"; return this; } }
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js
index ab3ccbbc5..3df85463d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-55gs.js

- * @description Strict - checking 'this' from a global scope (Literal getter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = { get foo() { "use strict"; return this; } }

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Literal getter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = { get foo() { "use strict"; return this; } }
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js
index 1a492c462..e6aa7f8ce 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-56-s.js

- * @description Strict Mode - checking 'this' (Literal setter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var x = 2;

-var o = { set foo(stuff) { x=this; } }

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Literal setter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var x = 2;
+var o = { set foo(stuff) { x=this; } }
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js
index 7ea7c7a3f..4b26a0747 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-56gs.js

- * @description Strict - checking 'this' from a global scope (Literal setter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var x = 2;

-var o = { set foo(stuff) { x=this; } }

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Literal setter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var x = 2;
+var o = { set foo(stuff) { x=this; } }
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
index bcd4ef62c..a6149545c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-57-s.js

- * @description Strict Mode - checking 'this' (Literal setter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 2;

-var o = { set foo(stuff) { "use strict"; x=this;  } }

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Literal setter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 2;
+var o = { set foo(stuff) { "use strict"; x=this;  } }
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js
index e59df3357..f8f19472c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-57gs.js

- * @description Strict - checking 'this' from a global scope (Literal setter includes strict directive prologue)

- * @onlyStrict

- */

-

-var x = 2;

-var o = { set foo(stuff) { "use strict"; x=this;  } }

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Literal setter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var x = 2;
+var o = { set foo(stuff) { "use strict"; x=this;  } }
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
index 964f8d435..44358987e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-58-s.js

- * @description Strict Mode - checking 'this' (Injected getter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get: function() { return this; } });

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Injected getter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get: function() { return this; } });
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js
index 166e44079..17655967e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-58gs.js

- * @description Strict - checking 'this' from a global scope (Injected getter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get : function() { return this; } });

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Injected getter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get : function() { return this; } });
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
index 7d0afddf5..4bd379437 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-59-s.js

- * @description Strict Mode - checking 'this' (Injected getter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Injected getter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js
index 09e1d0648..f38f545f8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-59gs.js

- * @description Strict - checking 'this' from a global scope (Injected getter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Injected getter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js
index 1bd803bee..73a691e4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-60-s.js

- * @description Strict Mode - checking 'this' (Injected setter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Injected setter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js
index 09053dbd1..7e934fe4d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-60gs.js

- * @description Strict - checking 'this' from a global scope (Injected setter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Injected setter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js
index 23586b250..7d8c5237a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-61-s.js

- * @description Strict Mode - checking 'this' (Injected setter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (Injected setter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js
index 2d31c32d8..220b8d6e3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-61gs.js

- * @description Strict - checking 'this' from a global scope (Injected setter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (Injected setter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
index a2e3c0bb8..4a99cb84f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-62-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict function declaration)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-function foo() { return f();}

-return foo()===undefined;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by non-strict function declaration)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+function foo() { return f();}
+return foo()===undefined;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js
index 9cd2ae0e7..30b1b5b48 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-62gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict function declaration)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-function foo() { return f();}

-if (foo()!==undefined){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by non-strict function declaration)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this;};
+function foo() { return f();}
+if (foo()!==undefined){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
index 5b93d280b..e931de93c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-63-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict eval)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return eval("f();");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by non-strict eval)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return eval("f();");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js
index 07f7a9cee..95c202569 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-63gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict eval)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! eval("f();")){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by non-strict eval)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! eval("f();")){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
index ddb042449..d73863634 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-64-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict Function constructor)

- * @onlyStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function() { "use strict"; return this===undefined;};

-return Function("return f();")();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by non-strict Function constructor)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function() { "use strict"; return this===undefined;};
+return Function("return f();")();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js
index 6877c8341..6d23df649 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-64gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict Function constructor)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (Function("return f();")())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by non-strict Function constructor)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (Function("return f();")())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
index 5b0f20a65..ee43f6ac1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-65-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict new'ed Function constructor)

- * @onlyStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function()  { "use strict"; return this===undefined;};

-return (new Function("return f();"))();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by non-strict new'ed Function constructor)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function()  { "use strict"; return this===undefined;};
+return (new Function("return f();"))();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js
index 567a12360..0e4349006 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-65gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict new'ed Function constructor)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! ( (new Function("return f();")) () )){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by non-strict new'ed Function constructor)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! ( (new Function("return f();")) () )){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
index 3b4401827..7ae13faf1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-66-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.apply();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.apply())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.apply();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js
index 29a609b7a..8652e2769 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-66gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.apply()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.apply()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
index baf57dc0c..c59fb8f64 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-67-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(null))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.apply(null);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.apply(null))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.apply(null);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js
index 9122b9fde..2141f88c0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-67gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(null))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! f.apply(null)){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(null))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! f.apply(null)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
index 10a5294e1..8f18d9609 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-68-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(undefined))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.apply(undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.apply(undefined))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.apply(undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js
index 5bfeee3f0..d11ec5c28 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-68gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(undefined))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.apply(undefined)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(undefined))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.apply(undefined)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
index 8db3b94ce..6bdbd1057 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-69-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.apply(o);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.apply(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.apply(o);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js
index f32b45575..080e4494b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-69gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! f.apply(o)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! f.apply(o)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js
index ae370f766..fafdf813a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-7-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-

-function testcase() {

-"use strict";

-function f() {

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f() {
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
index d1bf918ee..d94ac9e4d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-70-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.apply(fnGlobalObject()) === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.apply(fnGlobalObject()) === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
index 0044b8afd..9c71387d6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-70gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.apply(fnGlobalObject()) !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.apply(fnGlobalObject()) !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
index 5fe5dcba3..a6c6ad720 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-71-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.call();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.call())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.call();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js
index c978be9ad..366ccffe6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-71gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.call()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.call()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
index b9c669291..683ab4da2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-72-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(null))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.call(null);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.call(null))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.call(null);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js
index 49ca243d1..e848e1134 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-72gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(null))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! f.call(null)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(null))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! f.call(null)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
index e04b5d7be..2f1f7adcb 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-73-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(undefined))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.call(undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.call(undefined))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.call(undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js
index 10a3176db..dfa5d1c86 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-73gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(undefined))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.call(undefined)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(undefined))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.call(undefined)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
index 7e2d746e3..47bcffc9b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-74-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.call(o);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.call(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.call(o);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js
index 27a73d67f..feff6fc04 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-74gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! f.call(o)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! f.call(o)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
index fa8f4d4b0..56d0785ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-75-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.call(fnGlobalObject()) === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.call(fnGlobalObject()) === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
index 3df699177..87d1b404d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-75gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(globalObject))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.call(fnGlobalObject()) !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.call(fnGlobalObject()) !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
index 7918f0dfa..3e55ddbcf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-76-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind()())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.bind()();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.bind()())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.bind()();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js
index f61d0e324..0457f92bd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-76gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind()())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (f.bind()())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind()())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (f.bind()())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
index fb5614dd9..c158b62e6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-77-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(null)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.bind(null)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.bind(null)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.bind(null)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js
index 51d38c398..78d1d7971 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-77gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(null)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! (f.bind(null)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(null)())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! (f.bind(null)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
index 3d50f279c..d67bcc012 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-78-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(undefined)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.bind(undefined)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.bind(undefined)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.bind(undefined)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js
index 8d67642fa..cc1e65f54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-78gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(undefined)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (f.bind(undefined)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(undefined)())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (f.bind(undefined)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
index 5dace0a45..9b8df1fb7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-79-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.bind(o)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.bind(o)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js
index a347c004a..3ff714660 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-79gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! (f.bind(o)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! (f.bind(o)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js
index 23b1c0583..459167364 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-7gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f() {

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js
index 7d6beaa1a..c68bea923 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-8-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-

-function testcase() {

-function f() {

-    "use strict";

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionDeclaration includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() {
+    "use strict";
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
index 86951b61a..bde1f45c6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-80-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.bind(fnGlobalObject())() === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (strict function declaration called
+    by Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.bind(fnGlobalObject())() === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
index e3ed02e6a..f9e844d54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-80gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.bind(fnGlobalObject())() !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.bind(fnGlobalObject())() !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
index 61be6b784..49dbd5439 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-81-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-function foo() { "use strict"; return f();}

-return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict function declaration)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+function foo() { "use strict"; return f();}
+return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js
index 0544e0cd7..500f08293 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-81gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-function foo() { "use strict"; return f();}

-if (! foo()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict function declaration)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+function foo() { "use strict"; return f();}
+if (! foo()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
index 0a2b16600..76237925d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-82-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict eval)

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-return (function () {"use strict"; return eval("f();");})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict eval)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+return (function () {"use strict"; return eval("f();");})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js
index 305435eeb..6f631c1b3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-82gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict eval)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {"use strict"; return eval("f();");})()) ){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict eval)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {"use strict"; return eval("f();");})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
index f03adeff5..0b983413e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-83-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function() {return this!==undefined;};

-return (function () {return Function("\"use strict\";return f();")();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function constructor)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function() {return this!==undefined;};
+return (function () {return Function("\"use strict\";return f();")();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js
index dfe59d84e..464aa6f41 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-83gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-

-function f() {return this!==undefined;};

-if (! ((function () {return Function("\"use strict\";return f();")();})()) ){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function constructor)
+flags: [noStrict]
+---*/
+
+function f() {return this!==undefined;};
+if (! ((function () {return Function("\"use strict\";return f();")();})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
index 807817846..3c3daaad7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-84-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function()  { return this!==undefined;};

-return (function () {return new Function("\"use strict\";return f();")();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict new'ed Function constructor)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function()  { return this!==undefined;};
+return (function () {return new Function("\"use strict\";return f();")();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js
index 23a20910d..13b21a69b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-84gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {return new Function("\"use strict\";return f();")();})()) ){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict new'ed Function constructor)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {return new Function("\"use strict\";return f();")();})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
index abdb33b92..b0055eee8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-85-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-return (function () {"use strict"; return f.apply();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.apply())
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+return (function () {"use strict"; return f.apply();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js
index 093115f32..eb4a9e1a8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-85gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {"use strict"; return f.apply();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply())
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {"use strict"; return f.apply();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
index fca8007f3..cc3987935 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-86-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.apply(null);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(null))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.apply(null);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
index f1e23cce2..3a7fbc6ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-86gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.apply(null);})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(null))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.apply(null);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
index be4505ace..84ce5d7a0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-87-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject()};

-return (function () {"use strict"; return f.apply(undefined);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(undefined))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject()};
+return (function () {"use strict"; return f.apply(undefined);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
index af76c9a8b..b156e92ec 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-87gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.apply(undefined);})())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(undefined))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.apply(undefined);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
index 72c424567..01004523a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-88-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.apply(o);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.apply(o);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js
index 8b85f6993..e69957606 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-88gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.apply(o);})())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.apply(o);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
index 451851d5b..45c80e414 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-89-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this;};

-return (function () {"use strict"; return f.apply(fnGlobalObject()); })() === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this;};
+return (function () {"use strict"; return f.apply(fnGlobalObject()); })() === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
index 68f415a64..5ec17a401 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
@@ -1,15 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-89gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-

-function f() { return this;};

-if ((function () {"use strict"; return f.apply(fnGlobalObject());})() !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict
+    Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this;};
+if ((function () {"use strict"; return f.apply(fnGlobalObject());})() !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js
index 814fb7ec7..ea2c0d309 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-8gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-function f() {

-    "use strict";

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionDeclaration
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+function f() {
+    "use strict";
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js
index 38ca374e7..16981a9af 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-9-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = function () {

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (FunctionExpression defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = function () {
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
index 0b6a4b3f1..f78c8e013 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-90-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.call())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
index 78a91247f..95ab45a65 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-90gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
index 2dc4007e9..088fcc162 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-91-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(null); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.call(null))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(null); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
index c1052a773..44406330f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-91gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(null); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(null))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(null); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
index 3a04a7b6f..9776ac416 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-92-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(undefined);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.call(undefined))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(undefined);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
index 4517302f3..5b4625a83 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-92gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(undefined);})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(undefined))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(undefined);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
index e8da599e7..237f072f0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-93-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.call(o); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.call(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.call(o); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js
index 44bd495b4..737d29f8c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-93gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.call(o); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.call(o); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
index 655ac9e76..79fdac7bf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-94-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(fnGlobalObject());})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(fnGlobalObject());})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
index e752c688e..aa5ca4b11 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-94gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @onlyStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(fnGlobalObject());})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(fnGlobalObject());})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
index db48e89d9..4bc3c8cce 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-95-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind()(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.bind()())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind()(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
index 5d5fc09b8..c549c94f3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-95gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind()(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind()())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind()(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
index 3c4e652c3..fd2c678a1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-96-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(null)(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(null)())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(null)(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
index cbfe417c4..c4574087f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-96gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(null)(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(null)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(null)(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
index feac73bd6..5677a0e1e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-97-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(undefined)();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(undefined)();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
index 1e79dd96e..913f76fe3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-97gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(undefined)(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(undefined)(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
index 1c07cafc6..0db0b149d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-98-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.bind(o)();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.bind(o)();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js
index c72e9dcc6..a773fdaf9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-98gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.bind(o)();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.bind(o)();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
index 47b1dac4d..ad85e9d00 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
@@ -1,16 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-99-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(fnGlobalObject())();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - checking 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(fnGlobalObject())();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
index 5e9730d9f..3275cf2a0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
@@ -1,15 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-99gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(fnGlobalObject())();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (non-strict function
+    declaration called by strict
+    Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(fnGlobalObject())();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js
index 56c150c89..4ed3fd47a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-9gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = function () {

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict - checking 'this' from a global scope (FunctionExpression
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js b/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
index ea2432219..b7b6ff3d7 100644
--- a/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
+++ b/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
@@ -1,16 +1,15 @@
 // Copyright 2011 Google, Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch10/10.4/10.4.3/S10.4.3_A1.js
- * @description When calling a strict anonymous function as a
- * function, "this" should be bound to undefined.
- * @onlyStrict
- */
+/*---
+description: >
+    When calling a strict anonymous function as a  function, "this"
+    should be bound to undefined.
+flags: [onlyStrict]
+---*/
 
 "use strict";
 var that = (function() { return this; })();
 if (that !== undefined) {
   $ERROR('#1: "this" leaked as: ' + that);
 }
-
diff --git a/test/suite/ch10/10.4/S10.4A1.1_T2.js b/test/suite/ch10/10.4/S10.4A1.1_T2.js
index 080aad06a..fee20ce5d 100644
--- a/test/suite/ch10/10.4/S10.4A1.1_T2.js
+++ b/test/suite/ch10/10.4/S10.4A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every function call enters a new execution context
- *
- * @path ch10/10.4/S10.4A1.1_T2.js
- * @description Recursive function call
- */
+/*---
+info: Every function call enters a new execution context
+description: Recursive function call
+---*/
 
 var y;
 
@@ -30,4 +28,3 @@ y = f(0);
 if(!(y === undefined)){
   $ERROR("#1: Recursive function calls shares execution context");
 }
-
diff --git a/test/suite/ch10/10.4/S10.4_A1.1_T1.js b/test/suite/ch10/10.4/S10.4_A1.1_T1.js
index 408d50770..737541467 100644
--- a/test/suite/ch10/10.4/S10.4_A1.1_T1.js
+++ b/test/suite/ch10/10.4/S10.4_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every function call enters a new execution context
- *
- * @path ch10/10.4/S10.4_A1.1_T1.js
- * @description Sequence of function calls
- */
+/*---
+info: Every function call enters a new execution context
+description: Sequence of function calls
+---*/
 
 var y;
 
@@ -28,4 +26,3 @@ y = f();
 if(!(y === 0)){
   $ERROR("#1: Sequenced function calls shares execution context");
 }
-
diff --git a/test/suite/ch10/10.5/10.5-1-s.js b/test/suite/ch10/10.5/10.5-1-s.js
index fc841a5e4..b39193cd4 100644
--- a/test/suite/ch10/10.5/10.5-1-s.js
+++ b/test/suite/ch10/10.5/10.5-1-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.5/10.5-1-s.js

- * @description Strict Mode - arguments object is immutable

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            (function fun() {

-                eval("arguments = 10");

-            })(30);

-            return false;

-        } catch (e) {

-            return (e instanceof SyntaxError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - arguments object is immutable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            (function fun() {
+                eval("arguments = 10");
+            })(30);
+            return false;
+        } catch (e) {
+            return (e instanceof SyntaxError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.5/10.5-1gs.js b/test/suite/ch10/10.5/10.5-1gs.js
index aafbeb333..1729ebb91 100644
--- a/test/suite/ch10/10.5/10.5-1gs.js
+++ b/test/suite/ch10/10.5/10.5-1gs.js
@@ -1,20 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.5/10.5-1gs.js

- * @description Strict Mode - arguments cannot be assigned to in a strict function

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-

-function f_10_5_1_gs(){

-    arguments = 7;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - arguments cannot be assigned to in a strict function
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+
+function f_10_5_1_gs(){
+    arguments = 7;
+}
diff --git a/test/suite/ch10/10.5/10.5-7-b-1-s.js b/test/suite/ch10/10.5/10.5-7-b-1-s.js
index e1855c7c6..f50f0b6c8 100644
--- a/test/suite/ch10/10.5/10.5-7-b-1-s.js
+++ b/test/suite/ch10/10.5/10.5-7-b-1-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.5/10.5-7-b-1-s.js

- * @description Strict Mode - arguments object is immutable in eval'ed functions

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("(function _10_5_7_b_1_fun() { arguments = 10;} ());");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - arguments object is immutable in eval'ed functions
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("(function _10_5_7_b_1_fun() { arguments = 10;} ());");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.5/10.5-7-b-2-s.js b/test/suite/ch10/10.5/10.5-7-b-2-s.js
index 47820009e..6fb0a9b3b 100644
--- a/test/suite/ch10/10.5/10.5-7-b-2-s.js
+++ b/test/suite/ch10/10.5/10.5-7-b-2-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.5/10.5-7-b-2-s.js

- * @description Strict Mode - arguments object index assignment is allowed

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function _10_5_7_b_2_fun() {

-            arguments[7] = 12;

-            return arguments[7] === 12;

-        };

-

-        return _10_5_7_b_2_fun(30);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - arguments object index assignment is allowed
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function _10_5_7_b_2_fun() {
+            arguments[7] = 12;
+            return arguments[7] === 12;
+        };
+
+        return _10_5_7_b_2_fun(30);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.5/10.5-7-b-3-s.js b/test/suite/ch10/10.5/10.5-7-b-3-s.js
index cde0b88c6..26f55d5d7 100644
--- a/test/suite/ch10/10.5/10.5-7-b-3-s.js
+++ b/test/suite/ch10/10.5/10.5-7-b-3-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.5/10.5-7-b-3-s.js

- * @description Strict Mode - Adding property to the arguments object successful under strict mode 

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function _10_5_7_b_3_fun() {

-            arguments[1] = 12;

-            return arguments[0] === 30 && arguments[1] === 12;

-        };

-

-        return _10_5_7_b_3_fun(30);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Adding property to the arguments object successful
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function _10_5_7_b_3_fun() {
+            arguments[1] = 12;
+            return arguments[0] === 30 && arguments[1] === 12;
+        };
+
+        return _10_5_7_b_3_fun(30);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.5/10.5-7-b-4-s.js b/test/suite/ch10/10.5/10.5-7-b-4-s.js
index c695446b4..2425b0fd9 100644
--- a/test/suite/ch10/10.5/10.5-7-b-4-s.js
+++ b/test/suite/ch10/10.5/10.5-7-b-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.5/10.5-7-b-4-s.js

- * @description Strict Mode - Deleting property of the arguments object successful under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function _10_5_7_b_4_fun() {

-            var _10_5_7_b_4_1 = arguments[0] === 30 && arguments[1] === 12;

-            delete arguments[1];

-            var _10_5_7_b_4_2 = arguments[0] === 30 && typeof arguments[1] === "undefined";

-            return _10_5_7_b_4_1 && _10_5_7_b_4_2;

-        };

-        return _10_5_7_b_4_fun(30, 12);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - Deleting property of the arguments object successful
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function _10_5_7_b_4_fun() {
+            var _10_5_7_b_4_1 = arguments[0] === 30 && arguments[1] === 12;
+            delete arguments[1];
+            var _10_5_7_b_4_2 = arguments[0] === 30 && typeof arguments[1] === "undefined";
+            return _10_5_7_b_4_1 && _10_5_7_b_4_2;
+        };
+        return _10_5_7_b_4_fun(30, 12);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-10-c-ii-1-s.js b/test/suite/ch10/10.6/10.6-10-c-ii-1-s.js
index dcc3c49f9..c83f19a6a 100644
--- a/test/suite/ch10/10.6/10.6-10-c-ii-1-s.js
+++ b/test/suite/ch10/10.6/10.6-10-c-ii-1-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-10-c-ii-1-s.js

- * @description arguments[i] remains same after changing actual parameters in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  function foo(a,b,c)

-  {

-    'use strict';

-    a = 1; b = 'str'; c = 2.1;

-    return (arguments[0] === 10 && arguments[1] === 'sss' && arguments[2] === 1);

-  }

-  return foo(10, 'sss', 1);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments[i] remains same after changing actual parameters in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(a,b,c)
+  {
+    'use strict';
+    a = 1; b = 'str'; c = 2.1;
+    return (arguments[0] === 10 && arguments[1] === 'sss' && arguments[2] === 1);
+  }
+  return foo(10, 'sss', 1);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-10-c-ii-1.js b/test/suite/ch10/10.6/10.6-10-c-ii-1.js
index f0db64ee2..3d9693a45 100644
--- a/test/suite/ch10/10.6/10.6-10-c-ii-1.js
+++ b/test/suite/ch10/10.6/10.6-10-c-ii-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-10-c-ii-1.js

- * @description arguments[i] change with actual parameters

- */

-

-

-function testcase() {

-  function foo(a,b,c)

-  {

-    a = 1; b = 'str'; c = 2.1;

-    if(arguments[0] === 1 && arguments[1] === 'str' && arguments[2] === 2.1)

-      return true;   

-  }

-  return foo(10,'sss',1);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments[i] change with actual parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(a,b,c)
+  {
+    a = 1; b = 'str'; c = 2.1;
+    if(arguments[0] === 1 && arguments[1] === 'str' && arguments[2] === 2.1)
+      return true;   
+  }
+  return foo(10,'sss',1);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-10-c-ii-2-s.js b/test/suite/ch10/10.6/10.6-10-c-ii-2-s.js
index 58143f841..fc6839f21 100644
--- a/test/suite/ch10/10.6/10.6-10-c-ii-2-s.js
+++ b/test/suite/ch10/10.6/10.6-10-c-ii-2-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-10-c-ii-2-s.js

- * @description arguments[i] doesn't map to actual parameters in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-  function foo(a,b,c)

-  {

-    'use strict';    

-    arguments[0] = 1; arguments[1] = 'str'; arguments[2] = 2.1;

-    return 10 === a && 'sss' === b && 1 === c;

-  }

-  return foo(10,'sss',1);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments[i] doesn't map to actual parameters in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  function foo(a,b,c)
+  {
+    'use strict';    
+    arguments[0] = 1; arguments[1] = 'str'; arguments[2] = 2.1;
+    return 10 === a && 'sss' === b && 1 === c;
+  }
+  return foo(10,'sss',1);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-10-c-ii-2.js b/test/suite/ch10/10.6/10.6-10-c-ii-2.js
index 5891dfe3b..bfbcb9b2d 100644
--- a/test/suite/ch10/10.6/10.6-10-c-ii-2.js
+++ b/test/suite/ch10/10.6/10.6-10-c-ii-2.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-10-c-ii-2.js

- * @description arguments[i] map to actual parameter

- */

-

-

-function testcase() {

-  

-  function foo(a,b,c)

-  {

-    arguments[0] = 1; arguments[1] = 'str'; arguments[2] = 2.1;

-    if(1 === a && 'str' === b && 2.1 === c)

-      return true;   

-  }

-  return foo(10,'sss',1);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments[i] map to actual parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  function foo(a,b,c)
+  {
+    arguments[0] = 1; arguments[1] = 'str'; arguments[2] = 2.1;
+    if(1 === a && 'str' === b && 2.1 === c)
+      return true;   
+  }
+  return foo(10,'sss',1);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-11-b-1.js b/test/suite/ch10/10.6/10.6-11-b-1.js
index bcf937d63..7a7a486ce 100644
--- a/test/suite/ch10/10.6/10.6-11-b-1.js
+++ b/test/suite/ch10/10.6/10.6-11-b-1.js
@@ -1,54 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-11-b-1.js

- * @description Arguments Object has index property '0' as its own property, it shoulde be writable, enumerable, configurable and does not invoke the setter defined on Object.prototype[0] (Step 11.b)

- */

-

-

-function testcase() {

-        try {

-            var data = "data";

-            var getFunc = function () {

-                return data;

-            };

-

-            var setFunc = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(Object.prototype, "0", {

-                get: getFunc,

-                set: setFunc,

-                configurable: true

-            });

-

-            var argObj = (function () { return arguments })(1);

-

-            var verifyValue = false;

-            verifyValue = (argObj[0] === 1);

-

-            var verifyEnumerable = false;

-            for (var p in argObj) {

-                if (p === "0" && argObj.hasOwnProperty("0")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyWritable = false;

-            argObj[0] = 1001;

-            verifyWritable = (argObj[0] === 1001);

-

-            var verifyConfigurable = false;

-            delete argObj[0];

-            verifyConfigurable = argObj.hasOwnProperty("0");

-

-            return verifyValue && verifyWritable && verifyEnumerable && !verifyConfigurable && data === "data";

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Arguments Object has index property '0' as its own property, it
+    shoulde be writable, enumerable, configurable and does not invoke
+    the setter defined on Object.prototype[0] (Step 11.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var data = "data";
+            var getFunc = function () {
+                return data;
+            };
+
+            var setFunc = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(Object.prototype, "0", {
+                get: getFunc,
+                set: setFunc,
+                configurable: true
+            });
+
+            var argObj = (function () { return arguments })(1);
+
+            var verifyValue = false;
+            verifyValue = (argObj[0] === 1);
+
+            var verifyEnumerable = false;
+            for (var p in argObj) {
+                if (p === "0" && argObj.hasOwnProperty("0")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyWritable = false;
+            argObj[0] = 1001;
+            verifyWritable = (argObj[0] === 1001);
+
+            var verifyConfigurable = false;
+            delete argObj[0];
+            verifyConfigurable = argObj.hasOwnProperty("0");
+
+            return verifyValue && verifyWritable && verifyEnumerable && !verifyConfigurable && data === "data";
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-12-1.js b/test/suite/ch10/10.6/10.6-12-1.js
index 12746eb1e..7624258ca 100644
--- a/test/suite/ch10/10.6/10.6-12-1.js
+++ b/test/suite/ch10/10.6/10.6-12-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-12-1.js

- * @description Accessing callee property of Arguments object is allowed

- */

-

-

-function testcase() {

-  try 

-  {

-    arguments.callee;

-    return true;

-  }

-  catch (e) {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Accessing callee property of Arguments object is allowed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try 
+  {
+    arguments.callee;
+    return true;
+  }
+  catch (e) {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-12-2.js b/test/suite/ch10/10.6/10.6-12-2.js
index 11a1793f4..a38eb6e3a 100644
--- a/test/suite/ch10/10.6/10.6-12-2.js
+++ b/test/suite/ch10/10.6/10.6-12-2.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-12-2.js

- * @description arguments.callee has correct attributes

- */

-

-

-function testcase() {

-  

-  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");

-  if(desc.configurable === true &&

-     desc.enumerable === false &&

-     desc.writable === true &&

-     desc.hasOwnProperty('get') == false &&

-     desc.hasOwnProperty('put') == false)

-    return true;   

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments.callee has correct attributes
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");
+  if(desc.configurable === true &&
+     desc.enumerable === false &&
+     desc.writable === true &&
+     desc.hasOwnProperty('get') == false &&
+     desc.hasOwnProperty('put') == false)
+    return true;   
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-1.js b/test/suite/ch10/10.6/10.6-13-1.js
index d871a9ccb..5370e2866 100644
--- a/test/suite/ch10/10.6/10.6-13-1.js
+++ b/test/suite/ch10/10.6/10.6-13-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-1.js

- * @description Accessing caller property of Arguments object is allowed

- */

-

-

-function testcase() {

-  try 

-  {

-    arguments.caller;

-    return true;

-  }

-  catch (e) {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Accessing caller property of Arguments object is allowed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try 
+  {
+    arguments.caller;
+    return true;
+  }
+  catch (e) {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-a-1.js b/test/suite/ch10/10.6/10.6-13-a-1.js
index a7b3f2ee6..889301ec5 100644
--- a/test/suite/ch10/10.6/10.6-13-a-1.js
+++ b/test/suite/ch10/10.6/10.6-13-a-1.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-a-1.js

- * @description In non-strict mode, arguments object should have its own 'callee' property defined (Step 13.a)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "callee", {

-                value: 1,

-                writable: false,

-                configurable: true

-            });

-

-            var argObj = (function () { return arguments })();

-

-            var verifyValue = false;

-            verifyValue = typeof argObj.callee === "function";

-            

-            var verifyWritable = false;

-            argObj.callee = 1001;

-            verifyWritable = (argObj.callee === 1001);

-

-            var verifyEnumerable = false;

-            for (var p in argObj) {

-                if (p === "callee" && argObj.hasOwnProperty("callee")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete argObj.callee;

-            verifyConfigurable = argObj.hasOwnProperty("callee");

-

-            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable;

-        } finally {

-            delete Object.prototype.callee;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    In non-strict mode, arguments object should have its own 'callee'
+    property defined (Step 13.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "callee", {
+                value: 1,
+                writable: false,
+                configurable: true
+            });
+
+            var argObj = (function () { return arguments })();
+
+            var verifyValue = false;
+            verifyValue = typeof argObj.callee === "function";
+            
+            var verifyWritable = false;
+            argObj.callee = 1001;
+            verifyWritable = (argObj.callee === 1001);
+
+            var verifyEnumerable = false;
+            for (var p in argObj) {
+                if (p === "callee" && argObj.hasOwnProperty("callee")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete argObj.callee;
+            verifyConfigurable = argObj.hasOwnProperty("callee");
+
+            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable;
+        } finally {
+            delete Object.prototype.callee;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-a-2.js b/test/suite/ch10/10.6/10.6-13-a-2.js
index b68171258..7cd8c213f 100644
--- a/test/suite/ch10/10.6/10.6-13-a-2.js
+++ b/test/suite/ch10/10.6/10.6-13-a-2.js
@@ -1,35 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-a-2.js

- * @description A direct call to arguments.callee.caller should work

- */

-

-

-function testcase() {

-    var called = false;

-    

-    function test1(flag) {

-        if (flag!==true) {

-            test2();

-        } else {

-            called = true;

-        }

-    }

-

-    function test2() {

-        if(arguments.callee.caller===undefined) {

-          called=true; // Extension not supported - fake it

-        } else {

-          arguments.callee.caller(true);

-        }

-    }

-    

-    test1();

-    return called;   

-}

-

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: A direct call to arguments.callee.caller should work
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var called = false;
+    
+    function test1(flag) {
+        if (flag!==true) {
+            test2();
+        } else {
+            called = true;
+        }
+    }
+
+    function test2() {
+        if(arguments.callee.caller===undefined) {
+          called=true; // Extension not supported - fake it
+        } else {
+          arguments.callee.caller(true);
+        }
+    }
+    
+    test1();
+    return called;   
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-a-3.js b/test/suite/ch10/10.6/10.6-13-a-3.js
index ddd03a68c..d77a15b8d 100644
--- a/test/suite/ch10/10.6/10.6-13-a-3.js
+++ b/test/suite/ch10/10.6/10.6-13-a-3.js
@@ -1,36 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-a-3.js

- * @description An indirect call to arguments.callee.caller should work

- */

-

-

-function testcase() {

-    var called = false;

-    

-    function test1(flag) {

-        if (flag!==true) {

-            test2();

-        } else {

-            called = true;

-        }

-    }

-

-    function test2() {  

-       if (arguments.callee.caller===undefined) {

-         called = true;  //Extension not supported - fake it

-       } else {     

-         var explicit = arguments.callee.caller;

-         explicit(true);

-       }

-    }

-    

-    test1();

-    return called;   

-}

-

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: An indirect call to arguments.callee.caller should work
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var called = false;
+    
+    function test1(flag) {
+        if (flag!==true) {
+            test2();
+        } else {
+            called = true;
+        }
+    }
+
+    function test2() {  
+       if (arguments.callee.caller===undefined) {
+         called = true;  //Extension not supported - fake it
+       } else {     
+         var explicit = arguments.callee.caller;
+         explicit(true);
+       }
+    }
+    
+    test1();
+    return called;   
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-b-1-s.js b/test/suite/ch10/10.6/10.6-13-b-1-s.js
index d44b475af..2e7044d72 100644
--- a/test/suite/ch10/10.6/10.6-13-b-1-s.js
+++ b/test/suite/ch10/10.6/10.6-13-b-1-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-b-1-s.js

- * @description Accessing caller property of Arguments object throws TypeError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  try 

-  {

-    arguments.caller;

-  }

-  catch (e) {

-    if(e instanceof TypeError)

-      return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Accessing caller property of Arguments object throws TypeError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  try 
+  {
+    arguments.caller;
+  }
+  catch (e) {
+    if(e instanceof TypeError)
+      return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-b-2-s.js b/test/suite/ch10/10.6/10.6-13-b-2-s.js
index 0f1b2b764..2c559d445 100644
--- a/test/suite/ch10/10.6/10.6-13-b-2-s.js
+++ b/test/suite/ch10/10.6/10.6-13-b-2-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-b-2-s.js

- * @description arguments.caller exists in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-  'use strict';    

-  var desc = Object.getOwnPropertyDescriptor(arguments,"caller");

-  return desc!== undefined;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments.caller exists in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  'use strict';    
+  var desc = Object.getOwnPropertyDescriptor(arguments,"caller");
+  return desc!== undefined;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-b-3-s.js b/test/suite/ch10/10.6/10.6-13-b-3-s.js
index d85e084f1..34b901b31 100644
--- a/test/suite/ch10/10.6/10.6-13-b-3-s.js
+++ b/test/suite/ch10/10.6/10.6-13-b-3-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-b-3-s.js

- * @description arguments.caller is non-configurable in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-   

-  'use strict';    

-  var desc = Object.getOwnPropertyDescriptor(arguments,"caller");

-  

-  return (desc.configurable === false && 

-     desc.enumerable === false && 

-     desc.hasOwnProperty('value') == false  && 

-     desc.hasOwnProperty('writable') == false &&

-     desc.hasOwnProperty('get') == true && 

-     desc.hasOwnProperty('set') == true);                                     

-    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments.caller is non-configurable in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+   
+  'use strict';    
+  var desc = Object.getOwnPropertyDescriptor(arguments,"caller");
+  
+  return (desc.configurable === false && 
+     desc.enumerable === false && 
+     desc.hasOwnProperty('value') == false  && 
+     desc.hasOwnProperty('writable') == false &&
+     desc.hasOwnProperty('get') == true && 
+     desc.hasOwnProperty('set') == true);                                     
+    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-c-1-s.js b/test/suite/ch10/10.6/10.6-13-c-1-s.js
index f17a9b37b..e4979eb9a 100644
--- a/test/suite/ch10/10.6/10.6-13-c-1-s.js
+++ b/test/suite/ch10/10.6/10.6-13-c-1-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-c-1-s.js

- * @description Accessing callee property of Arguments object throws TypeError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  try 

-  {

-    arguments.callee;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Accessing callee property of Arguments object throws TypeError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  try 
+  {
+    arguments.callee;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-c-2-s.js b/test/suite/ch10/10.6/10.6-13-c-2-s.js
index e08e77003..0440e2788 100644
--- a/test/suite/ch10/10.6/10.6-13-c-2-s.js
+++ b/test/suite/ch10/10.6/10.6-13-c-2-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-c-2-s.js

- * @description arguments.callee is exists in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-  'use strict';    

-  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");

-  return desc !== undefined;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments.callee is exists in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  'use strict';    
+  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");
+  return desc !== undefined;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-13-c-3-s.js b/test/suite/ch10/10.6/10.6-13-c-3-s.js
index 8122932bd..821cdc0e4 100644
--- a/test/suite/ch10/10.6/10.6-13-c-3-s.js
+++ b/test/suite/ch10/10.6/10.6-13-c-3-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-13-c-3-s.js

- * @description arguments.callee is non-configurable in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-  'use strict';    

-  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");

-  return (desc.configurable === false &&

-     desc.enumerable === false &&

-     desc.hasOwnProperty('value') == false &&

-     desc.hasOwnProperty('writable') == false &&

-     desc.hasOwnProperty('get') == true &&

-     desc.hasOwnProperty('set') == true);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments.callee is non-configurable in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  'use strict';    
+  var desc = Object.getOwnPropertyDescriptor(arguments,"callee");
+  return (desc.configurable === false &&
+     desc.enumerable === false &&
+     desc.hasOwnProperty('value') == false &&
+     desc.hasOwnProperty('writable') == false &&
+     desc.hasOwnProperty('get') == true &&
+     desc.hasOwnProperty('set') == true);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-14-1-s.js b/test/suite/ch10/10.6/10.6-14-1-s.js
index aebc6fa1c..112a735b1 100644
--- a/test/suite/ch10/10.6/10.6-14-1-s.js
+++ b/test/suite/ch10/10.6/10.6-14-1-s.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-14-1-s.js

- * @description Strict Mode - 'callee' exists and 'caller' exists under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var argObj = function () {

-            return arguments;

-        } ();

-        return argObj.hasOwnProperty("callee") && argObj.hasOwnProperty("caller");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - 'callee' exists and 'caller' exists under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var argObj = function () {
+            return arguments;
+        } ();
+        return argObj.hasOwnProperty("callee") && argObj.hasOwnProperty("caller");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-14-b-1-s.js b/test/suite/ch10/10.6/10.6-14-b-1-s.js
index 51cbfff4d..3cdc79791 100644
--- a/test/suite/ch10/10.6/10.6-14-b-1-s.js
+++ b/test/suite/ch10/10.6/10.6-14-b-1-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-14-b-1-s.js

- * @description Strict Mode - [[Enumerable]] attribute value in 'caller' is false under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var argObj = function () {

-            return arguments;

-        } ();

-

-        var verifyEnumerable = false;

-        for (var _10_6_14_b_1 in argObj) {

-            if (argObj.hasOwnProperty(_10_6_14_b_1) && _10_6_14_b_1 === "caller") {

-                verifyEnumerable = true;

-            }

-        }

-        return !verifyEnumerable && argObj.hasOwnProperty("caller");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - [[Enumerable]] attribute value in 'caller' is false
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var argObj = function () {
+            return arguments;
+        } ();
+
+        var verifyEnumerable = false;
+        for (var _10_6_14_b_1 in argObj) {
+            if (argObj.hasOwnProperty(_10_6_14_b_1) && _10_6_14_b_1 === "caller") {
+                verifyEnumerable = true;
+            }
+        }
+        return !verifyEnumerable && argObj.hasOwnProperty("caller");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-14-b-4-s.js b/test/suite/ch10/10.6/10.6-14-b-4-s.js
index 748c630a9..e79a7c5d0 100644
--- a/test/suite/ch10/10.6/10.6-14-b-4-s.js
+++ b/test/suite/ch10/10.6/10.6-14-b-4-s.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-14-b-4-s.js

- * @description Strict Mode - TypeError is thrown when accessing the [[Set]] attribute in 'caller' under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var argObj = function () {

-            return arguments;

-        } ();

-

-        try {

-            argObj.caller = {};

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when accessing the [[Set]]
+    attribute in 'caller' under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var argObj = function () {
+            return arguments;
+        } ();
+
+        try {
+            argObj.caller = {};
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-14-c-1-s.js b/test/suite/ch10/10.6/10.6-14-c-1-s.js
index cade0a537..782dc9df6 100644
--- a/test/suite/ch10/10.6/10.6-14-c-1-s.js
+++ b/test/suite/ch10/10.6/10.6-14-c-1-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-14-c-1-s.js

- * @description Strict Mode - [[Enumerable]] attribute value in 'callee' is false under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var argObj = function () {

-            return arguments;

-        } ();

-

-        var verifyEnumerable = false;

-        for (var _10_6_14_c_1 in argObj) {

-            if (argObj.hasOwnProperty(_10_6_14_c_1) && _10_6_14_c_1 === "callee") {

-                verifyEnumerable = true;

-            }

-        }

-        return !verifyEnumerable && argObj.hasOwnProperty("callee");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - [[Enumerable]] attribute value in 'callee' is false
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var argObj = function () {
+            return arguments;
+        } ();
+
+        var verifyEnumerable = false;
+        for (var _10_6_14_c_1 in argObj) {
+            if (argObj.hasOwnProperty(_10_6_14_c_1) && _10_6_14_c_1 === "callee") {
+                verifyEnumerable = true;
+            }
+        }
+        return !verifyEnumerable && argObj.hasOwnProperty("callee");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-14-c-4-s.js b/test/suite/ch10/10.6/10.6-14-c-4-s.js
index 1238570c4..1866c2416 100644
--- a/test/suite/ch10/10.6/10.6-14-c-4-s.js
+++ b/test/suite/ch10/10.6/10.6-14-c-4-s.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-14-c-4-s.js

- * @description Strict Mode - TypeError is thrown when accessing the [[Set]] attribute in 'callee' under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var argObj = function () {

-            return arguments;

-        } ();

-

-        try {

-            argObj.callee = {};

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when accessing the [[Set]]
+    attribute in 'callee' under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var argObj = function () {
+            return arguments;
+        } ();
+
+        try {
+            argObj.callee = {};
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-1gs.js b/test/suite/ch10/10.6/10.6-1gs.js
index f77fd3c57..3e20dae85 100644
--- a/test/suite/ch10/10.6/10.6-1gs.js
+++ b/test/suite/ch10/10.6/10.6-1gs.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.6/10.6-1gs.js

- * @description Strict Mode - arguments.callee cannot be accessed in a strict function, but does not throw an early error

- * @onlyStrict

- */

-

-"use strict";

-function f_10_6_1_gs(){

-    return arguments.callee;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - arguments.callee cannot be accessed in a strict
+    function, but does not throw an early error
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f_10_6_1_gs(){
+    return arguments.callee;
+}
diff --git a/test/suite/ch10/10.6/10.6-2gs.js b/test/suite/ch10/10.6/10.6-2gs.js
index e13cc02f5..45069b091 100644
--- a/test/suite/ch10/10.6/10.6-2gs.js
+++ b/test/suite/ch10/10.6/10.6-2gs.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch10/10.6/10.6-2gs.js

- * @description Strict Mode - arguments.callee cannot be accessed in a strict function

- * @onlyStrict

- * @negative .

- */

-

-"use strict";

-function f_10_6_1_gs(){

-    return arguments.callee;

-}

-f_10_6_1_gs();

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - arguments.callee cannot be accessed in a strict
+    function
+negative: .
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f_10_6_1_gs(){
+    return arguments.callee;
+}
+f_10_6_1_gs();
diff --git a/test/suite/ch10/10.6/10.6-5-1.js b/test/suite/ch10/10.6/10.6-5-1.js
index f058239fe..8058ac6de 100644
--- a/test/suite/ch10/10.6/10.6-5-1.js
+++ b/test/suite/ch10/10.6/10.6-5-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-5-1.js

- * @description [[Prototype]] property of Arguments is set to Object prototype object

- */

-

-

-function testcase() {

-  if(Object.getPrototypeOf(arguments) === Object.getPrototypeOf({}))

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Prototype]] property of Arguments is set to Object prototype
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if(Object.getPrototypeOf(arguments) === Object.getPrototypeOf({}))
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-6-1.js b/test/suite/ch10/10.6/10.6-6-1.js
index d0ec15e27..ca57db6c6 100644
--- a/test/suite/ch10/10.6/10.6-6-1.js
+++ b/test/suite/ch10/10.6/10.6-6-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-6-1.js

- * @description 'length property of arguments object exists

- */

-

-

-function testcase() {

-  

-  var desc = Object.getOwnPropertyDescriptor(arguments,"length");

-  return desc !== undefined

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'length property of arguments object exists"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var desc = Object.getOwnPropertyDescriptor(arguments,"length");
+  return desc !== undefined
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-6-2.js b/test/suite/ch10/10.6/10.6-6-2.js
index afad35fd0..8a8cf5912 100644
--- a/test/suite/ch10/10.6/10.6-6-2.js
+++ b/test/suite/ch10/10.6/10.6-6-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-6-2.js

- * @description 'length' property of arguments object has correct attributes

- */

-

-

-function testcase() {

-  

-  var desc = Object.getOwnPropertyDescriptor(arguments,"length");

-  if(desc.configurable === true &&

-     desc.enumerable === false &&

-     desc.writable === true )

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'length' property of arguments object has correct attributes"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var desc = Object.getOwnPropertyDescriptor(arguments,"length");
+  if(desc.configurable === true &&
+     desc.enumerable === false &&
+     desc.writable === true )
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-6-3.js b/test/suite/ch10/10.6/10.6-6-3.js
index e7838e8a4..5e1d49128 100644
--- a/test/suite/ch10/10.6/10.6-6-3.js
+++ b/test/suite/ch10/10.6/10.6-6-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-6-3.js

- * @description 'length' property of arguments object for 0 argument function exists

- */

-

-

-function testcase() {

-      var arguments= undefined;

-	return (function () {return arguments.length !== undefined})();

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'length' property of arguments object for 0 argument function
+    exists
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+      var arguments= undefined;
+	return (function () {return arguments.length !== undefined})();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-6-4.js b/test/suite/ch10/10.6/10.6-6-4.js
index 6a3a77b23..5bad13376 100644
--- a/test/suite/ch10/10.6/10.6-6-4.js
+++ b/test/suite/ch10/10.6/10.6-6-4.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-6-4.js

- * @description 'length' property of arguments object for 0 argument function call is 0 even with formal parameters

- */

-

-

-function testcase() {

-      var arguments= undefined;

-	return (function (a,b,c) {return arguments.length === 0})();

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'length' property of arguments object for 0 argument function call
+    is 0 even with formal parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+      var arguments= undefined;
+	return (function (a,b,c) {return arguments.length === 0})();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/10.6-7-1.js b/test/suite/ch10/10.6/10.6-7-1.js
index 30fd4f373..565591be5 100644
--- a/test/suite/ch10/10.6/10.6-7-1.js
+++ b/test/suite/ch10/10.6/10.6-7-1.js
@@ -1,53 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch10/10.6/10.6-7-1.js

- * @description Arguments Object has length as its own property and does not invoke the setter defined on Object.prototype.length (Step 7)

- */

-

-

-function testcase() {

-        try {

-            var data = "data";

-            var getFunc = function () {

-                return 12;

-            };

-

-            var setFunc = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(Object.prototype, "length", {

-                get: getFunc,

-                set: setFunc,

-                configurable: true

-            });

-

-            var verifyValue = false;

-            var argObj = (function () { return arguments })();

-            verifyValue = (argObj.length === 0);

-

-            var verifyWritable = false;

-            argObj.length = 1001;

-            verifyWritable = (argObj.length === 1001);

-

-            var verifyEnumerable = false;

-            for (var p in argObj) {

-                if (p === "length") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete argObj.length;

-            verifyConfigurable = argObj.hasOwnProperty("length");

-

-            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable && data === "data";

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Arguments Object has length as its own property and does not
+    invoke the setter defined on Object.prototype.length (Step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var data = "data";
+            var getFunc = function () {
+                return 12;
+            };
+
+            var setFunc = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(Object.prototype, "length", {
+                get: getFunc,
+                set: setFunc,
+                configurable: true
+            });
+
+            var verifyValue = false;
+            var argObj = (function () { return arguments })();
+            verifyValue = (argObj.length === 0);
+
+            var verifyWritable = false;
+            argObj.length = 1001;
+            verifyWritable = (argObj.length === 1001);
+
+            var verifyEnumerable = false;
+            for (var p in argObj) {
+                if (p === "length") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete argObj.length;
+            verifyConfigurable = argObj.hasOwnProperty("length");
+
+            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable && data === "data";
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.6/S10.6_A1.js b/test/suite/ch10/10.6/S10.6_A1.js
index 89df9c4dd..187c999a7 100644
--- a/test/suite/ch10/10.6/S10.6_A1.js
+++ b/test/suite/ch10/10.6/S10.6_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When control enters an execution context for function code,
- * an arguments object is created and initialised
- *
- * @path ch10/10.6/S10.6_A1.js
- * @description Executing function which uses arguments object
- */
+/*---
+info: >
+    When control enters an execution context for function code,
+    an arguments object is created and initialised
+description: Executing function which uses arguments object
+---*/
 
 //CHECK#1
 function f1(){
@@ -32,4 +31,3 @@ try{
 catch(e){
   $ERROR("#2: arguments doesn't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A2.js b/test/suite/ch10/10.6/S10.6_A2.js
index 18698be00..688cee6b7 100644
--- a/test/suite/ch10/10.6/S10.6_A2.js
+++ b/test/suite/ch10/10.6/S10.6_A2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the
- * created arguments object is the original Object prototype object, the one
- * that is the initial value of Object.prototype
- *
- * @path ch10/10.6/S10.6_A2.js
- * @description Checking arguments.constructor.prototype===Object.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the
+    created arguments object is the original Object prototype object, the one
+    that is the initial value of Object.prototype
+description: Checking arguments.constructor.prototype===Object.prototype
+---*/
 
 //CHECK#1
 function f1(){
@@ -33,4 +32,3 @@ try{
 catch(e){
   $ERROR("#2: arguments doesn't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A3_T1.js b/test/suite/ch10/10.6/S10.6_A3_T1.js
index 234d6ad1a..a2cad7cb1 100644
--- a/test/suite/ch10/10.6/S10.6_A3_T1.js
+++ b/test/suite/ch10/10.6/S10.6_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name callee with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A3_T1.js
- * @description Checking existence of arguments.callee property
- */
+/*---
+info: >
+    A property is created with name callee with property
+    attributes { DontEnum } and no others
+description: Checking existence of arguments.callee property
+---*/
 
 //CHECK#1
 function f1(){
@@ -32,4 +31,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object doesn't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A3_T2.js b/test/suite/ch10/10.6/S10.6_A3_T2.js
index 327e5cf36..9cb310265 100644
--- a/test/suite/ch10/10.6/S10.6_A3_T2.js
+++ b/test/suite/ch10/10.6/S10.6_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name callee with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A3_T2.js
- * @description Checking if enumerating the arguments.callee property fails
- */
+/*---
+info: >
+    A property is created with name callee with property
+    attributes { DontEnum } and no others
+description: Checking if enumerating the arguments.callee property fails
+---*/
 
 //CHECK#1
 function f1(){
@@ -46,4 +45,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A3_T3.js b/test/suite/ch10/10.6/S10.6_A3_T3.js
index 4b2626570..6fdd603c8 100644
--- a/test/suite/ch10/10.6/S10.6_A3_T3.js
+++ b/test/suite/ch10/10.6/S10.6_A3_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name callee with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A3_T3.js
- * @description Checking if deleting arguments.callee property fails
- * @noStrict
- */
+/*---
+info: >
+    A property is created with name callee with property
+    attributes { DontEnum } and no others
+description: Checking if deleting arguments.callee property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(){
@@ -37,4 +36,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A3_T4.js b/test/suite/ch10/10.6/S10.6_A3_T4.js
index c83983507..5a94feae2 100644
--- a/test/suite/ch10/10.6/S10.6_A3_T4.js
+++ b/test/suite/ch10/10.6/S10.6_A3_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name callee with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A3_T4.js
- * @description Overriding arguments.callee property
- * @noStrict
- */
+/*---
+info: >
+    A property is created with name callee with property
+    attributes { DontEnum } and no others
+description: Overriding arguments.callee property
+flags: [noStrict]
+---*/
 
 var str = "something different";
 //CHECK#1
@@ -39,4 +38,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A4.js b/test/suite/ch10/10.6/S10.6_A4.js
index b49902a45..15c96f9f1 100644
--- a/test/suite/ch10/10.6/S10.6_A4.js
+++ b/test/suite/ch10/10.6/S10.6_A4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of the created property callee is the
- * Function object being executed
- *
- * @path ch10/10.6/S10.6_A4.js
- * @description Checking that arguments.callee === function object
- * @noStrict
- */
+/*---
+info: >
+    The initial value of the created property callee is the
+    Function object being executed
+description: Checking that arguments.callee === function object
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(){
@@ -35,4 +34,3 @@ try{
 catch(e){
   $ERROR("#1: arguments object doesn't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A5_T1.js b/test/suite/ch10/10.6/S10.6_A5_T1.js
index a76e58d47..05f412827 100644
--- a/test/suite/ch10/10.6/S10.6_A5_T1.js
+++ b/test/suite/ch10/10.6/S10.6_A5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name length with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A5_T1.js
- * @description Checking existence of arguments.length property
- */
+/*---
+info: >
+    A property is created with name length with property
+    attributes { DontEnum } and no others
+description: Checking existence of arguments.length property
+---*/
 
 //CHECK#1
 function f1(){
@@ -32,4 +31,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object doesn't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A5_T2.js b/test/suite/ch10/10.6/S10.6_A5_T2.js
index a0f4df7a9..cc0fdb4d5 100644
--- a/test/suite/ch10/10.6/S10.6_A5_T2.js
+++ b/test/suite/ch10/10.6/S10.6_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name length with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A5_T2.js
- * @description Checking if enumerating the arguments.length property fails
- */
+/*---
+info: >
+    A property is created with name length with property
+    attributes { DontEnum } and no others
+description: Checking if enumerating the arguments.length property fails
+---*/
 
 //CHECK#1
 function f1(){
@@ -46,4 +45,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A5_T3.js b/test/suite/ch10/10.6/S10.6_A5_T3.js
index c8187fac8..ded4c6b39 100644
--- a/test/suite/ch10/10.6/S10.6_A5_T3.js
+++ b/test/suite/ch10/10.6/S10.6_A5_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name length with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A5_T3.js
- * @description Checking if deleting arguments.length property fails
- */
+/*---
+info: >
+    A property is created with name length with property
+    attributes { DontEnum } and no others
+description: Checking if deleting arguments.length property fails
+---*/
 
 //CHECK#1
 function f1(){
@@ -36,4 +35,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A5_T4.js b/test/suite/ch10/10.6/S10.6_A5_T4.js
index 7178bf424..a32d5ea6d 100644
--- a/test/suite/ch10/10.6/S10.6_A5_T4.js
+++ b/test/suite/ch10/10.6/S10.6_A5_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property is created with name length with property
- * attributes { DontEnum } and no others
- *
- * @path ch10/10.6/S10.6_A5_T4.js
- * @description Overriding arguments.length property
- */
+/*---
+info: >
+    A property is created with name length with property
+    attributes { DontEnum } and no others
+description: Overriding arguments.length property
+---*/
 
 var str = "something different";
 //CHECK#1
@@ -38,4 +37,3 @@ try{
 catch(e){
   $ERROR("#2: arguments object don't exists");
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A6.js b/test/suite/ch10/10.6/S10.6_A6.js
index 3f1d0d1c1..1de852f01 100644
--- a/test/suite/ch10/10.6/S10.6_A6.js
+++ b/test/suite/ch10/10.6/S10.6_A6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of the created property length is the number
- * of actual parameter values supplied by the caller
- *
- * @path ch10/10.6/S10.6_A6.js
- * @description Create function, that returned arguments.length
- */
+/*---
+info: >
+    The initial value of the created property length is the number
+    of actual parameter values supplied by the caller
+description: Create function, that returned arguments.length
+---*/
 
 function f1(){
   return arguments.length;
@@ -64,4 +63,3 @@ if(!(f2(0, 1, 2) === 3)){
 if(!(f2(0, 1, 2, 3) === 4)){
   $ERROR('#10: argument.length === 4');
 }
-
diff --git a/test/suite/ch10/10.6/S10.6_A7.js b/test/suite/ch10/10.6/S10.6_A7.js
index f013ba013..09e8da177 100644
--- a/test/suite/ch10/10.6/S10.6_A7.js
+++ b/test/suite/ch10/10.6/S10.6_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Get arguments of function
- *
- * @path ch10/10.6/S10.6_A7.js
- * @description Use property arguments
- */
+/*---
+info: Get arguments of function
+description: Use property arguments
+---*/
 
 function f1() {
   return arguments;
@@ -17,4 +15,3 @@ for(var i = 1; i < 5; i++){
 if (f1(1,2,3,4,5)[i] !== (i+1))
   $ERROR("#"+i+": Returning function's arguments work wrong, f1(1,2,3,4,5)["+i+"] !== "+(i+1));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js b/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js
index 0f2b30b5d..f7473928d 100644
--- a/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js
+++ b/test/suite/ch11/11.1/11.1.1/11.1.1-1gs.js
@@ -1,16 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch11/11.1/11.1.1/11.1.1-1gs.js

- * @description Strict Mode - 'this' object at the global scope is not undefined

- * @onlyStrict

- */

-

-"use strict";

-if (this===undefined) {

-    throw NotEarlyError;

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - 'this' object at the global scope is not undefined
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (this===undefined) {
+    throw NotEarlyError;
+}
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
index c68c32736..876c46e90 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "this" is reserved word
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A1.js
- * @description Checking if execution of "this=1" fails
- * @negative
- */
+/*---
+info: The "this" is reserved word
+description: Checking if execution of "this=1" fails
+flags: [negative]
+---*/
 
 this = 1;
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
index 4094fa914..64589de5c 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in function code, "this" and eval("this"), called as a functions, return the global object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A3.1.js
- * @description Creating function which returns "this" or eval("this")
- * @noStrict
- */
+/*---
+info: >
+    Being in function code, "this" and eval("this"), called as a functions,
+    return the global object
+description: Creating function which returns "this" or eval("this")
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function MyFunction() {return this}
@@ -20,6 +20,3 @@ function MyFunction() {return eval("this")}
 if (MyFunction() !== this) {
   $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));
 }
-
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
index ca0d5e699..e6863804c 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A3.2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in function code, "this" and eval("this"), called as a constructors, return the object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A3.2.js
- * @description Create function. It have property, that returned "this"
- * @noStrict
- */
+/*---
+info: >
+    Being in function code, "this" and eval("this"), called as a
+    constructors, return the object
+description: Create function. It have property, that returned "this"
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function MyFunction() {this.THIS = this}
@@ -20,5 +20,3 @@ function MyFunction() {this.THIS = eval("this")}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
   $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
index 38e2adbbd..f79e1b463 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in anonymous code, "this" and eval("this"), called as a function, return the global object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A4.1.js
- * @description Creating function with new Function() constructor
- */
+/*---
+info: >
+    Being in anonymous code, "this" and eval("this"), called as a function,
+    return the global object
+description: Creating function with new Function() constructor
+---*/
 
 //CHECK#1
 var MyFunction = new Function("return this");
@@ -19,6 +19,3 @@ MyFunction = new Function("return eval(\'this\')");
 if (MyFunction() !== this) {
   $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
-
-
-
diff --git a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
index cd37d6824..1d8fc7469 100644
--- a/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
+++ b/test/suite/ch11/11.1/11.1.1/S11.1.1_A4.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Being in anonymous code, "this" and eval("this"), called as a constructor, return the object
- *
- * @path ch11/11.1/11.1.1/S11.1.1_A4.2.js
- * @description Creating function by using new Function() constructor. It has the property, which returns "this"
- */
+/*---
+info: >
+    Being in anonymous code, "this" and eval("this"), called as a
+    constructor, return the object
+description: >
+    Creating function by using new Function() constructor. It has the
+    property, which returns "this"
+---*/
 
 //CHECK#1
 var MyFunction = new Function("this.THIS = this");
@@ -21,5 +23,3 @@ MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
   $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
-
-
diff --git a/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T1.js b/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T1.js
index 46955d3ca..cdd983ded 100644
--- a/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T1.js
+++ b/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of evaluating an Identifier is always a value of type Reference
- *
- * @path ch11/11.1/11.1.2/S11.1.2_A1_T1.js
- * @description Creating variables without defining it
- */
+/*---
+info: The result of evaluating an Identifier is always a value of type Reference
+description: Creating variables without defining it
+---*/
 
 //CHECK#1
 if (this.x !== undefined) {
@@ -24,4 +22,3 @@ this.y++;
 if (isNaN(y) !== true) {
   $ERROR('#3: this.y++; y === Not-a-Number. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T2.js b/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T2.js
index df170468d..2cf3be2b3 100644
--- a/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T2.js
+++ b/test/suite/ch11/11.1/11.1.2/S11.1.2_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of evaluating an Identifier is always a value of type Reference
- *
- * @path ch11/11.1/11.1.2/S11.1.2_A1_T2.js
- * @description Trying to generate ReferenceError
- */
+/*---
+info: The result of evaluating an Identifier is always a value of type Reference
+description: Trying to generate ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ try {
     $ERROR('#1.2: this.z; z === undefined throw ReferenceError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/11.1.4-0.js b/test/suite/ch11/11.1/11.1.4/11.1.4-0.js
index 60d4b1d8c..4cd28c576 100644
--- a/test/suite/ch11/11.1/11.1.4/11.1.4-0.js
+++ b/test/suite/ch11/11.1/11.1.4/11.1.4-0.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.4/11.1.4-0.js

- * @description elements elided at the end of an array do not contribute to its length

- */

-

-

-function testcase() {

-  var a = [,];

-  if (a.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    elements elided at the end of an array do not contribute to its
+    length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [,];
+  if (a.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.4/11.1.4_4-5-1.js b/test/suite/ch11/11.1/11.1.4/11.1.4_4-5-1.js
index 15de1077b..95951b8e6 100644
--- a/test/suite/ch11/11.1/11.1.4/11.1.4_4-5-1.js
+++ b/test/suite/ch11/11.1/11.1.4/11.1.4_4-5-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.4; 

- * The production

- * ElementList : Elisionopt AssignmentExpression

- * 5.Call the [[DefineOwnProperty]] internal method of array with arguments ToString(firstIndex), the Property Descriptor { [[Value]]: initValue, [[Writable]]: true

- *     , [[Enumerable]]: true, [[Configurable]]: true}, and false.

- *

- * @path ch11/11.1/11.1.4/11.1.4_4-5-1.js

- * @description Initialize array using ElementList (Elisionopt AssignmentExpression) when index property (read-only) exists in Array.prototype (step 5)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-            var arr = [101];

-

-            return arr.hasOwnProperty("0") && arr[0] === 101;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.4; 
+    The production
+    ElementList : Elisionopt AssignmentExpression
+    5.Call the [[DefineOwnProperty]] internal method of array with arguments ToString(firstIndex), the Property Descriptor { [[Value]]: initValue, [[Writable]]: true
+    , [[Enumerable]]: true, [[Configurable]]: true}, and false.
+description: >
+    Initialize array using ElementList (Elisionopt
+    AssignmentExpression) when index property (read-only) exists in
+    Array.prototype (step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+            var arr = [101];
+
+            return arr.hasOwnProperty("0") && arr[0] === 101;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.4/11.1.4_5-6-1.js b/test/suite/ch11/11.1/11.1.4/11.1.4_5-6-1.js
index 14e02a1b7..2075bbc43 100644
--- a/test/suite/ch11/11.1/11.1.4/11.1.4_5-6-1.js
+++ b/test/suite/ch11/11.1/11.1.4/11.1.4_5-6-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.4; 

- * The production

- * ElementList : ElementList , Elisionopt AssignmentExpression

- * 6.Call the [[DefineOwnProperty]] internal method of array with arguments ToString(ToUint32((pad+len)) and the Property Descriptor { [[Value]]: initValue

- *     , [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true}, and false.

- *

- * @path ch11/11.1/11.1.4/11.1.4_5-6-1.js

- * @description Initialize array using ElementList (ElementList , Elisionopt AssignmentExpression) when index property (read-only) exists in Array.prototype (step 6)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-            var arr = [101, 12];

-

-            return arr.hasOwnProperty("1") && arr[1] === 12;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.4; 
+    The production
+    ElementList : ElementList , Elisionopt AssignmentExpression
+    6.Call the [[DefineOwnProperty]] internal method of array with arguments ToString(ToUint32((pad+len)) and the Property Descriptor { [[Value]]: initValue
+    , [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true}, and false.
+description: >
+    Initialize array using ElementList (ElementList , Elisionopt
+    AssignmentExpression) when index property (read-only) exists in
+    Array.prototype (step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+            var arr = [101, 12];
+
+            return arr.hasOwnProperty("1") && arr[1] === 12;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.1.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.1.js
index 6e202534b..7e7837662 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.1.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.1.js
- * @description Checking various properties of the array defined with expression "var array = []"
- */
+/*---
+info: "Evaluate the production ArrayLiteral: [ ]"
+description: >
+    Checking various properties of the array defined with expression
+    "var array = []"
+---*/
 
 var array = [];
 
@@ -29,4 +29,3 @@ if (array.toString !== Array.prototype.toString) {
 if (array.length !== 0) {
   $ERROR('#4: var array = []; array.length === 0. Actual: ' + (array.length));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.2.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.2.js
index e1b0ff3ee..db34ebf97 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.2.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ Elision ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.2.js
- * @description Checking various properties the array defined with "var array = [,,,,,]"
- */
+/*---
+info: "Evaluate the production ArrayLiteral: [ Elision ]"
+description: >
+    Checking various properties the array defined with "var array =
+    [,,,,,]"
+---*/
 
 var array = [,,,,,];
 
@@ -29,4 +29,3 @@ if (array.toString !== Array.prototype.toString) {
 if (array.length !== 5) {
   $ERROR('#4: var array = [,,,,,]; array.length === 5. Actual: ' + (array.length));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.3.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.3.js
index 6682a8eef..8fa9539b4 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.3.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ AssignmentExpression ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.3.js
- * @description Checking various properteis and contents of the array defined with "var array = [1,2,3,4,5]"
- */
+/*---
+info: "Evaluate the production ArrayLiteral: [ AssignmentExpression ]"
+description: >
+    Checking various properteis and contents of the array defined with
+    "var array = [1,2,3,4,5]"
+---*/
 
 var array = [1,2,3,4,5];
 
@@ -54,4 +54,3 @@ if (array[3] !== 4) {
 if (array[4] !== 5) {
   $ERROR('#9: var array = [1,2,3,4,5]; array[4] === 5. Actual: ' + (array[4]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.4.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.4.js
index 28e67233e..51b7fc7a9 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.4.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ Elision, AssignmentExpression ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.4.js
- * @description Checking various properteis and content of the array defined with "var array = [,,,1,2]"
- */
+/*---
+info: "Evaluate the production ArrayLiteral: [ Elision, AssignmentExpression ]"
+description: >
+    Checking various properteis and content of the array defined with
+    "var array = [,,,1,2]"
+---*/
 
 var array = [,,,1,2];
 
@@ -54,4 +54,3 @@ if (array[3] !== 1) {
 if (array[4] !== 2) {
   $ERROR('#9: var array = [,,,1,2]; array[4] === 2. Actual: ' + (array[4]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.5.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.5.js
index d08183f2e..43c392d15 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.5.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ AssignmentExpression, Elision ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.5.js
- * @description Checking various properteis and contents of the array defined with "var array = [4,5,,,,]"
- */
+/*---
+info: "Evaluate the production ArrayLiteral: [ AssignmentExpression, Elision ]"
+description: >
+    Checking various properteis and contents of the array defined with
+    "var array = [4,5,,,,]"
+---*/
 
 var array = [4,5,,,,];
 
@@ -54,4 +54,3 @@ if (array[3] !== undefined) {
 if (array[4] !== undefined) {
   $ERROR('#9: var array = [4,5,,,,]; array[4] === undefined. Actual: ' + (array[4]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.6.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.6.js
index 589eb3c0d..fa04a1f28 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.6.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ Elision, AssignmentExpression, Elision ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.6.js
- * @description Checking various properteis and contents of the array defined with "var array = [,,3,,,]"
- */
+/*---
+info: >
+    Evaluate the production ArrayLiteral: [ Elision, AssignmentExpression,
+    Elision ]
+description: >
+    Checking various properteis and contents of the array defined with
+    "var array = [,,3,,,]"
+---*/
 
 var array = [,,3,,,];
 
@@ -54,4 +56,3 @@ if (array[3] !== undefined) {
 if (array[4] !== undefined) {
   $ERROR('#9: var array = [,,3,,,]; array[4] === undefined. Actual: ' + (array[4]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.7.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.7.js
index 4689d6b00..609d3ff6f 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.7.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A1.7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ArrayLiteral: [ AssignmentExpression, Elision, AssignmentExpression ]
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A1.7.js
- * @description Checking various properteis and contents of the array defined with "var array = [1,2,,4,5]"
- */
+/*---
+info: >
+    Evaluate the production ArrayLiteral: [ AssignmentExpression, Elision,
+    AssignmentExpression ]
+description: >
+    Checking various properteis and contents of the array defined with
+    "var array = [1,2,,4,5]"
+---*/
 
 var array = [1,2,,4,5];
 
@@ -54,4 +56,3 @@ if (array[3] !== 4) {
 if (array[4] !== 5) {
   $ERROR('#9: var array = [1,2,,4,5]; array[4] === 5. Actual: ' + (array[4]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.4/S11.1.4_A2.js b/test/suite/ch11/11.1/11.1.4/S11.1.4_A2.js
index 3e1c699fb..b91afaf6a 100644
--- a/test/suite/ch11/11.1/11.1.4/S11.1.4_A2.js
+++ b/test/suite/ch11/11.1/11.1.4/S11.1.4_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Create multi dimensional array
- *
- * @path ch11/11.1/11.1.4/S11.1.4_A2.js
- * @description Checking various properteis and contents of the arrya defined with "var array = [[1,2], [3], []]"
- */
+/*---
+info: Create multi dimensional array
+description: >
+    Checking various properteis and contents of the arrya defined with
+    "var array = [[1,2], [3], []]"
+---*/
 
 var array = [[1,2], [3], []];
 
@@ -125,4 +125,3 @@ if (array[0][1] !== 2) {
 if (array[1][0] !== 3) {
   $ERROR('#722: var array = [[1,2], [3], []]; array[1][0] === 3. Actual: ' + (array[1][0]));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-0-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5-0-1.js
index 5ff963de5..ea0067315 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-0-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-0-1.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * it isn't clear what specific requirements of the specificaiton are being tested here. This test should 

- * probably be replaced by some more targeted tests.  AllenWB

- *

- * @path ch11/11.1/11.1.5/11.1.5-0-1.js

- * @description Object literal - get set property

- */

-

-

-function testcase() {

-  var s1 = "In getter";

-  var s2 = "In setter";

-  var s3 = "Modified by setter";

-  eval("var o = {get foo(){ return s1;},set foo(arg){return s2 = s3}};");

-  if(o.foo !== s1) 

-    return false;

-  o.foo=10;

-  if(s2 !== s3) 

-    return false;

-  return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    it isn't clear what specific requirements of the specificaiton are being tested here. This test should 
+    probably be replaced by some more targeted tests.  AllenWB
+description: Object literal - get set property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s1 = "In getter";
+  var s2 = "In setter";
+  var s3 = "Modified by setter";
+  eval("var o = {get foo(){ return s1;},set foo(arg){return s2 = s3}};");
+  if(o.foo !== s1) 
+    return false;
+  o.foo=10;
+  if(s2 !== s3) 
+    return false;
+  return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-0-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5-0-2.js
index 3f820b441..b4a4cdabc 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-0-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-0-2.js
@@ -1,32 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * it isn't clear what specific requirements of the specificaiton are being tested here. This test should 

- * probably be replaced by some more targeted tests.  AllenWB

- *

- * @path ch11/11.1/11.1.5/11.1.5-0-2.js

- * @description Object literal - multiple get set properties

- */

-

-

-function testcase() {

-  var s1 = "First getter";

-  var s2 = "First setter";

-  var s3 = "Second getter";

-  eval("var o = {get foo(){ return s1;},set foo(arg){return s2 = s3}, get bar(){ return s3}, set bar(arg){ s3 = arg;}};");

-  if(o.foo !== s1) 

-    return false;

-  o.foo = 10;

-  if(s2 !== s3) 

-    return false;

-  if(o.bar !== s3)

-    return false;

-  o.bar = "Second setter";

-  if(o.bar !== "Second setter")

-    return false;

-  return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    it isn't clear what specific requirements of the specificaiton are being tested here. This test should 
+    probably be replaced by some more targeted tests.  AllenWB
+description: Object literal - multiple get set properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s1 = "First getter";
+  var s2 = "First setter";
+  var s3 = "Second getter";
+  eval("var o = {get foo(){ return s1;},set foo(arg){return s2 = s3}, get bar(){ return s3}, set bar(arg){ s3 = arg;}};");
+  if(o.foo !== s1) 
+    return false;
+  o.foo = 10;
+  if(s2 !== s3) 
+    return false;
+  if(o.bar !== s3)
+    return false;
+  o.bar = "Second setter";
+  if(o.bar !== "Second setter")
+    return false;
+  return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-1-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5-1-s.js
index 371c0aceb..6b8b86888 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-1-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-1-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-1-s.js

- * @description Strict Mode - SyntaxError is thrown when 'eval' occurs as the Identifier in a PropertySetParameterList of a PropertyAssignment that is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var obj = {set _11_1_5_1_fun(eval) {}};");

-            return false;

-        } catch (e) {

-            return (e instanceof SyntaxError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when 'eval' occurs as the
+    Identifier in a PropertySetParameterList of a PropertyAssignment
+    that is contained in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {set _11_1_5_1_fun(eval) {}};");
+            return false;
+        } catch (e) {
+            return (e instanceof SyntaxError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-1gs.js b/test/suite/ch11/11.1/11.1.5/11.1.5-1gs.js
index 6d7766e3e..061f92cbd 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-1gs.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-1gs.js
@@ -1,14 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-1gs.js

- * @description Strict Mode - SyntaxError is thrown when 'eval' occurs as the Identifier in a PropertySetParameterList of a PropertyAssignment that is contained in strict code

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-var obj = { set _11_1_5_1_fun(eval) {}};

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when 'eval' occurs as the
+    Identifier in a PropertySetParameterList of a PropertyAssignment
+    that is contained in strict code
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var obj = { set _11_1_5_1_fun(eval) {}};
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-2-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5-2-s.js
index 5b763b78a..aba8cde74 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-2-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-2-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-2-s.js

- * @description Strict Mode - SyntaxError is thrown when 'arguments' occurs as the Identifier in a PropertySetParameterList of a PropertyAssignment that is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-         "use strict";

-

-        try {

-            eval("var obj = {set _11_1_5_2_fun(arguments) {} };");

-             return false;

-        } catch (e) {

-            return (e instanceof SyntaxError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when 'arguments' occurs as the
+    Identifier in a PropertySetParameterList of a PropertyAssignment
+    that is contained in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+         "use strict";
+
+        try {
+            eval("var obj = {set _11_1_5_2_fun(arguments) {} };");
+             return false;
+        } catch (e) {
+            return (e instanceof SyntaxError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-2gs.js b/test/suite/ch11/11.1/11.1.5/11.1.5-2gs.js
index f45f20b51..f2f0793e1 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-2gs.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-2gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-2gs.js

- * @description Strict Mode - SyntaxError is thrown when eval code contains an ObjectLiteral with more than one definition of any data property

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-var obj = { _11_1_5_2_gs: 10, _11_1_5_2_gs: 10 };

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when eval code contains an
+    ObjectLiteral with more than one definition of any data property
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var obj = { _11_1_5_2_gs: 10, _11_1_5_2_gs: 10 };
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-3-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5-3-s.js
index 72219037e..d08afb2be 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-3-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-3-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-3-s.js

- * @description Strict Mode - SyntaxError is thrown when  'evals'  occurs as the Identifier in a PropertySetParameterList of a PropertyAssignment  if its FunctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var obj = {set _11_1_5_3_fun(eval) { \"use strict\"; }};");

-            return false;

-        } catch (e) {

-            return (e instanceof SyntaxError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when  'evals'  occurs as the
+    Identifier in a PropertySetParameterList of a PropertyAssignment
+    if its FunctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var obj = {set _11_1_5_3_fun(eval) { \"use strict\"; }};");
+            return false;
+        } catch (e) {
+            return (e instanceof SyntaxError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-4-4-a-1-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5-4-4-a-1-s.js
index a192b85e4..29c078132 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-4-4-a-1-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-4-4-a-1-s.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true

- *

- * @path ch11/11.1/11.1.5/11.1.5-4-4-a-1-s.js

- * @description Object literal - SyntaxError for duplicate date property name in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-  try

-  {

-    eval("'use strict'; ({foo:0,foo:1});");

-    return false;

-  }

-  catch(e)

-  {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true
+description: >
+    Object literal - SyntaxError for duplicate date property name in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try
+  {
+    eval("'use strict'; ({foo:0,foo:1});");
+    return false;
+  }
+  catch(e)
+  {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5-4-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5-4-s.js
index 8e4185c91..0248eba61 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5-4-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5-4-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5-4-s.js

- * @description Strict Mode - SyntaxError is thrown when 'arguments'  occurs as the Identifier in a PropertySetParameterList of a PropertyAssignment  if its FunctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var obj = {set _11_1_5_4_fun(arguments) {\"use strict\";}};");

-            return false;

-        } catch (e) {

-            return (e instanceof SyntaxError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when 'arguments'  occurs as
+    the Identifier in a PropertySetParameterList of a
+    PropertyAssignment  if its FunctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var obj = {set _11_1_5_4_fun(arguments) {\"use strict\";}};");
+            return false;
+        } catch (e) {
+            return (e instanceof SyntaxError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_3-3-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_3-3-1.js
index 54b381128..c68a124e6 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_3-3-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_3-3-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- * The production

- * PropertyNameAndValueList : PropertyAssignment 

- * 3.Call the [[DefineOwnProperty]] internal method of obj with arguments propId.name, propId.descriptor, and false.

- *

- * @path ch11/11.1/11.1.5/11.1.5_3-3-1.js

- * @description Object initialization using PropertyNameAndValueList (PropertyAssignment) when property (read-only) exists in Object.prototype (step 3)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "prop", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-            var obj = { prop: 12 };

-

-            return obj.hasOwnProperty("prop") && obj.prop === 12;

-        } finally {

-            delete Object.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList : PropertyAssignment 
+    3.Call the [[DefineOwnProperty]] internal method of obj with arguments propId.name, propId.descriptor, and false.
+description: >
+    Object initialization using PropertyNameAndValueList
+    (PropertyAssignment) when property (read-only) exists in
+    Object.prototype (step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "prop", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+            var obj = { prop: 12 };
+
+            return obj.hasOwnProperty("prop") && obj.prop === 12;
+        } finally {
+            delete Object.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-2.js
index 837c309b3..8864f0f09 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-a-2.js

- * @description Object literal - Duplicate data property name allowed if not in strict mode

- */

-

-

-function testcase() {

-  

-  eval("({foo:0,foo:1});");

-  return true;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true
+description: >
+    Object literal - Duplicate data property name allowed if not in
+    strict mode
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  eval("({foo:0,foo:1});");
+  return true;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-3.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-3.js
index 9d37ec89d..2c516a511 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-3.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-a-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-a-3.js

- * @description Object literal - Duplicate data property name allowed gets last defined value

- */

-

-

-function testcase() {

-  

-  var o = eval("({foo:0,foo:1});");

-  return o.foo===1;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    a. This production is contained in strict code and IsDataDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true
+description: >
+    Object literal - Duplicate data property name allowed gets last
+    defined value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var o = eval("({foo:0,foo:1});");
+  return o.foo===1;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-1.js
index 9eb9c6dd4..b17759d4b 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-b-1.js

- * @description Object literal - SyntaxError if a data property definition is followed by get accessor definition with the same name

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({foo : 1, get foo(){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+description: >
+    Object literal - SyntaxError if a data property definition is
+    followed by get accessor definition with the same name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({foo : 1, get foo(){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-2.js
index 39ace4e17..a0bdf2ab7 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-b-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-b-2.js

- * @description Object literal - SyntaxError if a data property definition is followed by set accessor definition with the same name

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({foo : 1, set foo(x){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
+description: >
+    Object literal - SyntaxError if a data property definition is
+    followed by set accessor definition with the same name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({foo : 1, set foo(x){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-1.js
index b194489e0..89fac1a63 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-c-1.js

- * @description Object literal - SyntaxError if a get accessor property definition is followed by a data property definition with the same name

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({get foo(){}, foo : 1});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+description: >
+    Object literal - SyntaxError if a get accessor property definition
+    is followed by a data property definition with the same name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({get foo(){}, foo : 1});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-2.js
index 17b2080c3..f498a8563 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-c-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *      c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-c-2.js

- * @description Object literal - SyntaxError if a set accessor property definition is followed by a data property definition with the same name

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({set foo(x){}, foo : 1});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
+description: >
+    Object literal - SyntaxError if a set accessor property definition
+    is followed by a data property definition with the same name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({set foo(x){}, foo : 1});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-1.js
index 3c08ae391..0cca2a4a2 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-1.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *     PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *   4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *     d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-d-1.js

- * @description Object literal - SyntaxError for duplicate property name (get,get)

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({get foo(){}, get foo(){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields
+description: Object literal - SyntaxError for duplicate property name (get,get)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({get foo(){}, get foo(){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-2.js
index cad28d876..025412a70 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-2.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *     PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *   4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *     d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-d-2.js

- * @description Object literal - SyntaxError for duplicate property name (set,set)

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({set foo(arg){}, set foo(arg1){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields
+description: Object literal - SyntaxError for duplicate property name (set,set)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({set foo(arg){}, set foo(arg1){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-3.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-3.js
index 8bfacb42e..c68a3e252 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-3.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *     PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *   4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *     d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-d-3.js

- * @description Object literal - SyntaxError for duplicate property name (get,set,get)

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({get foo(){}, set foo(arg){}, get foo(){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields
+description: >
+    Object literal - SyntaxError for duplicate property name
+    (get,set,get)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({get foo(){}, set foo(arg){}, get foo(){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-4.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-4.js
index d43c0d18b..d9538edc2 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-4.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-4-d-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *     PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment

- *   4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true

- *     d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-4-d-4.js

- * @description Object literal - SyntaxError for duplicate property name (set,get,set)

- */

-

-

-function testcase() {

-  try

-  {

-    eval("({set foo(arg){}, get foo(){}, set foo(arg1){}});");

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof SyntaxError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList :  PropertyNameAndValueList , PropertyAssignment
+    4. If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
+    d.	IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true and either both previous and propId.descriptor have [[Get]] fields or both previous and propId.descriptor have [[Set]] fields
+description: >
+    Object literal - SyntaxError for duplicate property name
+    (set,get,set)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    eval("({set foo(arg){}, get foo(){}, set foo(arg1){}});");
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof SyntaxError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_4-5-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_4-5-1.js
index ff06c134b..d0eaec986 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_4-5-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_4-5-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- * The production

- * PropertyNameAndValueList : PropertyNameAndValueList , PropertyAssignment 

- * 5.Call the [[DefineOwnProperty]] internal method of obj with arguments propId.name, propId.descriptor, and false.

- *

- * @path ch11/11.1/11.1.5/11.1.5_4-5-1.js

- * @description Object initialization using PropertyNameAndValueList (PropertyNameAndValueList , PropertyAssignment) when property (read-only) exists in Object.prototype (Step 5)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "prop2", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-

-            var obj = { prop1: 101, prop2: 12 };

-

-            return obj.hasOwnProperty("prop2");

-        } finally {

-            delete Object.prototype.prop2;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyNameAndValueList : PropertyNameAndValueList , PropertyAssignment 
+    5.Call the [[DefineOwnProperty]] internal method of obj with arguments propId.name, propId.descriptor, and false.
+description: >
+    Object initialization using PropertyNameAndValueList
+    (PropertyNameAndValueList , PropertyAssignment) when property
+    (read-only) exists in Object.prototype (Step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "prop2", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+
+            var obj = { prop1: 101, prop2: 12 };
+
+            return obj.hasOwnProperty("prop2");
+        } finally {
+            delete Object.prototype.prop2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_5-4-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_5-4-1.js
index 7af0a34ec..60a8a8aba 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_5-4-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_5-4-1.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyAssignment : PropertyName : AssignmentExpression 

- *   4.Let desc be the Property Descriptor{[[Value]]: propValue, [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true}

- *

- * @path ch11/11.1/11.1.5/11.1.5_5-4-1.js

- * @description Object literal - property descriptor for assignment expression

- */

-

-

-function testcase() {

-

-  var o = {foo : 1};

-  var desc = Object.getOwnPropertyDescriptor(o,"foo");

-  if(desc.value === 1 &&

-     desc.writable === true &&

-     desc.enumerable === true &&

-     desc.configurable === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyAssignment : PropertyName : AssignmentExpression 
+    4.Let desc be the Property Descriptor{[[Value]]: propValue, [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: true}
+description: Object literal - property descriptor for assignment expression
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var o = {foo : 1};
+  var desc = Object.getOwnPropertyDescriptor(o,"foo");
+  if(desc.value === 1 &&
+     desc.writable === true &&
+     desc.enumerable === true &&
+     desc.configurable === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-1-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-1-s.js
index 090d90944..6729a4024 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-1-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-1-s.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5_6-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown when an assignment to a reserved word or a future reserved word is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var obj = {\

-                get _11_1_5_6_2_1() {\

-                   public = 42;\

-                   return public;\

-                }\

-            };");

-

-            var _11_1_5_6_2_1 = obj._11_1_5_6_2_1;

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when an assignment to a
+    reserved word or a future reserved word is contained in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {\
+                get _11_1_5_6_2_1() {\
+                   public = 42;\
+                   return public;\
+                }\
+            };");
+
+            var _11_1_5_6_2_1 = obj._11_1_5_6_2_1;
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-2-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-2-s.js
index 32afa56ed..f47262455 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-2-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_6-2-2-s.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5_6-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown when an assignment to a reserved word or a future reserved word is made inside a strict mode FunctionBody of a PropertyAssignment

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var obj = {\

-                get _11_1_5_6_2_2() {\

-                   \"use strict\";\

-                   public = 42;\

-                   return public;\

-                }\

-            };\

-            var _11_1_5_6_2_2 = obj._11_1_5_6_2_2;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when an assignment to a
+    reserved word or a future reserved word is made inside a strict
+    mode FunctionBody of a PropertyAssignment
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var obj = {\
+                get _11_1_5_6_2_2() {\
+                   \"use strict\";\
+                   public = 42;\
+                   return public;\
+                }\
+            };\
+            var _11_1_5_6_2_2 = obj._11_1_5_6_2_2;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-1.js
index 6514561d9..40083f93a 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyAssignment : get PropertyName ( ) { FunctionBody } 

- *   3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}

- *

- * @path ch11/11.1/11.1.5/11.1.5_6-3-1.js

- * @description Object literal - property descriptor for get property assignment

- */

-

-

-function testcase() {

-

-  eval("var o = {get foo(){return 1;}};");

-  var desc = Object.getOwnPropertyDescriptor(o,"foo");

-  if(desc.enumerable === true &&

-     desc.configurable === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyAssignment : get PropertyName ( ) { FunctionBody } 
+    3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}
+description: Object literal - property descriptor for get property assignment
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  eval("var o = {get foo(){return 1;}};");
+  var desc = Object.getOwnPropertyDescriptor(o,"foo");
+  if(desc.enumerable === true &&
+     desc.configurable === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-2.js
index dc0665d69..29e86d259 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_6-3-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyAssignment : get PropertyName ( ) { FunctionBody } 

- *   3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}

- *

- * @path ch11/11.1/11.1.5/11.1.5_6-3-2.js

- * @description Object literal - property descriptor for get property assignment should not create a set function

- */

-

-

-function testcase() {

-

-  eval("var o = {get foo(){return 1;}};");

-  var desc = Object.getOwnPropertyDescriptor(o,"foo");

-  return desc.set === undefined

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyAssignment : get PropertyName ( ) { FunctionBody } 
+    3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}
+description: >
+    Object literal - property descriptor for get property assignment
+    should not create a set function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  eval("var o = {get foo(){return 1;}};");
+  var desc = Object.getOwnPropertyDescriptor(o,"foo");
+  return desc.set === undefined
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-1-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-1-s.js
index 71aacfa2e..57661d820 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-1-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-1-s.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5_7-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown when an assignment to a reserved word is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var data = \"data\";\

-            var obj = {\

-                set _11_1_5_7_2_1(value) {\

-                    public = 42;\

-                    data = value;\

-                }\

-            };\

-            obj._11_1_5_7_2_1 = 1;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when an assignment to a
+    reserved word is contained in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var data = \"data\";\
+            var obj = {\
+                set _11_1_5_7_2_1(value) {\
+                    public = 42;\
+                    data = value;\
+                }\
+            };\
+            obj._11_1_5_7_2_1 = 1;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-2-s.js b/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-2-s.js
index b351a43f7..4e3543449 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-2-s.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_7-2-2-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.1/11.1.5/11.1.5_7-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown when an assignment to a reserved word is made in  a strict FunctionBody of a PropertyAssignment

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var data = \"data\";\

-            var obj = {\

-                set _11_1_5_7_2_2(value) {\

-                    public = 42;\

-                    data = value;\

-                }\

-            };\

-            obj._11_1_5_7_2_2 = 1;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when an assignment to a
+    reserved word is made in  a strict FunctionBody of a
+    PropertyAssignment
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var data = \"data\";\
+            var obj = {\
+                set _11_1_5_7_2_2(value) {\
+                    public = 42;\
+                    data = value;\
+                }\
+            };\
+            obj._11_1_5_7_2_2 = 1;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-1.js b/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-1.js
index ae453873d..9e5eb24ca 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-1.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyAssignment : set PropertyName( PropertySetParameterList ) { FunctionBody } 

- *   3.Let desc be the Property Descriptor{[[Set]]: closure, [[Enumerable]]: true, [[Configurable]]: true}

- *

- * @path ch11/11.1/11.1.5/11.1.5_7-3-1.js

- * @description Object literal - property descriptor for set property assignment

- */

-

-

-function testcase() {

-

-  eval("var o = {set foo(arg){return 1;}};");

-  var desc = Object.getOwnPropertyDescriptor(o,"foo");

-  if(desc.enumerable === true &&

-     desc.configurable === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyAssignment : set PropertyName( PropertySetParameterList ) { FunctionBody } 
+    3.Let desc be the Property Descriptor{[[Set]]: closure, [[Enumerable]]: true, [[Configurable]]: true}
+description: Object literal - property descriptor for set property assignment
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  eval("var o = {set foo(arg){return 1;}};");
+  var desc = Object.getOwnPropertyDescriptor(o,"foo");
+  if(desc.enumerable === true &&
+     desc.configurable === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-2.js b/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-2.js
index 216f80a2e..3eaf8aae6 100644
--- a/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-2.js
+++ b/test/suite/ch11/11.1/11.1.5/11.1.5_7-3-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 11.1.5; 

- *   The production

- *      PropertyAssignment : get PropertyName ( ) { FunctionBody } 

- *   3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}

- *

- * @path ch11/11.1/11.1.5/11.1.5_7-3-2.js

- * @description Object literal - property descriptor for set property assignment should not create a get function

- */

-

-

-function testcase() {

-

-  eval("var o = {set foo(arg){}};");

-  var desc = Object.getOwnPropertyDescriptor(o,"foo");

-  return desc.get === undefined

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 11.1.5; 
+    The production
+    PropertyAssignment : get PropertyName ( ) { FunctionBody } 
+    3.Let desc be the Property Descriptor{[[Get]]: closure, [[Enumerable]]: true, [[Configurable]]: true}
+description: >
+    Object literal - property descriptor for set property assignment
+    should not create a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  eval("var o = {set foo(arg){}};");
+  var desc = Object.getOwnPropertyDescriptor(o,"foo");
+  return desc.get === undefined
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.1.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.1.js
index 0f4a1936e..d8779bb53 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.1.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { }
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A1.1.js
- * @description Checking various properteis of the object defined with "var object = {}"
- */
+/*---
+info: "Evaluate the production ObjectLiteral: { }"
+description: >
+    Checking various properteis of the object defined with "var object
+    = {}"
+---*/
 
 var object = {};
 
@@ -29,4 +29,3 @@ if (object.toString !== Object.prototype.toString) {
 if (object.toString() !== "[object Object]") {
   $ERROR('#4: var object = {}; object.toString === "[object Object]". Actual: ' + (object.toString));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.2.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.2.js
index 9eff82640..f1deb0df6 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.2.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { NumericLiteral : AssignmentExpression}
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A1.2.js
- * @description Checking various properteis and contents of the object defined with "var object = {1 : true}"
- */
+/*---
+info: >
+    Evaluate the production ObjectLiteral: { NumericLiteral :
+    AssignmentExpression}
+description: >
+    Checking various properteis and contents of the object defined
+    with "var object = {1 : true}"
+---*/
 
 var object = {1 : true};
 
@@ -34,5 +36,3 @@ if (object[1] !== true) {
 if (object["1"] !== true) {
   $ERROR('#5: var object = {1 : true}; object["1"] === true');
 }
-
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.3.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.3.js
index dea77e509..58673449a 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.3.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { StringLiteral : AssignmentExpression}
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A1.3.js
- * @description Checking various properteis and contents of the object defined with "var object = {"x" : true}"
- */
+/*---
+info: >
+    Evaluate the production ObjectLiteral: { StringLiteral :
+    AssignmentExpression}
+description: >
+    Checking various properteis and contents of the object defined
+    with "var object = {"x" : true}"
+---*/
 
 var object = {"x" : true};
 
@@ -34,4 +36,3 @@ if (object["x"] !== true) {
 if (object.x !== true) {
   $ERROR('#5: var object = {"x" : true}; object.x === true');
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.4.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.4.js
index 5919596dc..3b2fdfdf2 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.4.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A1.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { Identifier : AssignmentExpression}
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A1.4.js
- * @description Checking various properteis and contents of the object defined with "var object = {prop : true}"
- */
+/*---
+info: >
+    Evaluate the production ObjectLiteral: { Identifier :
+    AssignmentExpression}
+description: >
+    Checking various properteis and contents of the object defined
+    with "var object = {prop : true}"
+---*/
 
 var object = {prop : true};
 
@@ -34,4 +36,3 @@ if (object["prop"] !== true) {
 if (object.prop !== true) {
   $ERROR('#5: var object = {prop : true}; object.prop === true');
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A2.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A2.js
index 808578392..9f69e5761 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A2.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { PropertyName : AssignmentExpression }
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A2.js
- * @description Creating property "prop" of various types(boolean, number and etc.)
- */
+/*---
+info: >
+    Evaluate the production ObjectLiteral: { PropertyName :
+    AssignmentExpression }
+description: Creating property "prop" of various types(boolean, number and etc.)
+---*/
 
 //CHECK#1
 var x = true;
@@ -91,4 +91,3 @@ var object = {prop : x};
 if (object.prop !== x) {
   $ERROR('#12: var x = this; var object = {prop : x}; object.prop === x. Actual: ' + (object.prop));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A3.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A3.js
index 1d0024a9f..a8c1abe93 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A3.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluate the production ObjectLiteral: { PropertyNameAndValueList }
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A3.js
- * @description Creating the object defined with "var object = {0 : 1, "1" : "x", o : {}}"
- */
+/*---
+info: "Evaluate the production ObjectLiteral: { PropertyNameAndValueList }"
+description: >
+    Creating the object defined with "var object = {0 : 1, "1" : "x",
+    o : {}}"
+---*/
 
 var object = {0 : 1, "1" : "x", o : {}};
 
@@ -24,4 +24,3 @@ if (object["1"] !== "x") {
 if (typeof object.o !== "object") {
   $ERROR('#1: var object = {0 : 1; "1" : "x"; o : {}}; typeof object.o === "object". Actual: ' + (typeof object.o));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.1.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.1.js
index b1d2a2f90..8a8ba26fa 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.1.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The PropertyName is not really a BooleanLiteral
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A4.1.js
- * @description Checking if execution of "var object = {true : 1}" does not fail
- */
+/*---
+info: The PropertyName is not really a BooleanLiteral
+description: "Checking if execution of \"var object = {true : 1}\" does not fail"
+---*/
 
 //CHECK#1
 var object = {true : 1};
-
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.2.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.2.js
index ebeb5fbc6..f8309e0cd 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.2.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The PropertyName is not really a nullLiteral
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A4.2.js
- * @description Checking if execution of "var object = {null : true}" does not fail
- */
+/*---
+info: The PropertyName is not really a nullLiteral
+description: "Checking if execution of \"var object = {null : true}\" does not fail"
+---*/
 
 //CHECK#1
 var object = {null : true};
diff --git a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.3.js b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.3.js
index 03c89ee99..3731ff692 100644
--- a/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.3.js
+++ b/test/suite/ch11/11.1/11.1.5/S11.1.5_A4.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The PropertyName is undefined, ToString(BooleanLiteral), ToString(nullLiteral)
- *
- * @path ch11/11.1/11.1.5/S11.1.5_A4.3.js
- * @description Creating properties with following names: undefined, 'true', 'null'
- */
+/*---
+info: >
+    The PropertyName is undefined, ToString(BooleanLiteral),
+    ToString(nullLiteral)
+description: "Creating properties with following names: undefined, 'true', 'null'"
+---*/
 
 //CHECK#1
 var object = {undefined : true};
@@ -31,4 +31,3 @@ var object = {"null" : true};
 if (object["null"] !== true) {
   $ERROR('#4: var object = {"null" : true}; object["null"] === true');
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A1.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A1.js
index d6b8323a8..085a51a4f 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A1.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator inside "grouping" operator are allowed
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A1.js
- * @description Inserting WhiteSpaces and LineTerminators into grouping operator. Eval is used
- */
+/*---
+info: White Space and Line Terminator inside "grouping" operator are allowed
+description: >
+    Inserting WhiteSpaces and LineTerminators into grouping operator.
+    Eval is used
+---*/
 
 //CHECK#1
 if (eval("(\u00091\u0009)") !== 1) {
@@ -57,4 +57,3 @@ if (eval("(\u20291\u2029)") !== 1) {
 if (eval("(\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029)") !== 1) {
   $ERROR('#10: (\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029) === 1');
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A2.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A2.js
index 30d5c290c..11b2c87fe 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A2.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator doesn't use GetValue. The operators "delete" and "typeof" can be applied to parenthesised expressions
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A2.js
- * @description Applying "delete" and "typeof" operators to an undefined variable and a property of an object
- */
+/*---
+info: >
+    "This" operator doesn't use GetValue. The operators "delete" and "typeof"
+    can be applied to parenthesised expressions
+description: >
+    Applying "delete" and "typeof" operators to an undefined variable
+    and a property of an object
+---*/
 
 //CHECK#1
 if (delete (x) !== true) {
@@ -28,4 +30,3 @@ if (delete (object.prop) !== true) {
 if (typeof (object.prop) !== "undefined") {
   $ERROR('#4: var object = {}; typeof (object.prop) === "undefined". Actual: ' + (typeof (object.prop)));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T1.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T1.js
index 26a030104..20d40f132 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T1.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T1.js
- * @description Applying grouping operator to Boolean
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Applying grouping operator to Boolean
+---*/
 
 // Check for Boolean
 
@@ -20,4 +18,3 @@ var x = new Boolean(true);
 if ((x) !== x) {
   $ERROR('#2: var x = new Boolean(true); (x) === x. Actual: ' + ((x)));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T2.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T2.js
index e29e039f4..98d0d7139 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T2.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T2.js
- * @description Applying grouping operator to Number
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Applying grouping operator to Number
+---*/
 
 //Check for Number
 
@@ -20,4 +18,3 @@ var x = new Number(1);
 if ((x) !== x) {
   $ERROR('#2: var x = new Number(1); (x) === x. Actual: ' + ((x)));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T3.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T3.js
index a673bd31d..4dbaa9457 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T3.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T3.js
- * @description Applying grouping operator to String
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Applying grouping operator to String
+---*/
 
 //Check for String
 
@@ -25,4 +23,3 @@ var x = new Number("1");
 if ((x) !== x) {
   $ERROR('#3: var x = new Number("1"); (x) === x. Actual: ' + ((x)));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T4.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T4.js
index 2c049ccc9..e31d85a02 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T4.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T4.js
- * @description Applying grouping operator to undefined
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Applying grouping operator to undefined
+---*/
 
 //Check for undefined and null
 
@@ -24,4 +22,3 @@ if ((void 0) !== void 0) {
 if ((null) !== null) {
   $ERROR('#2: (null) === null. Actual: ' + ((null)));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T5.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T5.js
index 6fe51bbe9..ea661e44f 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T5.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T5.js
- * @description Using grouping operator in declaration of variables
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Using grouping operator in declaration of variables
+---*/
 
 //CHECK#1
 (x) = 1;
@@ -19,4 +17,3 @@ var y = 1; (y)++; ++(y); (y)--; --(y);
 if (y !== 1) {
   $ERROR('#2: var y = 1; (y)++; ++(y); (y)--; --(y); y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T6.js b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T6.js
index e4398bfff..3e51c62f4 100644
--- a/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T6.js
+++ b/test/suite/ch11/11.1/11.1.6/S11.1.6_A3_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "This" operator only evaluates Expression
- *
- * @path ch11/11.1/11.1.6/S11.1.6_A3_T6.js
- * @description Applying grouping operator to delete and typeof operators
- */
+/*---
+info: "\"This\" operator only evaluates Expression"
+description: Applying grouping operator to delete and typeof operators
+---*/
 
 //CHECK#1
 if (delete (x) !== true) {
@@ -17,4 +15,3 @@ if (delete (x) !== true) {
 if (typeof (x) !== "undefined") {
   $ERROR('#2: typeof (x) === "undefined". Actual: ' + (typeof (x)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A1.js
index 25416cdca..224969173 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between BitwiseANDExpression and "&" or between "&" and EqualityExpression are allowed
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A1.js
- * @description Checking uses eval
- */
+/*---
+info: >
+    White Space and Line Terminator between BitwiseANDExpression and "&" or
+    between "&" and EqualityExpression are allowed
+description: Checking uses eval
+---*/
 
 //CHECK#1
 if ((eval("1\u0009&\u00091")) !== 1) {
@@ -58,4 +58,3 @@ if ((eval("1\u2029&\u20291")) !== 1) {
 if ((eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029&\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 1) {
   $ERROR('#10: (1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029&\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 1');
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T1.js
index 4acb431bc..1260bcdf3 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y uses GetValue
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x & y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1 & 1) !== 1) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if ((objectx.prop & objecty.prop) !== 1) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; (objectx.prop & objecty.prop) === 1. Actual: ' + ((objectx.prop & objecty.prop)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T2.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T2.js
index 91f0369a6..2a67311bf 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T2.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y uses GetValue
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x & y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x & 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T3.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T3.js
index eb308b1b8..fc3708d69 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T3.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y uses GetValue
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x & y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 & y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.2_T1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.2_T1.js
index b5aafe3d8..9bb925385 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.2_T1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y uses [[Default Value]]
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x & y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if (({valueOf: function() {return 1}} & 1) !== 1) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 & {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.3_T1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.3_T1.js
index 079e2ccb4..6849fcdc3 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.3_T1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToInt32(first expression) is called first, and then ToInt32(second expression)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.3_T1.js
- * @description Checking by using "throw"
- */
+/*---
+info: >
+    ToInt32(first expression) is called first, and then ToInt32(second
+    expression)
+description: Checking by using "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T1.js
index c77c23d5d..4c3fafd5e 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if ((x & (x = 1)) !== 0) {
   $ERROR('#2: var x = 0; (x & (x = 1)) === 0. Actual: ' + ((x & (x = 1))));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T2.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T2.js
index 23b8d91cf..4923ef8a6 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T2.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T3.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T3.js
index 2aef6019b..c9ea03c51 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T3.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A2.4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- * @noStrict
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+flags: [noStrict]
+---*/
 
 //CHECK#1
 try {
@@ -24,5 +22,3 @@ catch (e) {
 if (((y = 1) & y) !== 1) {
   $ERROR('#2: ((y = 1) & y) === 1. Actual: ' + (((y = 1) & y)));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.1.js
index 3818831d2..ac4ba597e 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T1.1.js
- * @description Type(x) and Type(y) are primitive boolean and Boolean object
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: Type(x) and Type(y) are primitive boolean and Boolean object
+---*/
 
 //CHECK#1
 if ((true & true) !== 1) {
@@ -27,4 +25,3 @@ if ((true & new Boolean(true)) !== 1) {
 if ((new Boolean(true) & new Boolean(true)) !== 1) {
   $ERROR('#4: (new Boolean(true) & new Boolean(true)) === 1. Actual: ' + ((new Boolean(true) & new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.2.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.2.js
index 96f0a7c52..b0a38ce71 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.2.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T1.2.js
- * @description Type(x) and Type(y) are primitive number and Number object
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: Type(x) and Type(y) are primitive number and Number object
+---*/
 
 //CHECK#1
 if ((1 & 1) !== 1) {
@@ -27,5 +25,3 @@ if ((1 & new Number(1)) !== 1) {
 if ((new Number(1) & new Number(1)) !== 1) {
   $ERROR('#4: (new Number(1) & new Number(1)) === 1. Actual: ' + ((new Number(1) & new Number(1))));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.3.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.3.js
index e94451b58..4a7519bc7 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.3.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T1.3.js
- * @description Type(x) and Type(y) are primitive string and String object
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: Type(x) and Type(y) are primitive string and String object
+---*/
 
 //CHECK#1
 if (("1" & "1") !== 1) {
@@ -37,4 +35,3 @@ if (("x" & "1") !== 0) {
 if (("1" & "x") !== 0) {
   $ERROR('#6: ("1" & "x") === 0. Actual: ' + (("1" & "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.4.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.4.js
index ba187bd35..d5923d39b 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.4.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T1.4.js
- * @description Type(x) and Type(y) are null and undefined
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: Type(x) and Type(y) are null and undefined
+---*/
 
 //CHECK#1
 if ((null & undefined) !== 0) {
@@ -27,4 +25,3 @@ if ((undefined & undefined) !== 0) {
 if ((null & null) !== 0) {
   $ERROR('#4: (null & null) === 0. Actual: ' + ((null & null)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.5.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.5.js
index 437336a4b..89a8105ce 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.5.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T1.5.js
- * @description Type(x) and Type(y) are Object object and Function object
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: Type(x) and Type(y) are Object object and Function object
+---*/
 
 //CHECK#1
 if (({} & function(){return 1}) !== 0) {
@@ -27,5 +25,3 @@ if ((function(){return 1} & function(){return 1}) !== 0) {
 if (({} & {}) !== 0) {
   $ERROR('#4: ({} & {}) === 0. Actual: ' + (({} & {})));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.1.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.1.js
index 7a70acf5f..5b6865825 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.1.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true & 1) !== 1) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) & new Number(1)) !== 1) {
 if ((new Number(1) & new Boolean(true)) !== 1) {
   $ERROR('#8: (new Number(1) & new Boolean(true)) === 1. Actual: ' + ((new Number(1) & new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.2.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.2.js
index 72765faf2..1810facb8 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.2.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if (("1" & 1) !== 1) {
@@ -57,4 +57,3 @@ if (("x" & 1) !== 0) {
 if ((1 & "x") !== 0) {
   $ERROR('#10: (1 & "x") === 0. Actual: ' + ((1 & "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.3.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.3.js
index a133e1f43..02355d9d4 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.3.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((1 & null) !== 0) {
@@ -27,4 +27,3 @@ if ((new Number(1) & null) !== 0) {
 if ((null & new Number(1)) !== 0) {
   $ERROR('#4: (null & new Number(1)) === 0. Actual: ' + ((null & new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.4.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.4.js
index 1ceb71fa0..157d116d9 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.4.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((1 & undefined) !== 0) {
@@ -27,4 +27,3 @@ if ((new Number(1) & undefined) !== 0) {
 if ((undefined & new Number(1)) !== 0) {
   $ERROR('#4: (undefined & new Number(1)) === 0. Actual: ' + ((undefined & new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.5.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.5.js
index 3983069f4..fe8fe2862 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.5.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.5.js
- * @description Type(x) us different from Type(y) and both types are String (primitive or object) or Boolean (primitive and object)
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) us different from Type(y) and both types are String
+    (primitive or object) or Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true & "1") !== 1) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) & new String("1")) !== 1) {
 if ((new String("1") & new Boolean(true)) !== 1) {
   $ERROR('#8: (new String("1") & new Boolean(true)) === 1. Actual: ' + ((new String("1") & new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.6.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.6.js
index b9f66bb79..63d58ebea 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.6.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (("1" & undefined) !== 0) {
@@ -27,4 +27,3 @@ if ((new String("1") & undefined) !== 0) {
 if ((undefined & new String("1")) !== 0) {
   $ERROR('#4: (undefined & new String("1")) === 0. Actual: ' + ((undefined & new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.7.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.7.js
index 0dbabe1f0..97475fad7 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.7.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (("1" & null) !== 0) {
@@ -27,4 +27,3 @@ if ((new String("1") & null) !== 0) {
 if ((null & new String("1")) !== 0) {
   $ERROR('#4: (null & new String("1")) === 0. Actual: ' + ((null & new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.8.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.8.js
index 33eec3241..bb53bd827 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.8.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((true & undefined) !== 0) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) & undefined) !== 0) {
 if ((undefined & new Boolean(true)) !== 0) {
   $ERROR('#4: (undefined & new Boolean(true)) === 0. Actual: ' + ((undefined & new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.9.js b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.9.js
index 9c94ad0e7..d2eb8268e 100644
--- a/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.9.js
+++ b/test/suite/ch11/11.10/11.10.1/S11.10.1_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x & y returns ToNumber(x) & ToNumber(y)
- *
- * @path ch11/11.10/11.10.1/S11.10.1_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x & y returns ToNumber(x) & ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((true & null) !== 0) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) & null) !== 0) {
 if ((null & new Boolean(true)) !== 0) {
   $ERROR('#4: (null & new Boolean(true)) === 0. Actual: ' + ((null & new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A1.js
index 6798a9ea4..a00206a81 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between BitwiseXORExpression and "^" or between "^" and BitwiseANDExpression are allowed
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A1.js
- * @description The check uses eval
- */
+/*---
+info: >
+    White Space and Line Terminator between BitwiseXORExpression and "^" or
+    between "^" and BitwiseANDExpression are allowed
+description: The check uses eval
+---*/
 
 //CHECK#1
 if ((eval("1\u0009^\u00091")) !== 0) {
@@ -58,4 +58,3 @@ if ((eval("1\u2029^\u20291")) !== 0) {
 if ((eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029^\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 0) {
   $ERROR('#10: (1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029^\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 0');
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T1.js
index f4aad4a19..b69ed2d8f 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y uses GetValue
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x ^ y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1 ^ 1) !== 0) {
@@ -40,5 +38,3 @@ objecty.prop = 1;
 if ((objectx.prop ^ objecty.prop) !== 0) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; (objectx.prop ^ objecty.prop) === 0. Actual: ' + ((objectx.prop ^ objecty.prop)));
 }
- 
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T2.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T2.js
index 503ac9678..2c03e64c4 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T2.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y uses GetValue
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x ^ y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x ^ 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T3.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T3.js
index 6c5969614..3dffea843 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T3.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y uses GetValue
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x ^ y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 ^ y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.2_T1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.2_T1.js
index 0a00ada6d..1e059ac4e 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.2_T1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y uses [[Default Value]]
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x ^ y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if (({valueOf: function() {return 1}} ^ 1) !== 0) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 ^ {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.3_T1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.3_T1.js
index cbf3009a1..d98fd7981 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.3_T1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToInt32(first expression) is called first, and then ToInt32(second expression)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToInt32(first expression) is called first, and then ToInt32(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T1.js
index e1af1b864..96ed61ec5 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 1; 
@@ -19,6 +17,3 @@ var x = 0;
 if ((x ^ (x = 1)) !== 1) {
   $ERROR('#2: var x = 0; (x ^ (x = 1)) === 1. Actual: ' + ((x ^ (x = 1))));
 }
-
-
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T2.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T2.js
index 5cc5a1540..6844ceb90 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T2.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T3.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T3.js
index 5241ec557..b916259ee 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T3.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A2.4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- * @noStrict
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+flags: [noStrict]
+---*/
 
 //CHECK#1
 try {
@@ -24,6 +22,3 @@ catch (e) {
 if (((y = 1) ^ y) !== 0) {
   $ERROR('#2: ((y = 1) ^ y) === 0. Actual: ' + (((y = 1) ^ y)));
 }
-
-
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.1.js
index e6466e784..c0350e625 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T1.1.js
- * @description Type(x) and Type(y) are primitive boolean and Boolean object
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: Type(x) and Type(y) are primitive boolean and Boolean object
+---*/
 
 //CHECK#1
 if ((true ^ true) !== 0) {
@@ -27,4 +25,3 @@ if ((true ^ new Boolean(true)) !== 0) {
 if ((new Boolean(true) ^ new Boolean(true)) !== 0) {
   $ERROR('#4: (new Boolean(true) ^ new Boolean(true)) === 0. Actual: ' + ((new Boolean(true) ^ new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.2.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.2.js
index 9b997e82f..043e61749 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.2.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T1.2.js
- * @description Type(x) and Type(y) are primitive number and Number object
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: Type(x) and Type(y) are primitive number and Number object
+---*/
 
 //CHECK#1
 if ((1 ^ 1) !== 0) {
@@ -27,5 +25,3 @@ if ((1 ^ new Number(1)) !== 0) {
 if ((new Number(1) ^ new Number(1)) !== 0) {
   $ERROR('#4: (new Number(1) ^ new Number(1)) === 0. Actual: ' + ((new Number(1) ^ new Number(1))));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.3.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.3.js
index acd61cf11..51a8ac49d 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.3.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T1.3.js
- * @description Type(x) and Type(y) are primitive string and String object
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: Type(x) and Type(y) are primitive string and String object
+---*/
 
 //CHECK#1
 if (("1" ^ "1") !== 0) {
@@ -37,4 +35,3 @@ if (("x" ^ "1") !== 1) {
 if (("1" ^ "x") !== 1) {
   $ERROR('#6: ("1" ^ "x") === 1. Actual: ' + (("1" ^ "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.4.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.4.js
index 72698a656..d259ee4c5 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.4.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T1.4.js
- * @description Type(x) and Type(y) are null and undefined
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: Type(x) and Type(y) are null and undefined
+---*/
 
 //CHECK#1
 if ((null ^ undefined) !== 0) {
@@ -27,4 +25,3 @@ if ((undefined ^ undefined) !== 0) {
 if ((null ^ null) !== 0) {
   $ERROR('#4: (null ^ null) === 0. Actual: ' + ((null ^ null)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.5.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.5.js
index b415d1c75..b4fa4efe1 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.5.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T1.5.js
- * @description Type(x) and Type(y) are Object object and Function object
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: Type(x) and Type(y) are Object object and Function object
+---*/
 
 //CHECK#1
 if (({} ^ function(){return 1}) !== 0) {
@@ -27,5 +25,3 @@ if ((function(){return 1} ^ function(){return 1}) !== 0) {
 if (({} ^ {}) !== 0) {
   $ERROR('#4: ({} ^ {}) === 0. Actual: ' + (({} ^ {})));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.1.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.1.js
index c32718b6e..e13655a4e 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.1.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true ^ 1) !== 0) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) ^ new Number(1)) !== 0) {
 if ((new Number(1) ^ new Boolean(true)) !== 0) {
   $ERROR('#8: (new Number(1) ^ new Boolean(true)) === 0. Actual: ' + ((new Number(1) ^ new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.2.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.2.js
index 1503fbaf5..df55b7193 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.2.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if (("1" ^ 1) !== 0) {
@@ -57,4 +57,3 @@ if (("x" ^ 1) !== 1) {
 if ((1 ^ "x") !== 1) {
   $ERROR('#10: (1 ^ "x") === 1. Actual: ' + ((1 ^ "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.3.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.3.js
index 7944312eb..cebb94e6d 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.3.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((1 ^ null) !== 1) {
@@ -27,4 +27,3 @@ if ((new Number(1) ^ null) !== 1) {
 if ((null ^ new Number(1)) !== 1) {
   $ERROR('#4: (null ^ new Number(1)) === 1. Actual: ' + ((null ^ new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.4.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.4.js
index 6578ce84d..948a4265a 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.4.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((1 ^ undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new Number(1) ^ undefined) !== 1) {
 if ((undefined ^ new Number(1)) !== 1) {
   $ERROR('#4: (undefined ^ new Number(1)) === 1. Actual: ' + ((undefined ^ new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.5.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.5.js
index 2e80dfef2..7b37a130b 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.5.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true ^ "1") !== 0) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) ^ new String("1")) !== 0) {
 if ((new String("1") ^ new Boolean(true)) !== 0) {
   $ERROR('#8: (new String("1") ^ new Boolean(true)) === 0. Actual: ' + ((new String("1") ^ new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.6.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.6.js
index b433b597e..7c1b463c5 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.6.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (("1" ^ undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new String("1") ^ undefined) !== 1) {
 if ((undefined ^ new String("1")) !== 1) {
   $ERROR('#4: (undefined ^ new String("1")) === 1. Actual: ' + ((undefined ^ new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.7.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.7.js
index 17996c7b8..1027484ee 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.7.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (("1" ^ null) !== 1) {
@@ -27,4 +27,3 @@ if ((new String("1") ^ null) !== 1) {
 if ((null ^ new String("1")) !== 1) {
   $ERROR('#4: (null ^ new String("1")) === 1. Actual: ' + ((null ^ new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.8.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.8.js
index 36c1c1d23..0d6c5e1ce 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.8.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((true ^ undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) ^ undefined) !== 1) {
 if ((undefined ^ new Boolean(true)) !== 1) {
   $ERROR('#4: (undefined ^ new Boolean(true)) === 1. Actual: ' + ((undefined ^ new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.9.js b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.9.js
index 6a9d6cb0d..9d7e4350c 100644
--- a/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.9.js
+++ b/test/suite/ch11/11.10/11.10.2/S11.10.2_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
- *
- * @path ch11/11.10/11.10.2/S11.10.2_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x ^ y returns ToNumber(x) ^ ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((true ^ null) !== 1) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) ^ null) !== 1) {
 if ((null ^ new Boolean(true)) !== 1) {
   $ERROR('#4: (null ^ new Boolean(true)) === 1. Actual: ' + ((null ^ new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A1.js
index 193860824..146b4c1fd 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between BitwiseORExpression and "|" or between "|" and BitwiseXORExpression are allowed
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between BitwiseORExpression and "|" or
+    between "|" and BitwiseXORExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if ((eval("0\u0009|\u00091")) !== 1) {
@@ -58,4 +58,3 @@ if ((eval("0\u2029|\u20291")) !== 1) {
 if ((eval("0\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029|\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 1) {
   $ERROR('#10: (0\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029|\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 1');
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T1.js
index 4c39440fe..b4b26fb5a 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y uses GetValue
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x | y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1 | 0) !== 1) {
@@ -40,4 +38,3 @@ objecty.prop = 0;
 if ((objectx.prop | objecty.prop) !== 1) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 0; (objectx.prop | objecty.prop) === 1. Actual: ' + ((objectx.prop | objecty.prop)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T2.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T2.js
index 38886529f..3ebc8ed5b 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T2.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y uses GetValue
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x | y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x | 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T3.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T3.js
index 313ea9588..1514d4cb4 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T3.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y uses GetValue
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x | y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 | y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.2_T1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.2_T1.js
index 1c7331411..2f67e3c9a 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.2_T1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y uses [[Default Value]]
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x | y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if (({valueOf: function() {return 1}} | 0) !== 1) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 0 | {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.3_T1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.3_T1.js
index fe60b24d1..84e664cac 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.3_T1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToInt32(first expression) is called first, and then ToInt32(second expression)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToInt32(first expression) is called first, and then ToInt32(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T1.js
index 4c5705d00..f1f32f3d9 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 1; 
@@ -19,4 +17,3 @@ var x = 1;
 if ((x | (x = 0)) !== 1) {
   $ERROR('#2: var x = 1; (x | (x = 0)) === 1. Actual: ' + ((x | (x = 0))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T2.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T2.js
index 886ae2af5..a481f8399 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T2.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T3.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T3.js
index 975bba911..4beb31e79 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T3.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A2.4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A2.4_T3.js
- * @description Checking with undeclarated variables
- * @noStrict
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+flags: [noStrict]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +22,3 @@ catch (e) {
 if (((y = 1) | y) !== 1) {
   $ERROR('#2: ((y = 1) | y) === 1. Actual: ' + (((y = 1) | y)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.1.js
index bdf1dddd2..5fc23ac90 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if ((true | true) !== 1) {
@@ -27,4 +27,3 @@ if ((true | new Boolean(true)) !== 1) {
 if ((new Boolean(true) | new Boolean(true)) !== 1) {
   $ERROR('#4: (new Boolean(true) | new Boolean(true)) === 1. Actual: ' + ((new Boolean(true) | new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.2.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.2.js
index 057a8fd55..0b8e19636 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.2.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if ((1 | 1) !== 1) {
@@ -27,5 +25,3 @@ if ((1 | new Number(1)) !== 1) {
 if ((new Number(1) | new Number(1)) !== 1) {
   $ERROR('#4: (new Number(1) | new Number(1)) === 1. Actual: ' + ((new Number(1) | new Number(1))));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.3.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.3.js
index f62798951..ff08dc8fd 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.3.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if (("1" | "1") !== 1) {
@@ -37,4 +35,3 @@ if (("x" | "1") !== 1) {
 if (("1" | "x") !== 1) {
   $ERROR('#6: ("1" | "x") === 1. Actual: ' + (("1" | "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.4.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.4.js
index 1fcf3aea4..17b6211f1 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.4.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if ((null | undefined) !== 0) {
@@ -27,4 +25,3 @@ if ((undefined | undefined) !== 0) {
 if ((null | null) !== 0) {
   $ERROR('#4: (null | null) === 0. Actual: ' + ((null | null)));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.5.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.5.js
index c3df41a2c..ecca0c182 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.5.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (({} | function(){return 1}) !== 0) {
@@ -27,5 +25,3 @@ if ((function(){return 1} | function(){return 1}) !== 0) {
 if (({} | {}) !== 0) {
   $ERROR('#4: ({} | {}) === 0. Actual: ' + (({} | {})));
 }
-
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.1.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.1.js
index a54f2dbdf..dc336b1e1 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.1.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true | 1) !== 1) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) | new Number(1)) !== 1) {
 if ((new Number(1) | new Boolean(true)) !== 1) {
   $ERROR('#8: (new Number(1) | new Boolean(true)) === 1. Actual: ' + ((new Number(1) | new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.2.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.2.js
index 78795a543..1dc3817d2 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.2.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if (("1" | 1) !== 1) {
@@ -57,4 +57,3 @@ if (("x" | 1) !== 1) {
 if ((1 | "x") !== 1) {
   $ERROR('#10: (1 | "x") === 1. Actual: ' + ((1 | "x")));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.3.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.3.js
index c01d6e726..85aba2820 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.3.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((1 | null) !== 1) {
@@ -27,4 +27,3 @@ if ((new Number(1) | null) !== 1) {
 if ((null | new Number(1)) !== 1) {
   $ERROR('#4: (null | new Number(1)) === 1. Actual: ' + ((null | new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.4.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.4.js
index eb7d1432a..576e07810 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.4.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((1 | undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new Number(1) | undefined) !== 1) {
 if ((undefined | new Number(1)) !== 1) {
   $ERROR('#4: (undefined | new Number(1)) === 1. Actual: ' + ((undefined | new Number(1))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.5.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.5.js
index 3195c149d..29a6dfded 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.5.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if ((true | "1") !== 1) {
@@ -47,4 +47,3 @@ if ((new Boolean(true) | new String("1")) !== 1) {
 if ((new String("1") | new Boolean(true)) !== 1) {
   $ERROR('#8: (new String("1") | new Boolean(true)) === 1. Actual: ' + ((new String("1") | new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.6.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.6.js
index c6aeffafd..59616b2cf 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.6.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (("1" | undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new String("1") | undefined) !== 1) {
 if ((undefined | new String("1")) !== 1) {
   $ERROR('#4: (undefined | new String("1")) === 1. Actual: ' + ((undefined | new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.7.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.7.js
index fc0e39bb9..4d0df0fef 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.7.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (("1" | null) !== 1) {
@@ -27,4 +27,3 @@ if ((new String("1") | null) !== 1) {
 if ((null | new String("1")) !== 1) {
   $ERROR('#4: (null | new String("1")) === 1. Actual: ' + ((null | new String("1"))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.8.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.8.js
index 4208476dd..406c71443 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.8.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ((true | undefined) !== 1) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) | undefined) !== 1) {
 if ((undefined | new Boolean(true)) !== 1) {
   $ERROR('#4: (undefined | new Boolean(true)) === 1. Actual: ' + ((undefined | new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.9.js b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.9.js
index 2c892773b..e1eb94be1 100644
--- a/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.9.js
+++ b/test/suite/ch11/11.10/11.10.3/S11.10.3_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x | y returns ToNumber(x) | ToNumber(y)
- *
- * @path ch11/11.10/11.10.3/S11.10.3_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x | y returns ToNumber(x) | ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ((true | null) !== 1) {
@@ -27,4 +27,3 @@ if ((new Boolean(true) | null) !== 1) {
 if ((null | new Boolean(true)) !== 1) {
   $ERROR('#4: (null | new Boolean(true)) === 1. Actual: ' + ((null | new Boolean(true))));
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A1.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A1.js
index 71ff7400e..940b5ef80 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A1.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LogicalANDExpression and "&&" or between "&&" and BitwiseORExpression are allowed
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between LogicalANDExpression and "&&" or
+    between "&&" and BitwiseORExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if ((eval("true\u0009&&\u0009true")) !== true) {
@@ -58,4 +58,3 @@ if ((eval("true\u2029&&\u2029true")) !== true) {
 if ((eval("true\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029&&\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true")) !== true) {
   $ERROR('#10: (true\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029&&\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true) === true');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T1.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T1.js
index f637f4d73..a127a777e 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T1.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x && y uses GetValue
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x && y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((false && true) !== false) {
@@ -61,4 +59,3 @@ objecty.prop = true;
 if ((objectx.prop && objecty.prop) !== objectx.prop) {
   $ERROR('#8: var objectx = new Object(); var objecty = new Object(); objectx.prop = 0; objecty.prop = true; (objectx.prop && objecty.prop) === objectx.prop');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T2.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T2.js
index 3c3585d1e..e90d9572b 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T2.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x && y uses GetValue
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x && y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x && true throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T3.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T3.js
index 65eb292aa..1763d951f 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T3.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x && y uses GetValue
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.1_T3.js
- * @description If ToBoolean(x) is true and GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x && y uses GetValue
+description: >
+    If ToBoolean(x) is true and GetBase(y) is null, throw
+    ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: true && y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T4.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T4.js
index e58d74ed2..7feb80665 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T4.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.1_T4.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x && y uses GetValue
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.1_T4.js
- * @description If ToBoolean(x) is false and GetBase(y) is null, return false
- */
+/*---
+info: Operator x && y uses GetValue
+description: If ToBoolean(x) is false and GetBase(y) is null, return false
+---*/
 
 //CHECK#1
 if ((false && x) !== false) {
   $ERROR('#1: (false && x) === false');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T1.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T1.js
index 44fad0ce8..c66468b7c 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T1.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = false; 
@@ -19,5 +17,3 @@ var x = false;
 if ((x && (x = true)) !== false) {
   $ERROR('#2: var x = false; (x && (x = true)) === false');
 }
-
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T2.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T2.js
index b5efeee14..1adaddbc3 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T2.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T3.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T3.js
index cf973f0ff..632995001 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T3.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A2.4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- * @noStrict
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+flags: [noStrict]
+---*/
 
 //CHECK#1
 try {
@@ -24,5 +22,3 @@ catch (e) {
 if (((y = true) && y) !== true) {
   $ERROR('#2: ((y = true) && y) === true');
 }
-
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T1.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T1.js
index 8274f3c61..b0472ed6f 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T1.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return x
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A3_T1.js
- * @description Type(x) is primitive boolean and Type(y) is changed between primitive boolean and Boolean object
- */
+/*---
+info: If ToBoolean(x) is false, return x
+description: >
+    Type(x) is primitive boolean and Type(y) is changed between
+    primitive boolean and Boolean object
+---*/
 
 //CHECK#1
 if ((false && true) !== false) {
@@ -27,4 +27,3 @@ if ((false && new Boolean(true)) !== false) {
 if ((false && new Boolean(false)) !== false) {
   $ERROR('#4: (false && new Boolean(false)) === false');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T2.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T2.js
index 01d206b5e..a1ba9083c 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T2.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return x
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A3_T2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: If ToBoolean(x) is false, return x
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if ((-0 && -1) !== 0) {
@@ -30,4 +28,3 @@ if ((0 && new Number(-1)) !== 0) {
 if ((isNaN(NaN && 1)) !== true) {
   $ERROR('#3: (NaN && 1) === Not-a-Number');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T3.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T3.js
index 034f9e2d8..2c96f8685 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T3.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return x
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A3_T3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: If ToBoolean(x) is false, return x
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if (("" && "1") !== "") {
@@ -17,4 +15,3 @@ if (("" && "1") !== "") {
 if (("" && new String("1")) !== "") {
   $ERROR('#2: ("" && new String("1")) === ""');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T4.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T4.js
index 1a10a4ce4..176a3b2b2 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T4.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return x
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A3_T4.js
- * @description Type(x) or Type(y) is changed between null and undefined
- */
+/*---
+info: If ToBoolean(x) is false, return x
+description: Type(x) or Type(y) is changed between null and undefined
+---*/
 
 //CHECK#1
 if ((undefined && true) !== undefined) {
@@ -17,4 +15,3 @@ if ((undefined && true) !== undefined) {
 if ((null && false) !== null) {
   $ERROR('#2: (null && false) === null');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T1.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T1.js
index 82f45be1f..0c2c3e5d4 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T1.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A4_T1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if ((true && true) !== true) {
@@ -41,4 +41,3 @@ var y = new Boolean(false);
 if ((new Boolean(false) &&  y) !== y) {
   $ERROR('#6: (var y = new Boolean(false); (new Boolean(false) &&  y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T2.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T2.js
index 5aaea6dce..aa4d63931 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T2.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A4_T2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if ((-1 && -0) !== 0) {
@@ -48,4 +46,3 @@ var y = new Number(-1);
 if ((new Number(NaN) && y) !== y) {
   $ERROR('#6: (var y = new Number(-1); (new Number(NaN) && y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T3.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T3.js
index 1ae1808d1..e7ad653cb 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T3.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A4_T3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if (("0" && "-1") !== "-1") {
@@ -41,4 +39,3 @@ var y = new String(-1);
 if ((new String(NaN) && y) !== y) {
   $ERROR('#6: (var y = new String(-1); (new String(NaN) && y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T4.js b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T4.js
index 109744386..a377db3bd 100644
--- a/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T4.js
+++ b/test/suite/ch11/11.11/11.11.1/S11.11.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.11/11.11.1/S11.11.1_A4_T4.js
- * @description Type(x) or Type(y) is changed between null and undefined
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(x) or Type(y) is changed between null and undefined
+---*/
 
 //CHECK#1
 if ((true && undefined) !== undefined) {
@@ -17,4 +15,3 @@ if ((true && undefined) !== undefined) {
 if ((true && null) !== null) {
   $ERROR('#2: (true && null) === null');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A1.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A1.js
index 904d903e8..71f835dae 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A1.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LogicalORExpression and "||" or between "||" and LogicalANDExpression are allowed
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between LogicalORExpression and "||" or
+    between "||" and LogicalANDExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if ((eval("false\u0009||\u0009true")) !== true) {
@@ -58,4 +58,3 @@ if ((eval("false\u2029||\u2029true")) !== true) {
 if ((eval("false\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029||\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true")) !== true) {
   $ERROR('#10: (false\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029||\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true) === true');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T1.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T1.js
index 2c79c2a5c..c8207792c 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T1.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x || y uses GetValue
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x || y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((true || false) !== true) {
@@ -61,4 +59,3 @@ objecty.prop = false;
 if ((objectx.prop || objecty.prop) !== objectx.prop) {
   $ERROR('#8: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1.1; objecty.prop = false; (objectx.prop || objecty.prop) === objectx.prop');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T2.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T2.js
index 7c3e74364..0bc31f834 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T2.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x || y uses GetValue
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x || y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x || true throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T3.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T3.js
index 1535d1ca6..88e558538 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T3.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x || y uses GetValue
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.1_T3.js
- * @description If ToBoolean(x) is false and GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x || y uses GetValue
+description: >
+    If ToBoolean(x) is false and GetBase(y) is null, throw
+    ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: false || y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T4.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T4.js
index 47101ac90..1497dadb2 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T4.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.1_T4.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x || y uses GetValue
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.1_T4.js
- * @description If ToBoolean(x) is true and GetBase(y) is null, return true
- */
+/*---
+info: Operator x || y uses GetValue
+description: If ToBoolean(x) is true and GetBase(y) is null, return true
+---*/
 
 //CHECK#1
 if ((true || x) !== true) {
   $ERROR('#1: (true || x) === true');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T1.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T1.js
index fd60270da..ab4a92ec3 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T1.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = true; 
@@ -19,4 +17,3 @@ var x = true;
 if ((x || (x = false)) !== true) {
   $ERROR('#2: var x = true; (x || (x = false)) === true');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T2.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T2.js
index 5d2ca6568..a0cf377c3 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T2.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T3.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T3.js
index c818312c8..0d34dafc7 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T3.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A2.4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- * @noStrict
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+flags: [noStrict]
+---*/
 
 //CHECK#1
 try {
@@ -24,5 +22,3 @@ catch (e) {
 if (((y = true) || y) !== true) {
   $ERROR('#2: ((y = true) || y) === true');
 }
-
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T1.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T1.js
index d03958565..f4e328c57 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T1.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return y
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A3_T1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: If ToBoolean(x) is false, return y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if ((false || true) !== true) {
@@ -29,4 +29,3 @@ var y = new Boolean(false);
 if ((false || y) !== y) {
   $ERROR('#4: (var y = new Boolean(false); false || y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T2.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T2.js
index dccc098d2..171d564b8 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T2.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return y
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A3_T2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: If ToBoolean(x) is false, return y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if ((0 || -0) !== 0) {
@@ -37,4 +35,3 @@ var y = new Number(0);
 if ((NaN || y) !== y) {
   $ERROR('#4: (var y = new Number(0); NaN || y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T3.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T3.js
index 6e500ede8..38adfd081 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T3.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return y
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A3_T3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: If ToBoolean(x) is false, return y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if (("" || "1") !== "1") {
@@ -18,4 +16,3 @@ var y = new String("1");
 if (("" || y) !== y) {
   $ERROR('#2: (var y = new String("1"); "" || y) === y');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T4.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T4.js
index 15b5579af..4b655ef97 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T4.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return y
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A3_T4.js
- * @description Type(x) or Type(y) is changed between null and undefined
- */
+/*---
+info: If ToBoolean(x) is false, return y
+description: Type(x) or Type(y) is changed between null and undefined
+---*/
 
 //CHECK#1
 if ((false || undefined) !== undefined) {
@@ -17,4 +15,3 @@ if ((false || undefined) !== undefined) {
 if ((false || null) !== null) {
   $ERROR('#2: (false || null) === null');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T1.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T1.js
index 567fbf522..e313797a6 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T1.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return x
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A4_T1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: If ToBoolean(x) is true, return x
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (((true || true)) !== true) {
@@ -41,4 +41,3 @@ var x = new Boolean(false);
 if ((x || new Boolean(false)) !== x) {
   $ERROR('#6: (var x = new Boolean(false); (x || new Boolean(false)) === x');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T2.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T2.js
index ff3c67a64..f3b928b64 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T2.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return x
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A4_T2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: If ToBoolean(x) is true, return x
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if ((-1 || 1) !== -1) {
@@ -40,4 +38,3 @@ var x = new Number(0);
 if ((x || new Number(NaN)) !== x) {
   $ERROR('#6: (var x = new Number(0); (x || new Number(NaN)) === x');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T3.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T3.js
index ad71dfed7..d01735e82 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T3.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return x
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A4_T3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: If ToBoolean(x) is true, return x
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if (("-1" || "1") !== "-1") {
@@ -41,4 +39,3 @@ var x = new String(0);
 if ((x || new String(NaN)) !== x) {
   $ERROR('#6: (var x = new String(0); (x || new String(NaN)) === x');
 }
-
diff --git a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T4.js b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T4.js
index d37b2ea59..3ee659e91 100644
--- a/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T4.js
+++ b/test/suite/ch11/11.11/11.11.2/S11.11.2_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return x
- *
- * @path ch11/11.11/11.11.2/S11.11.2_A4_T4.js
- * @description Type(x) or Type(y) vary between Null and Undefined
- */
+/*---
+info: If ToBoolean(x) is true, return x
+description: Type(x) or Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if ((true || undefined) !== true) {
@@ -17,4 +15,3 @@ if ((true || undefined) !== true) {
 if ((true || null) !== true) {
   $ERROR('#2: (true || null) === true');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A1.js b/test/suite/ch11/11.12/S11.12_A1.js
index b813aeb7f..0b2bd56df 100644
--- a/test/suite/ch11/11.12/S11.12_A1.js
+++ b/test/suite/ch11/11.12/S11.12_A1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LogicalORExpression and "?" or between "?" and AssignmentExpression or between AssignmentExpression and ":" or between ":" and AssignmentExpression are allowed
- *
- * @path ch11/11.12/S11.12_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between LogicalORExpression and "?" or
+    between "?" and AssignmentExpression or between AssignmentExpression and
+    ":" or between ":" and AssignmentExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if ((eval("false\u0009?\u0009true\u0009:\u0009true")) !== true) {
@@ -57,4 +58,3 @@ if ((eval("false\u2029?\u2029true\u2029:\u2029true")) !== true) {
 if ((eval("false\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029?\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029:\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true")) !== true) {
   $ERROR('#10: (false\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029?\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029:\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true) === true');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T1.js b/test/suite/ch11/11.12/S11.12_A2.1_T1.js
index 2a9e568a9..ec04fd146 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T1.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((true ? false : true) !== false) {
@@ -46,4 +44,3 @@ var z = new Boolean(true);
 if ((x ? y : z) !== z) {
   $ERROR('#6: var x = false; var y = new Boolean(false); var z = new Boolean(true); (x ? y : z) === z');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T2.js b/test/suite/ch11/11.12/S11.12_A2.1_T2.js
index 465976c49..75733cb43 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T2.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x ? true : false throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T3.js b/test/suite/ch11/11.12/S11.12_A2.1_T3.js
index 1e59cd63a..341fc7359 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T3.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T3.js
- * @description If ToBoolean(x) is true and GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: >
+    If ToBoolean(x) is true and GetBase(y) is null, throw
+    ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: true ? y : false throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T4.js b/test/suite/ch11/11.12/S11.12_A2.1_T4.js
index 0d3c01b29..88e659f76 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T4.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T4.js
- * @description If ToBoolean(x) is false and GetBase(z) is null, throw ReferenceError
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: >
+    If ToBoolean(x) is false and GetBase(z) is null, throw
+    ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: false ? true : z throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T5.js b/test/suite/ch11/11.12/S11.12_A2.1_T5.js
index 05df26fa5..11fb1c901 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T5.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T5.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T5.js
- * @description If ToBoolean(x) is true and GetBase(z) is null, return y
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: If ToBoolean(x) is true and GetBase(z) is null, return y
+---*/
 
 //CHECK#1
 var y = new Object();
 if ((true ? y : z) !== y) {
   $ERROR('#1: var y = new Object(); (true ? y : z) === y');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A2.1_T6.js b/test/suite/ch11/11.12/S11.12_A2.1_T6.js
index f25c22a52..5fa6dec4a 100644
--- a/test/suite/ch11/11.12/S11.12_A2.1_T6.js
+++ b/test/suite/ch11/11.12/S11.12_A2.1_T6.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x ? y : z uses GetValue
- *
- * @path ch11/11.12/S11.12_A2.1_T6.js
- * @description If ToBoolean(x) is false and GetBase(y) is null, return z
- */
+/*---
+info: "Operator x ? y : z uses GetValue"
+description: If ToBoolean(x) is false and GetBase(y) is null, return z
+---*/
 
 //CHECK#1
 var z = new Object();
 if ((false ? y : z) !== z) {
   $ERROR('#1: var z = new Object(); (false ? y : z) === z');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A3_T1.js b/test/suite/ch11/11.12/S11.12_A3_T1.js
index 6614bb7f2..661a440af 100644
--- a/test/suite/ch11/11.12/S11.12_A3_T1.js
+++ b/test/suite/ch11/11.12/S11.12_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return z
- *
- * @path ch11/11.12/S11.12_A3_T1.js
- * @description Type(y) and Type(z) are boolean primitives
- */
+/*---
+info: If ToBoolean(x) is false, return z
+description: Type(y) and Type(z) are boolean primitives
+---*/
 
 //CHECK#1
 if ((false ? false : true) !== true) {
@@ -18,4 +16,3 @@ var z = new Boolean(true);
 if ((false ? true : z) !== z) {
   $ERROR('#2: (var y = new Boolean(true); (false ? true : z) === z');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A3_T2.js b/test/suite/ch11/11.12/S11.12_A3_T2.js
index 311cce7d1..aa31654b3 100644
--- a/test/suite/ch11/11.12/S11.12_A3_T2.js
+++ b/test/suite/ch11/11.12/S11.12_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return z
- *
- * @path ch11/11.12/S11.12_A3_T2.js
- * @description Type(y) and Type(z) are number primitives
- */
+/*---
+info: If ToBoolean(x) is false, return z
+description: Type(y) and Type(z) are number primitives
+---*/
 
 //CHECK#1
 if ((0 ? 0 : 1) !== 1) {
@@ -18,4 +16,3 @@ var z = new Number(1);
 if ((0 ? 1 : z) !== z) {
   $ERROR('#2: (var y = new Number(1); (0 ? 1 : z) === z');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A3_T3.js b/test/suite/ch11/11.12/S11.12_A3_T3.js
index 644a58fd0..96f5a8efb 100644
--- a/test/suite/ch11/11.12/S11.12_A3_T3.js
+++ b/test/suite/ch11/11.12/S11.12_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return z
- *
- * @path ch11/11.12/S11.12_A3_T3.js
- * @description Type(y) and Type(z) are string primitives
- */
+/*---
+info: If ToBoolean(x) is false, return z
+description: Type(y) and Type(z) are string primitives
+---*/
 
 //CHECK#1
 if (("" ? "" : "1") !== "1") {
@@ -18,4 +16,3 @@ var z = new String("1");
 if (("" ? "1" : z) !== z) {
   $ERROR('#2: (var y = new String("1"); ("" ? "1" : z) === z');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A3_T4.js b/test/suite/ch11/11.12/S11.12_A3_T4.js
index 296ae94eb..8006dbb44 100644
--- a/test/suite/ch11/11.12/S11.12_A3_T4.js
+++ b/test/suite/ch11/11.12/S11.12_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is false, return z
- *
- * @path ch11/11.12/S11.12_A3_T4.js
- * @description Type(x) or Type(y) is changed between null and undefined
- */
+/*---
+info: If ToBoolean(x) is false, return z
+description: Type(x) or Type(y) is changed between null and undefined
+---*/
 
 //CHECK#1
 if ((false ? true : undefined) !== undefined) {
@@ -17,4 +15,3 @@ if ((false ? true : undefined) !== undefined) {
 if ((false ? true : null) !== null) {
   $ERROR('#2: (false ? true : null) === null');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A4_T1.js b/test/suite/ch11/11.12/S11.12_A4_T1.js
index 588d90141..30ceb8245 100644
--- a/test/suite/ch11/11.12/S11.12_A4_T1.js
+++ b/test/suite/ch11/11.12/S11.12_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.12/S11.12_A4_T1.js
- * @description Type(y) and Type(z) are boolean primitives
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(y) and Type(z) are boolean primitives
+---*/
 
 //CHECK#1
 if ((true ? false : true) !== false) {
@@ -24,4 +22,3 @@ var y = new Boolean(false);
 if ((y ? y : true) !== y) {
   $ERROR('#3: (var y = new Boolean(false); (y ? y : true) === y');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A4_T2.js b/test/suite/ch11/11.12/S11.12_A4_T2.js
index eda208159..5aef54959 100644
--- a/test/suite/ch11/11.12/S11.12_A4_T2.js
+++ b/test/suite/ch11/11.12/S11.12_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.12/S11.12_A4_T2.js
- * @description Type(y) and Type(z) are number primitives
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(y) and Type(z) are number primitives
+---*/
 
 //CHECK#1
 if ((1 ? 0 : 1) !== 0) {
@@ -24,4 +22,3 @@ var y = new Number(NaN);
 if ((y ? y : 1) !== y) {
   $ERROR('#3: (var y = new Number(NaN); (y ? y : 1) === y');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A4_T3.js b/test/suite/ch11/11.12/S11.12_A4_T3.js
index 168902e13..84cbc734a 100644
--- a/test/suite/ch11/11.12/S11.12_A4_T3.js
+++ b/test/suite/ch11/11.12/S11.12_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.12/S11.12_A4_T3.js
- * @description Type(y) and Type(z) are string primitives
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(y) and Type(z) are string primitives
+---*/
 
 //CHECK#1
 if (("1" ? "" : "1") !== "") {
@@ -24,4 +22,3 @@ var y = new String("y");
 if ((y ? y : "1") !== y) {
   $ERROR('#3: (var y = new String("y"); (y ? y : "1") === y');
 }
-
diff --git a/test/suite/ch11/11.12/S11.12_A4_T4.js b/test/suite/ch11/11.12/S11.12_A4_T4.js
index c3b5f4771..6222978d3 100644
--- a/test/suite/ch11/11.12/S11.12_A4_T4.js
+++ b/test/suite/ch11/11.12/S11.12_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToBoolean(x) is true, return y
- *
- * @path ch11/11.12/S11.12_A4_T4.js
- * @description Type(x) or Type(y) is changed between null and undefined
- */
+/*---
+info: If ToBoolean(x) is true, return y
+description: Type(x) or Type(y) is changed between null and undefined
+---*/
 
 //CHECK#1
 if ((true ? undefined : true) !== undefined) {
@@ -17,4 +15,3 @@ if ((true ? undefined : true) !== undefined) {
 if ((true ? null : true) !== null) {
   $ERROR('#2: (true ? null : true) === null');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-1.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-1.js
index 551c80478..6377bd282 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-1.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-1.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 1)

- *

- * @path ch11/11.13/11.13.1/11.13.1-1-1.js

- * @description simple assignment throws ReferenceError if LeftHandSide is not a reference (number)

- */

-

-

-function testcase() {

-  try {

-    eval("42 = 42");

-  }

-  catch (e) {

-    if (e instanceof ReferenceError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 1)
+description: >
+    simple assignment throws ReferenceError if LeftHandSide is not a
+    reference (number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("42 = 42");
+  }
+  catch (e) {
+    if (e instanceof ReferenceError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-2.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-2.js
index 5abde0d6d..b941c2e59 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-2.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-2.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 1).

- *

- * @path ch11/11.13/11.13.1/11.13.1-1-2.js

- * @description simple assignment throws ReferenceError if LeftHandSide is not a reference (string)

- */

-

-

-function testcase() {

-  try {

-    eval("'x' = 42");

-  }

-  catch (e) {

-    if (e instanceof ReferenceError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 1).
+description: >
+    simple assignment throws ReferenceError if LeftHandSide is not a
+    reference (string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("'x' = 42");
+  }
+  catch (e) {
+    if (e instanceof ReferenceError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-3.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-3.js
index 1dbeb18c3..cba984d3e 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-3.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-3.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 1).

- *

- * @path ch11/11.13/11.13.1/11.13.1-1-3.js

- * @description simple assignment throws ReferenceError if LeftHandSide is not a reference (boolean)

- */

-

-

-function testcase() {

-  try {

-    eval("true = 42");

-  }

-  catch (e) {

-    if (e instanceof ReferenceError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 1).
+description: >
+    simple assignment throws ReferenceError if LeftHandSide is not a
+    reference (boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("true = 42");
+  }
+  catch (e) {
+    if (e instanceof ReferenceError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-4.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-4.js
index dbbfb619b..7b926609c 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-4.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-4.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 1).

- *

- * @path ch11/11.13/11.13.1/11.13.1-1-4.js

- * @description simple assignment throws ReferenceError if LeftHandSide is not a reference (null)

- */

-

-

-function testcase() {

-  try {

-    eval("null = 42");

-  }

-  catch (e) {

-    if (e instanceof ReferenceError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 1).
+description: >
+    simple assignment throws ReferenceError if LeftHandSide is not a
+    reference (null)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("null = 42");
+  }
+  catch (e) {
+    if (e instanceof ReferenceError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-6-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-6-s.js
index 915caf590..11e3c23e8 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-6-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-6-s.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 3.a).

- *

- * @path ch11/11.13/11.13.1/11.13.1-1-6-s.js

- * @description simple assignment throws ReferenceError if LeftHandSide is an unresolvable reference in strict mode (base obj undefined)

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-  try {

-    __ES3_1_test_suite_test_11_13_1_unique_id_0__.x = 42;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof ReferenceError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 3.a).
+description: >
+    simple assignment throws ReferenceError if LeftHandSide is an
+    unresolvable reference in strict mode (base obj undefined)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+  try {
+    __ES3_1_test_suite_test_11_13_1_unique_id_0__.x = 42;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof ReferenceError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-1-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-1-s.js
index 5330f5411..f2646c484 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-1-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-1-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-1-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide is a reference to a data property with the attribute value {[[Writable]]:false} under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop = 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide is a
+    reference to a data property with the attribute value
+    {[[Writable]]:false} under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop = 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-2-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-2-s.js
index f16e19d18..6b8ab54f2 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-2-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-2-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-2-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide is a reference to an accessor property with the attribute value {[[Set]]:undefined} under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop = 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide is a
+    reference to an accessor property with the attribute value
+    {[[Set]]:undefined} under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop = 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-3-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-3-s.js
index 79d23670e..5457909cc 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-3-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-3-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-3-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide is a reference to a non-existent property of an object whose [[Extensible]] internal property has the value false under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len = 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide is a
+    reference to a non-existent property of an object whose
+    [[Extensible]] internal property has the value false under strict
+    mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len = 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-1.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-1.js
index 04e93c38d..319c1f2b4 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-1.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * PutValue operates only on references (see step 3.b).

- *

- * @path ch11/11.13/11.13.1/11.13.1-4-1.js

- * @description simple assignment creates property on the global object if LeftHandSide is an unresolvable reference

- */

-

-

-function testcase() {

-  function foo() {

-    __ES3_1_test_suite_test_11_13_1_unique_id_3__ = 42;

-  }

-  foo();

-

-  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), '__ES3_1_test_suite_test_11_13_1_unique_id_3__');

-  if (desc.value === 42 &&

-      desc.writable === true &&

-      desc.enumerable === true &&

-      desc.configurable === true) {

-    delete __ES3_1_test_suite_test_11_13_1_unique_id_3__;

-    return true;

-  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: PutValue operates only on references (see step 3.b).
+description: >
+    simple assignment creates property on the global object if
+    LeftHandSide is an unresolvable reference
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  function foo() {
+    __ES3_1_test_suite_test_11_13_1_unique_id_3__ = 42;
+  }
+  foo();
+
+  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), '__ES3_1_test_suite_test_11_13_1_unique_id_3__');
+  if (desc.value === 42 &&
+      desc.writable === true &&
+      desc.enumerable === true &&
+      desc.configurable === true) {
+    delete __ES3_1_test_suite_test_11_13_1_unique_id_3__;
+    return true;
+  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-14-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-14-s.js
index e82720d70..96dd765f7 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-14-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-14-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-14-s.js

- * @description simple assignment throws TypeError if LeftHandSide is a readonly property in strict mode (Number.MAX_VALUE)

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    Number.MAX_VALUE = 42;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    simple assignment throws TypeError if LeftHandSide is a readonly
+    property in strict mode (Number.MAX_VALUE)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    Number.MAX_VALUE = 42;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-27-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-27-s.js
index 00da46eda..026676ae3 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-27-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-27-s.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-27-s.js

- * @description simple assignment throws TypeError if LeftHandSide is a readonly property in strict mode (Global.undefined)

- */

-

-

-function testcase() {

-    'use strict';

-

-    try {

-      fnGlobalObject().undefined = 42;

-      return false;

-    }

-    catch (e) {

-      return (e instanceof TypeError);

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    simple assignment throws TypeError if LeftHandSide is a readonly
+    property in strict mode (Global.undefined)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    'use strict';
+
+    try {
+      fnGlobalObject().undefined = 42;
+      return false;
+    }
+    catch (e) {
+      return (e instanceof TypeError);
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-28-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-28-s.js
index 039991a37..f6b3f96b2 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-28-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-28-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-28-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears as the LeftHandSideExpression of simple assignment(=) under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("var eval = 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears as the LeftHandSideExpression of simple assignment(=)
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("var eval = 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-28gs.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-28gs.js
index 86867f1ba..651554799 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-28gs.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-28gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-28gs.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'Math.PI' appears as the LeftHandSideExpression of simple assignment(=)

- * @onlyStrict

- * @negative NotEarlyError

- */

-"use strict";

-throw NotEarlyError;

-Math.PI = 20;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'Math.PI'
+    appears as the LeftHandSideExpression of simple assignment(=)
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+Math.PI = 20;
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-29-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-29-s.js
index c9a5a404c..f7c667ab7 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-29-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-29-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-29-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears as the LeftHandSideExpression of simple assignment(=) under strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("var arguments = 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears as the LeftHandSideExpression of simple assignment(=)
+    under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("var arguments = 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-29gs.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-29gs.js
index 86e4f59ce..5e2ef6e4b 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-29gs.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-29gs.js
@@ -1,13 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-29gs.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'Math.PI' appears as the LeftHandSideExpression of simple assignment(=)

- * @onlyStrict

- * @negative .

- */

-"use strict";

-Math.PI = 20;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'Math.PI'
+    appears as the LeftHandSideExpression of simple assignment(=)
+negative: .
+flags: [onlyStrict]
+---*/
+
+"use strict";
+Math.PI = 20;
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-3-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-3-s.js
index ff4d1710d..087fb92eb 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-3-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-3-s.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-3-s.js

- * @description simple assignment throws TypeError if LeftHandSide is a readonly property in strict mode (Global.Infinity)

- * @onlyStrict

- */

-

-

-function testcase() {

-    'use strict';

-

-    try {

-      fnGlobalObject().Infinity = 42;

-      return false;

-    }

-    catch (e) {

-      return (e instanceof TypeError);

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    simple assignment throws TypeError if LeftHandSide is a readonly
+    property in strict mode (Global.Infinity)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    'use strict';
+
+    try {
+      fnGlobalObject().Infinity = 42;
+      return false;
+    }
+    catch (e) {
+      return (e instanceof TypeError);
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-30-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-30-s.js
index e494fab1b..03e6ef314 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-30-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-30-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-30-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears as the LeftHandSideExpression (PrimaryExpression) of simple assignment(=) under strict mode

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("(eval) = 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears as the LeftHandSideExpression (PrimaryExpression) of
+    simple assignment(=) under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("(eval) = 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-31-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-31-s.js
index 1d70a7723..e647e7ab7 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-31-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-31-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-31-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears as the LeftHandSideExpression (PrimaryExpression) of simple assignment(=) under strict mode

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("(arguments) = 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears as the LeftHandSideExpression (PrimaryExpression) of
+    simple assignment(=) under strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("(arguments) = 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/11.13.1-4-6-s.js b/test/suite/ch11/11.13/11.13.1/11.13.1-4-6-s.js
index 158152924..08675b340 100644
--- a/test/suite/ch11/11.13/11.13.1/11.13.1-4-6-s.js
+++ b/test/suite/ch11/11.13/11.13.1/11.13.1-4-6-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.1/11.13.1-4-6-s.js

- * @description simple assignment throws TypeError if LeftHandSide is a readonly property in strict mode (Function.length)

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-  try {

-    Function.length = 42;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    simple assignment throws TypeError if LeftHandSide is a readonly
+    property in strict mode (Function.length)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+  try {
+    Function.length = 42;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A1.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A1.js
index 533091b57..3699daae3 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A1.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "=" or between "=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A1.js
- * @description Checking by using eval
- * @noStrict
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "=" or
+    between "=" and AssignmentExpression are allowed
+description: Checking by using eval
+flags: [noStrict]
+---*/
 
 //CHECK#1
 if ((eval("x\u0009=\u0009true")) !== true) {
@@ -59,4 +59,3 @@ if ((eval("x\u2029=\u2029true")) !== true) {
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true")) !== true) {
   $ERROR('#10: (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true) === true');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T1.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T1.js
index 3c3a793ed..83129e9cd 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T1.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x = y uses GetValue and PutValue
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A2.1_T1.js
- * @description Either AssigmentExpression is not Reference or GetBase is not null
- */
+/*---
+info: Operator x = y uses GetValue and PutValue
+description: Either AssigmentExpression is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 x = 1;
@@ -46,5 +44,3 @@ if (objectx.prop !== objecty.prop) {
     $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objecty.prop = 1; objectx.prop = objecty.prop; objectx !== objecty');
   } 
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T2.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T2.js
index 7f48afc64..85444a225 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T2.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x = y uses GetValue and PutValue
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A2.1_T2.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator x = y uses GetValue and PutValue
+description: If GetBase(AssigmentExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x = y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T3.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T3.js
index 3e153946f..b4114b6ef 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T3.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A2.1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x = y uses GetValue and PutValue
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A2.1_T3.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError)
- * @negative
- */
+/*---
+info: Operator x = y uses GetValue and PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError)
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     1 = 1;
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.1.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.1.js
index d02876814..b800de890 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.1.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x = y PutValue(x, y)
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A3.1.js
- * @description Checking Expression and Variable statements
- */
+/*---
+info: Operator x = y PutValue(x, y)
+description: Checking Expression and Variable statements
+---*/
 
 //CHECK#1
 var x = 1;
@@ -19,4 +17,3 @@ y = 1;
 if (y !== 1) {
   $ERROR('#2: y = 1; y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.2.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.2.js
index f369e21c3..6174e75a1 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.2.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x = y returns GetValue(y)
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A3.2.js
- * @description Checking Expression and Variable statements
- */
+/*---
+info: Operator x = y returns GetValue(y)
+description: Checking Expression and Variable statements
+---*/
 
 //CHECK#1
 var x = 0;
@@ -19,4 +17,3 @@ x = 0;
 if ((x = 1) !== 1) {
   $ERROR('#2: x = 0; (x = 1) === 1. Actual: ' + ((x = 1)));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T1.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T1.js
index 5781fbdfc..4f1381df6 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T1.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T1.js
@@ -1,18 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * AssignmentExpression : LeftHandSideExpression = AssignmentExpression
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A4_T1.js
- * @description Syntax check
- */
+/*---
+info: "AssignmentExpression : LeftHandSideExpression = AssignmentExpression"
+description: Syntax check
+---*/
 
 //CHECK#1
 x = x = 1;
 if (x !== 1) {
   $ERROR('#1: The expression x = x = 1 is the same x = (x = 1), not (x = x) = 1. Actual: ' + (x));
 }
-
-
-
diff --git a/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T2.js b/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T2.js
index d1d4ea456..34743b56b 100644
--- a/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T2.js
+++ b/test/suite/ch11/11.13/11.13.1/S11.13.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * AssignmentExpression : LeftHandSideExpression = AssignmentExpression
- *
- * @path ch11/11.13/11.13.1/S11.13.1_A4_T2.js
- * @description Syntax check if "x = x" throws ReferenceError
- */
+/*---
+info: "AssignmentExpression : LeftHandSideExpression = AssignmentExpression"
+description: Syntax check if "x = x" throws ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -17,6 +15,3 @@ try {
     $ERROR('#1.2: x = x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-1-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-1-s.js
index 3a8522a32..948f0fac2 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-1-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-1-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-1-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(*=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_1 *= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(*=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_1 *= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-10-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-10-s.js
index e0c7dddb4..ec0ff54ad 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-10-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-10-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-10-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(^=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_10 ^= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(^=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_10 ^= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-11-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-11-s.js
index 60d2e8a63..c08614a85 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-11-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-11-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-11-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(|=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_11 |= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(|=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_11 |= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-12-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-12-s.js
index ae0eff54b..c7606c22d 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-12-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-12-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-12-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(*=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_12 = 5

-        _11_13_2_12 *= 2;

-        return _11_13_2_12 === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(*=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_12 = 5
+        _11_13_2_12 *= 2;
+        return _11_13_2_12 === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-13-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-13-s.js
index 3dc5a0f34..2b53032f4 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-13-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-13-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-13-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(/=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_13 = 6

-        _11_13_2_13 /= 2;

-        return _11_13_2_13 === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(/=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_13 = 6
+        _11_13_2_13 /= 2;
+        return _11_13_2_13 === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-14-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-14-s.js
index 578fae60e..2856f391e 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-14-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-14-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-14-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(%=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_14 = 5

-        _11_13_2_14 %= 2;

-        return _11_13_2_14 === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(%=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_14 = 5
+        _11_13_2_14 %= 2;
+        return _11_13_2_14 === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-15-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-15-s.js
index 832e1f98d..3991a7b50 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-15-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-15-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-15-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(>>>=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_15 = 8

-        _11_13_2_15 >>>= 2;

-        return _11_13_2_15 === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(>>>=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_15 = 8
+        _11_13_2_15 >>>= 2;
+        return _11_13_2_15 === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-16-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-16-s.js
index ae83bb032..b11856252 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-16-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-16-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-16-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(-=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_16 = 5

-        _11_13_2_16 -= 2;

-        return _11_13_2_16 === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(-=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_16 = 5
+        _11_13_2_16 -= 2;
+        return _11_13_2_16 === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-17-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-17-s.js
index f78dd1b8b..12810cac3 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-17-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-17-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-17-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(<<=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_17 = 1;

-        _11_13_2_17 <<= 2;

-        return _11_13_2_17 === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(<<=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_17 = 1;
+        _11_13_2_17 <<= 2;
+        return _11_13_2_17 === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-18-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-18-s.js
index cb2af550d..7f301aaeb 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-18-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-18-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-18-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(>>=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_18 = 4

-        _11_13_2_18 >>= 2;

-        return _11_13_2_18 === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(>>=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_18 = 4
+        _11_13_2_18 >>= 2;
+        return _11_13_2_18 === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-19-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-19-s.js
index 187d7c78a..9804f4a95 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-19-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-19-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-19-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(+=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_19 = -1

-        _11_13_2_19 += 10;

-        return _11_13_2_19 === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(+=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_19 = -1
+        _11_13_2_19 += 10;
+        return _11_13_2_19 === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-2-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-2-s.js
index 395bed37d..56434ebef 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-2-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-2-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-2-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(/=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_2 /= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(/=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_2 /= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-20-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-20-s.js
index 8f1547ca7..a63ecbd3d 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-20-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-20-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-20-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(&=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_20 = 5

-        _11_13_2_20 &= 3;

-        return _11_13_2_20 === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(&=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_20 = 5
+        _11_13_2_20 &= 3;
+        return _11_13_2_20 === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-21-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-21-s.js
index 3cf11ab55..48e045a99 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-21-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-21-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-21-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(^=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_21 = 5

-        _11_13_2_21 ^= 3;

-        return _11_13_2_21 === 6;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(^=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_21 = 5
+        _11_13_2_21 ^= 3;
+        return _11_13_2_21 === 6;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-22-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-22-s.js
index b525c1621..2487d4266 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-22-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-22-s.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-22-s.js

- * @description Strict Mode - ReferenceError isn't thrown if the LeftHandSideExpression of a Compound Assignment operator(|=) evaluates to a resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_13_2_22 = 5

-        _11_13_2_22 |= 2;

-        return _11_13_2_22 === 7;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError isn't thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(|=)
+    evaluates to a resolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_13_2_22 = 5
+        _11_13_2_22 |= 2;
+        return _11_13_2_22 === 7;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-23-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-23-s.js
index f6b492dc3..6bbec00e7 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-23-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-23-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-23-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(*=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop *= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(*=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop *= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-24-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-24-s.js
index 7c0886277..d99ccbf8c 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-24-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-24-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-24-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(/=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop /= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(/=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop /= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-25-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-25-s.js
index 3f52583c3..b7334f4d4 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-25-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-25-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-25-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(%=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop %= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(%=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop %= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-26-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-26-s.js
index a13b710d8..b77d93f1f 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-26-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-26-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-26-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(+=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop += 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(+=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop += 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-27-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-27-s.js
index c8b649257..7c4903275 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-27-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-27-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-27-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(-=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop -= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(-=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop -= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-28-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-28-s.js
index 326c710e1..66ddd58c1 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-28-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-28-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-28-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(<<=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop <<= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(<<=) is a reference to a data
+    property with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop <<= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-29-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-29-s.js
index dac5aff74..0fb10a854 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-29-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-29-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-29-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop >>= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>=) is a reference to a data
+    property with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop >>= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-3-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-3-s.js
index efbbe64ab..72498aefd 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-3-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-3-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-3-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(%=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_3 %= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(%=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_3 %= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-30-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-30-s.js
index 77b4a3f99..b02de02ba 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-30-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-30-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-30-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>>=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop >>>= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>>=) is a reference to a data
+    property with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop >>>= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-31-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-31-s.js
index 1a42e5ac1..8345e02b3 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-31-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-31-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-31-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(&=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop &= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(&=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop &= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-32-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-32-s.js
index 63ed6d804..82aa35c27 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-32-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-32-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-32-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(^=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop ^= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(^=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop ^= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-33-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-33-s.js
index a0b27a8f3..36ddf2461 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-33-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-33-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-33-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(|=) is a reference to a data property with the attribute value {[[Writable]]:false}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop |= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 10;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(|=) is a reference to a data property
+    with the attribute value {[[Writable]]:false}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop |= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 10;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-34-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-34-s.js
index 196038b2b..eb7827033 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-34-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-34-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-34-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(*=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop *= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(*=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop *= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-35-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-35-s.js
index 2a7dba157..bf51db141 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-35-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-35-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-35-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(/=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop /= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(/=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop /= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-36-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-36-s.js
index 2e1204180..b8a40359e 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-36-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-36-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-36-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(%=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop %= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(%=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop %= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-37-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-37-s.js
index e426178ab..cb4aec71a 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-37-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-37-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-37-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(+=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop += 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(+=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop += 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-38-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-38-s.js
index a522f871e..86cf4c80d 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-38-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-38-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-38-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(-=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop -= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(-=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop -= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-39-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-39-s.js
index a682e1466..22470c074 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-39-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-39-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-39-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(<<=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop <<= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(<<=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop <<= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-4-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-4-s.js
index e565ceccc..cabfa2016 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-4-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-4-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-4-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(+=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_4 += 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(+=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_4 += 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-40-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-40-s.js
index 2f31f32bb..e26280649 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-40-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-40-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-40-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop >>= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop >>= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-41-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-41-s.js
index acc1d54ff..08e687fd3 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-41-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-41-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-41-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>>=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop >>>= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>>=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop >>>= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-42-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-42-s.js
index 6b2f4642a..3d58dc7e3 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-42-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-42-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-42-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(&=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop &= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(&=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop &= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-43-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-43-s.js
index 72aafec6e..af497f57a 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-43-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-43-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-43-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(^=) is a reference to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop ^= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(^=) is a reference to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop ^= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-44-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-44-s.js
index 33a47ddb9..2da8b8674 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-44-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-44-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-44-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(|=) is a reference of to an accessor property with the attribute value {[[Set]]:undefined}

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            obj.prop |= 20;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(|=) is a reference of to an accessor
+    property with the attribute value {[[Set]]:undefined}
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            obj.prop |= 20;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-45-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-45-s.js
index 5122b4bdf..9775dbc7f 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-45-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-45-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-45-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(*=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len *= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(*=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len *= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-46-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-46-s.js
index 382f41c25..c61e228aa 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-46-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-46-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-46-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(/=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len /= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(/=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len /= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-47-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-47-s.js
index 4e3761c20..d1bd31555 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-47-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-47-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-47-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(%=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len %= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(%=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len %= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-48-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-48-s.js
index fa14cbf86..d616b0e54 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-48-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-48-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-48-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(+=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len += 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(+=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len += 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-49-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-49-s.js
index b9105eca8..2ec3f598c 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-49-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-49-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-49-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(-=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len -= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(-=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len -= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-5-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-5-s.js
index 09fdb5fa9..6da39a975 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-5-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-5-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-5-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(-=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_5 -= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(-=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_5 -= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-50-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-50-s.js
index 7ae50545b..119604184 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-50-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-50-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-50-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(<<=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len <<= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(<<=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len <<= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-51-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-51-s.js
index 7818d3d81..7646c32fc 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-51-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-51-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-51-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len >>= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len >>= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-52-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-52-s.js
index 0668c86e6..15a43fb6e 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-52-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-52-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-52-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(>>>=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len >>>= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(>>>=) is a reference to a
+    non-existent property of an object whose [[Extensible]] internal
+    property if false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len >>>= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-53-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-53-s.js
index 64bdafb9b..85f37c854 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-53-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-53-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-53-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(&=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len &= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(&=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len &= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-54-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-54-s.js
index f5439a483..786c5d8ca 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-54-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-54-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-54-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(^=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len ^= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(^=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len ^= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-55-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-55-s.js
index e44a53038..e22d39af9 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-55-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-55-s.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-55-s.js

- * @description Strict Mode - TypeError is thrown if The LeftHandSide of a Compound Assignment operator(|=) is a reference to a non-existent property of an object whose [[Extensible]] internal property if false

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            obj.len |= 10;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown if The LeftHandSide of a
+    Compound Assignment operator(|=) is a reference to a non-existent
+    property of an object whose [[Extensible]] internal property if
+    false
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            obj.len |= 10;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-1-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-1-s.js
index 6bbe5ceb7..09f608cb4 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-1-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-1-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(*=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval *= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(*=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval *= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-10-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-10-s.js
index acf0fc522..6db7be17a 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-10-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-10-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-10-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(^=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval ^= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(^=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval ^= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-11-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-11-s.js
index 7273172df..d5223bbe7 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-11-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-11-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-11-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(|=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval |= 20;"); 

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(|=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval |= 20;"); 
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-12-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-12-s.js
index b3eaf8e76..bc3ca7009 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-12-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-12-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-12-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(*=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments *= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(*=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments *= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-13-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-13-s.js
index f553885ba..b20d3c265 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-13-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-13-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-13-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(/=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments /= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(/=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments /= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-14-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-14-s.js
index f039ab988..7f0e12220 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-14-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-14-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-14-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(%=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments %= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(%=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments %= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-15-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-15-s.js
index cd473315c..06a353c21 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-15-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-15-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-15-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(+=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments += 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(+=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments += 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-16-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-16-s.js
index 4c7038b79..db71def81 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-16-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-16-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-16-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(-=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments -= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(-=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments -= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-17-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-17-s.js
index 1b0efaf36..1905ea5aa 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-17-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-17-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-17-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(<<=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments <<= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(<<=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments <<= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-18-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-18-s.js
index 0413ebfeb..efe0bffb1 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-18-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-18-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-18-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(>>=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments >>= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(>>=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments >>= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-19-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-19-s.js
index 8af9d1b37..83195e6ba 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-19-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-19-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-19-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(>>>=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments >>>= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(>>>=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments >>>= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-1gs.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-1gs.js
index a3f33416c..c5fa34ca8 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-1gs.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-1gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-1gs.js

- * @description Strict Mode - SyntaxError is throw if the identifier eval appears as the LeftHandSideExpression of a Compound Assignment operator(*=)

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-eval *= 20;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is throw if the identifier eval appears
+    as the LeftHandSideExpression of a Compound Assignment operator(*=)
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+eval *= 20;
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-2-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-2-s.js
index f342f29ef..182ca9b0f 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-2-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-2-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(/=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval /= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(/=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval /= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-20-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-20-s.js
index 468a01dab..f22334987 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-20-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-20-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-20-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(&=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments &= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(&=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments &= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-21-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-21-s.js
index 6ce81e359..bdd2bd209 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-21-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-21-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-21-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(^=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments ^= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(^=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments ^= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-22-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-22-s.js
index 48a6651c2..d1633e2fe 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-22-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-22-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-22-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier arguments appear as the LeftHandSideExpression of a Compound Assignment operator(|=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments |= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier arguments
+    appear as the LeftHandSideExpression of a Compound Assignment
+    operator(|=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments |= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-3-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-3-s.js
index 133e41d16..85316beb2 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-3-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-3-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-3-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(%=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval %= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(%=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval %= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-4-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-4-s.js
index c5314930e..082cbbeb6 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-4-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-4-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-4-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(+=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval += 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(+=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval += 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-5-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-5-s.js
index 394632041..88ba2b61a 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-5-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-5-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-5-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(-=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval -= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(-=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval -= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-6-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-6-s.js
index e3e709b76..f7692019b 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-6-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-6-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-6-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(<<=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval <<= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment
+    operator(<<=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval <<= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-7-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-7-s.js
index f07505be0..ccb503a08 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-7-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-7-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-7-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(>>=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval >>= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment
+    operator(>>=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval >>= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-8-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-8-s.js
index 8a2226ae1..bf6e27882 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-8-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-8-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-8-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(>>>=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval >>>= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment
+    operator(>>>=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval >>>= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-9-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-9-s.js
index 4f5817fdb..7af2e8494 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-9-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-9-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-9-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier eval appear as the LeftHandSideExpression of a Compound Assignment operator(&=)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval &= 20;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier eval appear
+    as the LeftHandSideExpression of a Compound Assignment operator(&=)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval &= 20;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-6-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-6-s.js
index 832d3afd0..a3d3325e5 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-6-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-6-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-6-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(<<=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_6 <<= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(<<=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_6 <<= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-7-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-7-s.js
index 8a290330a..3e8130aa4 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-7-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-7-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-7-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(>>=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_7 >>= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(>>=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_7 >>= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-8-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-8-s.js
index 4f4167f87..6520ffffd 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-8-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-8-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-8-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(>>>=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_8 >>>= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(>>>=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_8 >>>= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/11.13.2-9-s.js b/test/suite/ch11/11.13/11.13.2/11.13.2-9-s.js
index 3393d5c27..e66ed96ba 100644
--- a/test/suite/ch11/11.13/11.13.2/11.13.2-9-s.js
+++ b/test/suite/ch11/11.13/11.13.2/11.13.2-9-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.13/11.13.2/11.13.2-9-s.js

- * @description Strict Mode - ReferenceError is thrown if the LeftHandSideExpression of a Compound Assignment operator(&=) evaluates to an unresolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("_11_13_2_9 &= 1;");

-            return false;

-        } catch (e) {

-            return e instanceof ReferenceError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - ReferenceError is thrown if the
+    LeftHandSideExpression of a Compound Assignment operator(&=)
+    evaluates to an unresolvable reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("_11_13_2_9 &= 1;");
+            return false;
+        } catch (e) {
+            return e instanceof ReferenceError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T1.js
index db0495c5c..5c1bd3ee7 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T1.js
- * @description Checking by using eval, check operator is x *= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x *= y
+---*/
 
 //CHECK#1
 x = -1;
@@ -68,4 +68,3 @@ x = -1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029*=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-1")) !== 1) {
   $ERROR('#10: x = -1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029*=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-1) === 1');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T10.js
index 3487b3dd0..de1e78367 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T10.js
- * @description Checking by using eval, check operator is x ^= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x ^= y
+---*/
 
 //CHECK#1
 x = 1;
@@ -68,4 +68,3 @@ x = 1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029^=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 0) {
   $ERROR('#10: x = 1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029^=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 0');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T11.js
index fc81632c0..595f38afa 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T11.js
- * @description Checking by using eval, check operator is x |= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x |= y
+---*/
 
 //CHECK#1
 x = 0;
@@ -68,4 +68,3 @@ x = 0;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029|=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 1) {
   $ERROR('#10: x = 0; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029|=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 1');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T2.js
index 1e15c0115..d3ddbedc4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T2.js
- * @description Checking by using eval, check operator is x /= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x /= y
+---*/
 
 //CHECK#1
 x = -1;
@@ -68,4 +68,3 @@ x = -1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029/=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-1")) !== 1) {
   $ERROR('#10: x = -1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029/=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-1) === 1');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T3.js
index 1e2a6760a..3f8219565 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T3.js
- * @description Checking by using eval, check operator is x %= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x %= y
+---*/
 
 //CHECK#1
 x = -1;
@@ -68,4 +68,3 @@ x = -1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029%=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-1")) !== 0) {
   $ERROR('#10: x = -1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029%=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-1) === 0');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T4.js
index fa97eb77f..4df569efd 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T4.js
- * @description Checking by using eval, check operator is x += y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x += y
+---*/
 
 //CHECK#1
 x = -1;
@@ -68,4 +68,3 @@ x = -1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029+=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-1")) !== -2) {
   $ERROR('#10: x = -1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029+=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-1) === -2');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T5.js
index d4fc5a620..ac552ff80 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T5.js
- * @description Checking by using eval, check operator is x -= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x -= y
+---*/
 
 //CHECK#1
 x = -1;
@@ -68,4 +68,3 @@ x = -1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== -2) {
   $ERROR('#10: x = -1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === -2');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T6.js
index 65370cf1b..ac24ffca1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T6.js
- * @description Checking by using eval, check operator is x <<= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x <<= y
+---*/
 
 //CHECK#1
 x = 1;
@@ -68,4 +68,3 @@ x = 1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029<<=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 2) {
   $ERROR('#10: x = 1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029<<=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 2');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T7.js
index 5093eaeca..c89c8614a 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T7.js
- * @description Checking by using eval, check operator is x >>= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x >>= y
+---*/
 
 //CHECK#1
 x = 1;
@@ -68,4 +68,3 @@ x = 1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>>=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 0) {
   $ERROR('#10: x = 1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>>=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 0');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T8.js
index 8469f353d..07e5cd4db 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T8.js
- * @description Checking by using eval, check operator is x >>>= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x >>>= y
+---*/
 
 //CHECK#1
 x = 1;
@@ -68,4 +68,3 @@ x = 1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>>>=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 0) {
   $ERROR('#10: x = 1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>>>=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 0');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T9.js
index c73eac5e1..731edd4c5 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between LeftHandSideExpression and "@=" or between "@=" and AssignmentExpression are allowed
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A1_T9.js
- * @description Checking by using eval, check operator is x &= y
- */
+/*---
+info: >
+    White Space and Line Terminator between LeftHandSideExpression and "@="
+    or between "@=" and AssignmentExpression are allowed
+description: Checking by using eval, check operator is x &= y
+---*/
 
 //CHECK#1
 x = 1;
@@ -68,4 +68,3 @@ x = 1;
 if ((eval("x\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029&=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) !== 1) {
   $ERROR('#10: x = 1; (x\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029&=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === 1');
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.1.js
index e6a01dd52..599ec7d09 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.1.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x *= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x *= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x *= y);
 if (z !== -1) {
   $ERROR('#2: var x = 1; var y = -1; var z = (x *= y); z === -1. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.10.js
index a85d13eb0..04afdf293 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.10.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x ^= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x ^= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x ^= y);
 if (z !== 0) {
   $ERROR('#2: var x = 1; var y = 1; var z = (x ^= y); z === 0. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.11.js
index 925ed41d6..35b11c0b6 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.11.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x |= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x |= y"
+---*/
 
 //CHECK#1
 var x = 0;
@@ -22,5 +22,3 @@ var z = (x |= y);
 if (z !== 1) {
   $ERROR('#2: var x = 0; var y = 1; var z = (x |= y); z === 1. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.2.js
index d9ee6bd59..7b624f6a6 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.2.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x /= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x /= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x /= y);
 if (z !== -1) {
   $ERROR('#2: var x = 1; var y = -1; var z = (x /= y); z === -1. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.3.js
index 70586cfbb..a7aaf2649 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.3.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x %= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x %= y"
+---*/
 
 //CHECK#1
 var x = -1;
@@ -22,5 +22,3 @@ var z = (x %= y);
 if (z !== -1) {
   $ERROR('#2: var x = -1; var y = 2; var z = (x %= y); z === -1. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.4.js
index 7fcda2fec..e2adb317c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.4.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x += y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x += y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x += y);
 if (z !== 2) {
   $ERROR('#2: var x = 1; var y = 1; var z = (x += y); z === 2. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.5.js
index db68d5585..f8e3f3a92 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.5.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x -= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x -= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x -= y);
 if (z !== 0) {
   $ERROR('#2: var x = 1; var y = 1; var z = (x -= y); z === 0. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.6.js
index f6f5ac7ca..7938614a4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.6.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x <<= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x <<= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x <<= y);
 if (z !== 2) {
   $ERROR('#2: var x = 1; var y = 1; var z = (x <<= y); z === 2. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.7.js
index cdc37d9ba..5784680f9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.7.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x >>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x >>= y"
+---*/
 
 //CHECK#1
 var x = 4;
@@ -22,5 +22,3 @@ var z = (x >>= y);
 if (z !== 2) {
   $ERROR('#2: var x = 4; var y = 1; var z = (x >>= y); z === 2. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.8.js
index e53d41a51..cd873eedb 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.8.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x >>>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x >>>= y"
+---*/
 
 //CHECK#1
 var x = 4;
@@ -22,5 +22,3 @@ var z = (x >>>= y);
 if (z !== 2) {
   $ERROR('#2: var x = 4; var y = 1; var z = (x >>>= y); z === 2. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.9.js
index a74dee97d..800c6efeb 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T1.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T1.9.js
- * @description Either Type is not Reference or GetBase is not null, check opeartor is "x &= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    Either Type is not Reference or GetBase is not null, check
+    opeartor is "x &= y"
+---*/
 
 //CHECK#1
 var x = 1;
@@ -22,5 +22,3 @@ var z = (x &= y);
 if (z !== 1) {
   $ERROR('#2: var x = 1; var y = 1; var z = (x &= y); z === 1. Actual: ' + (z));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.1.js
index eede73f3d..ff6557035 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.1.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x *= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x *= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x *= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.10.js
index 27c243325..c1d795e9c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.10.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x ^= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x ^= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x ^= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.11.js
index 22cd6c1b8..07afa4377 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.11.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x |= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x |= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x |= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.2.js
index 02a39f6c4..c75682a26 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.2.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x /= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x /= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x /= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.3.js
index 1d11d3bce..054369ffe 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.3.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x %= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x %= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x %= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.4.js
index 771302777..d9139d84b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.4.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x += y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x += y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x += y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.5.js
index 500e5e6a9..56c246b7c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.5.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x -= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x -= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x -= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.6.js
index 9042f94bb..f2260748b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.6.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x <<= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x <<= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x <<= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.7.js
index 8c391557e..3dcec40e4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.7.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x >>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x >>= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x >>= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.8.js
index 8db8963a9..6adf947a6 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.8.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x >>>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x >>>= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x >>>= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.9.js
index a9155a34e..7dcda0106 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T2.9.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError. Check operator is "x &= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(AssigmentExpression) is null, throw ReferenceError.
+    Check operator is "x &= y"
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ catch (e) {
     $ERROR('#1.2: var x = 1; x &= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.1.js
index 247f69ebc..2ef6edd88 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.1.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x *= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x *= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x *= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.10.js
index 2c8495ca8..7cc960a15 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.10.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x ^= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x ^= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x ^= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.11.js
index 9901b9db1..573da267b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.11.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x |= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x |= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x |= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.2.js
index 6832765ef..671e38ae9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.2.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x /= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x /= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x /= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.3.js
index dc0df0e52..7dbf0a96c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.3.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x %= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x %= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x %= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.4.js
index a32957d99..d7a68a7f1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.4.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x += y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x += y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x += 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.5.js
index 7e8f4601d..054410cd8 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.5.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x -= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x -= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x -= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.6.js
index 0c1d107bd..e10bd36ab 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.6.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x <<= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x <<= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x <<= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.7.js
index 0fd60d869..74f33f429 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.7.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x >>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x >>= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x >>= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.8.js
index 57259d1da..c0580ca7c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.8.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x >>>= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x >>>= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x >>>= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.9.js
index eac242da4..edb73381c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.1_T3.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.1_T3.9.js
- * @description If GetBase(LeftHandSideExpression) is null, throw ReferenceError. Check operator is "x &= y"
- */
+/*---
+info: Operator uses GetValue
+description: >
+    If GetBase(LeftHandSideExpression) is null, throw ReferenceError.
+    Check operator is "x &= y"
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: x &= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T1.js
index d9ce71a56..edbb3228c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T1.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x *= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x *= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 *= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T10.js
index 38c494279..af244d98d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T10.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T10.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x ^= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x ^= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 ^= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T11.js
index 45c162f86..c59e6a78e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T11.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T11.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x |= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x |= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 |= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T2.js
index 7ba092e88..bc77afb9e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T2.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x /= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x /= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 /= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T3.js
index c26da6dd4..cbee7e4d4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T3.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x %= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x %= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 %= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T4.js
index bbfbd0f41..2fbf8fe77 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T4.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x += y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x += y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 += 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T5.js
index d9a53ecaf..d0a200f10 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T5.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x -= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x -= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 -= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T6.js
index 34154341d..ce4a06fce 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T6.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T6.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x <<= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x <<= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 <<= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T7.js
index 6f0e3fd4d..c3f6f94cb 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T7.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T7.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x >>= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x >>= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 >>= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T8.js
index d82235391..5f37bdab3 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T8.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T8.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x >>>= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x >>>= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 >>>= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T9.js
index f85aa27dd..484383659 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A2.2_T9.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses PutValue
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A2.2_T9.js
- * @description If Type(LeftHandSideExpression) is not Reference, throw ReferenceError (or SyntaxError). Check operator is "x &= y"
- * @negative
- */
+/*---
+info: Operator uses PutValue
+description: >
+    If Type(LeftHandSideExpression) is not Reference, throw
+    ReferenceError (or SyntaxError). Check operator is "x &= y"
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +21,3 @@ catch (e) {
     var z = (1 &= 1);
   }
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T1.js
index a50a1cba5..29c40cec2 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T1.js
- * @description Checking Expression and Variable statements for x *= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x *= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y *= -1;
 if (y !== -1) {
   $ERROR('#2: y = 1; y *= -1; y === -1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T10.js
index a552f7d08..8920f0cbe 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T10.js
- * @description Checking Expression and Variable statements for x ^= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x ^= y
+---*/
 
 //CHECK#1
 var x = 0;
@@ -21,4 +19,3 @@ y ^= 0;
 if (y !== 1) {
   $ERROR('#2: y = 1; y ^= 0; y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T11.js
index 6bacd0744..a628437d3 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T11.js
- * @description Checking Expression and Variable statements for x |= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x |= y
+---*/
 
 //CHECK#1
 var x = 0;
@@ -21,4 +19,3 @@ y |= 0;
 if (y !== 1) {
   $ERROR('#2: y = 1; y |= 0; y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T2.js
index 2b07ad143..03913ee5d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T2.js
- * @description Checking Expression and Variable statements for x /= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x /= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y /= -1;
 if (y !== -1) {
   $ERROR('#2: y = 1; y /= -1; y === -1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T3.js
index 74ca601ac..9eb56bc3e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T3.js
- * @description Checking Expression and Variable statements for x %= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x %= y
+---*/
 
 //CHECK#1
 var x = -1;
@@ -21,4 +19,3 @@ y %= 2;
 if (y !== -1) {
   $ERROR('#2: y = -1; y %= 2; y === -1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T4.js
index b97dce0b0..c34072524 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T4.js
- * @description Checking Expression and Variable statements for x += y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x += y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y += 1;
 if (y !== 2) {
   $ERROR('#2: y = 1; y += 1; y === 2. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T5.js
index 266953269..e0ac8c55c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T5.js
- * @description Checking Expression and Variable statements for x -= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x -= y
+---*/
 
 //CHECK#1
 var x = -1;
@@ -21,4 +19,3 @@ y -= 1;
 if (y !== -2) {
   $ERROR('#2: y = -1; y -= 1; y === -2. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T6.js
index 08aac7981..4217f7407 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T6.js
- * @description Checking Expression and Variable statements for x <<= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x <<= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y <<= 1;
 if (y !== 2) {
   $ERROR('#2: y = 1; y <<= 1; y === 2. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T7.js
index b2102b2b8..08560a409 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T7.js
- * @description Checking Expression and Variable statements for x >>= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x >>= y
+---*/
 
 //CHECK#1
 var x = 4;
@@ -21,4 +19,3 @@ y >>= 1;
 if (y !== 2) {
   $ERROR('#2: y = 4; y >>= 1; y === 2. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T8.js
index 7a7dbc7f6..1f0302c22 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T8.js
- * @description Checking Expression and Variable statements for x >>>= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x >>>= y
+---*/
 
 //CHECK#1
 var x = 4;
@@ -21,4 +19,3 @@ y >>>= 1;
 if (y !== 2) {
   $ERROR('#2: y = 4; y >>>= 1; y === 2. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T9.js
index 8e1408df5..684bf6113 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y uses PutValue(x, x @ y)
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.1_T9.js
- * @description Checking Expression and Variable statements for x &= y
- */
+/*---
+info: Operator x @= y uses PutValue(x, x @ y)
+description: Checking Expression and Variable statements for x &= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y &= 1;
 if (y !== 1) {
   $ERROR('#2: y = 1; y &= 1; y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T1.js
index 8a092bea6..071576647 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T1.js
- * @description Checking Expression and Variable statements for x *= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x *= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y1 = (y *= -1);
 if (y1 !== -1) {
   $ERROR('#2: y = 1; y1 = (y *= -1); y1 === -1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T10.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T10.js
index 26de3f6ed..d347163c3 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T10.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T10.js
- * @description Checking Expression and Variable statements for x ^= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x ^= y
+---*/
 
 //CHECK#1
 var x = 0;
@@ -21,4 +19,3 @@ y1 = (y ^= 0);
 if (y1 !== 1) {
   $ERROR('#2: y = 1; y1 = (y ^= 0); y1 === 1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T11.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T11.js
index e9c1ed403..53ad0bc7a 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T11.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T11.js
- * @description Checking Expression and Variable statements for x |= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x |= y
+---*/
 
 //CHECK#1
 var x = 0;
@@ -21,4 +19,3 @@ y1 = (y |= 0);
 if (y1 !== 1) {
   $ERROR('#2: y = 1; y1 = (y |= 0); y1 === 1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T2.js
index 8de215e0f..e999a2f5c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T2.js
- * @description Checking Expression and Variable statements for x /= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x /= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y1 = (y /= -1);
 if (y1 !== -1) {
   $ERROR('#2: y = 1; y1 = (y /= -1); y1 === -1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T3.js
index 2e4853ae2..f958aa4fe 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T3.js
- * @description Checking Expression and Variable statements for x %= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x %= y
+---*/
 
 //CHECK#1
 var x = -1;
@@ -21,4 +19,3 @@ y1 = (y %= 2);
 if (y1 !== -1) {
   $ERROR('#2: y = -1; y1 = (y %= 2); y1 === -1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T4.js
index 8aa84317f..b8406a251 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T4.js
- * @description Checking Expression and Variable statements for x += y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x += y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y1 = (y += 1);
 if (y1 !== 2) {
   $ERROR('#2: y = 1; y1 = (y += 1); y1 === 2. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T5.js
index 50ca35e71..25bd6ce17 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T5.js
- * @description Checking Expression and Variable statements for x -= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x -= y
+---*/
 
 //CHECK#1
 var x = -1;
@@ -21,4 +19,3 @@ y1 = (y -= 1);
 if (y1 !== -2) {
   $ERROR('#2: y = -1; y1 = (y -= 1); y1 === -2. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T6.js
index 250be77af..2eb1d983e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T6.js
- * @description Checking Expression and Variable statements for x <<= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x <<= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y1 = (y <<= 1);
 if (y1 !== 2) {
   $ERROR('#2: y = 1; y1 = (y <<= 1); y1 === 2. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T7.js
index d37cce498..009165025 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T7.js
- * @description Checking Expression and Variable statements for x >>= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x >>= y
+---*/
 
 //CHECK#1
 var x = 4;
@@ -21,4 +19,3 @@ y1 = (y >>= 1);
 if (y1 !== 2) {
   $ERROR('#2: y = 4; y1 = (y >>= 1); y1 === 2. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T8.js
index f636cbfe5..9bc1f737f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T8.js
- * @description Checking Expression and Variable statements for x >>>= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x >>>= y
+---*/
 
 //CHECK#1
 var x = 4;
@@ -21,4 +19,3 @@ y1 = (y >>>= 1);
 if (y1 !== 2) {
   $ERROR('#2: y = 4; y1 = (y >>>= 1); y1 === 2. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T9.js
index de09e1fd5..05ff154a0 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A3.2_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x @= y returns x @ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A3.2_T9.js
- * @description Checking Expression and Variable statements for x &= y
- */
+/*---
+info: Operator x @= y returns x @ y
+description: Checking Expression and Variable statements for x &= y
+---*/
 
 //CHECK#1
 var x = 1;
@@ -21,4 +19,3 @@ y1 = (y &= 1);
 if (y1 !== 1) {
   $ERROR('#2: y = 1; y1 = (y &= 1); y1 === 1. Actual: ' + (y1));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.1.js
index e9b0ee0c4..0ca2364a9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x ^= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = new Boolean(true); x ^= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.2.js
index 28a622e5b..c8c2d5cc4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x ^= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = new Number(1); x ^= new Number(1); x === 0. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.3.js
index bfaec704b..f787e1751 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x ^= "x";
 if (x !== 1) {
   $ERROR('#6: x = "1"; x ^= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.4.js
index 03b9f63e5..f398c8562 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x ^= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x ^= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.1.js
index 82f176291..3ca0b9a58 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x ^= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new Number(1); x ^= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.2.js
index 5b877f27a..4614c6ec9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x ^= "x";
 if (x !== 1) {
   $ERROR('#10: x = 1; x ^= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.3.js
index a41eb8d6c..93a435030 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x ^= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = null; x ^= new Number(1); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.4.js
index 666f20604..e04cbb615 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x ^= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = undefined; x ^= new Number(1); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.5.js
index aff6b25da..313ce3474 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x ^= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new String("1"); x ^= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.6.js
index 4b30cef36..40235e363 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x ^= new String("1");
 if (x !== 1) {
   $ERROR('#4: x = undefined; x ^= new String("1"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.7.js
index 880fb66ec..60cbbc047 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x ^= new String("1");
 if (x !== 1) {
   $ERROR('#4: x = null; x ^= new String("1"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.8.js
index 4e0e83855..5989a6428 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x ^= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = undefined; x ^= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.9.js
index 59a622d54..e8cfa53b5 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.10_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x ^= y is the same as x = x ^ y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.10_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x ^= y is the same as x = x ^ y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x ^= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = null; x ^= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.1.js
index afc6d63cf..a4507dd65 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x |= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = new Boolean(true); x |= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.2.js
index 24a4a8fa5..73e077bda 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x |= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = new Number(1); x |= new Number(1); x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.3.js
index 5e6ae229a..6ebc493f1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x |= "x";
 if (x !== 1) {
   $ERROR('#6: x = "1"; x |= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.4.js
index 2c16de058..8a6005ecc 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x |= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x |= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.1.js
index f764964f0..021355784 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x |= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new Number(1); x |= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.2.js
index 46e183eb9..874deb13f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x |= "x";
 if (x !== 1) {
   $ERROR('#10: x = 1; x |= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.3.js
index 070f1ecfe..f55fe1098 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x |= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = null; x |= new Number(1); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.4.js
index e83610f36..06b1bf634 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x |= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = undefined; x |= new Number(1); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.5.js
index 0511f6674..79f1cd6db 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x |= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new String("1"); x |= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.6.js
index b3aa7445c..2e062488c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x |= new String("1");
 if (x !== 1) {
   $ERROR('#4: x = undefined; x |= new String("1"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.7.js
index b1539ad74..52e34532e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x |= new String("1");
 if (x !== 1) {
   $ERROR('#4: x = null; x |= new String("1"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.8.js
index dbe3e0a1f..6fb51cbd7 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x |= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = undefined; x |= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.9.js
index aaf7e4a87..edcedbe71 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.11_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x |= y is the same as x = x | y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.11_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x |= y is the same as x = x | y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x |= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = null; x |= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.1.js
index bfc284bbc..f98db886c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x *= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = new Boolean(true); x *= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.2.js
index f13415b28..951874cf7 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x *= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = new Number(1); x *= new Number(1); x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.3.js
index 67aca8fc1..cd5263c64 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x *= "x";
 if (isNaN(x) !== true) {
   $ERROR('#6: x = "1"; x *= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.4.js
index fbb268105..c83676a67 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x *= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x *= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.1.js
index 29db0f5cb..58fc54822 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Number (primitive and object)
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Number (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x *= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new Number(1); x *= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.2.js
index 7d3046127..273dac1d7 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x *= "x";
 if (isNaN(x) !== true) {
   $ERROR('#10: x = 1; x *= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.3.js
index b796dc5cb..5f7304462 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x *= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x *= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.4.js
index 925d73634..3bd5a1b90 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x *= new Number(1);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x *= new Number(1); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.5.js
index 7799377cd..eb12ce46e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) amd Boolean (primitive and object)
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) amd Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x *= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new String("1"); x *= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.6.js
index 07be01351..5c7dba468 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between primitive String (primitive or object) and Undefined
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    primitive String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x *= new String("1");
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x *= new String("1"); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.7.js
index b0e8eddc4..d08f9b96f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x *= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x *= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.8.js
index dc0adc04c..5401a4be0 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x *= new Boolean(true);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x *= new Boolean(true); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.9.js
index 0a7443afe..1ba29c2b9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.1_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x *= y is the same as the production x = x * y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.1_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x *= y is the same as the production x = x * y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x *= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x *= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.1.js
index da1ab4cdf..5449cd63e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x /= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = new Boolean(true); x /= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.2.js
index 3287c7c78..5a0549700 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x /= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = new Number(1); x /= new Number(1); x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.3.js
index d327257ff..5f144c297 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x /= "x";
 if (isNaN(x) !== true) {
   $ERROR('#6: x = "1"; x /= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.4.js
index e97535c94..35144ff42 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x /= null;
 if (isNaN(x) !== true) {
   $ERROR('#4: x = null; x /= null; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.1.js
index 46eae946e..98d6c8282 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x /= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new Number(1); x /= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.2.js
index 8a607b515..8b48626a5 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x /= "x";
 if (isNaN(x) !== true) {
   $ERROR('#10: x = 1; x /= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.3.js
index dae7a092a..64204d832 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x /= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x /= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.4.js
index 28c6d611d..c41089674 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x /= new Number(1);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x /= new Number(1); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.5.js
index f4ea9ad5f..9867a2d38 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x /= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new String("1"); x /= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.6.js
index 91ce4dd2b..f3ddfed93 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x /= new String("1");
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x /= new String("1"); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.7.js
index 99905f4d9..8b3a44e42 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x /= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x /= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.8.js
index c5c373b76..013fadff0 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x /= new Boolean(true);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x /= new Boolean(true); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.9.js
index 466f9ce87..b286f4836 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.2_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x /= y is the same as x = x / y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.2_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x /= y is the same as x = x / y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x /= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x /= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.1.js
index bb8d9cccd..29580e333 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x %= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = new Boolean(true); x %= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.2.js
index 97093ecdb..070717a0e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x %= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = new Number(1); x %= new Number(1); x === 0. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.3.js
index e95df69bb..96f22cf88 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x %= "x";
 if (isNaN(x) !== true) {
   $ERROR('#6: x = "1"; x %= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.4.js
index 51e763cac..eee1dbb32 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x %= null;
 if (isNaN(x) !== true) {
   $ERROR('#4: x = null; x %= null; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.1.js
index a45476433..acb979ef2 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x %= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new Number(1); x %= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.2.js
index e2027c6b3..a719ec779 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x %= "x";
 if (isNaN(x) !== true) {
   $ERROR('#10: x = 1; x %= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.3.js
index 8566f8702..f2967ae43 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x %= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x %= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.4.js
index 259c937b4..6f77a7940 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x %= new Number(1);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x %= new Number(1); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.5.js
index 69bff3cb4..754889079 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x %= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new String("1"); x %= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.6.js
index 51f30a6d0..d4c0871ef 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x %= new String("1");
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x %= new String("1"); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.7.js
index e451b5bfe..d28cd687d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x %= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x %= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.8.js
index 59a57095d..2e1816f7e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x %= new Boolean(true);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x %= new Boolean(true); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.9.js
index ebb9b209f..8f15eaf36 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x %= y is the same as x = x % y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x %= y is the same as x = x % y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x %= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x %= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.1.js
index 11313aac6..cc0848389 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x += new Boolean(true);
 if (x !== 2) {
   $ERROR('#4: x = new Boolean(true); x += new Boolean(true); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.2.js
index 141d56b4d..b059eea6f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x += new Number(1);
 if (x !== 2) {
   $ERROR('#4: x = new Number(1); x += new Number(1); x === 2. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.3.js
index da89e3789..c455ecb70 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T1.3.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x += null;
 if (x !== 0) {
   $ERROR('#4: x = null; x += null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.4.js
index 3ae788c91..1d477b3b9 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T1.4.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -47,4 +45,3 @@ x += "x";
 if (x !== "1x") {
   $ERROR('#6: x = "1"; x += "x"; x === "1x". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.1.js
index b26a00f80..1e2c73840 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x += new Boolean(true);
 if (x !== 2) {
   $ERROR('#8: x = new Number(1); x += new Boolean(true); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.2.js
index 73b6923bf..807713a28 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x += new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = null; x += new Number(1); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.3.js
index 158d2aa24..4bcf4a44e 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x += new Number(1);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x += new Number(1); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.4.js
index f54e30a45..1a7dca100 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x += new Boolean(true);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x += new Boolean(true); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.5.js
index b020ca563..3b87630d0 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x += new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = null; x += new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.6.js
index 7833c0ce9..8eaaa2602 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -75,4 +75,3 @@ x += "x";
 if (x !== "1x") {
   $ERROR('#10: x = 1; x += "x"; x === "1x". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.7.js
index 2d80cf750..1921fa7fa 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x += new Boolean(true);
 if (x !== "1true") {
   $ERROR('#8: x = new String("1"); x += new Boolean(true); x === "1true". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.8.js
index c5f364c15..4bf5430ae 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x += new String("1");
 if (x !== "undefined1") {
   $ERROR('#4: x = undefined; x += new String("1"); x === "undefined1". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.9.js
index f2a986ab8..6323fdc72 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.4_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x += y is the same as x = x + y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.4_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x += y is the same as x = x + y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x += new String("1");
 if (x !== "null1") {
   $ERROR('#4: x = null; x += new String("1"); x === "null1". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.1.js
index 1a155d3da..6b90e002a 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x -= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = new Boolean(true); x -= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.2.js
index 42d5abdb7..c77d753af 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x -= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = new Number(1); x -= new Number(1); x === 0. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.3.js
index 298948f61..eeaf80d45 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x -= "x";
 if (isNaN(x) !== true) {
   $ERROR('#6: x = "1"; x -= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.4.js
index 28a9d2d76..09f626fc8 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x -= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x -= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.1.js
index 94b810cbc..de4f893b8 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x -= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new Number(1); x -= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.2.js
index e71788b75..abd74bde4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x -= "x";
 if (isNaN(x) !== true) {
   $ERROR('#10: x = 1; x -= "x"; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.3.js
index f7385f53f..1e6ee6420 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x -= new Number(1);
 if (x !== -1) {
   $ERROR('#4: x = null; x -= new Number(1); x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.4.js
index 0c1c5375f..5761f574b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x -= new Number(1);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x -= new Number(1); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.5.js
index c6c26409c..51d0988f4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x -= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new String("1"); x -= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.6.js
index 39b17aeeb..4457252b3 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x -= new String("1");
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x -= new String("1"); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.7.js
index b6d0cc0a8..7687c4ccc 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x -= new String("1");
 if (x !== -1) {
   $ERROR('#4: x = null; x -= new String("1"); x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.8.js
index 61c68cfa3..1cdb28c60 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x -= new Boolean(true);
 if (isNaN(x) !== true) {
   $ERROR('#4: x = undefined; x -= new Boolean(true); x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.9.js
index 4881e2d8b..9ba149f46 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.5_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x -= y is the same as x = x - y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.5_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x -= y is the same as x = x - y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x -= new Boolean(true);
 if (x !== -1) {
   $ERROR('#4: x = null; x -= new Boolean(true); x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.1.js
index d4b6680cf..c3ba20488 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x <<= new Boolean(true);
 if (x !== 2) {
   $ERROR('#4: x = new Boolean(true); x <<= new Boolean(true); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.2.js
index 63493abb6..2c1f3ae4f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x <<= new Number(1);
 if (x !== 2) {
   $ERROR('#4: x = new Number(1); x <<= new Number(1); x === 2. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.3.js
index 8a31b37ed..125abc139 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x <<= "x";
 if (x !== 1) {
   $ERROR('#6: x = "1"; x <<= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.4.js
index 1c1a81781..a25ecf8c6 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x <<= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x <<= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.1.js
index 9348c745e..8447f6433 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x <<= new Boolean(true);
 if (x !== 2) {
   $ERROR('#8: x = new Number(1); x <<= new Boolean(true); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.2.js
index 2cd913d8e..d8a3d5334 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x <<= "x";
 if (x !== 1) {
   $ERROR('#10: x = 1; x <<= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.3.js
index 6040e1de8..9a0b3a98a 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x <<= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x <<= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.4.js
index 1eee51320..8a6804d09 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x <<= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x <<= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.5.js
index 7616e4e7c..8755cef47 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x <<= new Boolean(true);
 if (x !== 2) {
   $ERROR('#8: x = new String("1"); x <<= new Boolean(true); x === 2. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.6.js
index 6fbf4f4f2..b2a50e9b5 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x <<= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = undefined; x <<= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.7.js
index ce324f83a..683f505cf 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x <<= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x <<= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.8.js
index 606ae17bc..68c35bfd1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x <<= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x <<= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.9.js
index 2b0820a85..a02c398e1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.6_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x <<= y is the same as x = x << y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.6_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x <<= y is the same as x = x << y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x <<= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x <<= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.1.js
index aeb328d7c..9e2b59a6f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = new Boolean(true); x >>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.2.js
index dc83e1ad0..b6829d4ee 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x >>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = new Number(1); x >>= new Number(1); x === 0. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.3.js
index 9513cf37d..ff582ad9b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x >>= "x";
 if (x !== 1) {
   $ERROR('#6: x = "1"; x >>= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.4.js
index 7195a5e44..1d4c0ef21 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x >>= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x >>= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.1.js
index 8fa6a383c..1a22125eb 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x >>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new Number(1); x >>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.2.js
index 87e69c0aa..0b02d1d57 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x >>= "x";
 if (x !== 1) {
   $ERROR('#10: x = 1; x >>= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.3.js
index 0cf56fb53..3f0c5402d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x >>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x >>= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.4.js
index f9ad58a30..2752be1dd 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x >>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.5.js
index bdc8b729f..8952636ec 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x >>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new String("1"); x >>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.6.js
index 970a3540b..4680fce63 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x >>= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.7.js
index 7720b5512..8a6fcc0c2 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x >>= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x >>= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.8.js
index 05a4415a1..1f60d6f76 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.9.js
index ddfdbfc64..a91b79aab 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.7_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>= y is the same as x = x >> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.7_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x >>= y is the same as x = x >> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x >>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.1.js
index 0b2e033dc..ccf5cf058 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = new Boolean(true); x >>>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.2.js
index 64cb86684..4bba5a802 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x >>>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = new Number(1); x >>>= new Number(1); x === 0. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.3.js
index 47f197886..d3ca0904c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x >>>= "x";
 if (x !== 1) {
   $ERROR('#6: x = "1"; x >>>= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.4.js
index 6464ffa82..e3ef1eaec 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x >>>= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x >>>= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.1.js
index f610d8278..2f76e3eb1 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x >>>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new Number(1); x >>>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.2.js
index 9a1d719fe..7b7c1922a 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x >>>= "x";
 if (x !== 1) {
   $ERROR('#10: x = 1; x >>>= "x"; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.3.js
index bf809a272..c763832c2 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x >>>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x >>>= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.4.js
index 4e034735f..a7fce7701 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x >>>= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>>= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.5.js
index cf319f71d..c684f7049 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x >>>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#8: x = new String("1"); x >>>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.6.js
index d73b02dd2..4eb07870f 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x >>>= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>>= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.7.js
index b62931e6b..ca3027b48 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x >>>= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x >>>= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.8.js
index a463cca10..f58c7487d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x >>>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.9.js
index e055c7d2d..bf951d6c2 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.8_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x >>>= y is the same as x = x >>> y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.8_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x >>>= y is the same as x = x >>> y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x >>>= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x >>>= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.1.js
index 13be4e002..35753c6a5 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x &= new Boolean(true);
 if (x !== 1) {
   $ERROR('#4: x = new Boolean(true); x &= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.2.js
index cc1eb514b..16457384b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,5 +33,3 @@ x &= new Number(1);
 if (x !== 1) {
   $ERROR('#4: x = new Number(1); x &= new Number(1); x === 1. Actual: ' + (x));
 }
-
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.3.js
index e845b3c9d..06cce8dfb 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 x = "1";
@@ -49,4 +47,3 @@ x &= "x";
 if (x !== 0) {
   $ERROR('#6: x = "1"; x &= "x"; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.4.js
index dd93cbb91..f18d0e37c 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 x = null;
@@ -35,4 +33,3 @@ x &= null;
 if (x !== 0) {
   $ERROR('#4: x = null; x &= null; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.1.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.1.js
index 05cd8f837..2deba9d56 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.1.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x &= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new Number(1); x &= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.2.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.2.js
index b394dd6e7..5716a67cf 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.2.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 x = "1";
@@ -77,4 +77,3 @@ x &= "x";
 if (x !== 0) {
   $ERROR('#10: x = 1; x &= "x"; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.3.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.3.js
index b4150a583..421a29eec 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.3.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x &= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = null; x &= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.4.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.4.js
index f7bb4d4d8..c4ecf1a59 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.4.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = 1;
@@ -35,4 +35,3 @@ x &= new Number(1);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x &= new Number(1); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.5.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.5.js
index a9ce33f78..d0417a07b 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.5.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 x = true;
@@ -63,4 +63,3 @@ x &= new Boolean(true);
 if (x !== 1) {
   $ERROR('#8: x = new String("1"); x &= new Boolean(true); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.6.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.6.js
index 2a62b9723..db81c7fb4 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.6.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x &= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = undefined; x &= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.7.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.7.js
index b9303bf5f..7c298399d 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.7.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = "1";
@@ -35,4 +35,3 @@ x &= new String("1");
 if (x !== 0) {
   $ERROR('#4: x = null; x &= new String("1"); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.8.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.8.js
index 0e4db1ffe..cad2f04cd 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.8.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x &= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = undefined; x &= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.9.js b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.9.js
index 3e5a05304..2a8c7ed65 100644
--- a/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.9.js
+++ b/test/suite/ch11/11.13/11.13.2/S11.13.2_A4.9_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production x &= y is the same as x = x & y
- *
- * @path ch11/11.13/11.13.2/S11.13.2_A4.9_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: The production x &= y is the same as x = x & y
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 x = true;
@@ -35,4 +35,3 @@ x &= new Boolean(true);
 if (x !== 0) {
   $ERROR('#4: x = null; x &= new Boolean(true); x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.14/S11.14_A1.js b/test/suite/ch11/11.14/S11.14_A1.js
index 2e3528db4..62cb2f5ee 100644
--- a/test/suite/ch11/11.14/S11.14_A1.js
+++ b/test/suite/ch11/11.14/S11.14_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between Expression and , or between , and AssignmentExpression are allowed
- *
- * @path ch11/11.14/S11.14_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between Expression and , or between , and
+    AssignmentExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if ((eval("false\u0009,\u0009true")) !== true) {
@@ -58,4 +58,3 @@ if ((eval("false\u2029,\u2029true")) !== true) {
 if ((eval("false\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029,\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true")) !== true) {
   $ERROR('#10: (false\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029,\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true) === true');
 }
-
diff --git a/test/suite/ch11/11.14/S11.14_A2.1_T1.js b/test/suite/ch11/11.14/S11.14_A2.1_T1.js
index e53336886..f20024b85 100644
--- a/test/suite/ch11/11.14/S11.14_A2.1_T1.js
+++ b/test/suite/ch11/11.14/S11.14_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.14/S11.14_A2.1_T1.js
- * @description Either Expression is not Reference or GetBase is not null
- */
+/*---
+info: Operator uses GetValue
+description: Either Expression is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1,2) !== 2) {
@@ -50,5 +48,3 @@ if ((objectx.prop = false, objecty.prop) !== objecty.prop) {
     $ERROR('#6: var objectx = new Object(); var objecty = new Object(); objectx.prop = true; objecty.prop = 1; objectx.prop = false, objecty.prop; objectx.prop === false');
   } 
 }
-
-
diff --git a/test/suite/ch11/11.14/S11.14_A2.1_T2.js b/test/suite/ch11/11.14/S11.14_A2.1_T2.js
index 3a6106edd..1c4116a0d 100644
--- a/test/suite/ch11/11.14/S11.14_A2.1_T2.js
+++ b/test/suite/ch11/11.14/S11.14_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.14/S11.14_A2.1_T2.js
- * @description If GetBase(Expression) is null, throw ReferenceError
- */
+/*---
+info: Operator uses GetValue
+description: If GetBase(Expression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x, 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.14/S11.14_A2.1_T3.js b/test/suite/ch11/11.14/S11.14_A2.1_T3.js
index ad654eeb0..01fe84b0c 100644
--- a/test/suite/ch11/11.14/S11.14_A2.1_T3.js
+++ b/test/suite/ch11/11.14/S11.14_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator uses GetValue
- *
- * @path ch11/11.14/S11.14_A2.1_T3.js
- * @description If GetBase(AssigmentExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator uses GetValue
+description: If GetBase(AssigmentExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1, y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.14/S11.14_A3.js b/test/suite/ch11/11.14/S11.14_A3.js
index d8858aa3d..83eb1b630 100644
--- a/test/suite/ch11/11.14/S11.14_A3.js
+++ b/test/suite/ch11/11.14/S11.14_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Comma Operator evaluates all Expressions and returns the last of them
- *
- * @path ch11/11.14/S11.14_A3.js
- * @description Checking with "="
- */
+/*---
+info: Comma Operator evaluates all Expressions and returns the last of them
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0;
@@ -35,4 +33,3 @@ if (y !== 2) {
 if (z !== 3) {
   $ERROR('#4: var x = 0; var y = 0; var z = 0; x = 1, y = 2, z = 3; z === 3. Actual: ' + (z));
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.1.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.1.js
index d8b3561b8..e9ebb9997 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.1.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between MemberExpression or CallExpression and "." and between "." and Identifier are allowed
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A1.1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between MemberExpression or
+    CallExpression and "." and between "." and Identifier are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("Number\u0009.\u0009POSITIVE_INFINITY") !== Number.POSITIVE_INFINITY) {
@@ -57,4 +57,3 @@ if (eval("Number\u2029.\u2029POSITIVE_INFINITY") !== Number.POSITIVE_INFINITY) {
 if (eval("Number\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029.\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029POSITIVE_INFINITY") !== Number.POSITIVE_INFINITY) {
   $ERROR('#10: Number\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029.\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029POSITIVE_INFINITY === Number.POSITIVE_INFINITY');
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.2.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.2.js
index a820dbd5d..8821a67ed 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.2.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "[" and MemberExpression or CallExpression and between Identifier and "]" are allowed
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A1.2.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "[" and MemberExpression or
+    CallExpression and between Identifier and "]" are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval('Number[\u0009"POSITIVE_INFINITY"\u0009]') !== Number.POSITIVE_INFINITY) {
@@ -57,4 +57,3 @@ if (eval('Number[\u2029"POSITIVE_INFINITY"\u2029]') !== Number.POSITIVE_INFINITY
 if (eval('Number[\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029"POSITIVE_INFINITY"\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029]') !== Number.POSITIVE_INFINITY) {
   $ERROR('#10: Number[\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029"POSITIVE_INFINITY"\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029] === Number.POSITIVE_INFINITY');
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A2.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A2.js
index 1237eae5e..a206dc5f9 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A2.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression and CallExpression uses GetValue
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A2.js
- * @description If GetBase(MemberExpression or CallExpression) is null, throw ReferenceError
- */
+/*---
+info: MemberExpression and CallExpression uses GetValue
+description: >
+    If GetBase(MemberExpression or CallExpression) is null, throw
+    ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +29,3 @@ catch (e) {
     $ERROR('#2.2: object.prop throw ReferenceError. Actual: ' + (e)); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T1.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T1.js
index a13f25e7b..ecd342e6b 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T1.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression calls ToObject(MemberExpression) and ToString(Expression). CallExpression calls ToObject(CallExpression) and ToString(Expression)
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A3_T1.js
- * @description Checking Boolean case
- */
+/*---
+info: >
+    MemberExpression calls ToObject(MemberExpression) and
+    ToString(Expression). CallExpression calls ToObject(CallExpression) and
+    ToString(Expression)
+description: Checking Boolean case
+---*/
 
 //CHECK#1
 if (true.toString() !== "true") {
@@ -26,5 +27,4 @@ if (new Boolean(true).toString() !== "true") {
 //CHECK#4
 if (new Boolean(false)["toString"]() !== "false") {
   $ERROR('#4: new Boolean(false)["toString"]() === "false". Actual: ' + (new Boolean(false)["toString"]()));
-}  
-
+}
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T2.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T2.js
index defe6a8c8..d4b06ebb6 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T2.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression calls ToObject(MemberExpression) and ToString(Expression). CallExpression calls ToObject(CallExpression) and ToString(Expression)
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A3_T2.js
- * @description Checking Number case
- */
+/*---
+info: >
+    MemberExpression calls ToObject(MemberExpression) and
+    ToString(Expression). CallExpression calls ToObject(CallExpression) and
+    ToString(Expression)
+description: Checking Number case
+---*/
 
 //CHECK#1
 if (1..toString() !== "1") {
@@ -36,5 +37,4 @@ if (new Number(1).toString() !== "1") {
 //CHECK#6
 if (new Number(1)["toFixed"](5) !== "1.00000") {
   $ERROR('#6: new Number(1)["toFixed"](5) === "1.00000". Actual: ' + (new Number(1)["toFixed"](5)));
-} 
-
+}
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T3.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T3.js
index 14a0e85e3..9f50c7ad7 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T3.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression calls ToObject(MemberExpression) and ToString(Expression). CallExpression calls ToObject(CallExpression) and ToString(Expression)
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A3_T3.js
- * @description Checking String case;
- */
+/*---
+info: >
+    MemberExpression calls ToObject(MemberExpression) and
+    ToString(Expression). CallExpression calls ToObject(CallExpression) and
+    ToString(Expression)
+description: Checking String case;
+---*/
 
 //CHECK#1
 if ("abc123".charAt(5) !== "3") {
@@ -36,5 +37,4 @@ if (new String("abc123").length !== 6) {
 //CHECK#6
 if (new String("abc123")["charAt"](2) !== "c") {
   $ERROR('#6: new String("abc123")["charAt"](2) === "c". Actual: ' + (new String("abc123")["charAt"](2)));
-}  
-
+}
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T4.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T4.js
index 2c360c65d..247870dc6 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T4.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression calls ToObject(MemberExpression) and ToString(Expression). CallExpression calls ToObject(CallExpression) and ToString(Expression)
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A3_T4.js
- * @description Checking "undefined" case
- */
+/*---
+info: >
+    MemberExpression calls ToObject(MemberExpression) and
+    ToString(Expression). CallExpression calls ToObject(CallExpression) and
+    ToString(Expression)
+description: Checking "undefined" case
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +30,3 @@ catch (e) {
     $ERROR('#2.2: undefined["toString"]() throw TypeError. Actual: ' + (e)); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T5.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T5.js
index 405415f72..11955473a 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T5.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A3_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * MemberExpression calls ToObject(MemberExpression) and ToString(Expression). CallExpression calls ToObject(CallExpression) and ToString(Expression)
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A3_T5.js
- * @description Checking "null" case
- */
+/*---
+info: >
+    MemberExpression calls ToObject(MemberExpression) and
+    ToString(Expression). CallExpression calls ToObject(CallExpression) and
+    ToString(Expression)
+description: Checking "null" case
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +30,3 @@ catch (e) {
     $ERROR('#2.2: null["toString"]() throw TypeError. Actual: ' + (e)); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js
index 8f9212243..415833061 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T1.js
- * @description Checking properties of this object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of this object
+---*/
 
 //CHECK#1-32
 if (typeof (this.NaN)  === "undefined")  $ERROR('#1: typeof (this.NaN) !== "undefined"');
@@ -37,4 +35,3 @@ if (typeof this.Date === "undefined")  $ERROR('#29: typeof this.Date !== "undefi
 if (typeof this['Date'] === "undefined")  $ERROR('#30: typeof this["Date"] !== "undefined"');
 if (typeof this.Math === "undefined")  $ERROR('#31: typeof this.Math !== "undefined"');
 if (typeof this['Math'] === "undefined")  $ERROR('#32: typeof this["Math"] !== "undefined"');
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T2.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T2.js
index ed27f8534..1bdb7c397 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T2.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T2.js
- * @description Checking properties and methods of Object objects
- */
+/*---
+info: Check type of various properties
+description: Checking properties and methods of Object objects
+---*/
 
 //CHECK#1-8
 if (typeof Object.prototype  !== "object")  $ERROR('#1: typeof Object.prototype === "object". Actual: ' + (typeof Object.prototype ));
@@ -17,4 +15,3 @@ if (typeof Object.valueOf !== "function")  $ERROR('#5: typeof Object.valueOf ===
 if (typeof Object['valueOf'] !== "function")  $ERROR('#6: typeof Object["valueOf"] === "function". Actual: ' + (typeof Object["valueOf"] ));
 if (typeof Object.constructor  !== "function")  $ERROR('#7: typeof Object.constructor === "function". Actual: ' + (typeof Object.constructor ));
 if (typeof Object['constructor'] !== "function")  $ERROR('#8: typeof Object["constructor"] === "function". Actual: ' + (typeof Object["constructor"] ));
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T3.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T3.js
index dfa72b139..cbdf53deb 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T3.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T3.js
- * @description Checking properties of the Function object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Function object
+---*/
 
 //CHECK#1-8
 if (typeof Function.prototype  !== "function")  $ERROR('#1: typeof Function.prototype === "function". Actual: ' + (typeof Function.prototype ));
@@ -17,4 +15,3 @@ if (typeof Function.prototype.length !== "number")  $ERROR('#5: typeof Function.
 if (typeof Function.prototype['length'] !== "number")  $ERROR('#6: typeof Function.prototype["length"] === "number". Actual: ' + (typeof Function.prototype["length"] ));
 if (typeof Function.prototype.valueOf  !== "function")  $ERROR('#7: typeof Function.prototype.valueOf === "function". Actual: ' + (typeof Function.prototype.valueOf ));
 if (typeof Function.prototype['valueOf']  !== "function")  $ERROR('#8: typeof Function.prototype["valueOf"] === "function". Actual: ' + (typeof Function.prototype["valueOf"] ));
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T4.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T4.js
index da4633fe2..7ad76349d 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T4.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T4.js
- * @description Checking properties of the Array object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Array object
+---*/
 
 //CHECK#1-8
 if (typeof Array.prototype  !== "object")  $ERROR('#1: typeof Array.prototype === "object". Actual: ' + (typeof Array.prototype ));
@@ -23,5 +21,3 @@ if (typeof Array.prototype.reverse  !== "function")  $ERROR('#11: typeof Array.p
 if (typeof Array.prototype['reverse'] !== "function")  $ERROR('#12: typeof Array.prototype["reverse"] === "function". Actual: ' + (typeof Array.prototype["reverse"] ));
 if (typeof Array.prototype.sort  !== "function")  $ERROR('#13: typeof Array.prototype.sort === "function". Actual: ' + (typeof Array.prototype.sort ));
 if (typeof Array.prototype['sort'] !== "function")  $ERROR('#14: typeof Array.prototype["sort"] === "function". Actual: ' + (typeof Array.prototype["sort"] ));
-
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T5.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T5.js
index 02904c0b4..8833112b3 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T5.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T5.js
- * @description Checking properties of the String object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the String object
+---*/
 
 //CHECK#1-28
 if (typeof String.prototype  !== "object")  $ERROR('#1: typeof String.prototype === "object". Actual: ' + (typeof String.prototype ));
@@ -37,5 +35,3 @@ if (typeof String.prototype.toUpperCase !== "function")  $ERROR('#25: typeof Str
 if (typeof String.prototype['toUpperCase'] !== "function")  $ERROR('#26: typeof Array.prototype === "object". Actual: ' + (typeof Array.prototype ));
 if (typeof String.prototype.length  !== "number")  $ERROR('#27: typeof String.prototype.length === "number". Actual: ' + (typeof String.prototype.length ));
 if (typeof String.prototype['length']  !== "number")  $ERROR('#28: typeof String.prototype["length"] === "number". Actual: ' + (typeof String.prototype["length"] ));
-
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T6.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T6.js
index 0d8668846..50e67700b 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T6.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T6.js
- * @description Checking properties of the Boolean object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Boolean object
+---*/
 
 //CHECK#1-8
 if (typeof Boolean.prototype  !== "object")   $ERROR('#1: typeof Boolean.prototype === "object". Actual: ' + (typeof Boolean.prototype ));
@@ -17,5 +15,3 @@ if (typeof Boolean.prototype.valueOf  !== "function")  $ERROR('#5: typeof Boolea
 if (typeof Boolean.prototype['valueOf'] !== "function")  $ERROR('#6: typeof Boolean.prototype["valueOf"] === "function". Actual: ' + (typeof Boolean.prototype["valueOf"] ));
 if (typeof Boolean.prototype.toString !== "function")  $ERROR('#7: typeof Boolean.prototype.toString === "function". Actual: ' + (typeof Boolean.prototype.toString ));
 if (typeof Boolean.prototype['toString'] !== "function")  $ERROR('#8: typeof Boolean.prototype["toString"] === "function". Actual: ' + (typeof Boolean.prototype["toString"] ));
-
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T7.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T7.js
index 7d8826d80..d2fcb3d77 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T7.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T7.js
- * @description Checking properties of the Number object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Number object
+---*/
 
 //CHECK#1-16
 if (typeof Number.MAX_VALUE  !== "number")  $ERROR('#1: typeof Number.MAX_VALUE === "number". Actual: ' + (typeof Number.MAX_VALUE ));
@@ -25,6 +23,3 @@ if (typeof Number.prototype.constructor !== "function")  $ERROR('#13: typeof Num
 if (typeof Number.prototype['constructor'] !== "function")  $ERROR('#14: typeof Number.prototype["constructor"] === "function". Actual: ' + (typeof Number.prototype["constructor"] ));
 if (typeof Number.prototype.valueOf  !== "function")  $ERROR('#15: typeof Number.prototype.valueOf === "function". Actual: ' + (typeof Number.prototype.valueOf ));
 if (typeof Number.prototype['valueOf']  !== "function")  $ERROR('#16: typeof Number.prototype["valueOf"] === "function". Actual: ' + (typeof Number.prototype["valueOf"] ));
-
-
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T8.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T8.js
index fd3846e9c..a956de663 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T8.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T8.js
- * @description Checking properties of the Math Object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Math Object
+---*/
 
 //CHECK#1-52
 if (typeof Math.E !== "number")  $ERROR('#1: typeof Math.E === "number". Actual: ' + (typeof Math.E ));
@@ -61,5 +59,3 @@ if (typeof Math.sqrt !== "function")  $ERROR('#49: typeof Math.sqrt === "functio
 if (typeof Math['sqrt'] !== "function")  $ERROR('#50: typeof Math["sqrt"] === "function". Actual: ' + (typeof Math["sqrt"] ));
 if (typeof Math.tan !== "function")  $ERROR('#51: typeof Math.tan === "function". Actual: ' + (typeof Math.tan ));
 if (typeof Math['tan'] !== "function")  $ERROR('#52: typeof Math["tan"] === "function". Actual: ' + (typeof Math["tan"] ));
-
-
diff --git a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
index 409d49e58..de3e06a12 100644
--- a/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
+++ b/test/suite/ch11/11.2/11.2.1/S11.2.1_A4_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check type of various properties
- *
- * @path ch11/11.2/11.2.1/S11.2.1_A4_T9.js
- * @description Checking properties of the Date object
- */
+/*---
+info: Check type of various properties
+description: Checking properties of the Date object
+---*/
 
 //CHECK#1-86
 if (typeof Date.parse !== "function")  $ERROR('#1: typeof Date.parse === "function". Actual: ' + (typeof Date.parse ));
@@ -89,6 +87,3 @@ if (typeof Date.prototype.toLocaleString !== "function")  $ERROR('#81: typeof Da
 if (typeof Date.prototype['toLocaleString'] !== "function")  $ERROR('#82: typeof Date.prototype["toLocaleString"] === "function". Actual: ' + (typeof Date.prototype["toLocaleString"] ));
 if (typeof Date.prototype.toUTCString !== "function")  $ERROR('#83: typeof Date.prototype.toUTCString === "function". Actual: ' + (typeof Date.prototype.toUTCString ));
 if (typeof Date.prototype['toUTCString'] !== "function")  $ERROR('#84: typeof Date.prototype["toUTCString"] === "function". Actual: ' + (typeof Date.prototype["toUTCString"] ));
-
-
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.1.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.1.js
index 10811b4b0..54a2909fb 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.1.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "new" and NewExpression are allowed
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A1.1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "new" and NewExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("new\u0009Number") != 0) {
@@ -57,4 +57,3 @@ if (eval("new\u2029Number") != 0) {
 if (eval("new\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029Number") != 0) {
   $ERROR('#10: new\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029Number == 0');
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.2.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.2.js
index d47eb10bf..2c4bece9a 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.2.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "new" and MemberExpression are allowed
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A1.2.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "new" and MemberExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("new\u0009Number()") != 0) {
@@ -57,4 +57,3 @@ if (eval("new\u2029Number()") != 0) {
 if (eval("new\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029Number()") != 0) {
   $ERROR('#10: new\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029Number == 0');
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A2.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A2.js
index e879390fc..9109147c2 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A2.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "new" uses GetValue
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A2.js
- * @description If GetBase(NewExpression) or GetBase(MemberExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator "new" uses GetValue
+description: >
+    If GetBase(NewExpression) or GetBase(MemberExpression) is null,
+    throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +29,3 @@ catch (e) {
     $ERROR('#2: new x() throw ReferenceError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T1.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T1.js
index 3f52d9527..c87525dee 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T1.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(NewExpression) or Type(MemberExpression) is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A3_T1.js
- * @description Checking boolean primitive case
- */
+/*---
+info: >
+    If Type(NewExpression) or Type(MemberExpression) is not Object, throw
+    TypeError
+description: Checking boolean primitive case
+---*/
 
 //CHECK#1
 try {
@@ -42,5 +42,3 @@ catch (e) {
     $ERROR('#3: var x = true; new x() throw TypeError');  
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T2.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T2.js
index 1ad67c548..628d206ef 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T2.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(NewExpression) or Type(MemberExpression) is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A3_T2.js
- * @description Checking "number primitive" case
- */
+/*---
+info: >
+    If Type(NewExpression) or Type(MemberExpression) is not Object, throw
+    TypeError
+description: Checking "number primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -42,4 +42,3 @@ catch (e) {
     $ERROR('#3: var x = 1; new x() throw TypeError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T3.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T3.js
index c93406012..11c224f33 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T3.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(NewExpression) or Type(MemberExpression) is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A3_T3.js
- * @description Checking "string primitive" case
- */
+/*---
+info: >
+    If Type(NewExpression) or Type(MemberExpression) is not Object, throw
+    TypeError
+description: Checking "string primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -42,4 +42,3 @@ catch (e) {
     $ERROR('#3: var x = "1"; new x() throw TypeError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T4.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T4.js
index adbd1356c..bfef5ee1b 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T4.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(NewExpression) or Type(MemberExpression) is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A3_T4.js
- * @description Checking "undefined" case
- */
+/*---
+info: >
+    If Type(NewExpression) or Type(MemberExpression) is not Object, throw
+    TypeError
+description: Checking "undefined" case
+---*/
 
 //CHECK#1
 try {
@@ -42,4 +42,3 @@ catch (e) {
     $ERROR('#3: var x = undefined; new x() throw TypeError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T5.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T5.js
index abf71da19..0fdf7f54a 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T5.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A3_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(NewExpression) or Type(MemberExpression) is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A3_T5.js
- * @description Checking "null primitive" case
- */
+/*---
+info: >
+    If Type(NewExpression) or Type(MemberExpression) is not Object, throw
+    TypeError
+description: Checking "null primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -42,4 +42,3 @@ catch (e) {
     $ERROR('#3: var x = null; new x() throw TypeError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T1.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T1.js
index cd6517cbf..29d28e174 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T1.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If NewExpression or MemberExpression does not implement internal [[Construct]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A4_T1.js
- * @description Checking Boolean object case
- */
+/*---
+info: >
+    If NewExpression or MemberExpression does not implement internal
+    [[Construct]] method, throw TypeError
+description: Checking Boolean object case
+---*/
 
 //CHECK#1
 try {
@@ -42,5 +42,3 @@ catch (e) {
     $ERROR('#3: var x = new Boolean(true); new x() throw TypeError');  
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T2.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T2.js
index bc776ec65..9106c1503 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T2.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If NewExpression or MemberExpression does not implement internal [[Construct]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A4_T2.js
- * @description Checking Number object case
- */
+/*---
+info: >
+    If NewExpression or MemberExpression does not implement internal
+    [[Construct]] method, throw TypeError
+description: Checking Number object case
+---*/
 
 //CHECK#1
 try {
@@ -42,5 +42,3 @@ catch (e) {
     $ERROR('#3: var x = new Number(1); new x() throw TypeError');
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T3.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T3.js
index 9027cf051..c207d1064 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T3.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If NewExpression or MemberExpression does not implement internal [[Construct]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A4_T3.js
- * @description Checking String object case
- */
+/*---
+info: >
+    If NewExpression or MemberExpression does not implement internal
+    [[Construct]] method, throw TypeError
+description: Checking String object case
+---*/
 
 //CHECK#1
 try {
@@ -42,5 +42,3 @@ catch (e) {
     $ERROR('#3: var x = new String("1"); new x() throw TypeError');  
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T4.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T4.js
index e240ba827..e780a7290 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T4.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If NewExpression or MemberExpression does not implement internal [[Construct]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A4_T4.js
- * @description Checking Global object case
- */
+/*---
+info: >
+    If NewExpression or MemberExpression does not implement internal
+    [[Construct]] method, throw TypeError
+description: Checking Global object case
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +29,3 @@ catch (e) {
     $ERROR('#2: new this() throw TypeError'); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T5.js b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T5.js
index 72fdae876..2854aa685 100644
--- a/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T5.js
+++ b/test/suite/ch11/11.2/11.2.2/S11.2.2_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If NewExpression or MemberExpression does not implement internal [[Construct]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.2/S11.2.2_A4_T5.js
- * @description Checking Math object case
- */
+/*---
+info: >
+    If NewExpression or MemberExpression does not implement internal
+    [[Construct]] method, throw TypeError
+description: Checking Math object case
+---*/
 
 //CHECK#1
 try {
@@ -41,5 +41,3 @@ catch (e) {
     $ERROR('#3: var x = new Math(); new x() throw TypeError'); 
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_1.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_1.js
index 8ae5b5e84..6eb06c1d7 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_1.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_1.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (FunctionDeclaration)

- */

-

-

-function testcase() {

-    var fooCalled = false;

-    function foo(){ fooCalled = true; } 

-    

-    var o = { }; 

-    try {

-        o.bar( foo() );

-        throw new Exception("o.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===true);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (FunctionDeclaration)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var fooCalled = false;
+    function foo(){ fooCalled = true; } 
+    
+    var o = { }; 
+    try {
+        o.bar( foo() );
+        throw new Exception("o.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===true);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_2.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_2.js
index 5e7496d51..0d4495fc7 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_2.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_2.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (FunctionExpression)

- */

-

-

-function testcase() {

-    var fooCalled = false;

-    var foo = function (){ fooCalled = true; } 

-    

-    var o = { }; 

-    try {

-        o.bar( foo() );

-        throw new Exception("o.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===true);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (FunctionExpression)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var fooCalled = false;
+    var foo = function (){ fooCalled = true; } 
+    
+    var o = { }; 
+    try {
+        o.bar( foo() );
+        throw new Exception("o.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===true);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_3.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_3.js
index 04616e5a0..ce9b694ea 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_3.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_3.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_3.js

- * @description Call arguments are not evaluated before the check is made to see if the object is actually callable (undefined member)

- */

-

-

-function testcase() {

-    var fooCalled = false;

-    function foo(){ fooCalled = true; } 

-    

-    var o = { }; 

-    try {

-        o.bar.gar( foo() );

-        throw new Exception("o.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===false);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are not evaluated before the check is made to see
+    if the object is actually callable (undefined member)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var fooCalled = false;
+    function foo(){ fooCalled = true; } 
+    
+    var o = { }; 
+    try {
+        o.bar.gar( foo() );
+        throw new Exception("o.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===false);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_4.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_4.js
index f6970fa79..d629fd8f7 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_4.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_4.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (property)

- */

-

-

-function testcase() {

-    var fooCalled = false;

-    function foo(){ fooCalled = true; } 

-    

-    var o = { }; 

-    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 

-                                     set: function(x) {this.barSetter = true; }});

-    try {

-        o.bar( foo() );

-        throw new Exception("o.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===true) && (o.barGetter===true) && (o.barSetter===undefined);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var fooCalled = false;
+    function foo(){ fooCalled = true; } 
+    
+    var o = { }; 
+    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 
+                                     set: function(x) {this.barSetter = true; }});
+    try {
+        o.bar( foo() );
+        throw new Exception("o.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===true) && (o.barGetter===true) && (o.barSetter===undefined);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_5.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_5.js
index 3e2315f03..fbc0783cd 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_5.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_5.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_5.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (eval'ed)

- */

-

-

-function testcase() {

-    var fooCalled = false;

-    function foo(){ fooCalled = true; } 

-    

-    var o = { }; 

-    try {

-        eval("o.bar( foo() );");

-        throw new Exception("o.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===true);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (eval'ed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var fooCalled = false;
+    function foo(){ fooCalled = true; } 
+    
+    var o = { }; 
+    try {
+        eval("o.bar( foo() );");
+        throw new Exception("o.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===true);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_6.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_6.js
index c2bfcc45a..b8ba459d2 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_6.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_6.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (getter called)

- */

-

-

-function testcase() {

-    var o = { }; 

-    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 

-                                     set: function(x) {this.barSetter = true; }});

-    try {

-        o.foo( o.bar );

-        throw new Exception("o.foo does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (o.barGetter===true) && (o.barSetter===undefined);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (getter called)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = { }; 
+    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 
+                                     set: function(x) {this.barSetter = true; }});
+    try {
+        o.foo( o.bar );
+        throw new Exception("o.foo does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (o.barGetter===true) && (o.barSetter===undefined);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_7.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_7.js
index 2c320e778..50c65bfb6 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_7.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_7.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (getter called as indexed property)

- */

-

-

-function testcase() {

-    var o = { }; 

-    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 

-                                     set: function(x) {this.barSetter = true; }});

-    try {

-        o.foo( o["bar"] );

-        throw new Exception("o.foo does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (o.barGetter===true) && (o.barSetter===undefined);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (getter called as indexed property)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = { }; 
+    Object.defineProperty(o, "bar", {get: function()  {this.barGetter = true; return 42;}, 
+                                     set: function(x) {this.barSetter = true; }});
+    try {
+        o.foo( o["bar"] );
+        throw new Exception("o.foo does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (o.barGetter===true) && (o.barSetter===undefined);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/11.2.3-3_8.js b/test/suite/ch11/11.2/11.2.3/11.2.3-3_8.js
index 67e5b9b80..4068fa0db 100644
--- a/test/suite/ch11/11.2/11.2.3/11.2.3-3_8.js
+++ b/test/suite/ch11/11.2/11.2.3/11.2.3-3_8.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.2/11.2.3/11.2.3-3_8.js

- * @description Call arguments are evaluated before the check is made to see if the object is actually callable (global object)

- */

-

-

-function testcase() {

-    if (this!==fnGlobalObject()) {

-        return;

-    }

-    

-    var fooCalled = false;

-    function foo(){ fooCalled = true; } 

-    

-    try {

-        this.bar( foo() );

-        throw new Exception("this.bar does not exist!");

-    } catch(e) {

-        return (e instanceof TypeError) && (fooCalled===true);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Call arguments are evaluated before the check is made to see if
+    the object is actually callable (global object)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    if (this!==fnGlobalObject()) {
+        return;
+    }
+    
+    var fooCalled = false;
+    function foo(){ fooCalled = true; } 
+    
+    try {
+        this.bar( foo() );
+        throw new Exception("this.bar does not exist!");
+    } catch(e) {
+        return (e instanceof TypeError) && (fooCalled===true);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A1.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A1.js
index 19dfdce73..fe2b01c91 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A1.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between MemberExpression and Arguments are allowed
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between MemberExpression and Arguments
+    are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("Number\u0009()") !== 0) {
@@ -57,4 +57,3 @@ if (eval("Number\u2029()") !== 0) {
 if (eval("Number\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029()") !== 0) {
   $ERROR('#10: Number\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029() === 0');
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A2.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A2.js
index 29ae4a55a..b51b0e29b 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A2.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CallExpression : MemberExpression Arguments uses GetValue
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A2.js
- * @description If GetBase(MemberExpression) is null, throw ReferenceError
- */
+/*---
+info: "CallExpression : MemberExpression Arguments uses GetValue"
+description: If GetBase(MemberExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -29,4 +27,3 @@ catch (e) {
     $ERROR('#2.2: x(1,2,3) throw ReferenceError. Actual: ' + (e)); 
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T1.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T1.js
index 5fbf7b68d..a66b84ca7 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T1.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A3_T1.js
- * @description Checking "boolean primitive" case
- */
+/*---
+info: If MemberExpression is not Object, throw TypeError
+description: Checking "boolean primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +28,3 @@ catch (e) {
     $ERROR('#2.2: var x = true; x() throw TypeError. Actual: ' + (e))  
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T2.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T2.js
index 253f1b0e6..6fe12eb6e 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T2.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A3_T2.js
- * @description Checking "number primitive" case
- */
+/*---
+info: If MemberExpression is not Object, throw TypeError
+description: Checking "number primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +28,3 @@ catch (e) {
     $ERROR('#2.2: var x = 1; x() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T3.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T3.js
index 388510f21..b6b7eee0d 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T3.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A3_T3.js
- * @description Checking "string primitive" case
- */
+/*---
+info: If MemberExpression is not Object, throw TypeError
+description: Checking "string primitive" case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +28,3 @@ catch (e) {
     $ERROR('#2.2: var x = "1"; x() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T4.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T4.js
index a167260ed..7ab909b55 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T4.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A3_T4.js
- * @description Checking "undefined" case
- */
+/*---
+info: If MemberExpression is not Object, throw TypeError
+description: Checking "undefined" case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +28,3 @@ catch (e) {
     $ERROR('#2.2: var x = undefined; x() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T5.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T5.js
index 77cd76fa4..263e0ee86 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T5.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression is not Object, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A3_T5.js
- * @description Checking "null" case
- */
+/*---
+info: If MemberExpression is not Object, throw TypeError
+description: Checking "null" case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +28,3 @@ catch (e) {
     $ERROR('#2.2: var x = null; x() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T1.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T1.js
index ca028fa5a..886e83894 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T1.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression does not implement the internal [[Call]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A4_T1.js
- * @description Checking Boolean object case
- */
+/*---
+info: >
+    If MemberExpression does not implement the internal [[Call]] method,
+    throw TypeError
+description: Checking Boolean object case
+---*/
 
 //CHECK#1
 try {
@@ -30,5 +30,3 @@ catch (e) {
     $ERROR('#2.2: var x = new Boolean(true); x() throw TypeError. Actual: ' + (e));	
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T2.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T2.js
index 41f898305..c8e6b956b 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T2.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression does not implement the internal [[Call]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A4_T2.js
- * @description Checking Number object case
- */
+/*---
+info: >
+    If MemberExpression does not implement the internal [[Call]] method,
+    throw TypeError
+description: Checking Number object case
+---*/
 
 //CHECK#1
 try {
@@ -30,5 +30,3 @@ catch (e) {
     $ERROR('#2.2: var x = new Number(1); x() throw TypeError. Actual: ' + (e));	
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T3.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T3.js
index 108085425..46bb9b1fb 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T3.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression does not implement the internal [[Call]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A4_T3.js
- * @description Checking String object case
- */
+/*---
+info: >
+    If MemberExpression does not implement the internal [[Call]] method,
+    throw TypeError
+description: Checking String object case
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ catch (e) {
     $ERROR('#2.2: var x = new String("1"); x() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T4.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T4.js
index a19cc05e6..f77ef16c9 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T4.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression does not implement the internal [[Call]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A4_T4.js
- * @description Checking Global object case
- */
+/*---
+info: >
+    If MemberExpression does not implement the internal [[Call]] method,
+    throw TypeError
+description: Checking Global object case
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +18,3 @@ catch (e) {
     $ERROR('#1.2: this() throw TypeError. Actual: ' + (e));	
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T5.js b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T5.js
index ddaf40c8d..6cfa04bcf 100644
--- a/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T5.js
+++ b/test/suite/ch11/11.2/11.2.3/S11.2.3_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If MemberExpression does not implement the internal [[Call]] method, throw TypeError
- *
- * @path ch11/11.2/11.2.3/S11.2.3_A4_T5.js
- * @description Checking Math object case
- */
+/*---
+info: >
+    If MemberExpression does not implement the internal [[Call]] method,
+    throw TypeError
+description: Checking Math object case
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +18,3 @@ catch (e) {
     $ERROR('#1.2: Math() throw TypeError. Actual: ' + (e));	
   }
 }
-
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T1.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T1.js
index 0d31a6c22..1a06be561 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T1.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : ()
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.1_T1.js
- * @description Function is declared with no FormalParameterList
- */
+/*---
+info: "Arguments : ()"
+description: Function is declared with no FormalParameterList
+---*/
 
 function f_arg() {
   return arguments;
@@ -21,4 +19,3 @@ if (f_arg().length !== 0) {
 if (f_arg()[0] !== undefined) {
   $ERROR('#2: function f_arg() {return arguments;} f_arg()[0] === undefined. Actual: ' + (f_arg()[0]));
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T2.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T2.js
index 6be2a9937..6466013b2 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T2.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : ()
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.1_T2.js
- * @description Function is declared with FormalParameterList
- */
+/*---
+info: "Arguments : ()"
+description: Function is declared with FormalParameterList
+---*/
 
 function f_arg(x,y) {
   return arguments;
@@ -26,4 +24,3 @@ if (f_arg()[0] !== undefined) {
 if (f_arg.length !== 2) {
   $ERROR('#3: function f_arg(x,y) {return arguments;} f_arg.length === 2. Actual: ' + (f_arg.length));
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T1.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T1.js
index aa419e295..860214150 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T1.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.2_T1.js
- * @description Function is declared with no FormalParameterList
- */
+/*---
+info: "Arguments : (ArgumentList)"
+description: Function is declared with no FormalParameterList
+---*/
 
 f_arg = function() {
   return arguments;
@@ -36,4 +34,3 @@ if (f_arg(1,2,3)[2] !== 3) {
 if (f_arg(1,2,3)[3] !== undefined) {
   $ERROR('#5: f_arg = function()() {return arguments;} f_arg(1,2,3)[3] === undefined. Actual: ' + (f_arg(1,2,3)[3]));
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T2.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T2.js
index 2541df3d1..b0208f7c6 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T2.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.2_T2.js
- * @description Function is declared with FormalParameterList
- */
+/*---
+info: "Arguments : (ArgumentList)"
+description: Function is declared with FormalParameterList
+---*/
 
 f_arg = function(x,y) {
   return arguments;
@@ -41,4 +39,3 @@ if (f_arg(1,2,3)[3] !== undefined) {
 if (f_arg.length !== 2) {
   $ERROR('#6: f_arg = function(x,y) {return arguments;} f_arg.length === 2. Actual: ' + (f_arg.length));
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.3_T1.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.3_T1.js
index e54238ea1..3613f2895 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.3_T1.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.3_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList : ArgumentList,, AssignmentExpression) is a bad syntax
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.3_T1.js
- * @description incorrect syntax
- * @negative
- */
+/*---
+info: >
+    Arguments : (ArgumentList : ArgumentList,, AssignmentExpression) is a bad
+    syntax
+description: incorrect syntax
+flags: [negative]
+---*/
 
 function f_arg() {
 }
 
 f_arg(1,,2);
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T1.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T1.js
index a2eb7989b..94db97698 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T1.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T1.js
@@ -1,19 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList : ArgumentList, AssignmentExpression)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.4_T1.js
- * @description Return an internal list whose length is one greater than the
- * length of ArgumentList and whose items are the items of ArgumentList, in order,
- * followed at the end by GetValue(AssignmentExpression), which is the last item of
- * the new list
- */
+/*---
+info: "Arguments : (ArgumentList : ArgumentList, AssignmentExpression)"
+description: >
+    Return an internal list whose length is one greater than the
+    length of ArgumentList and whose items are the items of
+    ArgumentList, in order,  followed at the end by
+    GetValue(AssignmentExpression), which is the last item of  the new
+    list
+---*/
 
 function f_arg() {
 }
 
 //CHECK#1
 f_arg(x=1,x);
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T2.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T2.js
index 0db853abd..e76730a79 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T2.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList : ArgumentList, AssignmentExpression)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.4_T2.js
- * @description Return an internal list whose length is one greater than the
- * length of ArgumentList and whose items are the items of ArgumentList, in order,
- * followed at the end by GetValue(AssignmentExpression), which is the last item of
- * the new list
- */
+/*---
+info: "Arguments : (ArgumentList : ArgumentList, AssignmentExpression)"
+description: >
+    Return an internal list whose length is one greater than the
+    length of ArgumentList and whose items are the items of
+    ArgumentList, in order,  followed at the end by
+    GetValue(AssignmentExpression), which is the last item of  the new
+    list
+---*/
 
 function f_arg() {
 }
@@ -24,4 +24,3 @@ catch (e) {
     $ERROR('#1.2: function f_arg() {} f_arg(x,x=1) throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T3.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T3.js
index 7d8bd02c9..577a4bcbe 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T3.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T3.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList : ArgumentList, AssignmentExpression)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.4_T3.js
- * @description Return an internal list whose length is one greater than the
- * length of ArgumentList and whose items are the items of ArgumentList, in order,
- * followed at the end by GetValue(AssignmentExpression), which is the last item of
- * the new list
- */
+/*---
+info: "Arguments : (ArgumentList : ArgumentList, AssignmentExpression)"
+description: >
+    Return an internal list whose length is one greater than the
+    length of ArgumentList and whose items are the items of
+    ArgumentList, in order,  followed at the end by
+    GetValue(AssignmentExpression), which is the last item of  the new
+    list
+---*/
 
 function f_arg(x,y,z) {
   return z;
@@ -19,4 +19,3 @@ function f_arg(x,y,z) {
 if (f_arg(x=1,y=x,x+y) !== 2) {
   $ERROR('#1: function f_arg(x,y,z) {return z;} f_arg(x=1,y=x,x+y) === 2. Actual: ' + (f_arg(x=1,y=x,x+y)));    
 }
-
diff --git a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T4.js b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T4.js
index 83b228a88..86cfecec5 100644
--- a/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T4.js
+++ b/test/suite/ch11/11.2/11.2.4/S11.2.4_A1.4_T4.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments : (ArgumentList : ArgumentList, AssignmentExpression)
- *
- * @path ch11/11.2/11.2.4/S11.2.4_A1.4_T4.js
- * @description Return an internal list whose length is one greater than the
- * length of ArgumentList and whose items are the items of ArgumentList, in order,
- * followed at the end by GetValue(AssignmentExpression), which is the last item of
- * the new list
- */
+/*---
+info: "Arguments : (ArgumentList : ArgumentList, AssignmentExpression)"
+description: >
+    Return an internal list whose length is one greater than the
+    length of ArgumentList and whose items are the items of
+    ArgumentList, in order,  followed at the end by
+    GetValue(AssignmentExpression), which is the last item of  the new
+    list
+---*/
 
 var x = function () { throw "x"; };
 var y = function () { throw "y"; };
@@ -31,4 +31,3 @@ catch (e) {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/11.3.1-2-1-s.js b/test/suite/ch11/11.3/11.3.1/11.3.1-2-1-s.js
index 28b299108..edd091396 100644
--- a/test/suite/ch11/11.3/11.3.1/11.3.1-2-1-s.js
+++ b/test/suite/ch11/11.3/11.3.1/11.3.1-2-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.1/11.3.1-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appear as a PostfixExpression(arguments++)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments++;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appear as a PostfixExpression(arguments++)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments++;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.1/11.3.1-2-1gs.js b/test/suite/ch11/11.3/11.3.1/11.3.1-2-1gs.js
index 15456cd5c..b177e0bfc 100644
--- a/test/suite/ch11/11.3/11.3.1/11.3.1-2-1gs.js
+++ b/test/suite/ch11/11.3/11.3.1/11.3.1-2-1gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch11/11.3/11.3.1/11.3.1-2-1gs.js

- * @description Strict Mode - SyntaxError is throw if the identifier arguments appear as a PostfixExpression(arguments++)

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-arguments++;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is throw if the identifier arguments
+    appear as a PostfixExpression(arguments++)
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+arguments++;
diff --git a/test/suite/ch11/11.3/11.3.1/11.3.1-2-2-s.js b/test/suite/ch11/11.3/11.3.1/11.3.1-2-2-s.js
index f71ea4568..b1dcb70cc 100644
--- a/test/suite/ch11/11.3/11.3.1/11.3.1-2-2-s.js
+++ b/test/suite/ch11/11.3/11.3.1/11.3.1-2-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.1/11.3.1-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appear as a PostfixExpression(eval++)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval++;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appear as a PostfixExpression(eval++)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval++;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.1/11.3.1-2-3-s.js b/test/suite/ch11/11.3/11.3.1/11.3.1-2-3-s.js
index e46a70606..e7defbc6e 100644
--- a/test/suite/ch11/11.3/11.3.1/11.3.1-2-3-s.js
+++ b/test/suite/ch11/11.3/11.3.1/11.3.1-2-3-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.1/11.3.1-2-3-s.js

- * @description Strict Mode - SyntaxError is not thrown if the identifier 'arguments[...]' appears as a PostfixExpression(arguments++)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        arguments[1] = 7;

-        arguments[1]++;

-        return arguments[1]===8;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is not thrown if the identifier
+    'arguments[...]' appears as a PostfixExpression(arguments++)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        arguments[1] = 7;
+        arguments[1]++;
+        return arguments[1]===8;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T1.js
index 9f8bc65a1..8541e15ee 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "++" is not allowed
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A1.1_T1.js
- * @description Checking Line Feed
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "++" is not allowed
+description: Checking Line Feed
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u000A++");
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T2.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T2.js
index 4c97a56d1..7c9467a8d 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T2.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "++" is not allowed
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A1.1_T2.js
- * @description Carriage Return
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "++" is not allowed
+description: Carriage Return
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u000D++");
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T3.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T3.js
index 16eb546f4..ddae0cefd 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T3.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T3.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "++" is not allowed
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A1.1_T3.js
- * @description Checking Line Seprator
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "++" is not allowed
+description: Checking Line Seprator
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u2028++");
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T4.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T4.js
index 8f9d56e71..53c9e905e 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T4.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.1_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "++" is not allowed
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A1.1_T4.js
- * @description Checking Paragraph separator
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "++" is not allowed
+description: Checking Paragraph separator
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u2029++");
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.2_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.2_T1.js
index b8df6ebd7..a378888aa 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.2_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space between LeftHandSideExpression and "++" are allowed
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A1.2_T1.js
- * @description Checking by using eval
- */
+/*---
+info: White Space between LeftHandSideExpression and "++" are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("var x = 0; x\u0009++; x") !== 1) {
@@ -37,4 +35,3 @@ if (eval("var x = 0; x\u00A0++; x") !== 1) {
 if (eval("var x = 0; x\u0009\u000B\u000C\u0020\u00A0++; x") !== 1) {
     $ERROR('#6: var x = 0; x\\u0009\\u000B\\u000C\\u0020\\u00A0++; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T1.js
index 3f32ea5b7..ce3dc89e8 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A2.1_T1.js
- * @description Type(x) is Reference and GetBase(x) is not null
- */
+/*---
+info: Operator x++ uses GetValue and PutValue
+description: Type(x) is Reference and GetBase(x) is not null
+---*/
 
 //CHECK#1
 var x = 1;
@@ -41,6 +39,3 @@ if (y !== 1) {
     $ERROR('#3: var object = new Object(); object.prop = 1; var y = object.prop++; object.prop === 1 + 1. Actual: ' + (object.prop));
   } 
 }
-
-
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T2.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T2.js
index 5bc1abbad..59aae50e1 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T2.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x++ uses GetValue and PutValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x++ throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T3.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T3.js
index fec236e6d..9956452d9 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T3.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.1_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A2.1_T3.js
- * @description If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
- * @negative
- */
+/*---
+info: Operator x++ uses GetValue and PutValue
+description: If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +19,3 @@ catch (e) {
     1++;
   }
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.2_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.2_T1.js
index dc82a92da..1d1a77902 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.2_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ uses [[Default Value]]
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x++ uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -107,4 +105,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; object++ throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T1.js
index e3003d2d4..4c625e470 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns x = ToNumber(x) + 1
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator x++ returns x = ToNumber(x) + 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = false; 
@@ -21,4 +19,3 @@ x++;
 if (x !== 1 + 1) {
   $ERROR('#2: var x = new Boolean(true); x++; x === 1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T2.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T2.js
index 6b5560d1a..1d11733fe 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T2.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns x = ToNumber(x) + 1
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator x++ returns x = ToNumber(x) + 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1; 
@@ -21,4 +19,3 @@ x++;
 if (x !== -1.1 + 1) {
   $ERROR('#2: var x = new Number(-1.1); x++; x === -1.1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T3.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T3.js
index b43aa2c42..1196c44b9 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T3.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns x = ToNumber(x) + 1
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator x++ returns x = ToNumber(x) + 1
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1"; 
@@ -28,4 +26,3 @@ x++;
 if (x !== -1 + 1) {
   $ERROR('#3: var x = new String("-1"); x++; x === -1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T4.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T4.js
index 1a6fd79ec..1e9eb1854 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T4.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns x = ToNumber(x) + 1
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator x++ returns x = ToNumber(x) + 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -21,4 +19,3 @@ x++;
 if (x !== 1) {
   $ERROR('#2: var x = null; x++; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T5.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T5.js
index c18fc2085..46e499aec 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T5.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns x = ToNumber(x) + 1
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator x++ returns x = ToNumber(x) + 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -21,4 +19,3 @@ x++;
 if (isNaN(x) !== true) {
   $ERROR('#2: var x = function(){return 1}; x++; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T1.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T1.js
index 174800a77..5b4ad088f 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T1.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A4_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator x++ returns ToNumber(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = false;
@@ -21,4 +19,3 @@ var y = x++;
 if (y !== 1) {
   $ERROR('#2: var x = new Boolean(true); var y = x++; y === 1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T2.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T2.js
index 36fe9aec5..785f980cd 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T2.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A4_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator x++ returns ToNumber(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = -0.1;
@@ -21,4 +19,3 @@ var y = x++;
 if (y !== 1.1) {
   $ERROR('#2: var x = new Number(1.1); var y = x++; y === 1.1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T3.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T3.js
index 540ee9024..a2cfea3f2 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T3.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A4_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator x++ returns ToNumber(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1";
@@ -28,4 +26,3 @@ var y = x++;
 if (y !== -1) {
   $ERROR('#3: var x = new String("-1"); var y = x++; y === -1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T4.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T4.js
index cf703689d..58c496003 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T4.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A4_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator x++ returns ToNumber(x)
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x;
@@ -21,4 +19,3 @@ var y = x++;
 if (y !== 0) {
   $ERROR('#2: var x = null; var y = x++; y === 0. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T5.js b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T5.js
index 09a248cf3..a1f01cb5a 100644
--- a/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T5.js
+++ b/test/suite/ch11/11.3/11.3.1/S11.3.1_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x++ returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.1/S11.3.1_A4_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator x++ returns ToNumber(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -21,4 +19,3 @@ var y = x++;
 if (isNaN(y) !== true) {
   $ERROR('#2: var x = function(){return 1}; var y = x++; y === Not-a-Number. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/11.3.2-2-1-s.js b/test/suite/ch11/11.3/11.3.2/11.3.2-2-1-s.js
index f40c73ac1..5f4448011 100644
--- a/test/suite/ch11/11.3/11.3.2/11.3.2-2-1-s.js
+++ b/test/suite/ch11/11.3/11.3.2/11.3.2-2-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.2/11.3.2-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appear as a PostfixExpression(arguments--)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("arguments--;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appear as a PostfixExpression(arguments--)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("arguments--;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.2/11.3.2-2-2-s.js b/test/suite/ch11/11.3/11.3.2/11.3.2-2-2-s.js
index 09c186fd3..bb56564bd 100644
--- a/test/suite/ch11/11.3/11.3.2/11.3.2-2-2-s.js
+++ b/test/suite/ch11/11.3/11.3.2/11.3.2-2-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.2/11.3.2-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appear as a PostfixExpression(eval--)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("eval--;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appear as a PostfixExpression(eval--)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("eval--;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.2/11.3.2-2-3-s.js b/test/suite/ch11/11.3/11.3.2/11.3.2-2-3-s.js
index 6eb43dbbd..c413323c1 100644
--- a/test/suite/ch11/11.3/11.3.2/11.3.2-2-3-s.js
+++ b/test/suite/ch11/11.3/11.3.2/11.3.2-2-3-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.3/11.3.2/11.3.2-2-3-s.js

- * @description Strict Mode - SyntaxError is not thrown if the identifier 'arguments[...]' appears as a PostfixExpression(arguments--)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        arguments[1] = 7;

-        arguments[1]--;

-        return arguments[1]===6;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is not thrown if the identifier
+    'arguments[...]' appears as a PostfixExpression(arguments--)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        arguments[1] = 7;
+        arguments[1]--;
+        return arguments[1]===6;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T1.js
index 2fe2120bf..881ef8f20 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "--" is not allowed
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A1.1_T1.js
- * @description Checking Line Feed
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "--" is not allowed
+description: Checking Line Feed
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u000A--");
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T2.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T2.js
index 49654288a..2fd50c357 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T2.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "--" is not allowed
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A1.1_T2.js
- * @description Checking Carriage Return
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "--" is not allowed
+description: Checking Carriage Return
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u000D--");
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T3.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T3.js
index 5e0af0e99..9921ebc16 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T3.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T3.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "--" is not allowed
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A1.1_T3.js
- * @description Checking Page separator
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "--" is not allowed
+description: Checking Page separator
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u2028--");
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T4.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T4.js
index e7d54a741..8a99e8189 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T4.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.1_T4.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Line Terminator between LeftHandSideExpression and "--" is not allowed
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A1.1_T4.js
- * @description Checking Line separator
- * @negative
- */
+/*---
+info: Line Terminator between LeftHandSideExpression and "--" is not allowed
+description: Checking Line separator
+flags: [negative]
+---*/
 
 //CHECK#1
 eval("var x = 1; x\u2029--");
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.2_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.2_T1.js
index 8140d2b8e..2ca8d0521 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.2_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space between LeftHandSideExpression and "--" are allowed
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A1.2_T1.js
- * @description Checking by using eval
- */
+/*---
+info: White Space between LeftHandSideExpression and "--" are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("var x = 0; x\u0009--; x") !== -1) {
@@ -37,4 +35,3 @@ if (eval("var x = 0; x\u00A0--; x") !== -1) {
 if (eval("var x = 0; x\u0009\u000B\u000C\u0020\u00A0--; x") !== -1) {
     $ERROR('#6: var x = 0; x\\u0009\\u000B\\u000C\\u0020\\u00A0--; x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T1.js
index b665af599..67ca58971 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A2.1_T1.js
- * @description Type(x) is Reference and GetBase(x) is not null
- */
+/*---
+info: Operator x-- uses GetValue and PutValue
+description: Type(x) is Reference and GetBase(x) is not null
+---*/
 
 //CHECK#1
 var x = 1;
@@ -38,4 +36,3 @@ if (object.prop-- !== 1) {
     $ERROR('#3: var object = new Object(); object.prop = 1; object.prop--; object.prop === 1 - 1. Actual: ' + (object.prop));
   } 
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T2.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T2.js
index cae6d80b5..9e243d54f 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T2.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x-- uses GetValue and PutValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x-- throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T3.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T3.js
index adcf758c3..49b6543fe 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T3.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.1_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- uses GetValue and PutValue
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A2.1_T3.js
- * @description If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
- * @negative
- */
+/*---
+info: Operator x-- uses GetValue and PutValue
+description: If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +19,3 @@ catch (e) {
     1--;
   }
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.2_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.2_T1.js
index 22f31a1fa..7051544c4 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.2_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- uses [[Default Value]]
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x-- uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -107,4 +105,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; object-- throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T1.js
index d35aeffc5..60a846512 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns x = ToNumber(x) - 1
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator x-- returns x = ToNumber(x) - 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = true; 
@@ -21,4 +19,3 @@ x--;
 if (x !== 0 - 1) {
   $ERROR('#2: var x = new Boolean(false); x--; x === 0 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T2.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T2.js
index cf1435a4c..16b38c982 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T2.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns x = ToNumber(x) - 1
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator x-- returns x = ToNumber(x) - 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 1.1; 
@@ -21,4 +19,3 @@ x--;
 if (x !== -0.1 - 1) {
   $ERROR('#2: var x = new Number(-0.1); x--; x === -0.1 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T3.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T3.js
index 63108752b..19dcfafe9 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T3.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns x = ToNumber(x) - 1
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator x-- returns x = ToNumber(x) - 1
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1"; 
@@ -28,4 +26,3 @@ x--;
 if (x !== -1 - 1) {
   $ERROR('#3: var x = new String("-1"); x--; x === -1 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T4.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T4.js
index ea248bfb0..a3ea54a5b 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T4.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns x = ToNumber(x) - 1
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator x-- returns x = ToNumber(x) - 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -21,4 +19,3 @@ x--;
 if (x !== -1) {
   $ERROR('#2: var x = null; x--; x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T5.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T5.js
index b571f0654..da9c4e6f5 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T5.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns x = ToNumber(x) - 1
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator x-- returns x = ToNumber(x) - 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -21,4 +19,3 @@ x--;
 if (isNaN(x) !== true) {
   $ERROR('#2: var x = function(){return 1}; x--; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T1.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T1.js
index 4d07e77e4..5ed893bd1 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T1.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A4_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator x-- returns ToNumber(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = true;
@@ -21,4 +19,3 @@ var y = x--;
 if (y !== 0) {
   $ERROR('#2: var x = new Boolean(false); var y = x--; y === 0. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T2.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T2.js
index eb5c3bcde..7af12bd6e 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T2.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A4_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator x-- returns ToNumber(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 1.1;
@@ -21,4 +19,3 @@ var y = x--;
 if (y !== -0.1) {
   $ERROR('#2: var x = new Number(-0.1); var y = x--; y === -0.1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T3.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T3.js
index 8a4edfca8..8cd6c9140 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T3.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A4_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator x-- returns ToNumber(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1"; 
@@ -28,4 +26,3 @@ var y = x--;
 if (y !== -1) {
   $ERROR('#3: var x = new String("-1"); var y = x--; y === -1. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T4.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T4.js
index add21d32a..4256ee0a1 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T4.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A4_T4.js
- * @description If Type(x) is undefined or null
- */
+/*---
+info: Operator x-- returns ToNumber(x)
+description: If Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -21,4 +19,3 @@ var y = x--;
 if (y !== 0) {
   $ERROR('#2: var x = null; var y = x--; y === 0. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T5.js b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T5.js
index aa6856568..1c80151da 100644
--- a/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T5.js
+++ b/test/suite/ch11/11.3/11.3.2/S11.3.2_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x-- returns ToNumber(x)
- *
- * @path ch11/11.3/11.3.2/S11.3.2_A4_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator x-- returns ToNumber(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {};
@@ -21,4 +19,3 @@ var y = x--;
 if (isNaN(y) !== true) {
   $ERROR('#2: var x = function(){return 1}; var y = x--; y === Not-a-Number. Actual: ' + (y));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-0-1.js b/test/suite/ch11/11.4/11.4.1/11.4.1-0-1.js
index 2a3407dd5..975908d62 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-0-1.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-0-1.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-0-1.js

- * @description delete operator as UnaryExpression

- */

-

-

-function testcase() {

-  var x = 1;

-  var y = 2;

-  var z = 3;

-  

-  if( (!delete x || delete y) &&

-      delete delete z)

-  {

-    return true;

-  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator as UnaryExpression
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var x = 1;
+  var y = 2;
+  var z = 3;
+  
+  if( (!delete x || delete y) &&
+      delete delete z)
+  {
+    return true;
+  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-1.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-1.js
index 223de50d5..8622eea79 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-1.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-1.js

- * @description delete operator returns true when deleting a non-reference (number)

- */

-

-

-function testcase() {

-  var d = delete 42;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: delete operator returns true when deleting a non-reference (number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete 42;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-2.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-2.js
index eed36f4c5..0deaa1229 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-2.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-2.js

- * @description delete operator returns true when deleting returned value from a function

- */

-

-

-function testcase() {

-  var bIsFooCalled = false;

-  var foo = function(){bIsFooCalled = true;};

-

-  var d = delete foo();

-  if(d === true && bIsFooCalled === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns true when deleting returned value from a
+    function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bIsFooCalled = false;
+  var foo = function(){bIsFooCalled = true;};
+
+  var d = delete foo();
+  if(d === true && bIsFooCalled === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-3.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-3.js
index 5d8fc9bce..d589fdfca 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-3.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-3.js

- * @description delete operator returns true when deleting a non-reference (boolean)

- */

-

-

-function testcase() {

-  var d = delete true;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns true when deleting a non-reference
+    (boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete true;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-4.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-4.js
index 3da874599..1bf2abf0d 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-4.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-4.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-4.js

- * @description delete operator returns true when deleting a non-reference (string)

- */

-

-

-function testcase() {

-  var d = delete "abc";

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: delete operator returns true when deleting a non-reference (string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete "abc";
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-5.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-5.js
index ae32bebce..30c92b11d 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-5.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-5.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-5.js

- * @description delete operator returns true when deleting a non-reference (obj)

- */

-

-

-function testcase() {

-  var d = delete {a:0} ;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: delete operator returns true when deleting a non-reference (obj)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete {a:0} ;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-2-6.js b/test/suite/ch11/11.4/11.4.1/11.4.1-2-6.js
index bcee797c2..a8547293c 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-2-6.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-2-6.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-2-6.js

- * @description delete operator returns true when deleting a non-reference (null)

- */

-

-

-function testcase() {

-  var d = delete null;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: delete operator returns true when deleting a non-reference (null)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete null;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-3-1.js b/test/suite/ch11/11.4/11.4.1/11.4.1-3-1.js
index 9ae258064..5c74ec433 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-3-1.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-3-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-3-1.js

- * @description delete operator returns true when deleting an unresolvable reference

- */

-

-

-function testcase() {

-  // just cooking up a long/veryLikely unique name

-  var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_0__;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns true when deleting an unresolvable
+    reference
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // just cooking up a long/veryLikely unique name
+  var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_0__;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-3-2.js b/test/suite/ch11/11.4/11.4.1/11.4.1-3-2.js
index fefff3071..fba128dd5 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-3-2.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-3-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-3-2.js

- * @description delete operator throws ReferenceError when deleting an explicitly qualified yet unresolvable reference (base obj undefined)

- */

-

-

-function testcase() {

-  // just cooking up a long/veryLikely unique name

-  try

-  {

-    var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_2__.x;

-  }

-  catch(e)

-  {

-    if (e instanceof ReferenceError)

-      return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator throws ReferenceError when deleting an explicitly
+    qualified yet unresolvable reference (base obj undefined)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // just cooking up a long/veryLikely unique name
+  try
+  {
+    var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_2__.x;
+  }
+  catch(e)
+  {
+    if (e instanceof ReferenceError)
+      return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-3-3.js b/test/suite/ch11/11.4/11.4.1/11.4.1-3-3.js
index 1f70cca92..6d3a75255 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-3-3.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-3-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-3-3.js

- * @description delete operator returns true when deleting an explicitly qualified yet unresolvable reference (property undefined for base obj)

- */

-

-

-function testcase() {

-  var __ES3_1_test_suite_test_11_4_1_3_unique_id_3__ = {};

-  var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_3__.x;

-  if (d === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns true when deleting an explicitly qualified
+    yet unresolvable reference (property undefined for base obj)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var __ES3_1_test_suite_test_11_4_1_3_unique_id_3__ = {};
+  var d = delete __ES3_1_test_suite_test_11_4_1_3_unique_id_3__.x;
+  if (d === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-3-a-1-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-3-a-1-s.js
index 7172421d0..c91d02fd2 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-3-a-1-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-3-a-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-3-a-1-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting an un-resolvable reference

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete obj");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting an un-resolvable
+    reference
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete obj");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-1-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-1-s.js
index 82c586a1f..23b11c1a6 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-1-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-1-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-4-a-1-s.js

- * @description Strict Mode - TypeError is thrown when deleting non-configurable data property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: "abc",

-            configurable: false

-        });

-

-        try {

-            delete obj.prop;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === "abc";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when deleting non-configurable
+    data property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: "abc",
+            configurable: false
+        });
+
+        try {
+            delete obj.prop;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === "abc";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-2-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-2-s.js
index 135f01295..f0012b723 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-2-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-2-s.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-4-a-2-s.js

- * @description Strict Mode - TypeError is thrown when deleting non-configurable accessor property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return "abc"; 

-            },

-            configurable: false

-        });

-

-        try {

-            delete obj.prop;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.prop === "abc";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when deleting non-configurable
+    accessor property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return "abc"; 
+            },
+            configurable: false
+        });
+
+        try {
+            delete obj.prop;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.prop === "abc";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-3-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-3-s.js
index 85bc8b2d7..7f5226266 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-3-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-3-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-4-a-3-s.js

- * @description Strict Mode - TypeError isn't thrown when deleting configurable data property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: "abc",

-            configurable: true

-        });

-

-        delete obj.prop;

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError isn't thrown when deleting configurable
+    data property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: "abc",
+            configurable: true
+        });
+
+        delete obj.prop;
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-4-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-4-s.js
index 6ce81cfbc..ae31baf88 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-4-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4-a-4-s.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-4-a-4-s.js

- * @description Strict Mode - TypeError isn't thrown when deleting configurable accessor property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return "abc"; 

-            },

-            configurable: true

-        });

-

-        delete obj.prop;

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError isn't thrown when deleting configurable
+    accessor property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return "abc"; 
+            },
+            configurable: true
+        });
+
+        delete obj.prop;
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-1.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-1.js
index 0ed36af96..f0e84e559 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-1.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-1.js

- * @description delete operator returns true when deleting a configurable data property

- */

-

-

-function testcase() {

-  var o = {};

-

-  var desc = { value: 1, configurable: true };

-  Object.defineProperty(o, "foo", desc);

-

-  var d = delete o.foo;

-  if (d === true && o.hasOwnProperty("foo") === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns true when deleting a configurable data
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  var desc = { value: 1, configurable: true };
+  Object.defineProperty(o, "foo", desc);
+
+  var d = delete o.foo;
+  if (d === true && o.hasOwnProperty("foo") === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-10.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-10.js
index 7a515d725..5d0b89b3f 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-10.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-10.js

- * @description delete operator returns true for property (stringify) defined on built-in object (JSON)

- */

-

-

-function testcase() {

-  try {

-      var o = JSON.stringify;

-	  var desc;

-	  try {

-	  	desc = Object.getOwnPropertyDescriptor(JSON, 'stringify')

-	  } 

-	  catch (e) {

-	  };

-      var d = delete JSON.stringify;

-      if (d === true && JSON.stringify === undefined) {

-        return true;

-      }

-  } finally {

-    if (desc) Object.defineProperty(JSON, 'stringify', desc)

-	else JSON.stringify = o  /* this branch messes up the attributes */;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns true for property (stringify) defined on
+    built-in object (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+      var o = JSON.stringify;
+	  var desc;
+	  try {
+	  	desc = Object.getOwnPropertyDescriptor(JSON, 'stringify')
+	  } 
+	  catch (e) {
+	  };
+      var d = delete JSON.stringify;
+      if (d === true && JSON.stringify === undefined) {
+        return true;
+      }
+  } finally {
+    if (desc) Object.defineProperty(JSON, 'stringify', desc)
+	else JSON.stringify = o  /* this branch messes up the attributes */;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-11.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-11.js
index b46af9f74..8399355d6 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-11.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-11.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-11.js

- * @description delete operator returns true on deleting arguments propterties(arguments.callee)

- */

-

-

-function testcase() {

-  function foo(a,b)

-  {

-    return (delete arguments.callee); 

-  }

-  var d = delete arguments.callee;

-  if(d === true && arguments.callee === undefined)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns true on deleting arguments
+    propterties(arguments.callee)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(a,b)
+  {
+    return (delete arguments.callee); 
+  }
+  var d = delete arguments.callee;
+  if(d === true && arguments.callee === undefined)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-12.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-12.js
index 5cc30983c..b1c138335 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-12.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-12.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-12.js

- * @description delete operator returns false when deleting a property(length)

- */

-

-

-function testcase() {

-

-  var a = [1,2,3]

-  a.x = 10;

-  var d = delete a.length

-  if(d === false && a.length === 3)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns false when deleting a property(length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var a = [1,2,3]
+  a.x = 10;
+  var d = delete a.length
+  if(d === false && a.length === 3)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-13.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-13.js
index 5156957ed..a81fb1beb 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-13.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-13.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-13.js

- * @description delete operator returns false when deleting Array object

- */

-

-

-function testcase() {

-

-  var a = [1,2,3]

-  a.x = 10;

-

-  var d = delete a 

-

-  if(d === false && Array.isArray(a) === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns false when deleting Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var a = [1,2,3]
+  a.x = 10;
+
+  var d = delete a 
+
+  if(d === false && Array.isArray(a) === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-14.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-14.js
index 288d25ec0..2acb81612 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-14.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-14.js

- * @description delete operator returns true when deleting Array elements

- */

-

-

-function testcase() {

-

-  var a = [1,2,3]

-  a.x = 10;

-  var d = delete a[1]

-  if(d === true && a[1] === undefined)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns true when deleting Array elements
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var a = [1,2,3]
+  a.x = 10;
+  var d = delete a[1]
+  if(d === true && a[1] === undefined)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-15.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-15.js
index 98a6d6c08..420581627 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-15.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-15.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-15.js

- * @description delete operator returns true when deleting Array expandos

- */

-

-

-function testcase() {

-

-  var a = [1,2,3]

-  a.x = 10;

-  var d = delete a.x;

-  if( d === true && a.x === undefined)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns true when deleting Array expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var a = [1,2,3]
+  a.x = 10;
+  var d = delete a.x;
+  if( d === true && a.x === undefined)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-16.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-16.js
index 01873811f..c5a195704 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-16.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-16.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-16.js

- * @description delete operator returns false on deleting arguments object

- */

-

-

-function testcase() {

-

-  if(delete arguments === false && arguments !== undefined)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns false on deleting arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  if(delete arguments === false && arguments !== undefined)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-17.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-17.js
index 97f0e0ab9..de02dd400 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-17.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-17.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-17.js

- * @description delete operator returns true on deleting a arguments element

- */

-

-

-function testcase() {

-  function foo(a,b)

-  {

-    var d = delete arguments[0];

-    return (d === true && arguments[0] === undefined);  

-  }

-

-  if(foo(1,2) === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns true on deleting a arguments element
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(a,b)
+  {
+    var d = delete arguments[0];
+    return (d === true && arguments[0] === undefined);  
+  }
+
+  if(foo(1,2) === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-2.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-2.js
index be165f1f1..402ab2bbc 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-2.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-2.js

- * @description delete operator returns true when deleting a configurable accessor property

- */

-

-

-function testcase() {

-  var o = {};

-

-  // define an accessor

-  // dummy getter

-  var getter = function () { return 1; }

-  var desc = { get: getter, configurable: true };

-  Object.defineProperty(o, "foo", desc);

-    

-  var d = delete o.foo;

-  if (d === true && o.hasOwnProperty("foo") === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns true when deleting a configurable accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // define an accessor
+  // dummy getter
+  var getter = function () { return 1; }
+  var desc = { get: getter, configurable: true };
+  Object.defineProperty(o, "foo", desc);
+    
+  var d = delete o.foo;
+  if (d === true && o.hasOwnProperty("foo") === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3-s.js
index 85e5c23db..e8d29f89a 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-3-s.js

- * @description delete operator throws TypeError when deleting a non-configurable data property in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  var o = {};

-  var desc = { value : 1 }; // all other attributes default to false

-  Object.defineProperty(o, "foo", desc);

-  

-  // Now, deleting o.foo should throw TypeError because [[Configurable]] on foo is false.

-  try {

-    delete o.foo;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator throws TypeError when deleting a non-configurable
+    data property in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  var o = {};
+  var desc = { value : 1 }; // all other attributes default to false
+  Object.defineProperty(o, "foo", desc);
+  
+  // Now, deleting o.foo should throw TypeError because [[Configurable]] on foo is false.
+  try {
+    delete o.foo;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3.js
index 25f9bc7d0..6196313aa 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-3.js

- * @description delete operator returns false when deleting a non-configurable data property

- */

-

-

-function testcase() {

-  var o = {};

-  var desc = { value : 1, configurable: false }; // all other attributes default to false

-  Object.defineProperty(o, "foo", desc);

-  

-  // Now, deleting o.foo should fail because [[Configurable]] on foo is false.

-  var d = delete o.foo;

-  if (d === false && o.hasOwnProperty("foo") === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns false when deleting a non-configurable
+    data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+  var desc = { value : 1, configurable: false }; // all other attributes default to false
+  Object.defineProperty(o, "foo", desc);
+  
+  // Now, deleting o.foo should fail because [[Configurable]] on foo is false.
+  var d = delete o.foo;
+  if (d === false && o.hasOwnProperty("foo") === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-4.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-4.js
index 98f2496f9..964822489 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-4.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-4.js

- * @description delete operator returns false when deleting a non-configurable data property (NaN)

- */

-

-

-function testcase() {

-  // NaN (15.1.1.1) has [[Configurable]] set to false.

-  var d = delete NaN;

-  if (d === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns false when deleting a non-configurable
+    data property (NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // NaN (15.1.1.1) has [[Configurable]] set to false.
+  var d = delete NaN;
+  if (d === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-5.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-5.js
index 0585bb3c4..16d53d0d0 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-5.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-5.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-5.js

- * @description delete operator returns false when deleting the environment object inside 'with'

- */

-

-

-function testcase() {

-  var o = new Object();

-  o.x = 1;

-  var d;

-  with(o)

-  {

-    d = delete o;

-  }

-  if (d === false && typeof(o) === 'object' && o.x === 1) {

-    return true;

-  }

-  return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns false when deleting the environment object
+    inside 'with'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = new Object();
+  o.x = 1;
+  var d;
+  with(o)
+  {
+    d = delete o;
+  }
+  if (d === false && typeof(o) === 'object' && o.x === 1) {
+    return true;
+  }
+  return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-6.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-6.js
index a5194837f..886cb02f3 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-6.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-6.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-6.js

- * @description delete operator returns true when deleting a property inside 'with'

- */

-

-

-function testcase() {

-  var o = new Object();

-  o.x = 1;

-  var d;

-  with(o)

-  {

-    d = delete x;

-  }

-  if (d === true && o.x === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns true when deleting a property inside 'with'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = new Object();
+  o.x = 1;
+  var d;
+  with(o)
+  {
+    d = delete x;
+  }
+  if (d === true && o.x === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-7.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-7.js
index 85bbe995d..d976e0c89 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-7.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-7.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-7.js

- * @description delete operator inside 'eval'

- */

-

-

-function testcase() {

-  var x = 1;

-  var d = eval("delete x");

-  if (d === false && x === 1) {

-    return true;

-  }

-  return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator inside 'eval'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var x = 1;
+  var d = eval("delete x");
+  if (d === false && x === 1) {
+    return true;
+  }
+  return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8-s.js
index c73f8d833..e1b95e8f8 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8-s.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-8-s.js

- * @description delete operator throws TypeError when deleting a non-configurable data property in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-  // NaN (15.1.1.1) has [[Configurable]] set to false.

-  try {

-    delete fnGlobalObject().NaN;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator throws TypeError when deleting a non-configurable
+    data property in strict mode
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  'use strict';
+  
+  // NaN (15.1.1.1) has [[Configurable]] set to false.
+  try {
+    delete fnGlobalObject().NaN;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8.js
index 0d6da1a80..00f51d110 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-8.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-8.js

- * @description delete operator returns true for built-in objects (JSON)

- */

-

-

-function testcase() {

-  try {

-      var o = JSON;

-      var d = delete JSON;  

-      if (d === true) {	    

-        return true;

-      }

-  } finally {

-    JSON = o;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: delete operator returns true for built-in objects (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+      var o = JSON;
+      var d = delete JSON;  
+      if (d === true) {	    
+        return true;
+      }
+  } finally {
+    JSON = o;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9-s.js
index da7a464ba..46cbd2862 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9-s.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-9-s.js

- * @description delete operator throws TypeError when deleting a non-configurable data property (Math.LN2) in strict mode 

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-  try {

-    delete Math.LN2;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError); 

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator throws TypeError when deleting a non-configurable
+    data property (Math.LN2) in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+  try {
+    delete Math.LN2;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError); 
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9.js b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9.js
index 472fdc0c8..c4ccab113 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-4.a-9.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.1-4.a-9.js

- * @description delete operator returns false when deleting a non-configurable data property (Math.LN2)

- */

-

-

-function testcase() {

-  var d = delete Math.LN2;

-  if (d === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator returns false when deleting a non-configurable
+    data property (Math.LN2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = delete Math.LN2;
+  if (d === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-1.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-1.js
index c4de1ba6f..d33fc53be 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-1.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-1.js

- * @description delete operator returns false when deleting a direct reference to a var

- */

-

-

-function testcase() {

-  var x = 1;

-

-  // Now, deleting 'x' directly should fail;

-  var d = delete x;

-  if(d === false && x === 1)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns false when deleting a direct reference to
+    a var
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var x = 1;
+
+  // Now, deleting 'x' directly should fail;
+  var d = delete x;
+  if(d === false && x === 1)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-2.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-2.js
index 838b653b1..015544bd1 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-2.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-2.js

- * @description delete operator returns false when deleting a direct reference to a function argument

- */

-

-

-function testcase() {

-  

-  function foo(a,b) {

-  

-    // Now, deleting 'a' directly should fail

-    // because 'a' is direct reference to a function argument;

-    var d = delete a;

-    return (d === false && a === 1);

-  }

-  return foo(1,2);  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns false when deleting a direct reference to
+    a function argument
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  function foo(a,b) {
+  
+    // Now, deleting 'a' directly should fail
+    // because 'a' is direct reference to a function argument;
+    var d = delete a;
+    return (d === false && a === 1);
+  }
+  return foo(1,2);  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-3.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-3.js
index 33efcdb3e..0060b8410 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-3.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-3.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-3.js

- * @description delete operator returns false when deleting a direct reference to a function name

- */

-

-

-function testcase() {

-  var foo = function(){};

-

-  // Now, deleting 'foo' directly should fail;

-  var d = delete foo;

-  if(d === false && fnExists(foo))

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    delete operator returns false when deleting a direct reference to
+    a function name
+includes:
+    - runTestCase.js
+    - fnExists.js
+---*/
+
+function testcase() {
+  var foo = function(){};
+
+  // Now, deleting 'foo' directly should fail;
+  var d = delete foo;
+  if(d === false && fnExists(foo))
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-1-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-1-s.js
index 3235f6aff..fa4be16bb 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-1-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-1-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-1-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable which is a primitive value type (number)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_4_1_5 = 5;

-

-        try {

-            eval("delete _11_4_1_5;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable which
+    is a primitive value type (number)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_4_1_5 = 5;
+
+        try {
+            eval("delete _11_4_1_5;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-10-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-10-s.js
index 6d614fb99..1e9ccff2a 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-10-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-10-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-10-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Array

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var arrObj = [1,2,3];

-

-        try {

-            eval("delete arrObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Array
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var arrObj = [1,2,3];
+
+        try {
+            eval("delete arrObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-11-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-11-s.js
index 328b4926f..02b97fa73 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-11-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-11-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-11-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type String

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var strObj = new String("abc");

-

-        try {

-            eval("delete strObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type String
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var strObj = new String("abc");
+
+        try {
+            eval("delete strObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-12-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-12-s.js
index e09226b1d..4f5044d23 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-12-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-12-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-12-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Boolean

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var boolObj = new Boolean(false);

-

-        try {

-            eval("delete boolObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Boolean
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var boolObj = new Boolean(false);
+
+        try {
+            eval("delete boolObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-13-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-13-s.js
index 008466068..76ec7b732 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-13-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-13-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-13-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Number

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var numObj = new Number(0);

-

-        try {

-            eval("delete numObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Number
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var numObj = new Number(0);
+
+        try {
+            eval("delete numObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-14-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-14-s.js
index 8d6770b27..7d744cde2 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-14-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-14-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-14-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Date

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var dateObj = new Date();

-

-        try {

-            eval("delete dateObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Date
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var dateObj = new Date();
+
+        try {
+            eval("delete dateObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-15-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-15-s.js
index 3ce568c6a..0517a446a 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-15-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-15-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-15-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type RegExp

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var regObj = new RegExp();

-

-        try {

-            eval("delete regObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type RegExp
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var regObj = new RegExp();
+
+        try {
+            eval("delete regObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-16-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-16-s.js
index 0edd4401f..56d2834c7 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-16-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-16-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-16-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Error

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var errObj = new Error();

-

-        try {

-            eval("delete errObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Error
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var errObj = new Error();
+
+        try {
+            eval("delete errObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-17-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-17-s.js
index 2cb8fedef..3d38c27bf 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-17-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-17-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-17-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-       try {

-            eval("var argObj = (function (a, b) { delete arguments; }(1, 2));");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+       try {
+            eval("var argObj = (function (a, b) { delete arguments; }(1, 2));");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-18-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-18-s.js
index d26819ff7..d0657ebc1 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-18-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-18-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-18-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Object)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Object;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Object)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Object;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-19-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-19-s.js
index c45a701b0..846e9c64d 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-19-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-19-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-19-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Function)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Function;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Function;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-2-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-2-s.js
index aa5290faa..93833b0ff 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-2-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-2-s.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-2-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a function parameter

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function funObj(x) {

-            eval("delete x;");

-        }

-

-        try {

-            funObj(1);

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a function
+    parameter
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function funObj(x) {
+            eval("delete x;");
+        }
+
+        try {
+            funObj(1);
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-20-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-20-s.js
index cf683589c..e22fb1448 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-20-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-20-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-20-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Array)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Array;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Array)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Array;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-21-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-21-s.js
index 994e6ff96..ffe0d0234 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-21-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-21-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-21-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (String)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete String;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (String)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete String;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-22-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-22-s.js
index 341062b03..9fb5a48f0 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-22-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-22-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-22-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Boolean)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Boolean;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Boolean)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Boolean;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-23-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-23-s.js
index b0302df8b..963a46048 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-23-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-23-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-23-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Number)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Number;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Number)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Number;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-24-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-24-s.js
index 0f03df1a7..36c3182e6 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-24-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-24-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-24-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Date)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete Date;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown when deleting a built-in (Date)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete Date;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-25-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-25-s.js
index 0f418645a..45388113b 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-25-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-25-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-25-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (RegExp)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("delete RegExp;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (RegExp)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("delete RegExp;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-26-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-26-s.js
index 62ed21fc3..6f3dc9eeb 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-26-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-26-s.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-26-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a built-in (Error)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var errorBackup = Error;

-        try {

-            eval("delete Error;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        } finally {

-            Error = errorBackup;

-        }

-        

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a built-in
+    (Error)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var errorBackup = Error;
+        try {
+            eval("delete Error;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        } finally {
+            Error = errorBackup;
+        }
+        
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-27-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-27-s.js
index 4dacb29bd..ae054dfbb 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-27-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-27-s.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-27-s.js

- * @description Strict Mode - TypeError is thrown after deleting a property, calling preventExtensions, and attempting to reassign the property

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var a = {x:0, get y() { return 0;}};

-        delete a.x;

-        Object.preventExtensions(a);

-        try {

-            a.x = 1;

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown after deleting a property,
+    calling preventExtensions, and attempting to reassign the property
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var a = {x:0, get y() { return 0;}};
+        delete a.x;
+        Object.preventExtensions(a);
+        try {
+            a.x = 1;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-28-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-28-s.js
index 4a5e015c3..421e4ecba 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-28-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-28-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-28-s.js

- * @description Strict Mode - TypeError is thrown when deleting RegExp.length

- * @onlyStrict

- */

-

-

-function testcase() {

-    "use strict";

-    var a = new RegExp();

-    try {

-        var b = delete RegExp.length;

-        return false;

-    } catch (e) {

-        return e instanceof TypeError;

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - TypeError is thrown when deleting RegExp.length
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    "use strict";
+    var a = new RegExp();
+    try {
+        var b = delete RegExp.length;
+        return false;
+    } catch (e) {
+        return e instanceof TypeError;
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-3-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-3-s.js
index 3c1e18390..e606aed27 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-3-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-3-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-3-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a function name

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function funObj () { }

-

-        try {

-            eval("delete funObj");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown when deleting a function name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function funObj () { }
+
+        try {
+            eval("delete funObj");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-4-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-4-s.js
index 55bca492b..d4c2374c1 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-4-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-4-s.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-4-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a function parameter

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function funObj(x, y, z) {

-            eval("delete y;");

-        }

-

-        try {

-            funObj(1);

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a function
+    parameter
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function funObj(x, y, z) {
+            eval("delete y;");
+        }
+
+        try {
+            funObj(1);
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5-s.js
index 4e72bc917..c179aed5b 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-5-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable which is a primitive type (boolean)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_4_1_5 = true;

-

-        try {

-            eval("delete _11_4_1_5;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable which
+    is a primitive type (boolean)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_4_1_5 = true;
+
+        try {
+            eval("delete _11_4_1_5;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5gs.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5gs.js
index ed126f668..d44fed5c4 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5gs.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-5gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-5gs.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable which is primitive type(boolean)

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-var _11_4_1_5 = 7;

-throw NotEarlyError;

-delete _11_4_1_5;
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable which
+    is primitive type(boolean)
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var _11_4_1_5 = 7;
+throw NotEarlyError;
+delete _11_4_1_5;
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-6-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-6-s.js
index f428dfeb6..6b18c998f 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-6-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-6-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-6-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable which is a primitive type (string)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _11_4_1_5 = "abc";

-

-        try {

-            eval("delete _11_4_1_5;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable which
+    is a primitive type (string)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _11_4_1_5 = "abc";
+
+        try {
+            eval("delete _11_4_1_5;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-7-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-7-s.js
index 090276fd7..85f9ad232 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-7-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-7-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-7-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type Object

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var obj = new Object();

-

-        try {

-            eval("delete obj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type Object
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var obj = new Object();
+
+        try {
+            eval("delete obj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-8-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-8-s.js
index 3116d6bc7..8faf0a724 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-8-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-8-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-8-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a function object

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var funObj = function () { };

-

-        try {

-            eval("delete funObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown when deleting a function object
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var funObj = function () { };
+
+        try {
+            eval("delete funObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-9-s.js b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-9-s.js
index 45b626551..e1c404bdf 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-9-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.1-5-a-9-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.1/11.4.1-5-a-9-s.js

- * @description Strict Mode - SyntaxError is thrown when deleting a variable of type function (declaration)

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function funObj () { };

-

-        try {

-            eval("delete funObj;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when deleting a variable of
+    type function (declaration)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function funObj () { };
+
+        try {
+            eval("delete funObj;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/11.4.4-4.a-3-s.js b/test/suite/ch11/11.4/11.4.1/11.4.4-4.a-3-s.js
index 109216dea..e8d29f89a 100644
--- a/test/suite/ch11/11.4/11.4.1/11.4.4-4.a-3-s.js
+++ b/test/suite/ch11/11.4/11.4.1/11.4.4-4.a-3-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test is actually testing the [[Delete]] internal method (8.12.8). Since the

- * language provides no way to directly exercise [[Delete]], the tests are placed here.

- *

- * @path ch11/11.4/11.4.1/11.4.4-4.a-3-s.js

- * @description delete operator throws TypeError when deleting a non-configurable data property in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  var o = {};

-  var desc = { value : 1 }; // all other attributes default to false

-  Object.defineProperty(o, "foo", desc);

-  

-  // Now, deleting o.foo should throw TypeError because [[Configurable]] on foo is false.

-  try {

-    delete o.foo;

-    return false;

-  }

-  catch (e) {

-    return (e instanceof TypeError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test is actually testing the [[Delete]] internal method (8.12.8). Since the
+    language provides no way to directly exercise [[Delete]], the tests are placed here.
+description: >
+    delete operator throws TypeError when deleting a non-configurable
+    data property in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  var o = {};
+  var desc = { value : 1 }; // all other attributes default to false
+  Object.defineProperty(o, "foo", desc);
+  
+  // Now, deleting o.foo should throw TypeError because [[Configurable]] on foo is false.
+  try {
+    delete o.foo;
+    return false;
+  }
+  catch (e) {
+    return (e instanceof TypeError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A1.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A1.js
index 35764288f..284957ef6 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A1.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "delete" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "delete" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("delete\u00090") !== true) {
@@ -57,4 +57,3 @@ if (eval("delete\u20290") !== true) {
 if (eval("delete\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20290") !== true) {
   $ERROR('#10: delete\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20290 === true');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.1.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.1.js
index b993e4a9d..6e846086a 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.1.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is not Reference, return true
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A2.1.js
- * @description Checking primitive value and Object value cases
- */
+/*---
+info: If Type(x) is not Reference, return true
+description: Checking primitive value and Object value cases
+---*/
 
 //CHECK#1
 if (delete 1 !== true) {
@@ -17,5 +15,3 @@ if (delete 1 !== true) {
 if (delete new Object() !== true) {
   $ERROR('#2: delete new Object() === true');
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T1.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T1.js
index 97fd10939..73fe0678b 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If GetBase(x) doesn't have a property GetPropertyName(x), return true
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A2.2_T1.js
- * @description Checking undeclared variable case
- */
+/*---
+info: If GetBase(x) doesn't have a property GetPropertyName(x), return true
+description: Checking undeclared variable case
+---*/
 
 //CHECK#1
 if (delete x !== true) {
@@ -17,4 +15,3 @@ if (delete x !== true) {
 if (delete this.x !== true) {
   $ERROR('#2: delete this.x === true');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T2.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T2.js
index e5c0cbe54..c8f69bcc6 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T2.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If GetBase(x) doesn't have a property GetPropertyName(x), return true
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A2.2_T2.js
- * @description Checking Object object and Function object cases
- */
+/*---
+info: If GetBase(x) doesn't have a property GetPropertyName(x), return true
+description: Checking Object object and Function object cases
+---*/
 
 //CHECK#1
 function MyFunction(){}
@@ -20,4 +18,3 @@ var MyObject = new Object();
 if (delete MyObject.prop !== true) {
   $ERROR('#2: var MyObject = new Object(); delete MyObject.prop === true');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.1.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.1.js
index b1edccca9..29c204a41 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.1.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the property has the DontDelete attribute, return false
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A3.1.js
- * @description Checking declared variable
- */
+/*---
+info: If the property has the DontDelete attribute, return false
+description: Checking declared variable
+---*/
 
 //CHECK#1
 var x = 1;
@@ -37,4 +35,3 @@ if (delete MyObject !== false) {
 if (delete MyObject !== false) {
   $ERROR('#5: function MyFunction(){}; var MyObject = new MyFunction(); delete MyObject === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.2.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.2.js
index bee091183..37d5b235f 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.2.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the property doesn't have the DontDelete attribute, return true
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A3.2.js
- * @description Checking declared variable
- */
+/*---
+info: If the property doesn't have the DontDelete attribute, return true
+description: Checking declared variable
+---*/
 
 //CHECK#1
 x = 1;
@@ -28,4 +26,3 @@ MyObject.prop = 1;
 if (delete MyObject.prop !== true) {
   $ERROR('#3: function MyFunction(){}; var MyObject = new MyFunction(); MyFunction.prop = 1; delete MyObject.prop === true');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.3.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.3.js
index e396ee626..2a00130ff 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.3.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A3.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the property doesn't have the DontDelete attribute, remove the property
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A3.3.js
- * @description Checking declared variable
- */
+/*---
+info: If the property doesn't have the DontDelete attribute, remove the property
+description: Checking declared variable
+---*/
 
 //CHECK#1
 try {
@@ -57,5 +55,3 @@ if (MyObjectNotVar.prop !== undefined) {
 if (delete MyObjectNotVar !== true) {
   $ERROR('#6: function MyFunction(){}; var MyObjectNotVar = new MyFunction(); delete MyObjectNotVar === true');
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A4.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A4.js
index a534ce959..fa8a0fec3 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A4.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "Delete" operator removes property, which is reference to the object, not the object
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A4.js
- * @description Checking two reference by one object
- */
+/*---
+info: >
+    "Delete" operator removes property, which is reference to the object, not
+    the object
+description: Checking two reference by one object
+---*/
 
 //CHECK#1
 var obj = new Object();
@@ -15,5 +15,3 @@ delete ref;
 if (typeof obj !== "object") {
   $ERROR('#1: obj = new Object(); ref = obj; delete ref; typeof obj === "object". Actual: ' + (typeof obj));
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.1/S11.4.1_A5.js b/test/suite/ch11/11.4/11.4.1/S11.4.1_A5.js
index 2fd5f5243..09e331b0d 100644
--- a/test/suite/ch11/11.4/11.4.1/S11.4.1_A5.js
+++ b/test/suite/ch11/11.4/11.4.1/S11.4.1_A5.js
@@ -1,16 +1,16 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A strict delete should either succeed, returning true, or it
- * should fail by throwing a TypeError. Under no circumstances
- * should a strict delete return false.
- *
- * @path ch11/11.4/11.4.1/S11.4.1_A5.js
- * @description See if a strict delete returns false when deleting a
- * non-standard property.
- * @onlyStrict
- */
+/*---
+info: >
+    A strict delete should either succeed, returning true, or it
+    should fail by throwing a TypeError. Under no circumstances
+    should a strict delete return false.
+description: >
+    See if a strict delete returns false when deleting a  non-standard
+    property.
+flags: [onlyStrict]
+---*/
 
 "use strict";
 
@@ -32,4 +32,3 @@ for (var i = 0, len = reNames.length; i < len; i++) {
     }
   }
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A1.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A1.js
index 6211fc242..32823bd1c 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A1.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "void" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "void" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("void\u00090") !== undefined) {
@@ -57,4 +57,3 @@ if (eval("void\u20290") !== undefined) {
 if (eval("void\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20290") !== undefined) {
   $ERROR('#10: void\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20290 === undefined');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T1.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T1.js
index bb2ba2a9d..d4fcc5709 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T1.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" uses GetValue
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A2_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator "void" uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (void 0 !== undefined) {
@@ -24,4 +22,3 @@ var x = new Object();
 if (void x !== undefined) {
   $ERROR('#3: var x = new Object(); void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T2.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T2.js
index a6074837a..e5c97cc6b 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T2.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A2_T2.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" uses GetValue
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A2_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- * @negative
- */
+/*---
+info: Operator "void" uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+flags: [negative]
+---*/
 
 //CHECK#1
 void x;
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T1.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T1.js
index 169eeb6c8..0c43b662a 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T1.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = false; 
@@ -19,4 +17,3 @@ var x = new Boolean(true);
 if (void x !== undefined) {
   $ERROR('#2: var x = new Boolean(true); void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T2.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T2.js
index 0175474af..ad71bce1a 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T2.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1;
@@ -19,4 +17,3 @@ var x = new Number(-1.1);
 if (void x !== undefined) {
   $ERROR('#2: var x = new Number(-1.1); void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T3.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T3.js
index 884b84af4..ccfc62e75 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T3.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T3.js
- * @description Type(x) is string primitive of String object
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Type(x) is string primitive of String object
+---*/
 
 //CHECK#1
 var x = "1";
@@ -25,4 +23,3 @@ var x = new String("-1");
 if (void x !== undefined) {
   $ERROR('#3: var x = new String("-1"); void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T4.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T4.js
index d6da81854..4b2095e77 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T4.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -19,4 +17,3 @@ var x = null;
 if (void x !== undefined) {
   $ERROR('#2: var x = null; void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T5.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T5.js
index 2be1def15..3c7477d24 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T5.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -19,4 +17,3 @@ var x = function(){return 1};
 if (isNaN(void x) !== true) {
   $ERROR('#2: var x = function(){return 1}; void x === undefined. Actual: ' + (void x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T6.js b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T6.js
index 40c184cbe..6b4510fe0 100644
--- a/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T6.js
+++ b/test/suite/ch11/11.4/11.4.2/S11.4.2_A4_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "void" evaluates UnaryExpression and returns undefined
- *
- * @path ch11/11.4/11.4.2/S11.4.2_A4_T6.js
- * @description Checking Simple Assignment operator
- */
+/*---
+info: Operator "void" evaluates UnaryExpression and returns undefined
+description: Checking Simple Assignment operator
+---*/
 
 //CHECK#1
 var x = 0;
@@ -17,4 +15,3 @@ if (void (x = 1) !== undefined) {
     $ERROR('#1: var x = 0; void (x = 1); x === 1. Actual: ' + (x));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A1.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A1.js
index 5021bab91..396f20e52 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A1.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "typeof" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "typeof" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("var x = 0; typeof\u0009x") !== "number") {
@@ -57,4 +57,3 @@ if (eval("var x = 0; typeof\u2029x") !== "number") {
 if (eval("var x = 0; typeof\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029x") !== "number") {
   $ERROR('#10: var x = 0; typeof\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029x; x === "number". Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T1.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T1.js
index 02217c333..007771a44 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T1.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "typeof" uses GetValue
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A2_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator "typeof" uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (typeof 0 !== "number") {
@@ -24,4 +22,3 @@ var x = new Object();
 if (typeof x !== "object") {
   $ERROR('#3: var x = new Object(); typeof x === "object". Actual: ' + (typeof x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T2.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T2.js
index 4030c1257..05eddb165 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T2.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A2_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "typeof" uses GetValue
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A2_T2.js
- * @description If GetBase(x) is null, return "undefined"
- */
+/*---
+info: Operator "typeof" uses GetValue
+description: If GetBase(x) is null, return "undefined"
+---*/
 
 //CHECK#1
 if (typeof x !== "undefined") {
   $ERROR('#1: typeof x === "undefined". Actual: ' + (typeof x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.1.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.1.js
index 1609ad326..3a56db529 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.1.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of applying "typeof" operator to undefined is "undefined"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.1.js
- * @description typeof undefined === "undefined"
- */
+/*---
+info: Result of applying "typeof" operator to undefined is "undefined"
+description: typeof undefined === "undefined"
+---*/
 
 //CHECK#1
 if (typeof undefined !== "undefined") {
@@ -17,4 +15,3 @@ if (typeof undefined !== "undefined") {
 if (typeof void 0 !== "undefined") {
   $ERROR('#2: typeof void 0 === "undefined". Actual: ' + (typeof void 0));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.2.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.2.js
index 94353f557..1246dc06a 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.2.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of applying "typeof" operator to null is "object"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.2.js
- * @description typeof null === "object"
- */
+/*---
+info: Result of applying "typeof" operator to null is "object"
+description: typeof null === "object"
+---*/
 
 //CHECK#1
 if (typeof null !== "object") {
@@ -17,4 +15,3 @@ if (typeof null !== "object") {
 if (typeof RegExp("0").exec("1") !== "object") {
   $ERROR('#2: typeof RegExp("0").exec("1") === "object". Actual: ' + (typeof RegExp("0").exec("1")));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.3.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.3.js
index 70dcf3ec6..2d2f66006 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.3.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of applying "typeof" operator to boolean is "boolean"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.3.js
- * @description typeof (boolean value) === "boolean"
- */
+/*---
+info: Result of applying "typeof" operator to boolean is "boolean"
+description: typeof (boolean value) === "boolean"
+---*/
 
 //CHECK#1
 if (typeof true !== "boolean") {
@@ -22,4 +20,3 @@ if (typeof false !== "boolean") {
 if (typeof !-1 !== "boolean") {
   $ERROR('#3: typeof !-1 === "boolean". Actual: ' + (typeof !-1));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.4.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.4.js
index e1444e9f5..10c76ac0c 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.4.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of appying "typeof" operator to number is "number"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.4.js
- * @description typeof (number value) === "number"
- */
+/*---
+info: Result of appying "typeof" operator to number is "number"
+description: typeof (number value) === "number"
+---*/
 
 //CHECK#1
 if (typeof 1 !== "number") {
@@ -32,4 +30,3 @@ if (typeof Number.NEGATIVE_INFINITY !== "number") {
 if (typeof Math.PI !== "number") {
   $ERROR('#5: typeof Math.PI === "number". Actual: ' + (typeof Math.PI));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.5.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.5.js
index f1c07acd1..e9af75712 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.5.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of appying "typeof" operator to string is "string"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.5.js
- * @description typeof (string value) === "string"
- */
+/*---
+info: Result of appying "typeof" operator to string is "string"
+description: typeof (string value) === "string"
+---*/
 
 //CHECK#1
 if (typeof "1" !== "string") {
@@ -37,4 +35,3 @@ if (typeof "true" !== "string") {
 if (typeof Date() !== "string") {
   $ERROR('#6: typeof Date() === "string". Actual: ' + (typeof Date()));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.6.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.6.js
index feab82ac6..9db0ac44d 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.6.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of applying "typeof" operator to the object that is native and doesn't implement [[Call]] is "object"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.6.js
- * @description typeof (object without [[Call]]) === "object"
- */
+/*---
+info: >
+    Result of applying "typeof" operator to the object that is native and
+    doesn't implement [[Call]] is "object"
+description: typeof (object without [[Call]]) === "object"
+---*/
 
 //CHECK#1
 if (typeof this !== "object") {
@@ -70,4 +70,3 @@ if (typeof new RegExp() !== "object") {
 if (typeof RegExp() !== "object") {
   $ERROR('#12: typeof RegExp() === "object". Actual: ' + (typeof RegExp()));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.7.js b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.7.js
index 66282799a..90526b1cb 100644
--- a/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.7.js
+++ b/test/suite/ch11/11.4/11.4.3/S11.4.3_A3.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Result of applying "typeof" operator to the object that is native and implements [[Call]] is "function"
- *
- * @path ch11/11.4/11.4.3/S11.4.3_A3.7.js
- * @description typeof (object with [[Call]]) === "function"
- */
+/*---
+info: >
+    Result of applying "typeof" operator to the object that is native and
+    implements [[Call]] is "function"
+description: typeof (object with [[Call]]) === "function"
+---*/
 
 //CHECK#1
 if (typeof new Function() !== "function") {
@@ -52,4 +52,3 @@ if (typeof Error !== "function") {
 if (typeof RegExp !== "function") {
   $ERROR('#9: typeof RegExp === "function". Actual: ' + (typeof RegExp));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/11.4.4-2-1-s.js b/test/suite/ch11/11.4/11.4.4/11.4.4-2-1-s.js
index f7e9b82de..dcfc1a10c 100644
--- a/test/suite/ch11/11.4/11.4.4/11.4.4-2-1-s.js
+++ b/test/suite/ch11/11.4/11.4.4/11.4.4-2-1-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.4/11.4.4-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown for ++eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("++eval;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown for ++eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("++eval;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.4/11.4.4-2-2-s.js b/test/suite/ch11/11.4/11.4.4/11.4.4-2-2-s.js
index 142adabef..21731ed7e 100644
--- a/test/suite/ch11/11.4/11.4.4/11.4.4-2-2-s.js
+++ b/test/suite/ch11/11.4/11.4.4/11.4.4-2-2-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.4/11.4.4-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown for ++arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("++arguments;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown for ++arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("++arguments;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.4/11.4.4-2-3-s.js b/test/suite/ch11/11.4/11.4.4/11.4.4-2-3-s.js
index 00d6448e3..26581ddcf 100644
--- a/test/suite/ch11/11.4/11.4.4/11.4.4-2-3-s.js
+++ b/test/suite/ch11/11.4/11.4.4/11.4.4-2-3-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.4/11.4.4-2-3-s.js

- * @description Strict Mode - SyntaxError is not thrown for ++arguments[...]

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        arguments[1] = 7;

-        ++arguments[1];

-        return arguments[1]===8;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is not thrown for ++arguments[...]
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        arguments[1] = 7;
+        ++arguments[1];
+        return arguments[1]===8;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A1.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A1.js
index 1a6f53940..2aeeb4fbf 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A1.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "++" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "++" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("var x = 0; ++\u0009x") !== 1) {
@@ -57,4 +57,3 @@ if (eval("var x = 0; ++\u2029x") !== 1) {
 if (eval("var x = 0; ++\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029x") !== 1) {
   $ERROR('#10: var x = 0; ++\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029x; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T1.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T1.js
index 253e2a970..2fe983cac 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A2.1_T1.js
- * @description Type(x) is Reference and GetBase(x) is not null
- */
+/*---
+info: Operator ++x uses GetValue and PutValue
+description: Type(x) is Reference and GetBase(x) is not null
+---*/
 
 //CHECK#1
 var x = 1;
@@ -38,4 +36,3 @@ if (++object.prop !== 1 + 1) {
     $ERROR('#3: var object = new Object(); object.prop = 1; ++object.prop; object.prop === 1 + 1. Actual: ' + (object.prop));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T2.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T2.js
index a67137e4b..9e5a50814 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator ++x uses GetValue and PutValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: ++x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T3.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T3.js
index 7faa4d81f..62ba5b79b 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T3.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.1_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A2.1_T3.js
- * @description If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
- * @negative
- */
+/*---
+info: Operator ++x uses GetValue and PutValue
+description: If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,5 +19,3 @@ catch (e) {
     ++1;
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.2_T1.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.2_T1.js
index bdc909df1..8a30c2555 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator ++x uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -101,4 +99,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; ++object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T1.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T1.js
index 9c41505c9..4b11fd1a3 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns x = ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator ++x returns x = ToNumber(x) + 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = false; 
@@ -21,4 +19,3 @@ var x = new Boolean(true);
 if (x !== 1 + 1) {
   $ERROR('#2: var x = new Boolean(true); ++x; x === 1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T2.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T2.js
index 52296a948..f34595046 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns x = ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator ++x returns x = ToNumber(x) + 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1; 
@@ -21,4 +19,3 @@ var x = new Number(-1.1);
 if (x !== -1.1 + 1) {
   $ERROR('#2: var x = new Number(-1.1); ++x; x === -1.1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T3.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T3.js
index aee3607dd..fdc1409f6 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns x = ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator ++x returns x = ToNumber(x) + 1
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1"; 
@@ -28,4 +26,3 @@ var x = new Number("-1");
 if (x !== -1 + 1) {
   $ERROR('#3: var x = new String("-1"); ++x; x === -1 + 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T4.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T4.js
index 89619003e..b63027eb3 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns x = ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator ++x returns x = ToNumber(x) + 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -21,4 +19,3 @@ var x = null;
 if (x !== 1) {
   $ERROR('#2: var x = null; ++x; x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T5.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T5.js
index d08522f72..1a4df245a 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns x = ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator ++x returns x = ToNumber(x) + 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -21,4 +19,3 @@ var x = function(){return 1};
 if (isNaN(x) !== true) {
   $ERROR('#2: var x = function(){return 1}; ++x; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T1.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T1.js
index 585e75091..08b1352cc 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T1.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A4_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator ++x returns ToNumber(x) + 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = false; 
@@ -19,4 +17,3 @@ var x = new Boolean(true);
 if (++x !== 1 + 1) {
   $ERROR('#2: var x = new Boolean(true); ++x === 1 + 1. Actual: ' + (++x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T2.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T2.js
index 3aacac1b8..94026e5ae 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T2.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A4_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator ++x returns ToNumber(x) + 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1;
@@ -19,4 +17,3 @@ var x = new Number(-1.1);
 if (++x !== -1.1 + 1) {
   $ERROR('#2: var x = new Number(-1.1); ++x === -1.1 + 1. Actual: ' + (++x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T3.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T3.js
index 4e2d5f22a..58ab2eb0c 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T3.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A4_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator ++x returns ToNumber(x) + 1
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1";
@@ -25,4 +23,3 @@ var x = new String("-1");
 if (++x !== -1 + 1) {
   $ERROR('#3: var x = new String("-1"); ++x === -1 + 1. Actual: ' + (++x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T4.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T4.js
index f0edb536e..c149f7dc3 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T4.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A4_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator ++x returns ToNumber(x) + 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -19,4 +17,3 @@ var x = null;
 if (++x !== 1) {
   $ERROR('#2: var x = null; ++x === 1. Actual: ' + (++x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T5.js b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T5.js
index c6c9d526a..d1c391ca1 100644
--- a/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T5.js
+++ b/test/suite/ch11/11.4/11.4.4/S11.4.4_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ++x returns ToNumber(x) + 1
- *
- * @path ch11/11.4/11.4.4/S11.4.4_A4_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator ++x returns ToNumber(x) + 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -19,4 +17,3 @@ var x = function(){return 1};
 if (isNaN(++x) !== true) {
   $ERROR('#2: var x = function(){return 1}; ++x === Not-a-Number. Actual: ' + (++x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/11.4.5-2-1-s.js b/test/suite/ch11/11.4/11.4.5/11.4.5-2-1-s.js
index 2c0d4c1a1..6c6469791 100644
--- a/test/suite/ch11/11.4/11.4.5/11.4.5-2-1-s.js
+++ b/test/suite/ch11/11.4/11.4.5/11.4.5-2-1-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.5/11.4.5-2-1-s.js

- * @description Strict Mode - SyntaxError is thrown for --eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = eval;

-        try {

-            eval("--eval;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === eval;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown for --eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = eval;
+        try {
+            eval("--eval;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === eval;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.5/11.4.5-2-2-s.js b/test/suite/ch11/11.4/11.4.5/11.4.5-2-2-s.js
index 373dabe9e..7e0deb875 100644
--- a/test/suite/ch11/11.4/11.4.5/11.4.5-2-2-s.js
+++ b/test/suite/ch11/11.4/11.4.5/11.4.5-2-2-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.5/11.4.5-2-2-s.js

- * @description Strict Mode - SyntaxError is thrown for --arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var blah = arguments;

-        try {

-            eval("--arguments;");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError && blah === arguments;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown for --arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var blah = arguments;
+        try {
+            eval("--arguments;");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError && blah === arguments;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.5/11.4.5-2-2gs.js b/test/suite/ch11/11.4/11.4.5/11.4.5-2-2gs.js
index 3040d8029..51598ad0a 100644
--- a/test/suite/ch11/11.4/11.4.5/11.4.5-2-2gs.js
+++ b/test/suite/ch11/11.4/11.4.5/11.4.5-2-2gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch11/11.4/11.4.5/11.4.5-2-2gs.js

- * @description Strict Mode - SyntaxError is throw if the UnaryExpression operated upon by a Prefix Increment operator(--arguments)

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

---arguments;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is throw if the UnaryExpression operated
+    upon by a Prefix Increment operator(--arguments)
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+--arguments;
diff --git a/test/suite/ch11/11.4/11.4.5/11.4.5-2-3-s.js b/test/suite/ch11/11.4/11.4.5/11.4.5-2-3-s.js
index 9af3f7bcb..3ac01cc31 100644
--- a/test/suite/ch11/11.4/11.4.5/11.4.5-2-3-s.js
+++ b/test/suite/ch11/11.4/11.4.5/11.4.5-2-3-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.5/11.4.5-2-3-s.js

- * @description Strict Mode - SyntaxError is not thrown for --arguments[...]

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        arguments[1] = 7;

-        --arguments[1];

-        return arguments[1]===6;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is not thrown for --arguments[...]
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        arguments[1] = 7;
+        --arguments[1];
+        return arguments[1]===6;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A1.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A1.js
index 5be2493ee..4ee754f2f 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A1.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "--" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "--" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("var x = 1; --\u0009x") !== 0) {
@@ -57,4 +57,3 @@ if (eval("var x = 1; --\u2029x") !== 0) {
 if (eval("var x = 1; --\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029x") !== 0) {
   $ERROR('#10: var x = 1; --\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029x; x === 0. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T1.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T1.js
index 136b72c51..e3e8dffd0 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A2.1_T1.js
- * @description Type(x) is Reference and GetBase(x) is not null
- */
+/*---
+info: Operator --x uses GetValue and PutValue
+description: Type(x) is Reference and GetBase(x) is not null
+---*/
 
 //CHECK#1
 var x = 1;
@@ -38,4 +36,3 @@ if (--object.prop !== 1 - 1) {
     $ERROR('#3: var object = new Object(); object.prop = 1; --object.prop; object.prop === 1 - 1. Actual: ' + (object.prop));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T2.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T2.js
index 2dabef975..de2d0cb28 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator --x uses GetValue and PutValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: --x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T3.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T3.js
index 5700185b9..30128f859 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T3.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.1_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x uses GetValue and PutValue
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A2.1_T3.js
- * @description If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
- * @negative
- */
+/*---
+info: Operator --x uses GetValue and PutValue
+description: If Type(x) is not Reference, throw ReferenceError (or SyntaxError)
+flags: [negative]
+---*/
 
 //CHECK#1
 try {
@@ -21,4 +19,3 @@ catch (e) {
     --1;
   }
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.2_T1.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.2_T1.js
index 6f19db9db..86fa0c89d 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator --x uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -101,4 +99,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; --object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T1.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T1.js
index f7fd9fc7b..f49beaef7 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns x = ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator --x returns x = ToNumber(x) - 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = true; 
@@ -21,4 +19,3 @@ var x = new Boolean(false);
 if (x !== 0 - 1) {
   $ERROR('#2: var x = new Boolean(false); --x; x === 0 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T2.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T2.js
index a946e8648..85396116b 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns x = ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator --x returns x = ToNumber(x) - 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1; 
@@ -21,4 +19,3 @@ var x = new Number(-1.1);
 if (x !== -1.1 - 1) {
   $ERROR('#2: var x = new Number(-1.1); --x; x === -1.1 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T3.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T3.js
index 6ed487073..37883b649 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns x = ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A3_T3.js
- * @description Type(x) is primitive string or String object
- */
+/*---
+info: Operator --x returns x = ToNumber(x) - 1
+description: Type(x) is primitive string or String object
+---*/
 
 //CHECK#1
 var x = "1"; 
@@ -28,4 +26,3 @@ var x = new Number("-1");
 if (x !== -1 - 1) {
   $ERROR('#3: var x = new String("-1"); --x; x === -1 - 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T4.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T4.js
index ed0d7798b..15ffd653f 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns x = ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator --x returns x = ToNumber(x) - 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x; 
@@ -21,4 +19,3 @@ var x = null;
 if (x !== -1) {
   $ERROR('#2: var x = null; --x; x === -1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T5.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T5.js
index 0fd3f76ac..b10c4c529 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns x = ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator --x returns x = ToNumber(x) - 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -21,4 +19,3 @@ var x = function(){return 1};
 if (isNaN(x) !== true) {
   $ERROR('#2: var x = function(){return 1}; --x; x === Not-a-Number. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T1.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T1.js
index 7f424a239..fae3b2218 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T1.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A4_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator --x returns ToNumber(x) - 1
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 var x = true;
@@ -19,4 +17,3 @@ var x = new Boolean(false);
 if (--x !== 0 - 1) {
   $ERROR('#2: var x = new Boolean(false); --x === 0 - 1. Actual: ' + (--x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T2.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T2.js
index c5c77de06..e5878cb2d 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T2.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A4_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator --x returns ToNumber(x) - 1
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 var x = 0.1;
@@ -19,4 +17,3 @@ var x = new Number(-1.1);
 if (--x !== -1.1 - 1) {
   $ERROR('#2: var x = new Number(-1.1); --x === -1.1- 1. Actual: ' + (--x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T3.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T3.js
index 29d4d123f..b9920b2d1 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T3.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A4_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator --x returns ToNumber(x) - 1
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 var x = "1";
@@ -25,4 +23,3 @@ var x = new String("-1");
 if (--x !== -1 - 1) {
   $ERROR('#3: var x = new String("-1"); --x === -1 - 1. Actual: ' + (--x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T4.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T4.js
index a1f600ace..05cd4b27e 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T4.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A4_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator --x returns ToNumber(x) - 1
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 var x;
@@ -19,4 +17,3 @@ var x = null;
 if (--x !== -1) {
   $ERROR('#2: var x = null; --x === -1. Actual: ' + (--x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T5.js b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T5.js
index fe40976df..e4b441a40 100644
--- a/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T5.js
+++ b/test/suite/ch11/11.4/11.4.5/S11.4.5_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator --x returns ToNumber(x) - 1
- *
- * @path ch11/11.4/11.4.5/S11.4.5_A4_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator --x returns ToNumber(x) - 1
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 var x = {}; 
@@ -19,4 +17,3 @@ var x = function(){return 1};
 if (isNaN(--x) !== true) {
   $ERROR('#2: var x = function(){return 1}; --x === Not-a-Number. Actual: ' + (--x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/11.4.6-2-1.js b/test/suite/ch11/11.4/11.4.6/11.4.6-2-1.js
index b4d785c18..013c82ff5 100644
--- a/test/suite/ch11/11.4/11.4.6/11.4.6-2-1.js
+++ b/test/suite/ch11/11.4/11.4.6/11.4.6-2-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.6/11.4.6-2-1.js

- * @description +"" should be zero

- */

-

-

-function testcase() {

-  return +"" === 0;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: +"" should be zero
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return +"" === 0;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A1.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A1.js
index ac0f45a12..f0f617f18 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A1.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "+" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "+" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("+\u00091") !== 1) {
@@ -57,4 +57,3 @@ if (eval("+\u20291") !== 1) {
 if (eval("+\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 1) {
   $ERROR('#10: +\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 1');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T1.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T1.js
index a3074769a..dffb46107 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x uses GetValue
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A2.1_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator +x uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (+1 !== 1) {
@@ -36,4 +34,3 @@ object.prop = 1;
 if (+object.prop !== 1) {
   $ERROR('#5: var object = new Object(); object.prop = 1; +object.prop === 1. Actual: ' + (+object.prop));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T2.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T2.js
index ab6aa9fe4..21f0c7f38 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x uses GetValue
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator +x uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: +x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.2_T1.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.2_T1.js
index 78eb580bb..529b6b96f 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator +x uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; +object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T1.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T1.js
index 7338942de..dc6d73400 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x returns ToNumber(x)
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator +x returns ToNumber(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 if (+false !== 0) {
@@ -17,4 +15,3 @@ if (+false !== 0) {
 if (+new Boolean(true) !== 1) {
   $ERROR('#2: +new Boolean(true) === 1. Actual: ' + (+new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T2.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T2.js
index 86f537c64..be88e8b47 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x returns ToNumber(x)
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator +x returns ToNumber(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 if (+0.1 !== 0.1) {
@@ -17,4 +15,3 @@ if (+0.1 !== 0.1) {
 if (+new Number(-1.1) !== -1.1) {
   $ERROR('#2: +new Number(-1.1) === -1.1. Actual: ' + (+new Number(-1.1)));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T3.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T3.js
index 36628861a..65e9f73cc 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x returns ToNumber(x)
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator +x returns ToNumber(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 if (+"1" !== 1) {
@@ -22,4 +20,3 @@ if (isNaN(+"x") !== true) {
 if (+new Number("-1") !== -1) {
   $ERROR('#3: +new String("-1") === -1. Actual: ' + (+new String("-1")));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T4.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T4.js
index 61b853375..68e946b91 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x returns ToNumber(x)
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator +x returns ToNumber(x)
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 if (isNaN(+void 0) !== true) {
@@ -17,4 +15,3 @@ if (isNaN(+void 0) !== true) {
 if (+null !== 0) {
   $ERROR('#2: +null === 0. Actual: ' + (+null));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T5.js b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T5.js
index 9b56ff09f..80bb5eaa0 100644
--- a/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.6/S11.4.6_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator +x returns ToNumber(x)
- *
- * @path ch11/11.4/11.4.6/S11.4.6_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator +x returns ToNumber(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 if (isNaN(+{}) !== true) {
@@ -17,4 +15,3 @@ if (isNaN(+{}) !== true) {
 if (isNaN(+function(){return 1}) !== true) {
   $ERROR('#2: +function(){return 1} === Not-a-Number. Actual: ' + (+function(){return 1}));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/11.4.7-4-1.js b/test/suite/ch11/11.4/11.4.7/11.4.7-4-1.js
index 12d050866..44c1940b6 100644
--- a/test/suite/ch11/11.4/11.4.7/11.4.7-4-1.js
+++ b/test/suite/ch11/11.4/11.4.7/11.4.7-4-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.4/11.4.7/11.4.7-4-1.js

- * @description -"" should be zero

- */

-

-

-function testcase() {

-  return -"" === 0;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: -"" should be zero
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return -"" === 0;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A1.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A1.js
index 13234518b..f254b594b 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A1.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "-" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "-" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("-\u00091") !== -1) {
@@ -57,4 +57,3 @@ if (eval("-\u20291") !== -1) {
 if (eval("-\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== -1) {
   $ERROR('#10: -\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === -1');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T1.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T1.js
index 8b3c47a90..8bb9a0e26 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x uses GetValue
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A2.1_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator -x uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (-1 !== -1) {
@@ -36,4 +34,3 @@ object.prop = 1;
 if (-object.prop !== -1) {
   $ERROR('#5: var object = new Object(); object.prop = -1; -object.prop === -1. Actual: ' + (-object.prop));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T2.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T2.js
index e7de28aa5..5218431d4 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x uses GetValue
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator -x uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: -x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.2_T1.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.2_T1.js
index a9ad69e5c..af2577ad0 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator -x uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return -1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; -object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T1.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T1.js
index f421d9133..518fe5891 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x returns -ToNumber(x)
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator -x returns -ToNumber(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 if (-false !== 0) {
@@ -17,4 +15,3 @@ if (-false !== 0) {
 if (-new Boolean(true) !== -1) {
   $ERROR('#2: -new Boolean(true) === -1. Actual: ' + (-new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T2.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T2.js
index 611683c12..22a2aa592 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x returns -ToNumber(x)
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator -x returns -ToNumber(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 if (-(1) !== -1) {
@@ -17,4 +15,3 @@ if (-(1) !== -1) {
 if (-new Number(-1) !== 1) {
   $ERROR('#2: -new Number(-1) === 1. Actual: ' + (-new Number(-1)));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T3.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T3.js
index 9a439804e..d185c97b8 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x returns -ToNumber(x)
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator -x returns -ToNumber(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 if (-"1" !== -1) {
@@ -22,4 +20,3 @@ if (isNaN(-"x") !== true) {
 if (-new String("-1") !== 1) {
   $ERROR('#3: -new String("-1") === 1. Actual: ' + (-new String("-1")));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T4.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T4.js
index 7fda40e95..1f03d6711 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x returns -ToNumber(x)
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator -x returns -ToNumber(x)
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 if (isNaN(-void 0) !== true) {
@@ -17,4 +15,3 @@ if (isNaN(-void 0) !== true) {
 if (-null !== 0) {
   $ERROR('#2: +null === 0. Actual: ' + (+null));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T5.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T5.js
index 426a4fd8b..33fdc8427 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator -x returns -ToNumber(x)
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator -x returns -ToNumber(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 if (isNaN(-{}) !== true) {
@@ -17,4 +15,3 @@ if (isNaN(-{}) !== true) {
 if (isNaN(-function(){return 1}) !== true) {
   $ERROR('#2: -function(){return 1} === Not-a-Number. Actual: ' + (-function(){return 1}));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.1.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.1.js
index e8d1dfe86..1adb3cc2f 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.1.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, operator -x returns NaN
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A4.1.js
- * @description Checking NaN
- */
+/*---
+info: If x is NaN, operator -x returns NaN
+description: Checking NaN
+---*/
 
 //CHECK#1
 if (isNaN(-NaN) !== true) {
@@ -18,4 +16,3 @@ var x = NaN;
 if (isNaN(-x) != true) {
   $ERROR('#2: var x = NaN; -x === Not-a-Number. Actual: ' + (-x));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.2.js b/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.2.js
index 8b39bd249..eca5fc0bc 100644
--- a/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.2.js
+++ b/test/suite/ch11/11.4/11.4.7/S11.4.7_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Negating +0 produces -0, negating -0 produces +0
- *
- * @path ch11/11.4/11.4.7/S11.4.7_A4.2.js
- * @description Checking Infinity
- */
+/*---
+info: Negating +0 produces -0, negating -0 produces +0
+description: Checking Infinity
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -29,5 +27,3 @@ if (x !== 0) {
     $ERROR('#2.2: var x = -0; x = -x; x === + 0. Actual: -0');
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A1.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A1.js
index 7a646edfd..4405f0729 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A1.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "~" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "~" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("~\u00090") !== -1) {
@@ -57,4 +57,3 @@ if (eval("~\u20290") !== -1) {
 if (eval("~\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20290") !== -1) {
   $ERROR('#10: ~\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20290 === -1');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T1.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T1.js
index 6dc44f7ae..0032d7edd 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x uses GetValue
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A2.1_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator ~x uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (~0 !== -1) {
@@ -36,4 +34,3 @@ object.prop = 0;
 if (~object.prop !== -1) {
   $ERROR('#5: var object = new Object(); object.prop = 0; ~object.prop === -1. Actual: ' + (~object.prop));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T2.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T2.js
index 3f53f4673..129ae0f79 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x uses GetValue
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator ~x uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: ~x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.2_T1.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.2_T1.js
index 44b5e6127..fa310ebb2 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator ~x uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; ~object throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T1.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T1.js
index 0958a0570..188b9d9cd 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x returns ~ToInt32(x)
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator ~x returns ~ToInt32(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 if (~false !== -1) {
@@ -22,4 +20,3 @@ if (~new Boolean(true) !== -2) {
 if (~new Boolean(false) !== -1) {
   $ERROR('#3: ~new Boolean(false) === -1. Actual: ' + (~new Boolean(false)));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T2.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T2.js
index a7b6d4bbc..1d31641f1 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x returns ~ToInt32(x)
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator ~x returns ~ToInt32(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 if (~0.1 !== -1) {
@@ -42,4 +40,3 @@ if (~new Number(-2) !== 1) {
 if (~Infinity !== -1) {
   $ERROR('#7: ~Infinity === -1. Actual: ' + (~Infinity));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T3.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T3.js
index ec54ebd48..ebd8ca0b2 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x returns ~ToInt32(x)
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator ~x returns ~ToInt32(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 if (~"1" !== -2) {
@@ -32,4 +30,3 @@ if (~"" !== -1) {
 if (~new String("-2") !== 1) {
   $ERROR('#5: ~new String("-2") === 1. Actual: ' + (~new String("-2")));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T4.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T4.js
index d8be652d4..b7d7053d7 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x returns ~ToInt32(x)
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator ~x returns ~ToInt32(x)
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 if (~void 0 !== -1) {
@@ -17,4 +15,3 @@ if (~void 0 !== -1) {
 if (~null !== -1) {
   $ERROR('#2: ~null === -1. Actual: ' + (~null));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T5.js b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T5.js
index 8fcfc740b..f3b937d5c 100644
--- a/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.8/S11.4.8_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator ~x returns ~ToInt32(x)
- *
- * @path ch11/11.4/11.4.8/S11.4.8_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator ~x returns ~ToInt32(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 if (~({}) !== -1) {
@@ -17,4 +15,3 @@ if (~({}) !== -1) {
 if (~(function(){return 1}) !== -1) {
   $ERROR('#2: ~(function(){return 1}) === -1. Actual: ' + (~(function(){return 1})));
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A1.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A1.js
index e4c26d0a1..cb08eb07b 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A1.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between "!" and UnaryExpression are allowed
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between "!" and UnaryExpression are
+    allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("!\u0009true") !== false) {
@@ -57,4 +57,3 @@ if (eval("!\u2029true") !== false) {
 if (eval("!\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029true") !== false) {
   $ERROR('#10: !\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029true === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T1.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T1.js
index d08fdd181..5cc1ea3fb 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T1.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x uses GetValue
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A2.1_T1.js
- * @description Either Type(x) is not Reference or GetBase(x) is not null
- */
+/*---
+info: Operator !x uses GetValue
+description: Either Type(x) is not Reference or GetBase(x) is not null
+---*/
 
 //CHECK#1
 if (!true !== false) {
@@ -36,4 +34,3 @@ object.prop = true;
 if (!object.prop !== false) {
   $ERROR('#5: var object = new Object(); object.prop = true; !object.prop === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T2.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T2.js
index b6592471d..ab63e0a8d 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T2.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x uses GetValue
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator !x uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: !x throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.2_T1.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.2_T1.js
index 3f156e9d4..2648347af 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.2_T1.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x uses [[Default Value]]
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A2.2_T1.js
- * @description If Type(value) is Object, return false
- */
+/*---
+info: Operator !x uses [[Default Value]]
+description: If Type(value) is Object, return false
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -54,5 +52,4 @@ if (!object !== false) {
 var object = {valueOf: function() {return {}}, toString: function() {return {}}};
 if (!object !== false) {
   $ERROR('#8: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; !object === false. Actual: ' + (!object));
-}  
-
+}
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T1.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T1.js
index 05a4ebcc7..6074cb867 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T1.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x returns !ToBoolean(x)
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A3_T1.js
- * @description Type(x) is boolean primitive or Boolean object
- */
+/*---
+info: Operator !x returns !ToBoolean(x)
+description: Type(x) is boolean primitive or Boolean object
+---*/
 
 //CHECK#1
 if (!false !== true) {
@@ -22,4 +20,3 @@ if (!new Boolean(true) !== false) {
 if (!new Boolean(false) !== false) {
   $ERROR('#3: !new Boolean(false) === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T2.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T2.js
index a2e13b0c0..83a476a10 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T2.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x returns !ToBoolean(x)
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A3_T2.js
- * @description Type(x) is number primitive or Number object
- */
+/*---
+info: Operator !x returns !ToBoolean(x)
+description: Type(x) is number primitive or Number object
+---*/
 
 //CHECK#1
 if (!0.1 !== false) {
@@ -42,4 +40,3 @@ if (!new Number(0) !== false) {
 if (!Infinity !== false) {
   $ERROR('#7: !Infinity === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T3.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T3.js
index a15994ddc..b7436484e 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T3.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x returns !ToBoolean(x)
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A3_T3.js
- * @description Type(x) is string primitive or String object
- */
+/*---
+info: Operator !x returns !ToBoolean(x)
+description: Type(x) is string primitive or String object
+---*/
 
 //CHECK#1
 if (!"1" !== false) {
@@ -32,4 +30,3 @@ if (!"" !== true) {
 if (!new String("") !== false) {
   $ERROR('#5: !new String("") === false');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T4.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T4.js
index 0ac35bb98..24f451794 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T4.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x returns !ToBoolean(x)
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A3_T4.js
- * @description Type(x) is undefined or null
- */
+/*---
+info: Operator !x returns !ToBoolean(x)
+description: Type(x) is undefined or null
+---*/
 
 //CHECK#1
 if (!void 0 !== true) {
@@ -17,4 +15,3 @@ if (!void 0 !== true) {
 if (!null !== true) {
   $ERROR('#2: !null === true');
 }
-
diff --git a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T5.js b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T5.js
index 88f6dcaec..3b74d931c 100644
--- a/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T5.js
+++ b/test/suite/ch11/11.4/11.4.9/S11.4.9_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator !x returns !ToBoolean(x)
- *
- * @path ch11/11.4/11.4.9/S11.4.9_A3_T5.js
- * @description Type(x) is Object object or Function object
- */
+/*---
+info: Operator !x returns !ToBoolean(x)
+description: Type(x) is Object object or Function object
+---*/
 
 //CHECK#1
 if ((!{}) !== false) {
@@ -17,4 +15,3 @@ if ((!{}) !== false) {
 if (!(function(){return 1}) !== false) {
   $ERROR('#2: !(function(){return 1}) === false');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A1.js
index 1a9876c01..06c4997c1 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between MultiplicativeExpression and "*" or between "*" and UnaryExpression are allowed
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between MultiplicativeExpression and "*"
+    or between "*" and UnaryExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009*\u00091") !== 1) {
@@ -57,4 +57,3 @@ if (eval("1\u2029*\u20291") !== 1) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029*\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 1) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029*\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 1');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T1.js
index ed649ace5..1ca420693 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y uses GetValue
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x * y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 * 1 !== 1) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop * objecty.prop !== 1) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop * objecty.prop === 1. Actual: ' + (objectx.prop * objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T2.js
index e1f16da9d..a4d31c9a9 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y uses GetValue
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x * y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x * 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T3.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T3.js
index 22af7df20..fd70e9867 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T3.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y uses GetValue
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x * y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 * y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.2_T1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.2_T1.js
index 932acabb2..8a209af85 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.2_T1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y uses [[Default Value]]
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x * y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} * 1 !== 1) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 * {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.3_T1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.3_T1.js
index ba58724a9..df36f1028 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.3_T1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T1.js
index 504923aee..f0d086640 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x * (x = 1) !== 0) {
   $ERROR('#2: var x = 0; x * (x = 1) === 0. Actual: ' + (x * (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T2.js
index 262f2e7fc..17146f95b 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T3.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T3.js
index edcb5e006..e0280e32f 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T3.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) * y !== 1) {
   $ERROR('#2: (y = 1) * y === 1. Actual: ' + ((y = 1) * y));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.1.js
index de1e6dfdb..0f0f8b6dc 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true * true !== 1) {
@@ -27,4 +27,3 @@ if (true * new Boolean(true) !== 1) {
 if (new Boolean(true) * new Boolean(true) !== 1) {
   $ERROR('#4: new Boolean(true) * new Boolean(true) === 1. Actual: ' + (new Boolean(true) * new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.2.js
index 1e0a49387..eb8a44fdb 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 * 1 !== 1) {
@@ -27,5 +25,3 @@ if (1 * new Number(1) !== 1) {
 if (new Number(1) * new Number(1) !== 1) {
   $ERROR('#4: new Number(1) * new Number(1) === 1. Actual: ' + (new Number(1) * new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.3.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.3.js
index e04ab70ea..e8b95dd7b 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.3.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" * "1" !== 1) {
@@ -37,4 +35,3 @@ if (isNaN("x" * "1") !== true) {
 if (isNaN("1" * "x") !== true) {
   $ERROR('#6: "1" * "x" === Not-a-Number. Actual: ' + ("1" * "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.4.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.4.js
index 2dbe84f97..3bd660f7b 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.4.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(null * undefined) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(undefined * undefined) !== true) {
 if (null * null !== 0) {
   $ERROR('#4: null * null === 0. Actual: ' + (null * null));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.5.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.5.js
index 061e0ff27..0a83e17c3 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.5.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (isNaN({} * function(){return 1}) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(function(){return 1} * function(){return 1}) !== true) {
 if (isNaN({} * {}) !== true) {
   $ERROR('#4: {} * {} === Not-a-Number. Actual: ' + ({} * {}));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.1.js
index 08a913b95..4999b6154 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Number (primitive and object)
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Number (primitive and object)
+---*/
 
 //CHECK#1
 if (true * 1 !== 1) {
@@ -47,4 +47,3 @@ if (new Boolean(true) * new Number(1) !== 1) {
 if (new Number(1) * new Boolean(true) !== 1) {
   $ERROR('#8: new Number(1) * new Boolean(true) === 1. Actual: ' + (new Number(1) * new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.2.js
index 063c4da9e..9d4167f7f 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" * 1 !== 1) {
@@ -57,4 +57,3 @@ if (isNaN("x" * 1) !== true) {
 if (isNaN(1 * "x") !== true) {
   $ERROR('#10: 1 * "x" === Not-a-Number. Actual: ' + (1 * "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.3.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.3.js
index cfab7ba6b..3633adfd2 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.3.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 * null !== 0) {
@@ -27,4 +27,3 @@ if (new Number(1) * null !== 0) {
 if (null * new Number(1) !== 0) {
   $ERROR('#4: null * new Number(1) === 0. Actual: ' + (null * new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.4.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.4.js
index 0216310cf..092befa78 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.4.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(1 * undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Number(1) * undefined) !== true) {
 if (isNaN(undefined * new Number(1)) !== true) {
   $ERROR('#4: undefined * new Number(1) === Not-a-Number. Actual: ' + (undefined * new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.5.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.5.js
index 5d92d9827..26a4a1977 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.5.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true * "1" !== 1) {
@@ -47,4 +47,3 @@ if (new Boolean(true) * new String("1") !== 1) {
 if (new String("1") * new Boolean(true) !== 1) {
   $ERROR('#8: new String("1") * new Boolean(true) === 1. Actual: ' + (new String("1") * new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.6.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.6.js
index 429683ff2..bc9c1821d 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.6.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between primitive String (primitive or object) and Undefined
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    primitive String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN("1" * undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new String("1") * undefined) !== true) {
 if (isNaN(undefined * new String("1")) !== true) {
   $ERROR('#4: undefined * new String("1") === Not-a-Number. Actual: ' + (undefined * new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.7.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.7.js
index 786f23057..dc65cae9a 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.7.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" * null !== 0) {
@@ -27,4 +27,3 @@ if (new String("1") * null !== 0) {
 if (null * new String("1") !== 0) {
   $ERROR('#4: null * new String("1") === 0. Actual: ' + (null * new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.8.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.8.js
index ef7ae0503..8181085c8 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.8.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(true * undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Boolean(true) * undefined) !== true) {
 if (isNaN(undefined * new Boolean(true)) !== true) {
   $ERROR('#4: undefined * new Boolean(true) === Not-a-Number. Actual: ' + (undefined * new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.9.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.9.js
index 377cb00f0..2c423af1f 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.9.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x * y returns ToNumber(x) * ToNumber(y)
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x * y returns ToNumber(x) * ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true * null !== 0) {
@@ -27,4 +27,3 @@ if (new Boolean(true) * null !== 0) {
 if (null * new Boolean(true) !== 0) {
   $ERROR('#4: null * new Boolean(true) === 0. Actual: ' + (null * new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.1.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.1.js
index d3b5006ce..54b8ffcf0 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T1.1.js
- * @description If left operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: If left operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN * Number.NaN) !== true) {
@@ -46,5 +46,4 @@ if (isNaN(Number.NaN * Number.MIN_VALUE) !== true) {
 //CHECK#8
 if (isNaN(Number.NaN * 1) !== true) {
   $ERROR('#8: NaN * 1 === Not-a-Number. Actual: ' + (NaN * 1));  
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.2.js
index 2f1d7c1c0..90ad78554 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T1.2.js
- * @description If right operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: If right operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN * Number.NaN) !== true) {
@@ -47,4 +47,3 @@ if (isNaN(Number.MIN_VALUE * Number.NaN) !== true) {
 if (isNaN(1 * Number.NaN) !== true) {
   $ERROR('#8: 1 * NaN === Not-a-Number. Actual: ' + (1 * NaN));  
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T2.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T2.js
index f6bc87a6f..b92384bc0 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T2.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T2.js
- * @description The sign of the result is positive if both operands have the same sign, negative if the operands have different signs
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    The sign of the result is positive if both operands have the same
+    sign, negative if the operands have different signs
+---*/
 
 //CHECK#1
 if (1 * 1 !== 1) {
@@ -63,4 +65,3 @@ if (-0 * -0 !== 0) {
     $ERROR('#8.2: 0 * -0 === - 0. Actual: +0');
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T3.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T3.js
index 6bc264f90..7af52e48d 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T3.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T3.js
- * @description Multiplication of an infinity by a zero results in NaN
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: Multiplication of an infinity by a zero results in NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NEGATIVE_INFINITY * 0) !== true) {
@@ -47,4 +47,3 @@ if (isNaN(Number.POSITIVE_INFINITY * 0) !== true) {
 if (isNaN(-0 * Number.POSITIVE_INFINITY) !== true) {
   $ERROR('#8: -0 * Infinity === Not-a-Number. Actual: ' + (-0 * Infinity));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T4.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T4.js
index 5603e976e..e627c6df3 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T4.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T4.js
- * @description Multiplication of an infinity by an infinity results in an infinity of appropriate sign
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    Multiplication of an infinity by an infinity results in an
+    infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.NEGATIVE_INFINITY * Number.NEGATIVE_INFINITY !== Number.POSITIVE_INFINITY) {
@@ -27,4 +29,3 @@ if (Number.NEGATIVE_INFINITY * Number.POSITIVE_INFINITY !== Number.NEGATIVE_INFI
 if (Number.POSITIVE_INFINITY * Number.NEGATIVE_INFINITY !== Number.NEGATIVE_INFINITY) {
   $ERROR('#4: Infinity * -Infinity === -Infinity. Actual: ' + (Infinity * -Infinity));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T5.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T5.js
index e52526d3a..404d87ecd 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T5.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T5.js
- * @description Multiplication of an infinity by a finite non-zero value results in a signed infinity
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    Multiplication of an infinity by a finite non-zero value results
+    in a signed infinity
+---*/
 
 //CHECK#1
 if (Number.NEGATIVE_INFINITY * -1 !== Number.POSITIVE_INFINITY) {
@@ -46,5 +48,4 @@ if (Number.NEGATIVE_INFINITY * Number.MIN_VALUE !== Number.NEGATIVE_INFINITY) {
 //CHECK#8
 if (Number.NEGATIVE_INFINITY * Number.MIN_VALUE !== Number.MIN_VALUE * Number.NEGATIVE_INFINITY) {
   $ERROR('#8: -Infinity * Number.MIN_VALUE === Number.MIN_VALUE * -Infinity. Actual: ' + (-Infinity * Number.MIN_VALUE));
-}  
-
+}
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T6.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T6.js
index 7432a3146..a15968cc1 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T6.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T6.js
- * @description If the magnitude is too large to represent, the result is then an infinity of appropriate sign
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    If the magnitude is too large to represent, the result is then an
+    infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MAX_VALUE * 1.1 !== Number.POSITIVE_INFINITY) {
@@ -26,5 +28,4 @@ if (Number.MAX_VALUE * 1 !== Number.MAX_VALUE) {
 //CHECK#4
 if (-1 * Number.MAX_VALUE !== -Number.MAX_VALUE) {
   $ERROR('#4: -1 * Number.MAX_VALUE === -Number.MAX_VALUE. Actual: ' + (-1 * Number.MAX_VALUE));
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T7.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T7.js
index 5a8d203e5..8ee177714 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T7.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T7.js
- * @description If the magnitude is too small to represent, the result is then a zero of appropriate sign
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    If the magnitude is too small to represent, the result is then a
+    zero of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MIN_VALUE * 0.1 !== 0) {
@@ -54,5 +56,4 @@ if (Number.MIN_VALUE * 0.9 !== Number.MIN_VALUE) {
 //CHECK#8
 if (-0.9 * Number.MIN_VALUE !== -Number.MIN_VALUE) {
   $ERROR('#8: -0.9 * Number.MIN_VALUE === -Number.MIN_VALUE. Actual: ' + (-0.9 * Number.MIN_VALUE));
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T8.js b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T8.js
index 0d777e06f..2fc0b6847 100644
--- a/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T8.js
+++ b/test/suite/ch11/11.5/11.5.1/S11.5.1_A4_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a floating-point multiplication is governed by the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.5/11.5.1/S11.5.1_A4_T8.js
- * @description Multiplication is not always associative (x * y * z is the same as (x * y) * z, not x * (y * z))
- */
+/*---
+info: >
+    The result of a floating-point multiplication is governed by the rules of
+    IEEE 754 double-precision arithmetics
+description: >
+    Multiplication is not always associative (x * y * z is the same as
+    (x * y) * z, not x * (y * z))
+---*/
 
 //CHECK#1
 if (Number.MAX_VALUE * 1.1 * 0.9 !== (Number.MAX_VALUE * 1.1) * 0.9) {
@@ -17,4 +19,3 @@ if (Number.MAX_VALUE * 1.1 * 0.9 !== (Number.MAX_VALUE * 1.1) * 0.9) {
 if ((Number.MAX_VALUE * 1.1) * 0.9 === Number.MAX_VALUE * (1.1 * 0.9)) {
   $ERROR('#2: (Number.MAX_VALUE * 1.1) * 0.9 !== Number.MAX_VALUE * (1.1 * 0.9)');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A1.js
index 0b92880bd..03b1ec57d 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between MultiplicativeExpression and "/" or between "/" and UnaryExpression are allowed
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between MultiplicativeExpression and "/"
+    or between "/" and UnaryExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009/\u00091") !== 1) {
@@ -57,4 +57,3 @@ if (eval("1\u2029/\u20291") !== 1) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029/\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 1) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029/\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 1');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T1.js
index c06d2991c..74b54e32d 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y uses GetValue
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x / y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 / 1 !== 1) {
@@ -40,5 +38,3 @@ objecty.prop = 1;
 if (objectx.prop / objecty.prop !== 1) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop / objecty.prop === 1. Actual: ' + (objectx.prop / objecty.prop));
 }
- 
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T2.js
index 68396ed54..2fef528bb 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y uses GetValue
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x / y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x / 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T3.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T3.js
index d0da4868d..714269989 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T3.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y uses GetValue
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x / y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 / y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.2_T1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.2_T1.js
index e0d8bc345..efa8222d8 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.2_T1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y uses [[Default Value]]
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x / y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} / 1 !== 1) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 / {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.3_T1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.3_T1.js
index 8c0b9888e..738f4dec2 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.3_T1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T1.js
index 2d2d55efe..3f39f911c 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x / (x = 1) !== 0) {
   $ERROR('#2: var x = 0; x / (x = 1) === 0. Actual: ' + (x / (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T2.js
index 44f0f2327..7b2090572 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T3.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T3.js
index 13ffe9ff3..906c3f1bb 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T3.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) / y !== 1) {
   $ERROR('#2: (y = 1) / y === 1. Actual: ' + ((y = 1) / y));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.1.js
index 5e53abaf2..4ca9b04b8 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true / true !== 1) {
@@ -27,4 +27,3 @@ if (true / new Boolean(true) !== 1) {
 if (new Boolean(true) / new Boolean(true) !== 1) {
   $ERROR('#4: new Boolean(true) / new Boolean(true) === 1. Actual: ' + (new Boolean(true) / new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.2.js
index 97bb6036d..e0d2ac63d 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 / 1 !== 1) {
@@ -27,5 +25,3 @@ if (1 / new Number(1) !== 1) {
 if (new Number(1) / new Number(1) !== 1) {
   $ERROR('#4: new Number(1) / new Number(1) === 1. Actual: ' + (new Number(1) / new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.3.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.3.js
index 56d1b142c..3ba453d8b 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.3.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" / "1" !== 1) {
@@ -37,4 +35,3 @@ if (isNaN("x" / "1") !== true) {
 if (isNaN("1" / "x") !== true) {
   $ERROR('#6: "1" / "x" === Not-a-Number. Actual: ' + ("1" / "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.4.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.4.js
index e9269fb45..13e9f6b6e 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.4.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(null / undefined) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(undefined / undefined) !== true) {
 if (isNaN(null / null) !== true) {
   $ERROR('#4: null / null === Not-a-Number. Actual: ' + (null / null));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.5.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.5.js
index ec57702be..53dfa9736 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.5.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (isNaN({} / function(){return 1}) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(function(){return 1} / function(){return 1}) !== true) {
 if (isNaN({} / {}) !== true) {
   $ERROR('#4: {} / {} === Not-a-Number. Actual: ' + ({} / {}));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.1.js
index 7cd3f7cf6..12ca6209b 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true / 1 !== 1) {
@@ -47,4 +47,3 @@ if (new Boolean(true) / new Number(1) !== 1) {
 if (new Number(1) / new Boolean(true) !== 1) {
   $ERROR('#8: new Number(1) / new Boolean(true) === 1. Actual: ' + (new Number(1) / new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.2.js
index 8678544ad..c0b869c78 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" / 1 !== 1) {
@@ -57,4 +57,3 @@ if (isNaN("x" / 1) !== true) {
 if (isNaN(1 / "x") !== true) {
   $ERROR('#10: 1 / "x" === Not-a-Number. Actual: ' + (1 / "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.3.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.3.js
index bd37aaefa..c4bcf2ba1 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.3.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 / null !== Number.POSITIVE_INFINITY) {
@@ -27,4 +27,3 @@ if (new Number(1) / null !== Number.POSITIVE_INFINITY) {
 if (null / new Number(1) !== 0) {
   $ERROR('#4: null / new Number(1) === 0. Actual: ' + (null / new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.4.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.4.js
index a67647f6b..2bcea22f2 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.4.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(1 / undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Number(1) / undefined) !== true) {
 if (isNaN(undefined / new Number(1)) !== true) {
   $ERROR('#4: undefined / new Number(1) === Not-a-Number. Actual: ' + (undefined / new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.5.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.5.js
index ae723bdae..002c97435 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.5.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true / "1" !== 1) {
@@ -47,4 +47,3 @@ if (new Boolean(true) / new String("1") !== 1) {
 if (new String("1") / new Boolean(true) !== 1) {
   $ERROR('#8: new String("1") / new Boolean(true) === 1. Actual: ' + (new String("1") / new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.6.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.6.js
index 728613ebd..b5964f389 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.6.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN("1" / undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new String("1") / undefined) !== true) {
 if (isNaN(undefined / new String("1")) !== true) {
   $ERROR('#4: undefined / new String("1") === Not-a-Number. Actual: ' + (undefined / new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.7.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.7.js
index 9a307dc32..97aacb059 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.7.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" / null !== Number.POSITIVE_INFINITY) {
@@ -27,4 +27,3 @@ if (new String("1") / null !== Number.POSITIVE_INFINITY) {
 if (null / new String("1") !== 0) {
   $ERROR('#4: null / new String("1") === 0. Actual: ' + (null / new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.8.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.8.js
index a3fb0e50e..190260366 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.8.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(true / undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Boolean(true) / undefined) !== true) {
 if (isNaN(undefined / new Boolean(true)) !== true) {
   $ERROR('#4: undefined / new Boolean(true) === Not-a-Number. Actual: ' + (undefined / new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.9.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.9.js
index 5459c4d04..f94105e98 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.9.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x / y returns ToNumber(x) / ToNumber(y)
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x / y returns ToNumber(x) / ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true / null !== Number.POSITIVE_INFINITY) {
@@ -27,4 +27,3 @@ if (new Boolean(true) / null !== Number.POSITIVE_INFINITY) {
 if (null / new Boolean(true) !== 0) {
   $ERROR('#4: null / new Boolean(true) === 0. Actual: ' + (null / new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.1.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.1.js
index f98c2b58e..0c748160c 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T1.1.js
- * @description If left operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: If left operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN / Number.NaN) !== true) {
@@ -46,5 +46,4 @@ if (isNaN(Number.NaN / Number.MIN_VALUE) !== true) {
 //CHECK#8
 if (isNaN(Number.NaN / 1) !== true) {
   $ERROR('#8: NaN / 1 === Not-a-Number. Actual: ' + (NaN / 1));  
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.2.js
index 57415ff2a..86e399127 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T1.2.js
- * @description If right operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: If right operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN / Number.NaN) !== true) {
@@ -47,4 +47,3 @@ if (isNaN(Number.MIN_VALUE / Number.NaN) !== true) {
 if (isNaN(1 / Number.NaN) !== true) {
   $ERROR('#8: 1 / NaN === Not-a-Number. Actual: ' + (1 / NaN));  
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T10.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T10.js
index a8a0f25ab..72a7bb6c2 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T10.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T10.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T10.js
- * @description If both operands are finite and nonzero, the quotient is computed and rounded using IEEE 754 round-to-nearest mode.
- * If the magnitude is too small to represent, the result is then a zero of appropriate sign
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    If both operands are finite and nonzero, the quotient is computed
+    and rounded using IEEE 754 round-to-nearest mode.  If the
+    magnitude is too small to represent, the result is then a zero of
+    appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MIN_VALUE / 2.1 !== 0) {
@@ -55,5 +58,4 @@ if (Number.MIN_VALUE / 1.1 !== Number.MIN_VALUE) {
 //CHECK#8
 if (Number.MIN_VALUE / -1.1 !== -Number.MIN_VALUE) {
   $ERROR('#8: Number.MIN_VALUE / -1.1 === -Number.MIN_VALUE. Actual: ' + (Number.MIN_VALUE / -1.1));
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T2.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T2.js
index 4e0143879..6e770263d 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T2.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T2.js
- * @description The sign of the result is positive if both operands have the same sign, negative if the operands have different signs
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    The sign of the result is positive if both operands have the same
+    sign, negative if the operands have different signs
+---*/
 
 //CHECK#1
 if (1 / 1 !== 1) {
@@ -27,4 +29,3 @@ if (-1 / 1 !== -1) {
 if (-1 / -1 !== 1) {
   $ERROR('#4: -1 / -1 === 1. Actual: ' + (-1 / -1));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T3.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T3.js
index dd67b91f8..d2e952a69 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T3.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T3.js
- * @description Division of an infinity by a zero results in an infinity of appropriate sign
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    Division of an infinity by a zero results in an infinity of
+    appropriate sign
+---*/
 
 //CHECK#1
 if (Number.NEGATIVE_INFINITY / 0 !== Number.NEGATIVE_INFINITY) {
@@ -27,4 +29,3 @@ if (Number.POSITIVE_INFINITY / 0 !== Number.POSITIVE_INFINITY) {
 if (Number.POSITIVE_INFINITY / -0 !== Number.NEGATIVE_INFINITY) {
   $ERROR('#4: Infinity / -0 === -Infinity. Actual: ' + (Infinity / -0));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T4.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T4.js
index 14804ad6f..e20e39f7e 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T4.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T4.js
- * @description Division of an infinity by an infinity results in NaN
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: Division of an infinity by an infinity results in NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NEGATIVE_INFINITY / Number.NEGATIVE_INFINITY) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(Number.NEGATIVE_INFINITY / Number.POSITIVE_INFINITY) !== true) {
 if (isNaN(Number.POSITIVE_INFINITY / Number.NEGATIVE_INFINITY) !== true) {
   $ERROR('#4: Infinity / -Infinity === Not-a-Number. Actual: ' + (Infinity / -Infinity));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T5.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T5.js
index 3f84058ca..cb259bddf 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T5.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T5.js
- * @description Division of an infinity by a finite non-zero value results in a signed infinity
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    Division of an infinity by a finite non-zero value results in a
+    signed infinity
+---*/
 
 //CHECK#1
 if (Number.NEGATIVE_INFINITY / 1 !== Number.NEGATIVE_INFINITY) {
@@ -37,4 +39,3 @@ if (Number.POSITIVE_INFINITY / -Number.MAX_VALUE !== Number.NEGATIVE_INFINITY) {
 if (Number.NEGATIVE_INFINITY / Number.MIN_VALUE !== Number.NEGATIVE_INFINITY) {
   $ERROR('#6: -Infinity / Number.MIN_VALUE === -Infinity. Actual: ' + (-Infinity / Number.MIN_VALUE));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T6.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T6.js
index 7c013ee31..0b9a9b77e 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T6.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T6.js
- * @description Division of a finite value by an infinity results in zero of appropriate sign
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    Division of a finite value by an infinity results in zero of
+    appropriate sign
+---*/
 
 //CHECK#1
 if (1 / Number.NEGATIVE_INFINITY !== -0) {
@@ -43,4 +45,3 @@ if (-1 / Number.POSITIVE_INFINITY !== -0) {
     $ERROR('#4.2: -1 / Infinity === - 0. Actual: +0');
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T7.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T7.js
index df2b59970..e6813428f 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T7.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T7.js
- * @description Division of a zero by a zero results in NaN
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: Division of a zero by a zero results in NaN
+---*/
 
 //CHECK#1
 if (isNaN(+0 / +0) !== true) {
@@ -26,5 +26,4 @@ if (isNaN(+0 / -0) !== true) {
 //CHECK#4
 if (isNaN(-0 / -0) !== true) {
   $ERROR('#4: -0 / -0 === Not-a-Number. Actual: ' + (-0 / -0));
-} 
-
+}
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T8.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T8.js
index 1984de1f2..fc3d81f67 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T8.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T8.js
- * @description Division of a zero by any non-zero finite value -0 results in zero of appropriate sign
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    Division of a zero by any non-zero finite value -0 results in zero
+    of appropriate sign
+---*/
 
 //CHECK#1
 if (-0 / 1 !== -0) {
@@ -61,4 +63,3 @@ if (-0 / Number.MIN_VALUE !== -0) {
     $ERROR('#6.2: -0 / Number.MIN_VALUE === - 0. Actual: +0');
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T9.js b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T9.js
index 9539057d7..048397746 100644
--- a/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T9.js
+++ b/test/suite/ch11/11.5/11.5.2/S11.5.2_A4_T9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of division is determined by the specification of IEEE 754 arithmetics
- *
- * @path ch11/11.5/11.5.2/S11.5.2_A4_T9.js
- * @description If the magnitude is too large to represent, the result is then an infinity of appropriate sign
- */
+/*---
+info: >
+    The result of division is determined by the specification of IEEE 754
+    arithmetics
+description: >
+    If the magnitude is too large to represent, the result is then an
+    infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MAX_VALUE / 0.9 !== Number.POSITIVE_INFINITY) {
@@ -32,4 +34,3 @@ if (Number.MAX_VALUE / -1 !== -Number.MAX_VALUE) {
 if (Number.MAX_VALUE / (Number.MAX_VALUE / 0.9) === (Number.MAX_VALUE / Number.MAX_VALUE) / 0.9) {
   $ERROR('#5: Number.MAX_VALUE / (Number.MAX_VALUE / 0.9) !== (Number.MAX_VALUE / Number.MAX_VALUE) / 0.9');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A1.js
index c372cc545..eeee0b8e8 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between MultiplicativeExpression and "%" or between "%" and UnaryExpression are allowed
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between MultiplicativeExpression and "%"
+    or between "%" and UnaryExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009%\u00091") !== 0) {
@@ -57,4 +57,3 @@ if (eval("1\u2029%\u20291") !== 0) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029%\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 0) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029%\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 0');
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T1.js
index b2a973d37..4b055393d 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y uses GetValue
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x % y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 % 2 !== 1) {
@@ -40,4 +38,3 @@ objecty.prop = 2;
 if (objectx.prop % objecty.prop !== 1) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 2; objectx.prop % objecty.prop === 1. Actual: ' + (objectx.prop % objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T2.js
index 5da5f3cff..ccb9ed76f 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y uses GetValue
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x % y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x % 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T3.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T3.js
index 20b64080e..eaff21ef2 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T3.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y uses GetValue
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x % y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 % y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.2_T1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.2_T1.js
index ab488af50..1537a0f29 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.2_T1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y uses [[Default Value]]
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x % y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} % 2 !== 1) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 % {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.3_T1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.3_T1.js
index 836a13ff6..e9af80476 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.3_T1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T1.js
index 7b87a3bf0..93e3df49c 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 1;
 if (x % (x = 2) !== 1) {
   $ERROR('#2: var x = 1; x % (x = 2) === 1. Actual: ' + (x % (x = 2)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T2.js
index f3c306ca1..b778861ae 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T3.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T3.js
index a597a95d2..2d585e0b3 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T3.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) % y !== 0) {
   $ERROR('#2: (y = 1) % y === 0. Actual: ' + ((y = 1) % y));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.1.js
index 816d0efe9..e729afa77 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true % true !== 0) {
@@ -27,4 +27,3 @@ if (true % new Boolean(true) !== 0) {
 if (new Boolean(true) % new Boolean(true) !== 0) {
   $ERROR('#4: new Boolean(true) % new Boolean(true) === 0. Actual: ' + (new Boolean(true) % new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.2.js
index db3ba1d64..888fb7923 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 % 1 !== 0) {
@@ -27,5 +25,3 @@ if (1 % new Number(1) !== 0) {
 if (new Number(1) % new Number(1) !== 0) {
   $ERROR('#4: new Number(1) % new Number(1) === 0. Actual: ' + (new Number(1) % new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.3.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.3.js
index 3520ef236..dca635358 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.3.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" % "1" !== 0) {
@@ -37,4 +35,3 @@ if (isNaN("x" % "1") !== true) {
 if (isNaN("1" % "x") !== true) {
   $ERROR('#6: "1" % "x" === Not-a-Number. Actual: ' + ("1" % "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.4.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.4.js
index 0af53ef4e..927937743 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.4.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(null % undefined) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(undefined % undefined) !== true) {
 if (isNaN(null % null) !== true) {
   $ERROR('#4: null % null === Not-a-Number. Actual: ' + (null % null));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.5.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.5.js
index 85cbbecf2..8c7139091 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.5.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (isNaN({} % function(){return 1}) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(function(){return 1} % function(){return 1}) !== true) {
 if (isNaN({} % {}) !== true) {
   $ERROR('#4: {} % {} === Not-a-Number. Actual: ' + ({} % {}));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.1.js
index 4cde92634..1544f8729 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true % 1 !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) % new Number(1) !== 0) {
 if (new Number(1) % new Boolean(true) !== 0) {
   $ERROR('#8: new Number(1) % new Boolean(true) === 0. Actual: ' + (new Number(1) % new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.2.js
index 6196513ce..0d077394f 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" % 1 !== 0) {
@@ -57,4 +57,3 @@ if (isNaN("x" % 1) !== true) {
 if (isNaN(1 % "x") !== true) {
   $ERROR('#10: 1 % "x" === Not-a-Number. Actual: ' + (1 % "x"));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.3.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.3.js
index c6f32f2b4..bda621797 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.3.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (isNaN(1 % null) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Number(1) % null) !== true) {
 if (null % new Number(1) !== 0) {
   $ERROR('#4: null % new Number(1) === 0. Actual: ' + (null % new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.4.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.4.js
index 4abfc2c0f..ba8f1047a 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.4.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(1 % undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Number(1) % undefined) !== true) {
 if (isNaN(undefined % new Number(1)) !== true) {
   $ERROR('#4: undefined % new Number(1) === Not-a-Number. Actual: ' + (undefined % new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.5.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.5.js
index 951f4c68c..c35daa6bf 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.5.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true % "1" !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) % new String("1") !== 0) {
 if (new String("1") % new Boolean(true) !== 0) {
   $ERROR('#8: new String("1") % new Boolean(true) === 0. Actual: ' + (new String("1") % new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.6.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.6.js
index 973fe5263..3748ced7d 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.6.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN("1" % undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new String("1") % undefined) !== true) {
 if (isNaN(undefined % new String("1")) !== true) {
   $ERROR('#4: undefined % new String("1") === Not-a-Number. Actual: ' + (undefined % new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.7.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.7.js
index baa8a90e4..09b58d148 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.7.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (isNaN("1" % null) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new String("1") % null) !== true) {
 if (null % new String("1") !== 0) {
   $ERROR('#4: null % new String("1") === 0. Actual: ' + (null % new String("1")));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.8.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.8.js
index 54e229b09..20f5c1572 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.8.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(true % undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Boolean(true) % undefined) !== true) {
 if (isNaN(undefined % new Boolean(true)) !== true) {
   $ERROR('#4: undefined % new Boolean(true) === Not-a-Number. Actual: ' + (undefined % new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.9.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.9.js
index 3ff69f285..b5c110fbb 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.9.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x % y returns ToNumber(x) % ToNumber(y)
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x % y returns ToNumber(x) % ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (isNaN(true % null) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Boolean(true) % null) !== true) {
 if (null % new Boolean(true) !== 0) {
   $ERROR('#4: null % new Boolean(true) === 0. Actual: ' + (null % new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.1.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.1.js
index b2ad39088..fcc1182a2 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.1.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T1.1.js
- * @description If either operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: If either operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN % Number.NaN) !== true) {
@@ -47,4 +47,3 @@ if (isNaN(Number.NaN % Number.MIN_VALUE) !== true) {
 if (isNaN(Number.NaN % 1) !== true) {
   $ERROR('#8: NaN % 1 === Not-a-Number. Actual: ' + (NaN % 1));  
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.2.js
index 2b7da808e..85fbd9176 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T1.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T1.2.js
- * @description If either operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: If either operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN % Number.NaN) !== true) {
@@ -47,4 +47,3 @@ if (isNaN(Number.MIN_VALUE % Number.NaN) !== true) {
 if (isNaN(1 % Number.NaN) !== true) {
   $ERROR('#8: 1 % NaN === Not-a-Number. Actual: ' + (1 % NaN));  
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T2.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T2.js
index ce2051688..9e253fd5a 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T2.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T2.js
- * @description The sign of the finite non-zero value result equals the sign of the divided
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: >
+    The sign of the finite non-zero value result equals the sign of
+    the divided
+---*/
 
 //CHECK#1
 if (1 % 1 !== 0) {
@@ -63,4 +65,3 @@ if (-101 % 51 !== -50) {
 if (-101 % -51 !== -50) {
   $ERROR('#8: -101 % -51 === -50. Actual: ' + (-101 % -51));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T3.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T3.js
index 5861cf727..749a64762 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T3.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T3.js
- * @description If the dividend is an infinity results is NaN
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: If the dividend is an infinity results is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NEGATIVE_INFINITY % Number.POSITIVE_INFINITY) !== true) {
@@ -67,4 +67,3 @@ if (isNaN(Number.POSITIVE_INFINITY % Number.MAX_VALUE) !== true) {
 if (isNaN(Number.POSITIVE_INFINITY % -Number.MAX_VALUE) !== true) {
   $ERROR('#12: Infinity % -Number.MAX_VALUE === Not-a-Number. Actual: ' + (Infinity % -Number.MAX_VALUE));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T4.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T4.js
index cdf3ebd38..70ad1d583 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T4.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T4.js
- * @description If the divisor is zero results is NaN
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: If the divisor is zero results is NaN
+---*/
 
 //CHECK#1
 if (isNaN(-0 % 0) !== true) {
@@ -87,4 +87,3 @@ if (isNaN(Number.MAX_VALUE % 0) !== true) {
 if (isNaN(Number.MAX_VALUE % -0) !== true) {
   $ERROR('#16: Number.MAX_VALUE % -0 === Not-a-Number. Actual: ' + (Number.MAX_VALUE % -0));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T5.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T5.js
index 46f9e75da..3b634718c 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T5.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T5.js
- * @description If dividend is finite and the divisor is an infinity, the result equals the dividend
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: >
+    If dividend is finite and the divisor is an infinity, the result
+    equals the dividend
+---*/
 
 //CHECK#1
 if (1 % Number.NEGATIVE_INFINITY !== 1) {
@@ -101,4 +103,3 @@ if (-Number.MIN_VALUE % Number.POSITIVE_INFINITY !== -Number.MIN_VALUE) {
 if (-Number.MIN_VALUE % Number.NEGATIVE_INFINITY !== -Number.MIN_VALUE) {
   $ERROR('#16: -Number.MIN_VALUE % -Infinity === -Number.MIN_VALUE. Actual: ' + (-Number.MIN_VALUE % -Infinity));
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T6.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T6.js
index 02373aec7..1ba546a42 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T6.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T6.js
- * @description If dividend is a zero and the divisor is nonzero finite, the result equals the dividend
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: >
+    If dividend is a zero and the divisor is nonzero finite, the
+    result equals the dividend
+---*/
 
 //CHECK#1
 if (0 % 1 !== 0) {
@@ -79,4 +81,3 @@ if (-0 % Number.MIN_VALUE !== -0) {
     $ERROR('#8.2: 0 % Number.MIN_VALUE === - 0. Actual: +0');
   }
 }
-
diff --git a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T7.js b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T7.js
index 54356536e..fd2ac24a6 100644
--- a/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T7.js
+++ b/test/suite/ch11/11.5/11.5.3/S11.5.3_A4_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of a ECMAScript floating-point remainder operation is determined by the rules of IEEE arithmetics
- *
- * @path ch11/11.5/11.5.3/S11.5.3_A4_T7.js
- * @description If operands neither an infinity, nor a zero, nor NaN, return x - truncate(x / y) * y
- */
+/*---
+info: >
+    The result of a ECMAScript floating-point remainder operation is
+    determined by the rules of IEEE arithmetics
+description: >
+    If operands neither an infinity, nor a zero, nor NaN, return x -
+    truncate(x / y) * y
+---*/
 
 function truncate(x) {
   if (x > 0) {
@@ -71,4 +73,3 @@ y = -1.1;
 if (x % y !== x - truncate(x / y) * y) {
   $ERROR('#8: x = -1.3; y = -1.1; x % y === x - truncate(x / y) * y. Actual: ' + (x % y));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A1.js
index 6e4793095..bf5cf5fe2 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between AdditiveExpression and "+" or between "+" and MultiplicativeExpression are allowed
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between AdditiveExpression and "+" or
+    between "+" and MultiplicativeExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009+\u00091") !== 2) {
@@ -57,4 +57,3 @@ if (eval("1\u2029+\u20291") !== 2) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029+\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 2) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029+\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 2');
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T1.js
index 748f791fa..2a3871a9c 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses GetValue
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x + y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 + 1 !== 2) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop + objecty.prop !== 2) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop + objecty.prop === 2. Actual: ' + (objectx.prop + objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T2.js
index 8a790be9f..03ceb3494 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses GetValue
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x + y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x + 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T3.js
index 6609a5593..0e490bf20 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses GetValue
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x + y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 + y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T1.js
index debdcd883..bfc08316c 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses [[Default Value]]
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x + y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} + 1 !== 2) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 + {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T2.js
index 732c32cc8..a66ac578c 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses [[Default Value]]
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.2_T2.js
- * @description If Type(value) is Date object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator x + y uses [[Default Value]]
+description: If Type(value) is Date object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var date = new Date();
@@ -31,5 +29,3 @@ var date = new Date();
 if (date + new Object() !== date.toString() + "[object Object]") {
   $ERROR('#4: var date = new Date(); date + new Object() === date.toString() + "[object Object]". Actual: ' + (date + new Object()));  
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T3.js
index 965c53d4d..2129863fd 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x + y uses [[Default Value]]
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.2_T3.js
- * @description If Type(value) is Function, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x + y uses [[Default Value]]
+description: If Type(value) is Function, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 function f1(){
@@ -43,4 +41,3 @@ f4.toString = function() {return 1;};
 if (f4 + 1 !== 1 - 1) {
   $ERROR('#4: f1unction f4() {return 0;}; f2.valueOf = function() {return -1;}; f4.toString() = function() {return 1;}; f4 + 1 === 1 - 1. Actual: ' + (f4 + 1));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.3_T1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.3_T1.js
index 07f11d4a1..383124e65 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.3_T1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T1.js
index ad6f74b40..df1ae536e 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x + (x = 1) !== 1) {
   $ERROR('#2: var x = 0; x + (x = 1) === 1. Actual: ' + (x + (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T2.js
index 349041ed4..f38129d5a 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T3.js
index 60d89e506..227e376c7 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) + y !== 2) {
   $ERROR('#2: (y = 1) + y === 2. Actual: ' + ((y = 1) + y));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.1.js
index e0f9656dd..84f848524 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive boolean and Boolean object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    boolean and Boolean object
+---*/
 
 //CHECK#1
 if (true + true !== 2) {
@@ -27,4 +29,3 @@ if (true + new Boolean(true) !== 2) {
 if (new Boolean(true) + new Boolean(true) !== 2) {
   $ERROR('#4: new Boolean(true) + new Boolean(true) === 2. Actual: ' + (new Boolean(true) + new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.2.js
index f5fccb105..ad9baa02a 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive number and Number object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    number and Number object
+---*/
 
 //CHECK#1
 if (1 + 1 !== 2) {
@@ -27,5 +29,3 @@ if (1 + new Number(1) !== 2) {
 if (new Number(1) + new Number(1) !== 2) {
   $ERROR('#4: new Number(1) + new Number(1) === 2. Actual: ' + (new Number(1) + new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.3.js
index c9d52e593..7b0417682 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T1.3.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Null and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Null and
+    Undefined
+---*/
 
 //CHECK#1
 if (isNaN(null + undefined) !== true) {
@@ -27,4 +29,3 @@ if (isNaN(undefined + undefined) !== true) {
 if (null + null !== 0) {
   $ERROR('#4: null + null === 0. Actual: ' + (null + null));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.1.js
index e5e3ee261..1949183d6 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) or Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) or Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true + 1 !== 2) {
@@ -47,4 +50,3 @@ if (new Boolean(true) + new Number(1) !== 2) {
 if (new Number(1) + new Boolean(true) !== 2) {
   $ERROR('#8: new Number(1) + new Boolean(true) === 2. Actual: ' + (new Number(1) + new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.2.js
index ec9dff926..ec1e370ea 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 + null !== 1) {
@@ -27,4 +29,3 @@ if (new Number(1) + null !== 1) {
 if (null + new Number(1) !== 1) {
   $ERROR('#4: null + new Number(1) === 1. Actual: ' + (null + new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.3.js
index dac10c083..76eed5705 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(1 + undefined) !== true) {
@@ -27,4 +29,3 @@ if (isNaN(new Number(1) + undefined) !== true) {
 if (isNaN(undefined + new Number(1)) !== true) {
   $ERROR('#4: undefined + new Number(1) === Not-a-Number. Actual: ' + (undefined + new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.4.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.4.js
index a2d56e2f7..d907bfa19 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.4.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(true + undefined) !== true) {
@@ -27,4 +29,3 @@ if (isNaN(new Boolean(true) + undefined) !== true) {
 if (isNaN(undefined + new Boolean(true)) !== true) {
   $ERROR('#4: undefined + new Boolean(true) === Not-a-Number. Actual: ' + (undefined + new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.5.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.5.js
index a3cfe0523..116167f5b 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.5.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.1_T2.5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String, then operator x + y returns ToNumber(x) + ToNumber(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.1_T2.5.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String and Type(Primitive(y)) is not String,
+    then operator x + y returns ToNumber(x) + ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true + null !== 1) {
@@ -27,4 +29,3 @@ if (new Boolean(true) + null !== 1) {
 if (null + new Boolean(true) !== 1) {
   $ERROR('#4: null + new Boolean(true) === 1. Actual: ' + (null + new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.1.js
index f2f1f8724..452cb933e 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive string and String object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    string and String object
+---*/
 
 //CHECK#1
 if ("1" + "1" !== "11") {
@@ -37,4 +40,3 @@ if ("x" + "1" !=="x1") {
 if ("1" + "x" !== "1x") {
   $ERROR('#6: "1" + "x" === "1x". Actual: ' + ("1" + "x"));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.2.js
index 422ed6b53..8323bfcd4 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T1.2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Object object and Function object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Object
+    object and Function object
+---*/
 
 //CHECK#1
 if (({} + function(){return 1}) !== ({}.toString() + function(){return 1}.toString())) {
@@ -27,6 +30,3 @@ if ((function(){return 1} + function(){return 1}) !== (function(){return 1}.toSt
 if (({} + {}) !== ({}.toString() + {}.toString())) {
   $ERROR('#4: ({} + {}) === ({}.toString() + {}.toString()). Actual: ' + (({} + {})));
 }
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.1.js
index 461a14c1a..f1e77e949 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.1.js
@@ -1,12 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and String
+    (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" + 1 !== "11") {
@@ -57,4 +61,3 @@ if ("x" + 1 !=="x1") {
 if (1 + "x" !== "1x") {
   $ERROR('#10: 1 + "x" === "1x". Actual: ' + (1 + "x"));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.2.js
index 5f4a4075a..bc7828c46 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.2.js
@@ -1,12 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true + "1" !== "true1") {
@@ -47,4 +51,3 @@ if (new Boolean(true) + new String("1") !== "true1") {
 if (new String("1") + new Boolean(true) !== "1true") {
   $ERROR('#8: new String("1") + new Boolean(true) === "1true". Actual: ' + (new String("1") + new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.3.js
index a097ed83b..657e70fa0 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" + undefined !== "1undefined") {
@@ -27,4 +30,3 @@ if (new String("1") + undefined !== "1undefined") {
 if (undefined + new String("1") !== "undefined1") {
   $ERROR('#4: undefined + new String("1") === "undefined1". Actual: ' + (undefined + new String("1")));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.4.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.4.js
index a957677b7..a53030b23 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.4.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A3.2_T2.4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then operator x + y returns the result of concatenating ToString(x) followed by ToString(y)
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A3.2_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String or Type(Primitive(y)) is String, then
+    operator x + y returns the result of concatenating ToString(x) followed
+    by ToString(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" + null !== "1null") {
@@ -27,4 +30,3 @@ if (new String("1") + null !== "1null") {
 if (null + new String("1") !== "null1") {
   $ERROR('#4: null + new String("1") === "null1". Actual: ' + (null + new String("1")));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T1.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T1.js
index 8a8ac37da..b8bb4bbc1 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T1.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T1.js
- * @description If either operand is NaN, the result is NaN
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: If either operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN + 1) !== true ) {
@@ -37,5 +37,3 @@ if (isNaN(Number.NaN + Number.NEGATIVE_INFINITY) !== true ) {
 if (isNaN(Number.NEGATIVE_INFINITY + Number.NaN) !== true ) {
   $ERROR('#6: Infinity + NaN === Not-a-Number. Actual: ' + (Infinity + NaN));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T2.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T2.js
index 6e6452567..b16bbf7e6 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T2.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T2.js
- * @description The sum of two infinities of opposite sign is NaN
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: The sum of two infinities of opposite sign is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.POSITIVE_INFINITY + Number.NEGATIVE_INFINITY) !== true ) {
@@ -17,7 +17,3 @@ if (isNaN(Number.POSITIVE_INFINITY + Number.NEGATIVE_INFINITY) !== true ) {
 if (isNaN(Number.NEGATIVE_INFINITY + Number.POSITIVE_INFINITY) !== true ) {
   $ERROR('#2: -Infinity + Infinity === Not-a-Number. Actual: ' + (-Infinity + Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T3.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T3.js
index d434e6c23..e020a44ec 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T3.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T3.js
- * @description The sum of two infinities of the same sign is the infinity of that sign
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The sum of two infinities of the same sign is the infinity of that
+    sign
+---*/
 
 //CHECK#1
 if (Number.POSITIVE_INFINITY + Number.POSITIVE_INFINITY !== Number.POSITIVE_INFINITY ) {
@@ -17,7 +19,3 @@ if (Number.POSITIVE_INFINITY + Number.POSITIVE_INFINITY !== Number.POSITIVE_INFI
 if (Number.NEGATIVE_INFINITY + Number.NEGATIVE_INFINITY !== Number.NEGATIVE_INFINITY ) {
   $ERROR('#2: -Infinity + -Infinity === -Infinity. Actual: ' + (-Infinity + -Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T4.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T4.js
index 4fd4a6f56..27599dfa5 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T4.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T4.js
- * @description The sum of an infinity and a finite value is equal to the infinite operand
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The sum of an infinity and a finite value is equal to the infinite
+    operand
+---*/
 
 //CHECK#1
 if (Number.POSITIVE_INFINITY + 1 !== Number.POSITIVE_INFINITY ) {
@@ -47,7 +49,3 @@ if (Number.NEGATIVE_INFINITY + Number.MAX_VALUE !== Number.NEGATIVE_INFINITY ) {
 if (-Number.MAX_VALUE + Number.NEGATIVE_INFINITY !== Number.NEGATIVE_INFINITY ) {
   $ERROR('#8: -Number.MAX_VALUE + -Infinity === -Infinity. Actual: ' + (-Number.MAX_VALUE + -Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T5.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T5.js
index 3ae18550a..ea716bb3c 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T5.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T5.js
- * @description The sum of two negative zeros is -0. The sum of two positive zeros, or of two zeros of opposite sign is +0
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The sum of two negative zeros is -0. The sum of two positive
+    zeros, or of two zeros of opposite sign is +0
+---*/
 
 //CHECK#1
 if (-0 + -0 !== -0 ) {  
@@ -43,4 +45,3 @@ if (0 + 0 !== 0 ) {
     $ERROR('#4.2: 0 + 0 === + 0. Actual: -0');
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T6.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T6.js
index b25a8fbae..1c3cf8a2f 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T6.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T6.js
- * @description The sum of a zero and a nonzero finite value is equal to the nonzero operand
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The sum of a zero and a nonzero finite value is equal to the
+    nonzero operand
+---*/
 
 //CHECK#1
 if (1 + -0 !== 1 ) {  
@@ -46,5 +48,4 @@ if (-0 + Number.MIN_VALUE !== Number.MIN_VALUE ) {
 //CHECK#8
 if (0 + Number.MIN_VALUE !== Number.MIN_VALUE ) {  
   $ERROR('#8: 0 + Number.MIN_VALUE === Number.MIN_VALUE. Actual: ' + (0 + Number.MIN_VALUE));
-} 
-
+}
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T7.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T7.js
index c8af57916..cc09718b8 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T7.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T7.js
- * @description The sum of two nonzero finite values of the same magnitude and opposite sign is +0
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The sum of two nonzero finite values of the same magnitude and
+    opposite sign is +0
+---*/
 
 //CHECK#1
 if (-Number.MIN_VALUE + Number.MIN_VALUE !== +0) {  
@@ -34,4 +36,3 @@ if (-1 / Number.MAX_VALUE + 1 / Number.MAX_VALUE !== +0) {
     $ERROR('#3.2: -1 / Number.MAX_VALUE + 1 / Number.MAX_VALUE === + 0. Actual: -0');
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T8.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T8.js
index ec90d44e5..985b18a75 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T8.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T8.js
- * @description If the magnitude is too large to represent, the operation overflows and the result is then an infinity of appropriate sign
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    If the magnitude is too large to represent, the operation
+    overflows and the result is then an infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MAX_VALUE + Number.MAX_VALUE !== Number.POSITIVE_INFINITY) {
@@ -27,4 +29,3 @@ if (1e+308 + 1e+308 !== Number.POSITIVE_INFINITY) {
 if (-8.99e+307 - 8.99e+307 !== Number.NEGATIVE_INFINITY) {
   $ERROR('#4: -8.99e+307 - 8.99e+307 === Number.NEGATIVE_INFINITY. Actual: ' + (-8.99e+307 - 8.99e+307));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T9.js b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T9.js
index bc082438a..bc117d6ef 100644
--- a/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T9.js
+++ b/test/suite/ch11/11.6/11.6.1/S11.6.1_A4_T9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of an addition is determined using the rules of IEEE 754 double-precision arithmetics
- *
- * @path ch11/11.6/11.6.1/S11.6.1_A4_T9.js
- * @description The addition operator is not always associative ( x + y + z is the same (x + y) + z, not x + (y + z))
- */
+/*---
+info: >
+    The result of an addition is determined using the rules of IEEE 754
+    double-precision arithmetics
+description: >
+    The addition operator is not always associative ( x + y + z is the
+    same (x + y) + z, not x + (y + z))
+---*/
 
 //CHECK#1
 if (-Number.MAX_VALUE + Number.MAX_VALUE + Number.MAX_VALUE !== (-Number.MAX_VALUE + Number.MAX_VALUE) + Number.MAX_VALUE) {
@@ -27,4 +29,3 @@ if ("1" + 1 + 1 !== ("1" + 1) + 1) {
 if (("1" + 1) + 1 === "1" + (1 + 1)) {
   $ERROR('#4: ("1" + 1) + 1 !== "1" + (1 + 1)');
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A1.js
index c3c08a221..b3e657dd3 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between AdditiveExpression and "-" or between "-" and MultiplicativeExpression are allowed
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between AdditiveExpression and "-" or
+    between "-" and MultiplicativeExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009-\u00091") !== 0) {
@@ -57,4 +57,3 @@ if (eval("1\u2029-\u20291") !== 0) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029-\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 0) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029-\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 0');
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T1.js
index 8d85c8233..9b2d4c54d 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y uses GetValue
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x - y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 - 1 !== 0) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop - objecty.prop !== 0) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop - objecty.prop === 0. Actual: ' + (objectx.prop - objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T2.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T2.js
index 34bcafc2b..e5a1bb2d6 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T2.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y uses GetValue
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x - y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x - 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T3.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T3.js
index e5ef600f8..aa7d6f920 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T3.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y uses GetValue
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x - y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 - y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.2_T1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.2_T1.js
index 3f24d4c13..738e63277 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.2_T1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y uses [[Default Value]]
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x - y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} - 1 !== 0) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 - {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.3_T1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.3_T1.js
index b54588088..d678e2f5a 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.3_T1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T1.js
index 09b0a7184..e9306e418 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x - (x = 1) !== -1) {
   $ERROR('#2: var x = 0; x - (x = 1) === -1. Actual: ' + (x - (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T2.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T2.js
index ef853e38f..e6ead1c3c 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T2.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T3.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T3.js
index ace9f2e95..da3682770 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T3.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) - y !== 0) {
   $ERROR('#2: (y = 1) - y === 0. Actual: ' + ((y = 1) - y));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.1.js
index 732297bf4..a28100286 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true - true !== 0) {
@@ -27,4 +27,3 @@ if (true - new Boolean(true) !== 0) {
 if (new Boolean(true) - new Boolean(true) !== 0) {
   $ERROR('#4: new Boolean(true) - new Boolean(true) === 0. Actual: ' + (new Boolean(true) - new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.2.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.2.js
index 4a19423a0..749b51ae0 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.2.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 - 1 !== 0) {
@@ -27,5 +25,3 @@ if (1 - new Number(1) !== 0) {
 if (new Number(1) - new Number(1) !== 0) {
   $ERROR('#4: new Number(1) - new Number(1) === 0. Actual: ' + (new Number(1) - new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.3.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.3.js
index 5e2f31a80..0bd73735a 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.3.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" - "1" !== 0) {
@@ -37,4 +35,3 @@ if (isNaN("x" - "1") !== true) {
 if (isNaN("1" - "x") !== true) {
   $ERROR('#6: "1" - "x" === Not-a-Number. Actual: ' + ("1" - "x"));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.4.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.4.js
index a76eb6628..8c5bca049 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.4.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(null - undefined) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(undefined - undefined) !== true) {
 if (null - null !== 0) {
   $ERROR('#4: null - null === 0. Actual: ' + (null - null));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.5.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.5.js
index 21bc87c78..5bdca833f 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.5.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (isNaN({} - function(){return 1}) !== true) {
@@ -27,4 +25,3 @@ if (isNaN(function(){return 1} - function(){return 1}) !== true) {
 if (isNaN({} - {}) !== true) {
   $ERROR('#4: {} - {} === Not-a-Number. Actual: ' + ({} - {}));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.1.js
index 8682a7154..11a548fe0 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true - 1 !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) - new Number(1) !== 0) {
 if (new Number(1) - new Boolean(true) !== 0) {
   $ERROR('#8: new Number(1) - new Boolean(true) === 0. Actual: ' + (new Number(1) - new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.2.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.2.js
index 2c98620cc..c1d553e84 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.2.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" - 1 !== 0) {
@@ -57,4 +57,3 @@ if (isNaN("x" - 1) !== true) {
 if (isNaN(1 - "x") !== true) {
   $ERROR('#10: 1 - "x" === Not-a-Number. Actual: ' + (1 - "x"));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.3.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.3.js
index 9edba35ba..74ccea572 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.3.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 - null !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) - null !== 1) {
 if (null - new Number(1) !== -1) {
   $ERROR('#4: null - new Number(1) === -1. Actual: ' + (null - new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.4.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.4.js
index 9169bacdd..140deba33 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.4.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(1 - undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Number(1) - undefined) !== true) {
 if (isNaN(undefined - new Number(1)) !== true) {
   $ERROR('#4: undefined - new Number(1) === Not-a-Number. Actual: ' + (undefined - new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.5.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.5.js
index 953fb4088..5f67ad57d 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.5.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true - "1" !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) - new String("1") !== 0) {
 if (new String("1") - new Boolean(true) !== 0) {
   $ERROR('#8: new String("1") - new Boolean(true) === 0. Actual: ' + (new String("1") - new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.6.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.6.js
index 34fdcb385..5fb0b2b96 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.6.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN("1" - undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new String("1") - undefined) !== true) {
 if (isNaN(undefined - new String("1")) !== true) {
   $ERROR('#4: undefined - new String("1") === Not-a-Number. Actual: ' + (undefined - new String("1")));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.7.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.7.js
index 3e467ed63..48f974457 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.7.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" - null !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") - null !== 1) {
 if (null - new String("1") !== -1) {
   $ERROR('#4: null - new String("1") === -1. Actual: ' + (null - new String("1")));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.8.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.8.js
index 92704df1d..73110e1a9 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.8.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (isNaN(true - undefined) !== true) {
@@ -27,4 +27,3 @@ if (isNaN(new Boolean(true) - undefined) !== true) {
 if (isNaN(undefined - new Boolean(true)) !== true) {
   $ERROR('#4: undefined - new Boolean(true) === Not-a-Number. Actual: ' + (undefined - new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.9.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.9.js
index 22bbe59e5..61267d33c 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.9.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y returns ToNumber(x) - ToNumber(y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x - y returns ToNumber(x) - ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true - null !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) - null !== 1) {
 if (null - new Boolean(true) !== -1) {
   $ERROR('#4: null - new Boolean(true) === -1. Actual: ' + (null - new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T1.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T1.js
index 2ea5c563c..d8525b75a 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T1.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T1.js
- * @description If either operand is NaN, the result is NaN
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: If either operand is NaN, the result is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.NaN - 1) !== true ) {
@@ -37,4 +35,3 @@ if (isNaN(Number.NaN - Number.NEGATIVE_INFINITY) !== true ) {
 if (isNaN(Number.NEGATIVE_INFINITY - Number.NaN) !== true ) {
   $ERROR('#6: Infinity - NaN === Not-a-Number. Actual: ' + (Infinity - NaN));
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T2.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T2.js
index 3853092ca..a8099331b 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T2.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T2.js
- * @description The difference of two infinities of opposite sign is the infinity of minuend sign
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    The difference of two infinities of opposite sign is the infinity
+    of minuend sign
+---*/
 
 //CHECK#1
 if (Number.POSITIVE_INFINITY - Number.NEGATIVE_INFINITY !== Number.POSITIVE_INFINITY ) {
@@ -17,7 +17,3 @@ if (Number.POSITIVE_INFINITY - Number.NEGATIVE_INFINITY !== Number.POSITIVE_INFI
 if (Number.NEGATIVE_INFINITY - Number.POSITIVE_INFINITY !== Number.NEGATIVE_INFINITY ) {
   $ERROR('#2: -Infinity - Infinity === -Infinity. Actual: ' + (-Infinity - Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T3.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T3.js
index e1c18e1cb..5c010e389 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T3.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T3.js
- * @description The difference of two infinities of the same sign is NaN
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: The difference of two infinities of the same sign is NaN
+---*/
 
 //CHECK#1
 if (isNaN(Number.POSITIVE_INFINITY - Number.POSITIVE_INFINITY) !== true ) {
@@ -17,7 +15,3 @@ if (isNaN(Number.POSITIVE_INFINITY - Number.POSITIVE_INFINITY) !== true ) {
 if (isNaN(Number.NEGATIVE_INFINITY - Number.NEGATIVE_INFINITY) !== true ) {
   $ERROR('#2: -Infinity - -Infinity === Not-a-Number. Actual: ' + (-Infinity - -Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T4.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T4.js
index 2a0ddf37b..50981d137 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T4.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T4.js
- * @description The difference of an infinity and a finite value is equal to infinity of appropriate sign
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    The difference of an infinity and a finite value is equal to
+    infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.POSITIVE_INFINITY - 1 !== Number.POSITIVE_INFINITY ) {
@@ -47,7 +47,3 @@ if (Number.NEGATIVE_INFINITY - Number.MAX_VALUE !== Number.NEGATIVE_INFINITY ) {
 if (-Number.MAX_VALUE - Number.NEGATIVE_INFINITY !== Number.POSITIVE_INFINITY ) {
   $ERROR('#8: -Number.MAX_VALUE - -Infinity === Infinity. Actual: ' + (-Number.MAX_VALUE - -Infinity));
 }
-
-
-
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T5.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T5.js
index bcc6ac258..eed84c336 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T5.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T5.js
- * @description Using the rule of sum of two zeroes and the fact that a - b = a + (-b)
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    Using the rule of sum of two zeroes and the fact that a - b = a +
+    (-b)
+---*/
 
 //CHECK#1
 if (-0 - -0 !== 0 ) {  
@@ -43,4 +43,3 @@ if (0 - 0 !== 0 ) {
     $ERROR('#4.2: 0 - 0 === + 0. Actual: -0');
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T6.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T6.js
index a71e3068f..57ffc1c8e 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T6.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T6.js
- * @description Using the rule of sum of a zero and a nonzero finite value and the fact that a - b = a + (-b)
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    Using the rule of sum of a zero and a nonzero finite value and the
+    fact that a - b = a + (-b)
+---*/
 
 //CHECK#1
 if (1 - -0 !== 1 ) {  
@@ -46,5 +46,4 @@ if (-0 - Number.MIN_VALUE !== -Number.MIN_VALUE ) {
 //CHECK#8
 if (0 - Number.MIN_VALUE !== -Number.MIN_VALUE ) {  
   $ERROR('#8: 0 - Number.MIN_VALUE === -Number.MIN_VALUE. Actual: ' + (0 - Number.MIN_VALUE));
-} 
-
+}
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T7.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T7.js
index 8f810cb46..e5befaf97 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T7.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T7.js
- * @description The mathematical difference of two nonzero finite values of the same magnitude and same sign is +0
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    The mathematical difference of two nonzero finite values of the
+    same magnitude and same sign is +0
+---*/
 
 //CHECK#1
 if (Number.MIN_VALUE - Number.MIN_VALUE !== +0) {  
@@ -34,4 +34,3 @@ if (1 / Number.MAX_VALUE - 1 / Number.MAX_VALUE !== +0) {
     $ERROR('#3.2: 1 / Number.MAX_VALUE - 1 / Number.MAX_VALUE === + 0. Actual: -0');
   }
 }
-
diff --git a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T8.js b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T8.js
index b8a5cd4e8..7558af58d 100644
--- a/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T8.js
+++ b/test/suite/ch11/11.6/11.6.2/S11.6.2_A4_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x - y produces the same result as x + (-y)
- *
- * @path ch11/11.6/11.6.2/S11.6.2_A4_T8.js
- * @description If the magnitude is too large to represent, the operation overflows and the result is then an infinity of appropriate sign
- */
+/*---
+info: Operator x - y produces the same result as x + (-y)
+description: >
+    If the magnitude is too large to represent, the operation
+    overflows and the result is then an infinity of appropriate sign
+---*/
 
 //CHECK#1
 if (Number.MAX_VALUE - -Number.MAX_VALUE !== Number.POSITIVE_INFINITY) {
@@ -27,4 +27,3 @@ if (1e+308 - -1e+308 !== Number.POSITIVE_INFINITY) {
 if (-8.99e+307 - 8.99e+307 !== Number.NEGATIVE_INFINITY) {
   $ERROR('#4: -8.99e+307 - 8.99e+307 === Number.NEGATIVE_INFINITY. Actual: ' + (-8.99e+307 - 8.99e+307));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A1.js
index 4b4e16d24..3654922eb 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between ShiftExpression and "<<" or between "<<" and AdditiveExpression are allowed
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between ShiftExpression and "<<" or
+    between "<<" and AdditiveExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009<<\u00091") !== 2) {
@@ -57,4 +57,3 @@ if (eval("1\u2029<<\u20291") !== 2) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029<<\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 2) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029<<\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 2');
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T1.js
index e1066f118..e0e2d4df8 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses GetValue
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x << y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (2 << 1 !== 4) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop << objecty.prop !== 4) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 2; objecty.prop = 1; objectx.prop << objecty.prop === 4. Actual: ' + (objectx.prop << objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T2.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T2.js
index 1d6dcee60..5b5474de1 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T2.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses GetValue
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x << y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x << 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T3.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T3.js
index b33c6c680..f692ae2d0 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T3.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses GetValue
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x << y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 << y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.2_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.2_T1.js
index b0403a9fb..7e0d0e314 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses [[Default Value]]
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x << y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 1}} << 1 !== 2) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 << {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.3_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.3_T1.js
index e06852489..44ff35d7d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.3_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T1.js
index 1beb86794..319447e40 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x << (x = 1) !== 0) {
   $ERROR('#2: var x = 0; x << (x = 1) === 0. Actual: ' + (x << (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T2.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T2.js
index e44dd956a..344096fe9 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T2.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T3.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T3.js
index ed53451ac..8cc219a76 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T3.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) << y !== 2) {
   $ERROR('#2: (y = 1) << y === 2. Actual: ' + ((y = 1) << y));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.1.js
index 5e1e84696..bf7c5d5f1 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true << true !== 2) {
@@ -27,4 +27,3 @@ if (true << new Boolean(true) !== 2) {
 if (new Boolean(true) << new Boolean(true) !== 2) {
   $ERROR('#4: new Boolean(true) << new Boolean(true) === 2. Actual: ' + (new Boolean(true) << new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.2.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.2.js
index 06d8dca64..a2d6a9375 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.2.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 << 1 !== 2) {
@@ -27,5 +25,3 @@ if (1 << new Number(1) !== 2) {
 if (new Number(1) << new Number(1) !== 2) {
   $ERROR('#4: new Number(1) << new Number(1) === 2. Actual: ' + (new Number(1) << new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.3.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.3.js
index 400362c34..5304fdf9d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.3.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" << "1" !== 2) {
@@ -37,4 +35,3 @@ if ("x" << "1" !== 0) {
 if ("1" << "x" !== 1) {
   $ERROR('#6: "1" << "x" === 1. Actual: ' + ("1" << "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.4.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.4.js
index f96d4eee5..286e0e551 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.4.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (null << undefined !== 0) {
@@ -27,4 +25,3 @@ if (undefined << undefined !== 0) {
 if (null << null !== 0) {
   $ERROR('#4: null << null === 0. Actual: ' + (null << null));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.5.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.5.js
index a548852a9..43b4c0b2d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.5.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (({} << function(){return 1}) !== 0) {
@@ -27,5 +25,3 @@ if ((function(){return 1} << function(){return 1}) !== 0) {
 if (({} << {}) !== 0) {
   $ERROR('#4: ({} << {}) === 0. Actual: ' + (({} << {})));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.1.js
index 3865695e1..f3d836a97 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true << 1 !== 2) {
@@ -47,4 +47,3 @@ if (new Boolean(true) << new Number(1) !== 2) {
 if (new Number(1) << new Boolean(true) !== 2) {
   $ERROR('#8: new Number(1) << new Boolean(true) === 2. Actual: ' + (new Number(1) << new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.2.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.2.js
index 363ee7234..b87aae941 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.2.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" << 1 !== 2) {
@@ -57,4 +57,3 @@ if ("x" << 1 !== 0) {
 if (1 << "x" !== 1) {
   $ERROR('#10: 1 << "x" === 1. Actual: ' + (1 << "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.3.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.3.js
index 182b1fbd2..1e3bba28d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.3.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 << null !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) << null !== 1) {
 if (null << new Number(1) !== 0) {
   $ERROR('#4: null << new Number(1) === 0. Actual: ' + (null << new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.4.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.4.js
index 2a4836aa5..b65a3bf85 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.4.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 << undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) << undefined !== 1) {
 if (undefined << new Number(1) !== 0) {
   $ERROR('#4: undefined << new Number(1) === 0. Actual: ' + (undefined << new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.5.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.5.js
index fa8652c5b..c26bd366d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.5.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) or Boolean (primitive and object)
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) or Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true << "1" !== 2) {
@@ -47,4 +47,3 @@ if (new Boolean(true) << new String("1") !== 2) {
 if (new String("1") << new Boolean(true) !== 2) {
   $ERROR('#8: new String("1") << new Boolean(true) === 2. Actual: ' + (new String("1") << new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.6.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.6.js
index 4f5d8c668..ae27977dc 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.6.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" << undefined !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") << undefined !== 1) {
 if (undefined << new String("1") !== 0) {
   $ERROR('#4: undefined << new String("1") === 0. Actual: ' + (undefined << new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.7.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.7.js
index da246f173..deb94fee6 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.7.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" << null !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") << null !== 1) {
 if (null << new String("1") !== 0) {
   $ERROR('#4: null << new String("1") === 0. Actual: ' + (null << new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.8.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.8.js
index 6c0d3858d..9b0c6e629 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.8.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true << undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) << undefined !== 1) {
 if (undefined << new Boolean(true) !== 0) {
   $ERROR('#4: undefined << new Boolean(true) === 0. Actual: ' + (undefined << new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.9.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.9.js
index 25935fea7..273d6fba7 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.9.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y returns ToNumber(x) << ToNumber(y)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x << y returns ToNumber(x) << ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true << null !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) << null !== 1) {
 if (null << new Boolean(true) !== 0) {
   $ERROR('#4: null << new Boolean(true) === 0. Actual: ' + (null << new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T1.js
index 6c2416dd9..315f12ef4 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x << y in distinct points
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A4_T1.js
- * @description ShiftExpression = -2^n, n = 0...15
- */
+/*---
+info: Check operator x << y in distinct points
+description: ShiftExpression = -2^n, n = 0...15
+---*/
 
 //CHECK
 
@@ -2567,5 +2565,4 @@ if (-1073741824 << 15 !== 0) {
 
 if (-2147483648 << 15 !== 0) { 
   $ERROR('#512: -2147483648 << 15 === 0. Actual: ' + (-2147483648 << 15)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T2.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T2.js
index 0cdfbda0e..2248b8837 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T2.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x << y in distinct points
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A4_T2.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check operator x << y in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
 
@@ -2567,6 +2565,4 @@ if (-1073741824 << 31 !== 0) {
 
 if (-2147483648 << 31 !== 0) { 
   $ERROR('#1024: -2147483648 << 31 === 0. Actual: ' + (-2147483648 << 31)); 
-} 
-
-
+}
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T3.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T3.js
index 5357d1857..2e4c8634d 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T3.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x << y in distinct points
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A4_T3.js
- * @description ShiftExpression = 2^n - 1, n = 0...15
- */
+/*---
+info: Check operator x << y in distinct points
+description: ShiftExpression = 2^n - 1, n = 0...15
+---*/
 
 //CHECK
 
@@ -2567,5 +2565,4 @@ if (1073741823 << 15 !== -32768) {
 
 if (2147483647 << 15 !== -32768) { 
   $ERROR('#512: 2147483647 << 15 === -32768. Actual: ' + (2147483647 << 15)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T4.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T4.js
index 15082a7cc..67b82e8d6 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T4.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x << y in distinct points
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A4_T4.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check operator x << y in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
 
@@ -2567,5 +2565,4 @@ if (1073741823 << 31 !== -2147483648) {
 
 if (2147483647 << 31 !== -2147483648) { 
   $ERROR('#1024: 2147483647 << 31 === -2147483648. Actual: ' + (2147483647 << 31)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.1_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.1_T1.js
index 49bdc5e7e..af0a3646a 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses ToInt32(ShiftExpression)
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A5.1_T1.js
- * @description Checking boundary points
- */
+/*---
+info: Operator x << y uses ToInt32(ShiftExpression)
+description: Checking boundary points
+---*/
 
 //CHECK#1
 if (2147483648.1 << 0 !== -2147483648) { 
@@ -56,5 +54,4 @@ if (-4294967296.1 << 0 !== 0) {
 //CHECK#10
 if (-6442450944.1 << 0 !== -2147483648) { 
   $ERROR('#10: -6442450944.1 << 0 === -2147483648. Actual: ' + (-6442450944.1 << 0)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.2_T1.js b/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.2_T1.js
index 689fe1203..9312b6fb3 100644
--- a/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.1/S11.7.1_A5.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x << y uses ToUint32(AdditiveExpression) & 31
- *
- * @path ch11/11.7/11.7.1/S11.7.1_A5.2_T1.js
- * @description Checking distinct points
- */
+/*---
+info: Operator x << y uses ToUint32(AdditiveExpression) & 31
+description: Checking distinct points
+---*/
 
 //CHECK#1
 if (1 << -32.1 !== 1) { 
@@ -326,5 +324,4 @@ if (1 << 62.1 !== 1073741824) {
 //CHECK#64
 if (1 << 63.1 !== -2147483648) { 
   $ERROR('#64: 1 << 63.1 === -2147483648. Actual: ' + (1 << 63.1)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A1.js
index 086e03849..6e7ebc871 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between ShiftExpression and ">>" or between ">>" and AdditiveExpression are allowed
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between ShiftExpression and ">>" or
+    between ">>" and AdditiveExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("-4\u0009>>\u00091") !== -2) {
@@ -57,4 +57,3 @@ if (eval("-4\u2029>>\u20291") !== -2) {
 if (eval("-4\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>>\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== -2) {
   $ERROR('#10: -4\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>>\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === -2');
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T1.js
index b036436d8..0dc74cb5a 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses GetValue
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x >> y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (-4 >> 1 !== -2) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop >> objecty.prop !== -2) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = -4; objecty.prop = 1; objectx.prop >> objecty.prop === -2. Actual: ' + (objectx.prop >> objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T2.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T2.js
index 107ac4ade..8d14f01b3 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T2.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses GetValue
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x >> y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x >> 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T3.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T3.js
index 1ce6c6dd2..d952752c1 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T3.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses GetValue
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x >> y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 >> y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.2_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.2_T1.js
index 3debe0ae1..f1e26364b 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses [[Default Value]]
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x >> y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return -4}} >> 1 !== -2) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: -4 >> {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.3_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.3_T1.js
index 1d3d1c544..0d8db695a 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.3_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T1.js
index 310bee61f..fe32cfcb6 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = -4;
 if (x >> (x = 1) !== -2) {
   $ERROR('#2: var x = -4; x >> (x = 1) === -2. Actual: ' + (x >> (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T2.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T2.js
index 4f1eb349a..da0a09f2d 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T2.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T3.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T3.js
index 45f52d79d..fcab44629 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T3.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) >> y !== 0) {
   $ERROR('#2: (y = 1) >> y === 0. Actual: ' + ((y = 1) >> y));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.1.js
index 0f872cd25..614084938 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true >> true !== 0) {
@@ -27,4 +27,3 @@ if (true >> new Boolean(true) !== 0) {
 if (new Boolean(true) >> new Boolean(true) !== 0) {
   $ERROR('#4: new Boolean(true) >> new Boolean(true) === 0. Actual: ' + (new Boolean(true) >> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.2.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.2.js
index 0398c019a..4ab0f8991 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.2.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 >> 1 !== 0) {
@@ -27,5 +25,3 @@ if (1 >> new Number(1) !== 0) {
 if (new Number(1) >> new Number(1) !== 0) {
   $ERROR('#4: new Number(1) >> new Number(1) === 0. Actual: ' + (new Number(1) >> new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.3.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.3.js
index 7172e563c..fb06756f2 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.3.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" >> "1" !== 0) {
@@ -37,4 +35,3 @@ if ("x" >> "1" !== 0) {
 if ("1" >> "x" !== 1) {
   $ERROR('#6: "1" >> "x" === 1. Actual: ' + ("1" >> "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.4.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.4.js
index b792d7c82..4b0b0c1d0 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.4.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (null >> undefined !== 0) {
@@ -27,4 +25,3 @@ if (undefined >> undefined !== 0) {
 if (null >> null !== 0) {
   $ERROR('#4: null >> null === 0. Actual: ' + (null >> null));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.5.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.5.js
index 3f208836f..e4020d246 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.5.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (({} >> function(){return 1}) !== 0) {
@@ -27,5 +25,3 @@ if ((function(){return 1} >> function(){return 1}) !== 0) {
 if (({} >> {}) !== 0) {
   $ERROR('#4: ({} >> {}) === 0. Actual: ' + (({} >> {})));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.1.js
index 808fb0e3a..820fc5296 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true >> 1 !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) >> new Number(1) !== 0) {
 if (new Number(1) >> new Boolean(true) !== 0) {
   $ERROR('#8: new Number(1) >> new Boolean(true) === 0. Actual: ' + (new Number(1) >> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.2.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.2.js
index 57c037ae0..94bf28baa 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.2.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" >> 1 !== 0) {
@@ -57,4 +57,3 @@ if ("x" >> 1 !== 0) {
 if (1 >> "x" !== 1) {
   $ERROR('#10: 1 >> "x" === 1. Actual: ' + (1 >> "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.3.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.3.js
index fe7a31aaa..0653a843e 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.3.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 >> null !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) >> null !== 1) {
 if (null >> new Number(1) !== 0) {
   $ERROR('#4: null >> new Number(1) === 0. Actual: ' + (null >> new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.4.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.4.js
index 138b77681..8231a7d67 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.4.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 >> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) >> undefined !== 1) {
 if (undefined >> new Number(1) !== 0) {
   $ERROR('#4: undefined >> new Number(1) === 0. Actual: ' + (undefined >> new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.5.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.5.js
index ca296c62e..c864b0476 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.5.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true >> "1" !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) >> new String("1") !== 0) {
 if (new String("1") >> new Boolean(true) !== 0) {
   $ERROR('#8: new String("1") >> new Boolean(true) === 0. Actual: ' + (new String("1") >> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.6.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.6.js
index ea18c20a6..4dc7aa86a 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.6.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" >> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") >> undefined !== 1) {
 if (undefined >> new String("1") !== 0) {
   $ERROR('#4: undefined >> new String("1") === 0. Actual: ' + (undefined >> new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.7.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.7.js
index 3061313c2..65b947c58 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.7.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" >> null !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") >> null !== 1) {
 if (null >> new String("1") !== 0) {
   $ERROR('#4: null >> new String("1") === 0. Actual: ' + (null >> new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.8.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.8.js
index a918a6791..b0f97f852 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.8.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true >> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) >> undefined !== 1) {
 if (undefined >> new Boolean(true) !== 0) {
   $ERROR('#4: undefined >> new Boolean(true) === 0. Actual: ' + (undefined >> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.9.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.9.js
index f5cbaf944..68b484c92 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.9.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y returns ToNumber(x) >> ToNumber(y)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x >> y returns ToNumber(x) >> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true >> null !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) >> null !== 1) {
 if (null >> new Boolean(true) !== 0) {
   $ERROR('#4: null >> new Boolean(true) === 0. Actual: ' + (null >> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T1.js
index 851139bb1..493059628 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check x >> y operator in distinct points
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A4_T1.js
- * @description ShiftExpression = -2^n, n = 0...15
- */
+/*---
+info: Check x >> y operator in distinct points
+description: ShiftExpression = -2^n, n = 0...15
+---*/
 
 //CHECK
 
@@ -2567,5 +2565,4 @@ if (-1073741824 >> 15 !== -32768) {
 
 if (-2147483648 >> 15 !== -65536) { 
   $ERROR('#512: -2147483648 >> 15 === -65536. Actual: ' + (-2147483648 >> 15)); 
-}  
-
+}
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T2.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T2.js
index 7077af853..cedd6cb56 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T2.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check x >> y operator in distinct points
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A4_T2.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check x >> y operator in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
  
@@ -2568,4 +2566,3 @@ if (-1073741824 >> 31 !== -1) {
 if (-2147483648 >> 31 !== -1) { 
   $ERROR('#1024: -2147483648 >> 31 === -1. Actual: ' + (-2147483648 >> 31)); 
 }
-
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T3.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T3.js
index 40f8d686d..d7afac984 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T3.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check x >> y operator in distinct points
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A4_T3.js
- * @description ShiftExpression = 2^n - 1, n = 0...15
- */
+/*---
+info: Check x >> y operator in distinct points
+description: ShiftExpression = 2^n - 1, n = 0...15
+---*/
 
 //CHECK
  
@@ -2567,5 +2565,4 @@ if (1073741823 >> 15 !== 32767) {
 
 if (2147483647 >> 15 !== 65535) { 
   $ERROR('#512: 2147483647 >> 15 === 65535. Actual: ' + (2147483647 >> 15)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T4.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T4.js
index aa1e0065a..b6cc04e06 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T4.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check x >> y operator in distinct points
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A4_T4.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check x >> y operator in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
  
@@ -2562,5 +2560,4 @@ if (536870911 >> 31 !== 0) {
 
 if (1073741823 >> 31 !== 0) { 
   $ERROR('#1023: 1073741823 >> 31 === 0. Actual: ' + (1073741823 >> 31)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.1_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.1_T1.js
index aa732c311..3d704ea14 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses ToInt32(ShiftExpression)
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A5.1_T1.js
- * @description Checking boundary points
- */
+/*---
+info: Operator x >> y uses ToInt32(ShiftExpression)
+description: Checking boundary points
+---*/
 
 //CHECK#1
 if (2147483648.1 >> 0 !== -2147483648) { 
@@ -56,5 +54,4 @@ if (-4294967296.1 >> 0 !== 0) {
 //CHECK#10
 if (-6442450944.1 >> 0 !== -2147483648) { 
   $ERROR('#10: -6442450944.1 >> 0 === -2147483648. Actual: ' + (-6442450944.1 >> 0)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.2_T1.js b/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.2_T1.js
index 64eca8df3..ce8c6842e 100644
--- a/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.2/S11.7.2_A5.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >> y uses ToUint32(AdditiveExpression) & 31
- *
- * @path ch11/11.7/11.7.2/S11.7.2_A5.2_T1.js
- * @description Checking distinct points
- */
+/*---
+info: Operator x >> y uses ToUint32(AdditiveExpression) & 31
+description: Checking distinct points
+---*/
 
 //CHECK#1
 if (2147483647 >> -32.1 !== 2147483647) { 
@@ -326,5 +324,4 @@ if (2147483647 >> 62.1 !== 1) {
 //CHECK#64
 if (2147483647 >> 63.1 !== 0) { 
   $ERROR('#64: 2147483647 >> 63.1 === 0. Actual: ' + (2147483647 >> 63.1)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A1.js
index 58906e8fb..200632f08 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between ShiftExpression and ">>>" or between ">>>" and AdditiveExpression are allowed
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between ShiftExpression and ">>>" or
+    between ">>>" and AdditiveExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("-4\u0009>>>\u00091") !== 2147483646) {
@@ -57,4 +57,3 @@ if (eval("-4\u2029>>>\u20291") !== 2147483646) {
 if (eval("-4\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>>>\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== 2147483646) {
   $ERROR('#10: -4\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>>>\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291 === 2147483646');
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T1.js
index e153a762e..3c61a19ef 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses GetValue
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x >>> y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (-4 >>> 1 !== 2147483646) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop >>> objecty.prop !== 2147483646) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = -4; objecty.prop = 1; objectx.prop >>> objecty.prop === 2147483646. Actual: ' + (objectx.prop >>> objecty.prop));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T2.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T2.js
index cae3ab773..9c5e5335f 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T2.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses GetValue
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x >>> y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x >>> 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T3.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T3.js
index e682a064a..5f05c56d6 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T3.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses GetValue
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x >>> y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 >>> y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.2_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.2_T1.js
index f678b914d..5fe396e6f 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses [[Default Value]]
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x >>> y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return -4}} >>> 1 !== 2147483646) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: -4 >>> {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.3_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.3_T1.js
index 717afe75d..57a05c066 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.3_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T1.js
index 7291d20fd..f78c575ed 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = -4;
 if (x >>> (x = 1) !== 2147483646) {
   $ERROR('#2: var x = -4; x >>> (x = 1) === 2147483646. Actual: ' + (x >>> (x = 1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T2.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T2.js
index 84069b1f1..9856906e1 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T2.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T3.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T3.js
index 72f08b3ee..920ddabfc 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T3.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) >>> y !== 0) {
   $ERROR('#2: (y = 1) >>> y === 0. Actual: ' + ((y = 1) >>> y));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.1.js
index 0d90bbd6f..56d633fa7 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T1.1.js
- * @description Type(x) and Type(y) vary between primitive boolean and Boolean object
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) and Type(y) vary between primitive boolean and Boolean
+    object
+---*/
 
 //CHECK#1
 if (true >>> true !== 0) {
@@ -27,4 +27,3 @@ if (true >>> new Boolean(true) !== 0) {
 if (new Boolean(true) >>> new Boolean(true) !== 0) {
   $ERROR('#4: new Boolean(true) >>> new Boolean(true) === 0. Actual: ' + (new Boolean(true) >>> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.2.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.2.js
index 48d41b63a..0d1c32078 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.2.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T1.2.js
- * @description Type(x) and Type(y) vary between primitive number and Number object
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: Type(x) and Type(y) vary between primitive number and Number object
+---*/
 
 //CHECK#1
 if (1 >>> 1 !== 0) {
@@ -27,5 +25,3 @@ if (1 >>> new Number(1) !== 0) {
 if (new Number(1) >>> new Number(1) !== 0) {
   $ERROR('#4: new Number(1) >>> new Number(1) === 0. Actual: ' + (new Number(1) >>> new Number(1)));
 }
-
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.3.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.3.js
index 60bf9d310..961eb3488 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.3.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T1.3.js
- * @description Type(x) and Type(y) vary between primitive string and String object
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: Type(x) and Type(y) vary between primitive string and String object
+---*/
 
 //CHECK#1
 if ("1" >>> "1" !== 0) {
@@ -37,4 +35,3 @@ if ("x" >>> "1" !== 0) {
 if ("1" >>> "x" !== 1) {
   $ERROR('#6: "1" >>> "x" === 1. Actual: ' + ("1" >>> "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.4.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.4.js
index 8da5b55c1..521bf60fa 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.4.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T1.4.js
- * @description Type(x) and Type(y) vary between Null and Undefined
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: Type(x) and Type(y) vary between Null and Undefined
+---*/
 
 //CHECK#1
 if (null >>> undefined !== 0) {
@@ -27,4 +25,3 @@ if (undefined >>> undefined !== 0) {
 if (null >>> null !== 0) {
   $ERROR('#4: null >>> null === 0. Actual: ' + (null >>> null));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.5.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.5.js
index aa023e286..568c482ac 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.5.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T1.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T1.5.js
- * @description Type(x) and Type(y) vary between Object object and Function object
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: Type(x) and Type(y) vary between Object object and Function object
+---*/
 
 //CHECK#1
 if (({} >>> function(){return 1}) !== 0) {
@@ -27,4 +25,3 @@ if ((function(){return 1} >>> function(){return 1}) !== 0) {
 if (({} >>> {}) !== 0) {
   $ERROR('#4: ({} >>> {}) === 0. Actual: ' + (({} >>> {})));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.1.js
index ef7427e70..1f00c49b7 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.1.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true >>> 1 !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) >>> new Number(1) !== 0) {
 if (new Number(1) >>> new Boolean(true) !== 0) {
   $ERROR('#8: new Number(1) >>> new Boolean(true) === 0. Actual: ' + (new Number(1) >>> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.2.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.2.js
index 04cf0bd1b..3a43d8ba3 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.2.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.2.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and String (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" >>> 1 !== 0) {
@@ -57,4 +57,3 @@ if ("x" >>> 1 !== 0) {
 if (1 >>> "x" !== 1) {
   $ERROR('#10: 1 >>> "x" === 1. Actual: ' + (1 >>> "x"));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.3.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.3.js
index 658d6029c..298e14d86 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.3.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.3.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 >>> null !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) >>> null !== 1) {
 if (null >>> new Number(1) !== 0) {
   $ERROR('#4: null >>> new Number(1) === 0. Actual: ' + (null >>> new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.4.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.4.js
index a398f8a09..41b4769bd 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.4.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.4.js
- * @description Type(x) is different from Type(y) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 >>> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Number(1) >>> undefined !== 1) {
 if (undefined >>> new Number(1) !== 0) {
   $ERROR('#4: undefined >>> new Number(1) === 0. Actual: ' + (undefined >>> new Number(1)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.5.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.5.js
index 83fc64bb2..1364f99fb 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.5.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.5.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Boolean (primitive and object)
+---*/
 
 //CHECK#1
 if (true >>> "1" !== 0) {
@@ -47,4 +47,3 @@ if (new Boolean(true) >>> new String("1") !== 0) {
 if (new String("1") >>> new Boolean(true) !== 0) {
   $ERROR('#8: new String("1") >>> new Boolean(true) === 0. Actual: ' + (new String("1") >>> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.6.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.6.js
index 63d3e4263..70e3c4a76 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.6.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.6.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" >>> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") >>> undefined !== 1) {
 if (undefined >>> new String("1") !== 0) {
   $ERROR('#4: undefined >>> new String("1") === 0. Actual: ' + (undefined >>> new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.7.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.7.js
index c19be4a7d..fd9bfeb8c 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.7.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.7.js
- * @description Type(x) is different from Type(y) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" >>> null !== 1) {
@@ -27,4 +27,3 @@ if (new String("1") >>> null !== 1) {
 if (null >>> new String("1") !== 0) {
   $ERROR('#4: null >>> new String("1") === 0. Actual: ' + (null >>> new String("1")));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.8.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.8.js
index 98636ab0f..0dbf10d1a 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.8.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.8.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true >>> undefined !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) >>> undefined !== 1) {
 if (undefined >>> new Boolean(true) !== 0) {
   $ERROR('#4: undefined >>> new Boolean(true) === 0. Actual: ' + (undefined >>> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.9.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.9.js
index aacc034f5..155535d3c 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.9.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A3_T2.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A3_T2.9.js
- * @description Type(x) is different from Type(y) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: Operator x >>> y returns ToNumber(x) >>> ToNumber(y)
+description: >
+    Type(x) is different from Type(y) and both types vary between
+    Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true >>> null !== 1) {
@@ -27,4 +27,3 @@ if (new Boolean(true) >>> null !== 1) {
 if (null >>> new Boolean(true) !== 0) {
   $ERROR('#4: null >>> new Boolean(true) === 0. Actual: ' + (null >>> new Boolean(true)));
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T1.js
index c05ddc4e5..49d6833e7 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x >>> y in distinct points
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A4_T1.js
- * @description ShiftExpression = 2^n, n = 0...15
- */
+/*---
+info: Check operator x >>> y in distinct points
+description: ShiftExpression = 2^n, n = 0...15
+---*/
 
 //CHECK
  
@@ -2567,5 +2565,4 @@ if (1073741824 >>> 15 !== 32768) {
 
 if (2147483648 >>> 15 !== 65536) { 
   $ERROR('#512: 2147483648 >>> 15 === 65536. Actual: ' + (2147483648 >>> 15)); 
-}  
-
+}
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T2.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T2.js
index 641360776..b3c442eea 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T2.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x >>> y in distinct points
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A4_T2.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check operator x >>> y in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
  
@@ -2568,4 +2566,3 @@ if (1073741824 >>> 31 !== 0) {
 if (2147483648 >>> 31 !== 1) { 
   $ERROR('#1024: 2147483648 >>> 31 === 1. Actual: ' + (2147483648 >>> 31)); 
 }
-
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T3.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T3.js
index 05cf9e7a2..717ecf08a 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T3.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x >>> y in distinct points
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A4_T3.js
- * @description ShiftExpression = 2^n - 1, n = 0...15
- */
+/*---
+info: Check operator x >>> y in distinct points
+description: ShiftExpression = 2^n - 1, n = 0...15
+---*/
 
 //CHECK
  
@@ -2647,5 +2645,4 @@ if (2147483647 >>> 15 !== 65535) {
 
 if (4294967295 >>> 15 !== 131071) { 
   $ERROR('#528: 4294967295 >>> 15 === 131071. Actual: ' + (4294967295 >>> 15)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T4.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T4.js
index b8af33ec2..eae1f3609 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T4.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check operator x >>> y in distinct points
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A4_T4.js
- * @description ShiftExpression = 2^n - 1, n = 16...31
- */
+/*---
+info: Check operator x >>> y in distinct points
+description: ShiftExpression = 2^n - 1, n = 16...31
+---*/
 
 //CHECK
  
@@ -2647,5 +2645,4 @@ if (2147483647 >>> 31 !== 0) {
 
 if (4294967295 >>> 31 !== 1) { 
   $ERROR('#1056: 4294967295 >>> 31 === 1. Actual: ' + (4294967295 >>> 31)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.1_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.1_T1.js
index a12bccd07..e814f9fa0 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.1_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses ToUint32(ShiftExpression)
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A5.1_T1.js
- * @description Checking boundary points
- */
+/*---
+info: Operator x >>> y uses ToUint32(ShiftExpression)
+description: Checking boundary points
+---*/
 
 //CHECK#1
 if (2147483648.1 >>> 0 !== 2147483648) { 
@@ -56,5 +54,4 @@ if (-4294967296.1 >>> 0 !== 0) {
 //CHECK#10
 if (-6442450944.1 >>> 0 !== 2147483648) { 
   $ERROR('#10: -6442450944.1 >>> 0 === 2147483648. Actual: ' + (-6442450944.1 >>> 0)); 
-} 
-
+}
diff --git a/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.2_T1.js b/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.2_T1.js
index 84abb3616..ae85a4c0e 100644
--- a/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.2_T1.js
+++ b/test/suite/ch11/11.7/11.7.3/S11.7.3_A5.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >>> y uses ToUint32(AdditiveExpression) & 31
- *
- * @path ch11/11.7/11.7.3/S11.7.3_A5.2_T1.js
- * @description Checking distinct points
- */
+/*---
+info: Operator x >>> y uses ToUint32(AdditiveExpression) & 31
+description: Checking distinct points
+---*/
 
 //CHECK#1
 if (4294967295 >>> -32.1 !== 4294967295) { 
@@ -326,6 +324,4 @@ if (4294967295 >>> 62.1 !== 3) {
 //CHECK#64
 if (4294967295 >>> 63.1 !== 1) { 
   $ERROR('#64: 4294967295 >>> 63.1 === 1. Actual: ' + (4294967295 >>> 63.1)); 
-} 
- 
-
+}
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A1.js
index 5203b7341..e151aa27b 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and "<" or between "<" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and "<" or
+    between "<" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("0\u0009<\u00091") !== true) {
@@ -57,4 +57,3 @@ if (eval("0\u2029<\u20291") !== true) {
 if (eval("0\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029<\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== true) {
   $ERROR('#10: (0\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029<\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T1.js
index 4bcd448cb..20ebcba99 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y uses GetValue
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x < y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 < 2 !== true) {
@@ -40,4 +38,3 @@ objecty.prop = 2;
 if (objectx.prop < objecty.prop !== true) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 2; objectx.prop < objecty.prop === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T2.js
index 591c7a7a5..27c621da3 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y uses GetValue
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x < y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x < 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T3.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T3.js
index b71cac528..a8978fe4d 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y uses GetValue
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x < y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 < y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.2_T1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.2_T1.js
index 8641cf4f2..924508c35 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.2_T1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y uses [[Default Value]]
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x < y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 0}} < 1 !== true) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 < {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.3_T1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.3_T1.js
index 9f7c478ca..73eec6137 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.3_T1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T1.js
index 739640488..21a6a1f10 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 1; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x < (x = 1) !== true) {
   $ERROR('#2: var x = 0; x < (x = 1) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T2.js
index acd8c1274..ca342460b 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T3.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T3.js
index 657ef95f2..cefba0ad6 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) < y !== false) {
   $ERROR('#2: (y = 1) < y === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.1.js
index 0d01c8f9f..cbd4111df 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive boolean and Boolean object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    boolean and Boolean object
+---*/
 
 //CHECK#1
 if (true < true !== false) {
@@ -27,4 +29,3 @@ if (true < new Boolean(true) !== false) {
 if (new Boolean(true) < new Boolean(true) !== false) {
   $ERROR('#4: new Boolean(true) < new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.2.js
index afec980fd..05ed01af4 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive number and Number object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    number and Number object
+---*/
 
 //CHECK#1
 if (1 < 1 !== false) {
@@ -27,5 +29,3 @@ if (1 < new Number(1) !== false) {
 if (new Number(1) < new Number(1) !== false) {
   $ERROR('#4: new Number(1) < new Number(1) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.3.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.3.js
index 7964cd27d..7d51e001c 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.3.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T1.3.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Null and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Null and
+    Undefined
+---*/
 
 //CHECK#1
 if (null < undefined !== false) {
@@ -27,4 +29,3 @@ if (undefined < undefined !== false) {
 if (null < null !== false) {
   $ERROR('#4: null < null === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.1.js
index acbeb65db..1a80ad1d5 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types are Number (primitive or object) or Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types are Number (primitive or object) or Boolean (primitive and
+    object)
+---*/
 
 //CHECK#1
 if (true < 1 !== false) {
@@ -47,4 +50,3 @@ if (new Boolean(true) < new Number(1) !== false) {
 if (new Number(1) < new Boolean(true) !== false) {
   $ERROR('#8: new Number(1) < new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.2.js
index e67f1c50a..1cfa1dd93 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and String
+    (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" < 1 !== false) {
@@ -57,4 +60,3 @@ if ("x" < 1 !== false) {
 if (1 < "x" !== false) {
   $ERROR('#10: 1 < "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.3.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.3.js
index 32d4fa5fa..cc69728eb 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.3.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 < null !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) < null !== false) {
 if (null < new Number(1) !== true) {
   $ERROR('#4: null < new Number(1) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.4.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.4.js
index 19ce587cb..e670bb93f 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.4.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 < undefined !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) < undefined !== false) {
 if (undefined < new Number(1) !== false) {
   $ERROR('#4: undefined < new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.5.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.5.js
index 2ec157c85..e4646e627 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.5.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.5.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true < "1" !== false) {
@@ -47,4 +50,3 @@ if (new Boolean(true) < new String("1") !== false) {
 if (new String("1") < new Boolean(true) !== false) {
   $ERROR('#8: new String("1") < new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.6.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.6.js
index de4ef0016..8075a0b52 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.6.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.6.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" < undefined !== false) {
@@ -27,4 +29,3 @@ if (new String("1") < undefined !== false) {
 if (undefined < new String("1") !== false) {
   $ERROR('#4: undefined < new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.7.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.7.js
index 97e9c8fdd..92c9d8bb4 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.7.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.7.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" < null !== false) {
@@ -27,4 +29,3 @@ if (new String("1") < null !== false) {
 if (null < new String("1") !== true) {
   $ERROR('#4: null < new String("1") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.8.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.8.js
index dcd5dfef8..fa5c1162e 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.8.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.8.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true < undefined !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) < undefined !== false) {
 if (undefined < new Boolean(true) !== false) {
   $ERROR('#4: undefined < new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.9.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.9.js
index 3e47b7d07..0abc5e65d 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.9.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.1_T2.9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x < y returns ToNumber(x) < ToNumber(y)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.1_T2.9.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x < y returns ToNumber(x) < ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true < null !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) < null !== false) {
 if (null < new Boolean(true) !== true) {
   $ERROR('#4: null < new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.1.js
index 9e1cb7811..4162b4215 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y returns ToString(x) < ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.2_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive string and String object
- */
+/*---
+info: >
+    Operator x < y returns ToString(x) < ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    string and String object
+---*/
 
 //CHECK#1
 if ("1" < "1" !== false) {
@@ -37,4 +39,3 @@ if ("x" < "1" !== false) {
 if ("1" < "x" !== true) {
   $ERROR('#6: "1" < "x" === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.2.js
index 47068903b..b2fb8b33e 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A3.2_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x < y returns ToString(x) < ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A3.2_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Object object and Function object
- */
+/*---
+info: >
+    Operator x < y returns ToString(x) < ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Object
+    object and Function object
+---*/
 
 //CHECK#1
 if (({} < function(){return 1}) !== ({}.toString() < function(){return 1}.toString())) {
@@ -27,4 +29,3 @@ if ((function(){return 1} < function(){return 1}) !== (function(){return 1}.toSt
 if (({} < {}) !== ({}.toString() < {}.toString())) {
   $ERROR('#4: ({} < {}) === ({}.toString() < {}.toString())');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.1.js
index 5dee6e657..a800a90b3 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.1.js
- * @description y is number primitive
- */
+/*---
+info: If x is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NaN < 0) !== false) {
@@ -47,5 +45,3 @@ if ((Number.NaN < Number.MAX_VALUE) !== false) {
 if ((Number.NaN < Number.MIN_VALUE) !== false) {
   $ERROR('#8: (NaN < Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.10.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.10.js
index 2caacdc42..90cad8e44 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.10.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is a prefix of x, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.10.js
- * @description x and y are string primitives
- */
+/*---
+info: If y is a prefix of x, return false
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" < "x") !== false) {
@@ -38,5 +36,3 @@ var x = "x";
 if ((x + "y" < x) !== false) {
   $ERROR('#6: var x = "x"; (x + "y" < x) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.11.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.11.js
index 2c87da030..4e6639e64 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.11.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is a prefix of y and x !== y, return true
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.11.js
- * @description x and y are string primitives
- */
+/*---
+info: If x is a prefix of y and x !== y, return true
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" < "x ") !== true) {
@@ -48,6 +46,3 @@ if (("a\u0000" < "a\u0000a") !== true) {
 if (("x" < " x") !== false) {
   $ERROR('#8: ("x" < " x") === false');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T1.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T1.js
index b8f0eb78d..53d120b3b 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T1.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.12_T1.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("xx" < "xy") !== true) {
@@ -42,4 +43,3 @@ if (("a\u0000a" < "a\u0000b") !== true) {
 if (("aB" < "aa") !== true) {
   $ERROR('#7: ("aB" < aa") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T2.js
index 0b0e2d5fb..626cacb8a 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.12_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.12_T2.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("0" < "x") !== true) {
@@ -42,4 +43,3 @@ if (("+1" < "-1") !== true) {
 if (("1" < "1e-10") !== true) {
 $ERROR('#7: ("1" < "1e-10") !== true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.2.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.2.js
index 2ab4adeb4..37053563b 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.2.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.2.js
- * @description x is number primitive
- */
+/*---
+info: If y is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 < Number.NaN) !== false) {
@@ -47,5 +45,3 @@ if ((Number.MAX_VALUE < Number.NaN) !== false) {
 if ((Number.MIN_VALUE < Number.NaN) !== false) {
   $ERROR('#8: (Number.MIN_VALUE < NaN) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.3.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.3.js
index 1fa8a4988..059099478 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.3.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x and y are the same number value, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.3.js
- * @description x and y are number primitives
- */
+/*---
+info: If x and y are the same number value, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 < 1) !== false) {
@@ -42,6 +40,3 @@ if ((Number.MAX_VALUE < Number.MAX_VALUE) !== false) {
 if ((Number.MIN_VALUE < Number.MIN_VALUE) !== false) {
   $ERROR('#7: (Number.MIN_VALUE < Number.MIN_VALUE) === false');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.4.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.4.js
index d04541e42..9e4298548 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.4.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x and y are +0 and -0, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.4.js
- * @description Checking all combinations
- */
+/*---
+info: If x and y are +0 and -0, return false
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((0 < 0) !== false) {
@@ -27,5 +25,3 @@ if ((+0 < -0) !== false) {
 if ((-0 < +0) !== false) {
   $ERROR('#4: (-0 < +0) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.5.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.5.js
index d874e0fde..e90599eb8 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.5.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.5.js
- * @description y is number primitive
- */
+/*---
+info: If x is +Infinity, return false
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY < 0) !== false) {
@@ -37,5 +35,3 @@ if ((Number.POSITIVE_INFINITY < Number.MAX_VALUE) !== false) {
 if ((Number.POSITIVE_INFINITY < Number.MIN_VALUE) !== false) {
   $ERROR('#6: (+Infinity < Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.6.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.6.js
index 2dce0a45a..203a4253d 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.6.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +Infinity and x !== y, return true
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.6.js
- * @description x is number primitive
- */
+/*---
+info: If y is +Infinity and x !== y, return true
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 < Number.POSITIVE_INFINITY) !== true) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE < Number.POSITIVE_INFINITY) !== true) {
 if ((Number.MIN_VALUE < Number.POSITIVE_INFINITY) !== true) {
   $ERROR('#6: (Number.MIN_VALUE < +Infinity) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.7.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.7.js
index a54ec57be..4ad7c3b88 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.7.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and x !== y, return true
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.7.js
- * @description y is number primitive
- */
+/*---
+info: If x is -Infinity and x !== y, return true
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NEGATIVE_INFINITY < 0) !== true) {
@@ -37,5 +35,3 @@ if ((Number.NEGATIVE_INFINITY < Number.MAX_VALUE) !== true) {
 if ((Number.NEGATIVE_INFINITY < Number.MIN_VALUE) !== true) {
   $ERROR('#6: (-Infinity < Number.MIN_VALUE) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.8.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.8.js
index ac5202d5a..e37961598 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.8.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -Infinity, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.8.js
- * @description x is number primitive
- */
+/*---
+info: If y is -Infinity, return false
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 < Number.NEGATIVE_INFINITY) !== false) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE < Number.NEGATIVE_INFINITY) !== false) {
 if ((Number.MIN_VALUE < Number.NEGATIVE_INFINITY) !== false) {
   $ERROR('#6: (Number.MIN_VALUE < -Infinity) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.9.js b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.9.js
index 32839492c..f2a18ea24 100644
--- a/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.9.js
+++ b/test/suite/ch11/11.8/11.8.1/S11.8.1_A4.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than y and these values are both finite non-zero, return true; otherwise, return false
- *
- * @path ch11/11.8/11.8.1/S11.8.1_A4.9.js
- * @description x and y are number primitives
- */
+/*---
+info: >
+    If x is less than y and these values are both finite non-zero, return
+    true; otherwise, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1.1 < 1) !== false) {
@@ -47,6 +47,3 @@ if ((Number.MAX_VALUE/2 < Number.MAX_VALUE) !== true) {
 if ((Number.MIN_VALUE < Number.MIN_VALUE*2) !== true) {
   $ERROR('#8: (Number.MIN_VALUE < Number.MIN_VALUE*2) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/11.8.2-1.js b/test/suite/ch11/11.8/11.8.2/11.8.2-1.js
index 97270dca2..bdfd48b1e 100644
--- a/test/suite/ch11/11.8/11.8.2/11.8.2-1.js
+++ b/test/suite/ch11/11.8/11.8.2/11.8.2-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.2/11.8.2-1.js

- * @description 11.8.2 Greater-than Operator - Partial left to right order enforced when using Greater-than operator: valueOf > valueOf

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            valueOf: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            valueOf: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return !(obj1 > obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.2 Greater-than Operator - Partial left to right order
+    enforced when using Greater-than operator: valueOf > valueOf
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            valueOf: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            valueOf: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return !(obj1 > obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.2/11.8.2-2.js b/test/suite/ch11/11.8/11.8.2/11.8.2-2.js
index 248452e99..a16ce9d77 100644
--- a/test/suite/ch11/11.8/11.8.2/11.8.2-2.js
+++ b/test/suite/ch11/11.8/11.8.2/11.8.2-2.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.2/11.8.2-2.js

- * @description 11.8.2 Greater-than Operator - Partial left to right order enforced when using Greater-than operator: valueOf > toString

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            valueOf: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            toString: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return !(obj1 > obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.2 Greater-than Operator - Partial left to right order
+    enforced when using Greater-than operator: valueOf > toString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            valueOf: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            toString: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return !(obj1 > obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.2/11.8.2-3.js b/test/suite/ch11/11.8/11.8.2/11.8.2-3.js
index b0db66533..10044b35a 100644
--- a/test/suite/ch11/11.8/11.8.2/11.8.2-3.js
+++ b/test/suite/ch11/11.8/11.8.2/11.8.2-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.2/11.8.2-3.js

- * @description 11.8.2 Greater-than Operator - Partial left to right order enforced when using Greater-than operator: toString > valueOf

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            toString: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            valueOf: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return !(obj1 > obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.2 Greater-than Operator - Partial left to right order
+    enforced when using Greater-than operator: toString > valueOf
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            toString: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            valueOf: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return !(obj1 > obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.2/11.8.2-4.js b/test/suite/ch11/11.8/11.8.2/11.8.2-4.js
index 50817010b..f3251060a 100644
--- a/test/suite/ch11/11.8/11.8.2/11.8.2-4.js
+++ b/test/suite/ch11/11.8/11.8.2/11.8.2-4.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.2/11.8.2-4.js

- * @description 11.8.2 Greater-than Operator - Partial left to right order enforced when using Greater-than operator: toString > toString

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            toString: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            toString: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return !(obj1 > obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.2 Greater-than Operator - Partial left to right order
+    enforced when using Greater-than operator: toString > toString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            toString: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            toString: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return !(obj1 > obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A1.js
index e2d072282..97479c585 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and ">" or ">" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and ">" or
+    ">" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("0\u0009>\u00091") !== false) {
@@ -57,4 +57,3 @@ if (eval("0\u2029>\u20291") !== false) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== true) {
   $ERROR('#10: (1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T1.js
index 9ae91af51..f69901d1e 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x > y uses GetValue
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x > y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (2 > 1 !== true) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop > objecty.prop !== true) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 2; objecty.prop = 1; objectx.prop > objecty.prop === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T2.js
index c6c0a2c71..2af951486 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x > y uses GetValue
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x > y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x > 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T3.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T3.js
index bf7dfc5e7..285dff2d9 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x > y uses GetValue
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x > y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 > y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.2_T1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.2_T1.js
index e8d7595ba..213d0fe8b 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.2_T1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x > y uses [[Default Value]]
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x > y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 2}} > 1 !== true) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 > {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.3_T1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.3_T1.js
index ab2e5a0e5..5a3771536 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.3_T1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In ES5, First expression should be evaluated first.
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.3_T1.js
- * @description Checking that operands of a "<" evaluate left-to-right
- */
+/*---
+info: In ES5, First expression should be evaluated first.
+description: Checking that operands of a "<" evaluate left-to-right
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T1.js
index ac5f1b540..8f2969c57 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 1;
 if (x > (x = 0) !== true) {
   $ERROR('#2: var x = 1; x > (x = 0) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T2.js
index 274f117cb..8ba2280ef 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T3.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T3.js
index d3228fdce..d2663fc9c 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) > y !== false) {
   $ERROR('#2: (y = 1) > y === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.1.js
index 4f69c859e..b771ef1af 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive boolean and Boolean object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    boolean and Boolean object
+---*/
 
 //CHECK#1
 if (true > true !== false) {
@@ -27,4 +29,3 @@ if (true > new Boolean(true) !== false) {
 if (new Boolean(true) > new Boolean(true) !== false) {
   $ERROR('#4: new Boolean(true) > new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.2.js
index 2a076c6c6..852dbea55 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive number and Number object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    number and Number object
+---*/
 
 //CHECK#1
 if (1 > 1 !== false) {
@@ -27,5 +29,3 @@ if (1 > new Number(1) !== false) {
 if (new Number(1) > new Number(1) !== false) {
   $ERROR('#4: new Number(1) > new Number(1) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.3.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.3.js
index 597266349..c8232e307 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.3.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T1.3.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Null and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Null and
+    Undefined
+---*/
 
 //CHECK#1
 if (null > undefined !== false) {
@@ -27,4 +29,3 @@ if (undefined > undefined !== false) {
 if (null > null !== false) {
   $ERROR('#4: null > null === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.1.js
index 81ba83400..301311e66 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true > 1 !== false) {
@@ -47,4 +50,3 @@ if (new Boolean(true) > new Number(1) !== false) {
 if (new Number(1) > new Boolean(true) !== false) {
   $ERROR('#8: new Number(1) > new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.2.js
index 4d6f8fc81..645844957 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and String
+    (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" > 1 !== false) {
@@ -57,4 +60,3 @@ if ("x" > 1 !== false) {
 if (1 > "x" !== false) {
   $ERROR('#10: 1 > "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.3.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.3.js
index 63ec06aac..46726dd7e 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.3.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 > null !== true) {
@@ -27,4 +29,3 @@ if (new Number(1) > null !== true) {
 if (null > new Number(1) !== false) {
   $ERROR('#4: null > new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.4.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.4.js
index d98572cc5..d3d67d7b0 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.4.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 > undefined !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) > undefined !== false) {
 if (undefined > new Number(1) !== false) {
   $ERROR('#4: undefined > new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.5.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.5.js
index b739bd4dc..6f6697d25 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.5.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.5.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true > "1" !== false) {
@@ -47,4 +50,3 @@ if (new Boolean(true) > new String("1") !== false) {
 if (new String("1") > new Boolean(true) !== false) {
   $ERROR('#8: new String("1") > new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.6.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.6.js
index 839884f83..7945e81af 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.6.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.6.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" > undefined !== false) {
@@ -27,4 +29,3 @@ if (new String("1") > undefined !== false) {
 if (undefined > new String("1") !== false) {
   $ERROR('#4: undefined > new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.7.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.7.js
index 5b44d0a70..8e29e4d08 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.7.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.7.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" > null !== true) {
@@ -27,4 +29,3 @@ if (new String("1") > null !== true) {
 if (null > new String("1") !== false) {
   $ERROR('#4: null > new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.8.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.8.js
index 3a3c48e7a..43fe1d76f 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.8.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.8.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true > undefined !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) > undefined !== false) {
 if (undefined > new Boolean(true) !== false) {
   $ERROR('#4: undefined > new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.9.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.9.js
index 32c04b23a..a87818f4e 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.9.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.1_T2.9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x > y returns ToNumber(x) > ToNumber(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.1_T2.9.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x > y returns ToNumber(x) > ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true > null !== true) {
@@ -27,4 +29,3 @@ if (new Boolean(true) > null !== true) {
 if (null > new Boolean(true) !== false) {
   $ERROR('#4: null > new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.1.js
index fb0bcb016..d4644e0ed 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String and Type(Primitive(y)) is String, then operator x > y returns ToString(x) > ToString(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.2_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive string and String object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String and Type(Primitive(y)) is String, then
+    operator x > y returns ToString(x) > ToString(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    string and String object
+---*/
 
 //CHECK#1
 if ("1" > "1" !== false) {
@@ -37,4 +39,3 @@ if ("x" > "1" !== true) {
 if ("1" > "x" !== false) {
   $ERROR('#6: "1" > "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.2.js
index cf6e2889b..8152ec3cd 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A3.2_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is String and Type(Primitive(y)) is String, then operator x > y returns ToString(x) > ToString(y)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A3.2_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Object object and Function object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is String and Type(Primitive(y)) is String, then
+    operator x > y returns ToString(x) > ToString(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Object
+    object and Function object
+---*/
 
 //CHECK#1
 if (({} > function(){return 1}) !== ({}.toString() > function(){return 1}.toString())) {
@@ -27,4 +29,3 @@ if ((function(){return 1} > function(){return 1}) !== (function(){return 1}.toSt
 if (({} > {}) !== ({}.toString() > {}.toString())) {
   $ERROR('#4: ({} > {}) === ({}.toString() > {}.toString())');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.1.js
index a36cb0b92..895539255 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.1.js
- * @description y is number primitive
- */
+/*---
+info: If x is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NaN > 0) !== false) {
@@ -47,5 +45,3 @@ if ((Number.NaN > Number.MAX_VALUE) !== false) {
 if ((Number.NaN > Number.MIN_VALUE) !== false) {
   $ERROR('#8: (NaN > Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.10.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.10.js
index eef094d97..bb60ad877 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.10.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is a prefix of y, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.10.js
- * @description x and y are string primitives
- */
+/*---
+info: If x is a prefix of y, return false
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" > "x") !== false) {
@@ -38,4 +36,3 @@ var x = "x";
 if ((x > x + "y") !== false) {
   $ERROR('#6: var x = "x"; (x > x + "y") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.11.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.11.js
index 76da4cc14..cdc7efef3 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.11.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is a prefix of x and x !== y, return true
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.11.js
- * @description x and y are string primitives
- */
+/*---
+info: If y is a prefix of x and x !== y, return true
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x " > "x") !== true) {
@@ -48,5 +46,3 @@ if (("a\u0000a" > "a\u0000") !== true) {
 if ((" x" > "x") !== false) {
   $ERROR('#8: (" x" > "x") === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T1.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T1.js
index 4bd4fb2ab..732ddaad4 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T1.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.12_T1.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("xy" > "xx") !== true) {
@@ -42,4 +43,3 @@ if (("a\u0000b" > "a\u0000a") !== true) {
 if (("aa" > "aB") !== true) {
   $ERROR('#7: ("aa" > aB") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T2.js
index ab16d98cb..7d399d8b2 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.12_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.12_T2.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" > "0") !== true) {
@@ -42,4 +43,3 @@ if (("-1" > "+1") !== true) {
 if (("1e-10" > "1") !== true) {
 $ERROR('#7: ("1e-10" > "1") !== true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.2.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.2.js
index 1e81c52fe..334cdf7eb 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.2.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.2.js
- * @description x is number primitive
- */
+/*---
+info: If y is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 > Number.NaN) !== false) {
@@ -47,5 +45,3 @@ if ((Number.MAX_VALUE > Number.NaN) !== false) {
 if ((Number.MIN_VALUE > Number.NaN) !== false) {
   $ERROR('#8: (Number.MIN_VALUE > NaN) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.3.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.3.js
index 8890a00e1..6b6dfdf28 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.3.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x and y are the same number value, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.3.js
- * @description x and y are number primitives
- */
+/*---
+info: If x and y are the same number value, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 > 1) !== false) {
@@ -42,6 +40,3 @@ if ((Number.MAX_VALUE > Number.MAX_VALUE) !== false) {
 if ((Number.MIN_VALUE > Number.MIN_VALUE) !== false) {
   $ERROR('#7: (Number.MIN_VALUE > Number.MIN_VALUE) === false');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.4.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.4.js
index 70a5440ca..b40ff199c 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.4.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If either variable x or y is +0 and the other is -0, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.4.js
- * @description Checking all combinations
- */
+/*---
+info: If either variable x or y is +0 and the other is -0, return false
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((0 > 0) !== false) {
@@ -27,5 +25,3 @@ if ((+0 > -0) !== false) {
 if ((-0 > +0) !== false) {
   $ERROR('#4: (-0 > +0) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.5.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.5.js
index 79d3bde31..a781439d0 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.5.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity and x !== y, return true
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.5.js
- * @description y is number primitive
- */
+/*---
+info: If x is +Infinity and x !== y, return true
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY > 0) !== true) {
@@ -37,5 +35,3 @@ if ((Number.POSITIVE_INFINITY > Number.MAX_VALUE) !== true) {
 if ((Number.POSITIVE_INFINITY > Number.MIN_VALUE) !== true) {
   $ERROR('#6: (+Infinity > Number.MIN_VALUE) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.6.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.6.js
index aa96e699d..46769b13d 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.6.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +Infinity, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.6.js
- * @description x is number primitive
- */
+/*---
+info: If y is +Infinity, return false
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 > Number.POSITIVE_INFINITY) !== false) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE > Number.POSITIVE_INFINITY) !== false) {
 if ((Number.MIN_VALUE > Number.POSITIVE_INFINITY) !== false) {
   $ERROR('#6: (Number.MIN_VALUE > +Infinity) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.7.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.7.js
index bc06818cc..b5a3fac9a 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.7.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.7.js
- * @description y is number primitive
- */
+/*---
+info: If x is -Infinity, return false
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NEGATIVE_INFINITY > 0) !== false) {
@@ -37,5 +35,3 @@ if ((Number.NEGATIVE_INFINITY > Number.MAX_VALUE) !== false) {
 if ((Number.NEGATIVE_INFINITY > Number.MIN_VALUE) !== false) {
   $ERROR('#6: (-Infinity > Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.8.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.8.js
index 3a3156114..f3a7865d8 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.8.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -Infinity and x !== y, return true
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.8.js
- * @description x is number primitive
- */
+/*---
+info: If y is -Infinity and x !== y, return true
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 > Number.NEGATIVE_INFINITY) !== true) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE > Number.NEGATIVE_INFINITY) !== true) {
 if ((Number.MIN_VALUE > Number.NEGATIVE_INFINITY) !== true) {
   $ERROR('#6: (Number.MIN_VALUE > -Infinity) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.9.js b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.9.js
index a31255368..fea57ae14 100644
--- a/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.9.js
+++ b/test/suite/ch11/11.8/11.8.2/S11.8.2_A4.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If is x greater than y and these values are both finite non-zero, return true; otherwise, return false
- *
- * @path ch11/11.8/11.8.2/S11.8.2_A4.9.js
- * @description x and y are number primitives
- */
+/*---
+info: >
+    If is x greater than y and these values are both finite non-zero, return
+    true; otherwise, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 > 1.1) !== false) {
@@ -47,6 +47,3 @@ if ((Number.MAX_VALUE > Number.MAX_VALUE/2) !== true) {
 if ((Number.MIN_VALUE*2 > Number.MIN_VALUE) !== true) {
   $ERROR('#8: (Number.MIN_VALUE*2 > Number.MIN_VALUE) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/11.8.3-1.js b/test/suite/ch11/11.8/11.8.3/11.8.3-1.js
index 4dc765ee2..eff46d7c7 100644
--- a/test/suite/ch11/11.8/11.8.3/11.8.3-1.js
+++ b/test/suite/ch11/11.8/11.8.3/11.8.3-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.3/11.8.3-1.js

- * @description 11.8.3 Less-than-or-equal Operator - Partial left to right order enforced when using Less-than-or-equal operator: valueOf <= valueOf

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            valueOf: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            valueOf: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return (obj1 <= obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.3 Less-than-or-equal Operator - Partial left to right order
+    enforced when using Less-than-or-equal operator: valueOf <= valueOf
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            valueOf: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            valueOf: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return (obj1 <= obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.3/11.8.3-2.js b/test/suite/ch11/11.8/11.8.3/11.8.3-2.js
index 0ff108b51..1f71eb65a 100644
--- a/test/suite/ch11/11.8/11.8.3/11.8.3-2.js
+++ b/test/suite/ch11/11.8/11.8.3/11.8.3-2.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.3/11.8.3-2.js

- * @description 11.8.3 Less-than-or-equal Operator - Partial left to right order enforced when using Less-than-or-equal operator: valueOf <= toString

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            valueOf: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            toString: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return (obj1 <= obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.3 Less-than-or-equal Operator - Partial left to right order
+    enforced when using Less-than-or-equal operator: valueOf <=
+    toString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            valueOf: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            toString: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return (obj1 <= obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.3/11.8.3-3.js b/test/suite/ch11/11.8/11.8.3/11.8.3-3.js
index 2f5deae83..74ee56966 100644
--- a/test/suite/ch11/11.8/11.8.3/11.8.3-3.js
+++ b/test/suite/ch11/11.8/11.8.3/11.8.3-3.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.3/11.8.3-3.js

- * @description 11.8.3 Less-than-or-equal Operator - Partial left to right order enforced when using Less-than-or-equal operator: toString <= valueOf

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            toString: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            valueOf: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return (obj1 <= obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.3 Less-than-or-equal Operator - Partial left to right order
+    enforced when using Less-than-or-equal operator: toString <=
+    valueOf
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            toString: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            valueOf: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return (obj1 <= obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.3/11.8.3-4.js b/test/suite/ch11/11.8/11.8.3/11.8.3-4.js
index 9105f9e6f..afbd3707b 100644
--- a/test/suite/ch11/11.8/11.8.3/11.8.3-4.js
+++ b/test/suite/ch11/11.8/11.8.3/11.8.3-4.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.3/11.8.3-4.js

- * @description 11.8.3 Less-than-or-equal Operator - Partial left to right order enforced when using Less-than-or-equal operator: toString <= toString

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            toString: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            toString: function () {

-                if (accessed === true) {

-                    return 4;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return (obj1 <= obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.3 Less-than-or-equal Operator - Partial left to right order
+    enforced when using Less-than-or-equal operator: toString <=
+    toString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            toString: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            toString: function () {
+                if (accessed === true) {
+                    return 4;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return (obj1 <= obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.3/11.8.3-5.js b/test/suite/ch11/11.8/11.8.3/11.8.3-5.js
index 9356ff34e..4febb1028 100644
--- a/test/suite/ch11/11.8/11.8.3/11.8.3-5.js
+++ b/test/suite/ch11/11.8/11.8.3/11.8.3-5.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch11/11.8/11.8.3/11.8.3-5.js

- * @description 11.8.3 Less-than-or-equal Operator - Partial left to right order enforced when using Less-than-or-equal operator: valueOf <= valueOf

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj1 = {

-            valueOf: function () {

-                accessed = true;

-                return 3;

-            }

-        };

-        var obj2 = {

-            valueOf: function () {

-                if (accessed === true) {

-                    return 3;

-                } else {

-                    return 2;

-                }

-            }

-        };

-        return (obj1 <= obj2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    11.8.3 Less-than-or-equal Operator - Partial left to right order
+    enforced when using Less-than-or-equal operator: valueOf <= valueOf
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj1 = {
+            valueOf: function () {
+                accessed = true;
+                return 3;
+            }
+        };
+        var obj2 = {
+            valueOf: function () {
+                if (accessed === true) {
+                    return 3;
+                } else {
+                    return 2;
+                }
+            }
+        };
+        return (obj1 <= obj2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A1.js
index 905571139..2b4857288 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and "<=" or between "<=" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and "<=" or
+    between "<=" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009<=\u00091") !== true) {
@@ -57,4 +57,3 @@ if (eval("1\u2029<=\u20291") !== true) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20290") !== true) {
   $ERROR('#10: (1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20290) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T1.js
index ddf5cde6d..fcd1ca920 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y uses GetValue
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x <= y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 <= 1 !== true) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop <= objecty.prop !== true) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop <= objecty.prop === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T2.js
index b767e2d95..5072f1057 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y uses GetValue
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x <= y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: x <= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T3.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T3.js
index d2a4df17b..aad9b5392 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y uses GetValue
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x <= y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 <= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.2_T1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.2_T1.js
index fbc706a2f..8aa8437c0 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.2_T1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y uses [[Default Value]]
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x <= y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 0}} <= 1 !== true) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 <= {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.3_T1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.3_T1.js
index 14ea37cc6..0f3fbb7cd 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.3_T1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In ES5, First expression should be evaluated first.
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.3_T1.js
- * @description Checking that operands of a "<=" evaluate left-to-right
- */
+/*---
+info: In ES5, First expression should be evaluated first.
+description: Checking that operands of a "<=" evaluate left-to-right
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T1.js
index 81e29c531..16175baa4 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 1;
 if (x <= (x = 0) !== false) {
   $ERROR('#2: var x = 1; x <= (x = 0) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T2.js
index 2cbb846ff..a07398d56 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T3.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T3.js
index e53f08142..2c877305a 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) <= y !== true) {
   $ERROR('#2: (y = 1) <= y === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.1.js
index a6a6f9dda..6b6c5e1f5 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive boolean and Boolean object
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    boolean and Boolean object
+---*/
 
 //CHECK#1
 if (true <= true !== true) {
@@ -27,4 +29,3 @@ if (true <= new Boolean(true) !== true) {
 if (new Boolean(true) <= new Boolean(true) !== true) {
   $ERROR('#4: new Boolean(true) <= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.2.js
index e4a93112a..25d8f7b96 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive number and Number object
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    number and Number object
+---*/
 
 //CHECK#1
 if (1 <= 1 !== true) {
@@ -27,5 +29,3 @@ if (1 <= new Number(1) !== true) {
 if (new Number(1) <= new Number(1) !== true) {
   $ERROR('#4: new Number(1) <= new Number(1) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.3.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.3.js
index c55bc154c..9f2930847 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.3.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T1.3.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Null and Undefined
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Null and
+    Undefined
+---*/
 
 //CHECK#1
 if (null <= undefined !== false) {
@@ -27,4 +29,3 @@ if (undefined <= undefined !== false) {
 if (null <= null !== true) {
   $ERROR('#4: null <= null === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.1.js
index 2eb6f2282..630c0d44e 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true <= 1 !== true) {
@@ -47,4 +50,3 @@ if (new Boolean(true) <= new Number(1) !== true) {
 if (new Number(1) <= new Boolean(true) !== true) {
   $ERROR('#8: new Number(1) <= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.2.js
index 7bbff24f5..b233e77c0 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and String
+    (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" <= 1 !== true) {
@@ -57,4 +60,3 @@ if ("x" <= 1 !== false) {
 if (1 <= "x" !== false) {
   $ERROR('#10: 1 <= "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.3.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.3.js
index a255c8b99..51d7dd2e5 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.3.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 <= null !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) <= null !== false) {
 if (null <= new Number(1) !== true) {
   $ERROR('#4: null <= new Number(1) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.4.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.4.js
index a124fb8d9..f37be48a9 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.4.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 <= undefined !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) <= undefined !== false) {
 if (undefined <= new Number(1) !== false) {
   $ERROR('#4: undefined <= new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.5.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.5.js
index 39fa250a5..81ebafdd7 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.5.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.5.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true <= "1" !== true) {
@@ -47,4 +50,3 @@ if (new Boolean(true) <= new String("1") !== true) {
 if (new String("1") <= new Boolean(true) !== true) {
   $ERROR('#8: new String("1") <= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.6.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.6.js
index 321a4848e..f87dec059 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.6.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.6.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" <= undefined !== false) {
@@ -27,4 +29,3 @@ if (new String("1") <= undefined !== false) {
 if (undefined <= new String("1") !== false) {
   $ERROR('#4: undefined <= new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.7.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.7.js
index 02a69689e..300de4416 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.7.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.7.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" <= null !== false) {
@@ -27,4 +29,3 @@ if (new String("1") <= null !== false) {
 if (null <= new String("1") !== true) {
   $ERROR('#4: null <= new String("1") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.8.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.8.js
index 580057063..3e92e5766 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.8.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.8.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true <= undefined !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) <= undefined !== false) {
 if (undefined <= new Boolean(true) !== false) {
   $ERROR('#4: undefined <= new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.9.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.9.js
index ed70b36f2..c64f6082d 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.9.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.1_T2.9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x)) is not String or Type(Primitive(y)) is not String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.1_T2.9.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: >
+    Operator x <= y returns ToNumber(x) <= ToNumber(y), if Type(Primitive(x))
+    is not String or Type(Primitive(y)) is not String
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true <= null !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) <= null !== false) {
 if (null <= new Boolean(true) !== true) {
   $ERROR('#4: null <= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.1.js
index 354384ea8..d5a0f6785 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToString(x) <= ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.2_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive string and String object
- */
+/*---
+info: >
+    Operator x <= y returns ToString(x) <= ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    string and String object
+---*/
 
 //CHECK#1
 if ("1" <= "1" !== true) {
@@ -37,4 +39,3 @@ if ("x" <= "1" !== false) {
 if ("1" <= "x" !== true) {
   $ERROR('#6: "1" <= "x" === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.2.js
index 93ff5e2e2..542531547 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A3.2_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x <= y returns ToString(x) <= ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A3.2_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Object object and Function object
- */
+/*---
+info: >
+    Operator x <= y returns ToString(x) <= ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Object
+    object and Function object
+---*/
 
 //CHECK#1
 if (({} <= function(){return 1}) !== ({}.toString() <= function(){return 1}.toString())) {
@@ -27,4 +29,3 @@ if ((function(){return 1} <= function(){return 1}) !== (function(){return 1}.toS
 if (({} <= {}) !== ({}.toString() <= {}.toString())) {
   $ERROR('#4: ({} <= {}) === ({}.toString() <= {}.toString())');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.1.js
index c94f02041..165cc9d4a 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.1.js
- * @description y is number primitive
- */
+/*---
+info: If x is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NaN <= 0) !== false) {
@@ -47,5 +45,3 @@ if ((Number.NaN <= Number.MAX_VALUE) !== false) {
 if ((Number.NaN <= Number.MIN_VALUE) !== false) {
   $ERROR('#8: (NaN <= Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.10.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.10.js
index 4e2295c6d..29e1135e9 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.10.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is a prefix of x and x !== y, return false
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.10.js
- * @description x and y are string primitives
- */
+/*---
+info: If y is a prefix of x and x !== y, return false
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x " <= "x") !== false) {
@@ -38,5 +36,3 @@ var x = "x";
 if ((x + 'y' <= x) !== false) {
   $ERROR('#6: var x = "x"; (x + "y" <= x) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.11.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.11.js
index 556a9eb89..8ff6e1650 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.11.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is a prefix of y, return true
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.11.js
- * @description x and y are string primitives
- */
+/*---
+info: If x is a prefix of y, return true
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" <= "x") !== true) {
@@ -48,6 +46,3 @@ if (("a\u0000" <= "a\u0000a") !== true) {
 if (("x" <= " x") !== false) {
   $ERROR('#8: ("x" <= " x") === false');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T1.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T1.js
index cb1228e57..a48917ff1 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T1.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.12_T1.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("xx" <= "xy") !== true) {
@@ -42,4 +43,3 @@ if (("a\u0000a" <= "a\u0000b") !== true) {
 if (("aB" <= "aa") !== true) {
   $ERROR('#7: ("aB" <= aa") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T2.js
index 459d73ed1..c1556441d 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.12_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.12_T2.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("0" <= "x") !== true) {
@@ -42,4 +43,3 @@ if (("+1" <= "-1") !== true) {
 if (("1" <= "1e-10") !== true) {
 $ERROR('#7: ("1" <= "1e-10") !== true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.2.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.2.js
index dd195d809..e03799466 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.2.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.2.js
- * @description x is number primitive
- */
+/*---
+info: If y is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 <= Number.NaN) !== false) {
@@ -47,5 +45,3 @@ if ((Number.MAX_VALUE <= Number.NaN) !== false) {
 if ((Number.MIN_VALUE <= Number.NaN) !== false) {
   $ERROR('#8: (Number.MIN_VALUE <= NaN) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.3.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.3.js
index 3c462cfdd..1bf568c5e 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.3.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x and y are the same number value, return true
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.3.js
- * @description x and y are number primitives
- */
+/*---
+info: If x and y are the same number value, return true
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 <= 1) !== true) {
@@ -42,6 +40,3 @@ if ((Number.MAX_VALUE <= Number.MAX_VALUE) !== true) {
 if ((Number.MIN_VALUE <= Number.MIN_VALUE) !== true) {
   $ERROR('#7: (Number.MIN_VALUE <= Number.MIN_VALUE) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.4.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.4.js
index 4669cde36..370f514aa 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.4.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If either x or y is +0 and the other is -0, return true
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.4.js
- * @description Checking all combinations
- */
+/*---
+info: If either x or y is +0 and the other is -0, return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((0 <= 0) !== true) {
@@ -27,5 +25,3 @@ if ((+0 <= -0) !== true) {
 if ((-0 <= +0) !== true) {
   $ERROR('#4: (-0 <= +0) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.5.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.5.js
index ff3ab3a85..5c07f1388 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.5.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity and x !== y, return false
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.5.js
- * @description y is number primitive
- */
+/*---
+info: If x is +Infinity and x !== y, return false
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY <= 0) !== false) {
@@ -37,5 +35,3 @@ if ((Number.POSITIVE_INFINITY <= Number.MAX_VALUE) !== false) {
 if ((Number.POSITIVE_INFINITY <= Number.MIN_VALUE) !== false) {
   $ERROR('#6: (+Infinity <= Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.6.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.6.js
index 1aa11f973..faad8099f 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.6.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +Infinity and x !== y, return true
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.6.js
- * @description x is number primitive
- */
+/*---
+info: If y is +Infinity and x !== y, return true
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 <= Number.POSITIVE_INFINITY) !== true) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE <= Number.POSITIVE_INFINITY) !== true) {
 if ((Number.MIN_VALUE <= Number.POSITIVE_INFINITY) !== true) {
   $ERROR('#6: (Number.MIN_VALUE <= +Infinity) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.7.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.7.js
index 8abd94de4..abbc88d00 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.7.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, return true
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.7.js
- * @description y is number primitive
- */
+/*---
+info: If x is -Infinity, return true
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NEGATIVE_INFINITY <= 0) !== true) {
@@ -37,5 +35,3 @@ if ((Number.NEGATIVE_INFINITY <= Number.MAX_VALUE) !== true) {
 if ((Number.NEGATIVE_INFINITY <= Number.MIN_VALUE) !== true) {
   $ERROR('#6: (-Infinity <= Number.MIN_VALUE) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.8.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.8.js
index c126d0795..e495f226f 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.8.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -Infinity and x !== y, return false
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.8.js
- * @description x is number primitive
- */
+/*---
+info: If y is -Infinity and x !== y, return false
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 <= Number.NEGATIVE_INFINITY) !== false) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE <= Number.NEGATIVE_INFINITY) !== false) {
 if ((Number.MIN_VALUE <= Number.NEGATIVE_INFINITY) !== false) {
   $ERROR('#6: (Number.MIN_VALUE <= -Infinity) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.9.js b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.9.js
index fa0d9302c..609561473 100644
--- a/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.9.js
+++ b/test/suite/ch11/11.8/11.8.3/S11.8.3_A4.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less or equal than y and these values are both finite non-zero, return true; otherwise, return false
- *
- * @path ch11/11.8/11.8.3/S11.8.3_A4.9.js
- * @description x and y are number primitives
- */
+/*---
+info: >
+    If x is less or equal than y and these values are both finite non-zero,
+    return true; otherwise, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1.1 <= 1) !== false) {
@@ -47,6 +47,3 @@ if ((Number.MAX_VALUE/2 <= Number.MAX_VALUE) !== true) {
 if ((Number.MIN_VALUE <= Number.MIN_VALUE*2) !== true) {
   $ERROR('#8: (Number.MIN_VALUE <= Number.MIN_VALUE*2) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A1.js
index 2a165a211..eee942672 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and "=>" or "=>" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and "=>" or
+    "=>" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009>=\u00091") !== true) {
@@ -57,4 +57,3 @@ if (eval("1\u2029>=\u20291") !== true) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029>=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== true) {
   $ERROR('#10: (1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029>=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T1.js
index 8f3adb309..3d136a7bb 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y uses GetValue
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x >= y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 >= 1 !== true) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if (objectx.prop >= objecty.prop !== true) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop >= objecty.prop === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T2.js
index 8a57a24e3..974927ebd 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y uses GetValue
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x >= y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x >= 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T3.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T3.js
index 23c2ea604..4535d9693 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y uses GetValue
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x >= y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 >= y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.2_T1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.2_T1.js
index f129ea315..0b03a6751 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.2_T1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y uses [[Default Value]]
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.2_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator x >= y uses [[Default Value]]
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 if ({valueOf: function() {return 2}} >= 1 !== true) {
@@ -68,4 +66,3 @@ catch (e) {
     $ERROR('#8.2: 1 >= {valueOf: function() {return {}}, toString: function() {return {}}} throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.3_T1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.3_T1.js
index dd286dd03..856480e83 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.3_T1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ToNumber(first expression) is called first, and then ToNumber(second expression)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.3_T1.js
- * @description Checking with "throw"
- */
+/*---
+info: >
+    ToNumber(first expression) is called first, and then ToNumber(second
+    expression)
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = { valueOf: function () { throw "x"; } };
@@ -23,4 +23,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T1.js
index 8e3f2b0c7..1e7baf551 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 1; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x >= (x = 1) !== false) {
   $ERROR('#2: var x = 0; x >= (x = 1) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T2.js
index f7c0446dd..aca2fe6dd 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T3.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T3.js
index 54efe21ac..fe38c26ce 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) >= y !== true) {
   $ERROR('#2: (y = 1) >= y === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.1.js
index d92463091..d23ac9d4f 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive boolean and Boolean object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    boolean and Boolean object
+---*/
 
 //CHECK#1
 if (true >= true !== true) {
@@ -27,4 +29,3 @@ if (true >= new Boolean(true) !== true) {
 if (new Boolean(true) >= new Boolean(true) !== true) {
   $ERROR('#4: new Boolean(true) >= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.2.js
index 255124d7d..e967d057d 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive number and Number object
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    number and Number object
+---*/
 
 //CHECK#1
 if (1 >= 1 !== true) {
@@ -27,5 +29,3 @@ if (1 >= new Number(1) !== true) {
 if (new Number(1) >= new Number(1) !== true) {
   $ERROR('#4: new Number(1) >= new Number(1) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.3.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.3.js
index ffe39372e..0252ba6cc 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.3.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T1.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T1.3.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Null and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Null and
+    Undefined
+---*/
 
 //CHECK#1
 if (null >= undefined !== false) {
@@ -27,4 +29,3 @@ if (undefined >= undefined !== false) {
 if (null >= null !== true) {
   $ERROR('#4: null >= null === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.1.js
index c1f367aae..8159c6f23 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.1.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true >= 1 !== true) {
@@ -47,4 +50,3 @@ if (new Boolean(true) >= new Number(1) !== true) {
 if (new Number(1) >= new Boolean(true) !== true) {
   $ERROR('#8: new Number(1) >= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.2.js
index 3e4bca79b..2ccfb7eb0 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.2.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and String (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and String
+    (primitive and object)
+---*/
 
 //CHECK#1
 if ("1" >= 1 !== true) {
@@ -57,4 +60,3 @@ if ("x" >= 1 !== false) {
 if (1 >= "x" !== false) {
   $ERROR('#10: 1 >= "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.3.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.3.js
index 4d0c6b6a9..0eab4ac8f 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.3.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.3.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (1 >= null !== true) {
@@ -27,4 +29,3 @@ if (new Number(1) >= null !== true) {
 if (null >= new Number(1) !== false) {
   $ERROR('#4: null >= new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.4.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.4.js
index f94a78e5a..c7b873f22 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.4.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.4.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Number (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Number (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (1 >= undefined !== false) {
@@ -27,4 +29,3 @@ if (new Number(1) >= undefined !== false) {
 if (undefined >= new Number(1) !== false) {
   $ERROR('#4: undefined >= new Number(1) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.5.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.5.js
index 5f949872e..43d84e760 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.5.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.5.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Boolean (primitive and object)
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Boolean
+    (primitive and object)
+---*/
 
 //CHECK#1
 if (true >= "1" !== true) {
@@ -47,4 +50,3 @@ if (new Boolean(true) >= new String("1") !== true) {
 if (new String("1") >= new Boolean(true) !== true) {
   $ERROR('#8: new String("1") >= new Boolean(true) === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.6.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.6.js
index ff2ab1820..9b24e162e 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.6.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.6.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if ("1" >= undefined !== false) {
@@ -27,4 +29,3 @@ if (new String("1") >= undefined !== false) {
 if (undefined >= new String("1") !== false) {
   $ERROR('#4: undefined >= new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.7.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.7.js
index 10745f98a..41a912293 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.7.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.7.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between String (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between String (primitive or object) and Null
+---*/
 
 //CHECK#1
 if ("1" >= null !== true) {
@@ -27,4 +29,3 @@ if (new String("1") >= null !== true) {
 if (null >= new String("1") !== false) {
   $ERROR('#4: null >= new String("1") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.8.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.8.js
index c45874ca8..5a202611c 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.8.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.8.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Undefined
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Undefined
+---*/
 
 //CHECK#1
 if (true >= undefined !== false) {
@@ -27,4 +29,3 @@ if (new Boolean(true) >= undefined !== false) {
 if (undefined >= new Boolean(true) !== false) {
   $ERROR('#4: undefined >= new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.9.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.9.js
index 8046d5a59..9fce92c87 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.9.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.1_T2.9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String, then operator x >= y returns ToNumber(x) >= ToNumber(y)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.1_T2.9.js
- * @description Type(Primitive(x)) is different from Type(Primitive(y)) and both types vary between Boolean (primitive or object) and Null
- */
+/*---
+info: >
+    If Type(Primitive(x)) is not String or Type(Primitive(y)) is not String,
+    then operator x >= y returns ToNumber(x) >= ToNumber(y)
+description: >
+    Type(Primitive(x)) is different from Type(Primitive(y)) and both
+    types vary between Boolean (primitive or object) and Null
+---*/
 
 //CHECK#1
 if (true >= null !== true) {
@@ -27,4 +29,3 @@ if (new Boolean(true) >= null !== true) {
 if (null >= new Boolean(true) !== false) {
   $ERROR('#4: null >= new Boolean(true) === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.1.js
index d166d3f9b..835537b96 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y returns ToString(x) >= ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.2_T1.1.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between primitive string and String object
- */
+/*---
+info: >
+    Operator x >= y returns ToString(x) >= ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between primitive
+    string and String object
+---*/
 
 //CHECK#1
 if ("1" >= "1" !== true) {
@@ -37,4 +39,3 @@ if ("x" >= "1" !== true) {
 if ("1" >= "x" !== false) {
   $ERROR('#6: "1" >= "x" === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.2.js
index 7a981028c..62bab1569 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A3.2_T1.2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x >= y returns ToString(x) >= ToString(y), if Type(Primitive(x)) is String and Type(Primitive(y)) is String
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A3.2_T1.2.js
- * @description Type(Primitive(x)) and Type(Primitive(y)) vary between Object object and Function object
- */
+/*---
+info: >
+    Operator x >= y returns ToString(x) >= ToString(y), if Type(Primitive(x))
+    is String and Type(Primitive(y)) is String
+description: >
+    Type(Primitive(x)) and Type(Primitive(y)) vary between Object
+    object and Function object
+---*/
 
 //CHECK#1
 if (({} >= function(){return 1}) !== ({}.toString() >= function(){return 1}.toString())) {
@@ -27,4 +29,3 @@ if ((function(){return 1} >= function(){return 1}) !== (function(){return 1}.toS
 if (({} >= {}) !== ({}.toString() >= {}.toString())) {
   $ERROR('#4: ({} >= {}) === ({}.toString() >= {}.toString())');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.1.js
index 601f23715..ce7999f27 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.1.js
- * @description y is number primitive
- */
+/*---
+info: If x is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NaN >= 0) !== false) {
@@ -47,5 +45,3 @@ if ((Number.NaN >= Number.MAX_VALUE) !== false) {
 if ((Number.NaN >= Number.MIN_VALUE) !== false) {
   $ERROR('#8: (NaN >= Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.10.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.10.js
index caaf1fa86..2f3bd2edd 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.10.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is a prefix of y and x !== y, return false
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.10.js
- * @description x and y are string primitives
- */
+/*---
+info: If x is a prefix of y and x !== y, return false
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" >= "x ") !== false) {
@@ -38,4 +36,3 @@ var x = "x";
 if ((x >= x + "y") !== false) {
   $ERROR('#6: var x = "x"; (x >= x + "y") === false');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.11.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.11.js
index 98b792a6d..7f15f3369 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.11.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is a prefix of x, return true
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.11.js
- * @description x and y are string primitives
- */
+/*---
+info: If y is a prefix of x, return true
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" >= "x") !== true) {
@@ -48,5 +46,3 @@ if (("a\u0000a" >= "a\u0000") !== true) {
 if ((" x" >= "x") !== false) {
   $ERROR('#8: (" x" >= "x") === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T1.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T1.js
index 961dc236f..52d274971 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T1.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.12_T1.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("xy" >= "xx") !== true) {
@@ -42,4 +43,3 @@ if (("a\u0000b" >= "a\u0000a") !== true) {
 if (("aa" >= "aB") !== true) {
   $ERROR('#7: ("aa" >= aB") === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T2.js
index 851e69d49..5512e0492 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.12_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither x, nor y is a prefix of each other, returned result of strings comparison applies a simple lexicographic ordering to the sequences of code point value values
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.12_T2.js
- * @description x and y are string primitives
- */
+/*---
+info: >
+    If neither x, nor y is a prefix of each other, returned result of strings
+    comparison applies a simple lexicographic ordering to the sequences of
+    code point value values
+description: x and y are string primitives
+---*/
 
 //CHECK#1
 if (("x" >= "0") !== true) {
@@ -42,4 +43,3 @@ if (("-1" >= "+1") !== true) {
 if (("1e-10" >= "1") !== true) {
 $ERROR('#7: ("1e-10" >= "1") !== true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.2.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.2.js
index a10b2ab4e..c2f5665a5 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.2.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is NaN, return false (if result in 11.8.5 is undefined, return false)
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.2.js
- * @description x is number primitive
- */
+/*---
+info: If y is NaN, return false (if result in 11.8.5 is undefined, return false)
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 >= Number.NaN) !== false) {
@@ -47,5 +45,3 @@ if ((Number.MAX_VALUE >= Number.NaN) !== false) {
 if ((Number.MIN_VALUE >= Number.NaN) !== false) {
   $ERROR('#8: (Number.MIN_VALUE >= NaN) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.3.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.3.js
index 4169a91bb..a4d00bcc2 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.3.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x and y are the same number value, return true
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.3.js
- * @description x and y are number primitives
- */
+/*---
+info: If x and y are the same number value, return true
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 >= 1) !== true) {
@@ -42,6 +40,3 @@ if ((Number.MAX_VALUE >= Number.MAX_VALUE) !== true) {
 if ((Number.MIN_VALUE >= Number.MIN_VALUE) !== true) {
   $ERROR('#7: (Number.MIN_VALUE >= Number.MIN_VALUE) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.4.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.4.js
index 3abe7fa77..d06f5b2c1 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.4.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If either x or y is +0 and the other is -0, return true
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.4.js
- * @description Checking all combinations
- */
+/*---
+info: If either x or y is +0 and the other is -0, return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((0 >= 0) !== true) {
@@ -27,5 +25,3 @@ if ((+0 >= -0) !== true) {
 if ((-0 >= +0) !== true) {
   $ERROR('#4: (-0 >= +0) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.5.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.5.js
index e0357fee2..f6c6c984f 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.5.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, return true
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.5.js
- * @description y is number primitive
- */
+/*---
+info: If x is +Infinity, return true
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY >= 0) !== true) {
@@ -37,5 +35,3 @@ if ((Number.POSITIVE_INFINITY >= Number.MAX_VALUE) !== true) {
 if ((Number.POSITIVE_INFINITY >= Number.MIN_VALUE) !== true) {
   $ERROR('#6: (+Infinity >= Number.MIN_VALUE) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.6.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.6.js
index b1f898a14..f12eae38c 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.6.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +Infinity and x !== y, return false
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.6.js
- * @description x is number primitive
- */
+/*---
+info: If y is +Infinity and x !== y, return false
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 >= Number.POSITIVE_INFINITY) !== false) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE >= Number.POSITIVE_INFINITY) !== false) {
 if ((Number.MIN_VALUE >= Number.POSITIVE_INFINITY) !== false) {
   $ERROR('#6: (Number.MIN_VALUE >= +Infinity) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.7.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.7.js
index 6a423b834..3e1ad0040 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.7.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and x !== y, return false
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.7.js
- * @description y is number primitive
- */
+/*---
+info: If x is -Infinity and x !== y, return false
+description: y is number primitive
+---*/
 
 //CHECK#1
 if ((Number.NEGATIVE_INFINITY >= 0) !== false) {
@@ -37,5 +35,3 @@ if ((Number.NEGATIVE_INFINITY >= Number.MAX_VALUE) !== false) {
 if ((Number.NEGATIVE_INFINITY >= Number.MIN_VALUE) !== false) {
   $ERROR('#6: (-Infinity >= Number.MIN_VALUE) === false');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.8.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.8.js
index ce00360b3..b0cfb6202 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.8.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -Infinity, return true
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.8.js
- * @description x is number primitive
- */
+/*---
+info: If y is -Infinity, return true
+description: x is number primitive
+---*/
 
 //CHECK#1
 if ((0 >= Number.NEGATIVE_INFINITY) !== true) {
@@ -37,5 +35,3 @@ if ((Number.MAX_VALUE >= Number.NEGATIVE_INFINITY) !== true) {
 if ((Number.MIN_VALUE >= Number.NEGATIVE_INFINITY) !== true) {
   $ERROR('#6: (Number.MIN_VALUE >= -Infinity) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.9.js b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.9.js
index 116d934ef..3c514df79 100644
--- a/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.9.js
+++ b/test/suite/ch11/11.8/11.8.4/S11.8.4_A4.9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is greater or equal than y and these values are both finite non-zero, return true; otherwise, return false
- *
- * @path ch11/11.8/11.8.4/S11.8.4_A4.9.js
- * @description x and y are number primitives
- */
+/*---
+info: >
+    If x is greater or equal than y and these values are both finite
+    non-zero, return true; otherwise, return false
+description: x and y are number primitives
+---*/
 
 //CHECK#1
 if ((1 >= 1.1) !== false) {
@@ -47,6 +47,3 @@ if ((Number.MAX_VALUE >= Number.MAX_VALUE/2) !== true) {
 if ((Number.MIN_VALUE*2 >= Number.MIN_VALUE) !== true) {
   $ERROR('#8: (Number.MIN_VALUE*2 >= Number.MIN_VALUE) === true');
 }
-
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A1.js
index 282b9fda4..b290b4c92 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and "instanceof" and between "instanceof" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and
+    "instanceof" and between "instanceof" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("({})\u0009instanceof\u0009Object") !== true) {
@@ -57,4 +57,3 @@ if (eval("({})\u2029instanceof\u2029Object") !== true) {
 if (eval("({})\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029instanceof\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029Object") !== true) {
   $ERROR('#10: ({})\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029instanceof\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029Object === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T1.js
index e7a31658c..8d612ac87 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "instanceof" uses GetValue
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.1_T1.js
- * @description Either Expression is not Reference or GetBase is not null
- */
+/*---
+info: Operator "instanceof" uses GetValue
+description: Either Expression is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (({}) instanceof Object !== true) {
@@ -31,5 +29,3 @@ var OBJECT = Object;
 if (object instanceof OBJECT !== true) {
   $ERROR('#4: var object = {}; var OBJECT = Object; object instanceof OBJECT === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T2.js
index 9477b0b5d..eaeaad9f6 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "instanceof" uses GetValue
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.1_T2.js
- * @description If GetBase(RelationalExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator "instanceof" uses GetValue
+description: If GetBase(RelationalExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: object instanceof Object throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T3.js
index bb0a094ce..fed60b6e4 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "instanceof" uses GetValue
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.1_T3.js
- * @description If GetBase(ShiftExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator "instanceof" uses GetValue
+description: If GetBase(ShiftExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: ({}) instanceof OBJECT throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T1.js
index 957c99b3b..0b713ac25 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1 
 var OBJECT = 0;
@@ -19,5 +17,3 @@ var object = {};
 if (object instanceof (object = 0, Object) !== true) {
   $ERROR('#2: var object = {};  object instanceof (object = 0, Object) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T2.js
index 5f87c4342..6f2ec9bfc 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T3.js
index 06ef16073..34b52a9ab 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((OBJECT = Object, {}) instanceof OBJECT !== true) {
   $ERROR('#2: (OBJECT = Object, {}) instanceof OBJECT !== true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A3.js
index da3d7e5dc..8b2134f1b 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ShiftExpression is not an object, throw TypeError
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A3.js
- * @description Checking all the types of primitives
- */
+/*---
+info: If ShiftExpression is not an object, throw TypeError
+description: Checking all the types of primitives
+---*/
 
 //CHECK#1
 try {
@@ -62,4 +60,3 @@ catch (e) {
     $ERROR('#5: null instanceof null throw TypeError');  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T1.js
index 0f9d2319d..2d8f596d0 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only constructor call (with "new" keyword) makes instance
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A4_T1.js
- * @description Checking Boolean case
- */
+/*---
+info: Only constructor call (with "new" keyword) makes instance
+description: Checking Boolean case
+---*/
 
 //CHECK#1
 if (false instanceof Boolean) {
@@ -22,5 +20,3 @@ if (Boolean(false) instanceof Boolean) {
 if (new Boolean instanceof Boolean !== true) {
 	$ERROR('#3: new Boolean instanceof Boolean');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T2.js
index a4f1f3c02..d52834d3e 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only constructor call (with "new" keyword) makes instance
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A4_T2.js
- * @description Checking Number case
- */
+/*---
+info: Only constructor call (with "new" keyword) makes instance
+description: Checking Number case
+---*/
 
 //CHECK#1
 if (0 instanceof Number) {
@@ -22,5 +20,3 @@ if (Number(0) instanceof Number) {
 if (new Number instanceof Number !== true) {
 	$ERROR('#3: new Number instanceof Number');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T3.js
index c8220049c..850da1852 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only constructor call (with "new" keyword) makes instance
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A4_T3.js
- * @description Checking String case
- */
+/*---
+info: Only constructor call (with "new" keyword) makes instance
+description: Checking String case
+---*/
 
 //CHECK#1
 if ("" instanceof String) {
@@ -22,4 +20,3 @@ if (String("") instanceof String) {
 if (new String instanceof String !== true) {
 	$ERROR('#3: new String instanceof String');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T1.js
index a021a9ac3..078812903 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TypeError is subclass of Error from instanceof operator point of view
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A5_T1.js
- * @description Checking Error case
- */
+/*---
+info: TypeError is subclass of Error from instanceof operator point of view
+description: Checking Error case
+---*/
 
 var __err = new Error;
 
@@ -43,5 +41,3 @@ if (err__ instanceof TypeError) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T2.js
index 8a9814a52..bb87ad80a 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TypeError is subclass of Error from instanceof operator point of view
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A5_T2.js
- * @description Checking TypeError case
- */
+/*---
+info: TypeError is subclass of Error from instanceof operator point of view
+description: Checking TypeError case
+---*/
 
 var __t__err = new TypeError;
 
@@ -32,5 +30,3 @@ if (!(err__t__ instanceof Error)) {
 if (!(err__t__ instanceof TypeError)) {
 	$ERROR('#4: TypeError is subclass of Error from instanceof operator point of view');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T1.js
index 16e0d82b3..7e85c8185 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only Function objects implement [[HasInstance]] and can be proper ShiftExpression for the "instanceof" operator consequently
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A6_T1.js
- * @description Checking "this" case
- */
+/*---
+info: >
+    Only Function objects implement [[HasInstance]] and can be proper
+    ShiftExpression for the "instanceof" operator consequently
+description: Checking "this" case
+---*/
 
 //CHECK#1
 try{
@@ -18,4 +18,3 @@ catch(e){
     $ERROR('#1: Only Function objects implement [[HasInstance]] and consequently can be proper ShiftExpression for The instanceof operator');
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T2.js
index f25dbed82..2d8d2a431 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only Function objects implement [[HasInstance]] and can be proper ShiftExpression for the "instanceof" operator consequently
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A6_T2.js
- * @description Checking Math case
- */
+/*---
+info: >
+    Only Function objects implement [[HasInstance]] and can be proper
+    ShiftExpression for the "instanceof" operator consequently
+description: Checking Math case
+---*/
 
 //CHECK#1
 try{
@@ -18,4 +18,3 @@ catch(e){
     $ERROR('#1: 1 instanceof Math throw TypeError');
   }  
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T3.js
index 24773ad97..3fac0a92e 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only Function objects implement [[HasInstance]] and can be proper ShiftExpression for the "instanceof" operator consequently
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A6_T3.js
- * @description Checking if RelationalExpression is function
- */
+/*---
+info: >
+    Only Function objects implement [[HasInstance]] and can be proper
+    ShiftExpression for the "instanceof" operator consequently
+description: Checking if RelationalExpression is function
+---*/
 
 function MyFunct(){return 0};
 
@@ -24,4 +24,3 @@ if (MyFunct instanceof Function !== true){
 if (MyFunct instanceof Object !== true){
 	$ERROR('#3 function MyFunct(){return 0}; MyFunct instanceof Object === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T4.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T4.js
index 68aa843e8..1164efd7b 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T4.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A6_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only Function objects implement [[HasInstance]] and can be proper ShiftExpression for the "instanceof" operator consequently
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A6_T4.js
- * @description Checking if RelationalExpression is object
- */
+/*---
+info: >
+    Only Function objects implement [[HasInstance]] and can be proper
+    ShiftExpression for the "instanceof" operator consequently
+description: Checking if RelationalExpression is object
+---*/
 
 MyFunct = function(){};
 __my__funct = new MyFunct;
@@ -37,4 +37,3 @@ catch(e){
       $ERROR('#4 Only Function objects implement [[HasInstance]] and consequently can be proper ShiftExpression for The instanceof operator');
 	}
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T1.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T1.js
index 97944a5fd..ae9fe0bb4 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T1.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "instanceof" returns true it means that GetValue(RelationalExpression) is constructed with ShiftExpression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A7_T1.js
- * @description Checking Object object
- */
+/*---
+info: >
+    When "instanceof" returns true it means that
+    GetValue(RelationalExpression) is constructed with ShiftExpression
+description: Checking Object object
+---*/
 
 var __obj={};
 
@@ -19,4 +19,3 @@ if (!(__obj instanceof Object)) {
 if (__obj.constructor !== Object) {
 	$ERROR('#2: If instanceof returns true then GetValue(RelationalExpression) was constructed with ShiftExpression');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T2.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T2.js
index c77c93c18..718516ff5 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T2.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "instanceof" returns true it means that GetValue(RelationalExpression) is constructed with ShiftExpression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A7_T2.js
- * @description Checking Array object
- */
+/*---
+info: >
+    When "instanceof" returns true it means that
+    GetValue(RelationalExpression) is constructed with ShiftExpression
+description: Checking Array object
+---*/
 
 var __arr=[];
 
@@ -19,4 +19,3 @@ if (!(__arr instanceof Array)) {
 if (__arr.constructor !== Array) {
 	$ERROR('#2: If instanceof returns true then GetValue(RelationalExpression) was constructed with ShiftExpression');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T3.js b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T3.js
index 8d476a8ad..a13bce785 100644
--- a/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T3.js
+++ b/test/suite/ch11/11.8/11.8.6/S11.8.6_A7_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "instanceof" returns true it means that GetValue(RelationalExpression) is constructed with ShiftExpression
- *
- * @path ch11/11.8/11.8.6/S11.8.6_A7_T3.js
- * @description Checking Function object
- */
+/*---
+info: >
+    When "instanceof" returns true it means that
+    GetValue(RelationalExpression) is constructed with ShiftExpression
+description: Checking Function object
+---*/
 
 var __func = new Function;
 
@@ -19,5 +19,3 @@ if (!(__func instanceof Function)) {
 if (__func.constructor !== Function) {
 	$ERROR('#2: If instanceof returns true then GetValue(RelationalExpression) was constructed with ShiftExpression');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A1.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A1.js
index 93c67bfcc..3005d6f95 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A1.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between RelationalExpression and "in" and between "in" and ShiftExpression are allowed
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between RelationalExpression and "in" and
+    between "in" and ShiftExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("'MAX_VALUE'\u0009in\u0009Number") !== true) {
@@ -57,4 +57,3 @@ if (eval("'MAX_VALUE'\u2029in\u2029Number") !== true) {
 if (eval("'MAX_VALUE'\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029in\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029Number") !== true) {
   $ERROR('#10: "MAX_VALUE"\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029in\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029Number === true');
 }
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T1.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T1.js
index 0e33a3d02..b24241ff5 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T1.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "in" uses GetValue
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.1_T1.js
- * @description Either Expression is not Reference or GetBase is not null
- */
+/*---
+info: Operator "in" uses GetValue
+description: Either Expression is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ("MAX_VALUE" in Number !== true) {
@@ -31,5 +29,3 @@ var y = Number;
 if (x in y !== true) {
   $ERROR('#4: var x = "MAX_VALUE"; var y = Number; x in y === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T2.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T2.js
index 307b23b83..fcf3983ec 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T2.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "in" uses GetValue
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.1_T2.js
- * @description If GetBase(RelationalExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator "in" uses GetValue
+description: If GetBase(RelationalExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: MAX_VALUE in Number throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T3.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T3.js
index 89f69661a..10fd2243a 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T3.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "in" uses GetValue
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.1_T3.js
- * @description If GetBase(ShiftExpression) is null, throw ReferenceError
- */
+/*---
+info: Operator "in" uses GetValue
+description: If GetBase(ShiftExpression) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +16,3 @@ catch (e) {
     $ERROR('#1.2: "MAX_VALUE" in NUMBER throw ReferenceError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T1.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T1.js
index 5403131ae..8f29eed1b 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T1.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1 
 var NUMBER = 0;
@@ -19,5 +17,3 @@ var max_value = "MAX_VALUE";
 if (max_value in (max_value = "none", Number) !== true) {
   $ERROR('#2: var max_value = "MAX_VALUE"; max_value in (max_value = "none", Number) === true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T2.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T2.js
index 3016c2278..d20425193 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T2.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T3.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T3.js
index 22744621a..42dacc9fc 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T3.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((NUMBER = Number, "MAX_VALUE") in NUMBER !== true) {
   $ERROR('#2: (NUMBER = Number, "MAX_VALUE") in NUMBER !== true');
 }
-
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A3.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A3.js
index 56dc73198..af188bc89 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A3.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ShiftExpression is not an object, throw TypeError
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A3.js
- * @description Checking all the types of primitives
- */
+/*---
+info: If ShiftExpression is not an object, throw TypeError
+description: Checking all the types of primitives
+---*/
 
 //CHECK#1
 try {
@@ -62,4 +60,3 @@ catch (e) {
     $ERROR('#5: "toString" in null throw TypeError');  
   }
 }
-
diff --git a/test/suite/ch11/11.8/11.8.7/S11.8.7_A4.js b/test/suite/ch11/11.8/11.8.7/S11.8.7_A4.js
index fcb4a6b86..9386f76af 100644
--- a/test/suite/ch11/11.8/11.8.7/S11.8.7_A4.js
+++ b/test/suite/ch11/11.8/11.8.7/S11.8.7_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator "in" calls ToString(ShiftExpression)
- *
- * @path ch11/11.8/11.8.7/S11.8.7_A4.js
- * @description Checking ToString coversion;
- */
+/*---
+info: Operator "in" calls ToString(ShiftExpression)
+description: Checking ToString coversion;
+---*/
 
 //CHECK#1
 var object = {};
@@ -35,4 +33,3 @@ object["null"] = 1;
 if (null in object !== "null" in object) {  
   $ERROR('#5: "var object = {}; object["null"] = 1; null in object === "null" in object');  
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A1.js
index 3f9904f46..9cd234174 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between EqualityExpression and "==" or between "==" and RelationalExpression are allowed
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between EqualityExpression and "==" or
+    between "==" and RelationalExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("true\u0009==\u00091") !== true) {
@@ -57,4 +57,3 @@ if (eval("true\u2029==\u20291") !== true) {
 if (eval("true\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029==\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== true) {
   $ERROR('#10: (true\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029==\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T1.js
index 2d59985ae..ff27d214e 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x == y uses GetValue
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x == y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1 == 1) !== true) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if ((objectx.prop == objecty.prop) !== true) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; (objectx.prop == objecty.prop) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T2.js
index 21994ea8b..0705baac8 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x == y uses GetValue
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x == y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x == 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T3.js
index 0f8b2c378..273bcd3b7 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x == y uses GetValue
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x == y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 == y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T1.js
index 04d461dcb..eb62a4f59 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if ((x == (x = 1)) !== false) {
   $ERROR('#2: var x = 0; (x == (x = 1)) === false');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T2.js
index fdfc3fc92..d56399f81 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T3.js
index eecdc35aa..850fd0d47 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if (((y = 1) == y) !== true) {
   $ERROR('#2: ((y = 1) == y) === true');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.1.js
index f54158976..dc5152d60 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return true, if x and y are both true or both false; otherwise, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A3.1.js
- * @description x and y are boolean primitives
- */
+/*---
+info: >
+    Return true, if x and y are both true or both false; otherwise, return
+    false
+description: x and y are boolean primitives
+---*/
 
 //CHECK#1
 if ((true == true) !== true) {
@@ -27,4 +27,3 @@ if ((true == false) !== false) {
 if ((false == true) !== false) {
   $ERROR('#4: (false == true) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.2.js
index d64e86948..ec844948a 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Boolean and Type(y) is Number,
- * return the result of comparison ToNumber(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A3.2.js
- * @description x is primitive boolean, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is Boolean and Type(y) is Number,
+    return the result of comparison ToNumber(x) == y
+description: x is primitive boolean, y is primitive number
+---*/
 
 //CHECK#1
 if ((true == 1) !== true) {
@@ -18,4 +17,3 @@ if ((true == 1) !== true) {
 if ((false == "0") !== true) {
   $ERROR('#2: (false == "0") === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.3.js
index 342c6f961..2bc607203 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A3.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(y) is Number and Type(y) is Boolean,
- * return the result of comparison x == ToNumber(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A3.3.js
- * @description x is primitive number, y is primitive boolean
- */
+/*---
+info: >
+    If Type(y) is Number and Type(y) is Boolean,
+    return the result of comparison x == ToNumber(y)
+description: x is primitive number, y is primitive boolean
+---*/
 
 //CHECK#1
 if ((0 == false) !== true) {
@@ -18,4 +17,3 @@ if ((0 == false) !== true) {
 if (("1" == true) !== true) {
   $ERROR('#2: ("1" == true) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T1.js
index 2e5b4738a..3e847949a 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A4.1_T1.js
- * @description x is NaN
- */
+/*---
+info: If x or y is NaN, return false
+description: x is NaN
+---*/
 
 //CHECK#1
 if ((Number.NaN == true) !== false) {
@@ -52,5 +50,3 @@ if ((Number.NaN == "string") !== false) {
 if ((Number.NaN == new Object()) !== false) {
   $ERROR('#9: (NaN == new Object()) === false');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T2.js
index 8d3be41d2..6c46a4572 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A4.1_T2.js
- * @description y is NaN
- */
+/*---
+info: If x or y is NaN, return false
+description: y is NaN
+---*/
 
 //CHECK#1
 if ((true == Number.NaN) !== false) {
@@ -52,4 +50,3 @@ if (("string" == Number.NaN) !== false) {
 if ((new Object() == Number.NaN) !== false) {
   $ERROR('#9: (new Object() == NaN) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.2.js
index b7e26344d..165fd9e00 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0(-0) and y is -0(+0), return true
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A4.2.js
- * @description Checking all combinations
- */
+/*---
+info: If x is +0(-0) and y is -0(+0), return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((+0 == -0) !== true) {
@@ -17,4 +15,3 @@ if ((+0 == -0) !== true) {
 if ((-0 == +0) !== true) {
   $ERROR('#2: (-0 == +0) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.3.js
index b888b280c..2f668c44a 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A4.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Number-s minus NaN, +0, -0.
- * Return true, if x is the same number value as y; otherwise, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A4.3.js
- * @description x and y are primitive numbers
- */
+/*---
+info: >
+    Type(x) and Type(y) are Number-s minus NaN, +0, -0.
+    Return true, if x is the same number value as y; otherwise, return false
+description: x and y are primitive numbers
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY == Number.POSITIVE_INFINITY) !== true) {
@@ -33,4 +32,3 @@ if ((1 == 0.999999999999) !== false) {
 if ((1.0 == 1) !== true) {
   $ERROR('#5: (1.0 == 1) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.1.js
index 26ba2d50d..5ad7cea74 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are String-s.
- * Return true, if x and y are exactly the same sequence of characters; otherwise, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A5.1.js
- * @description x and y are primitive string
- */
+/*---
+info: >
+    Type(x) and Type(y) are String-s.
+    Return true, if x and y are exactly the same sequence of characters; otherwise, return false
+description: x and y are primitive string
+---*/
 
 //CHECK#1
 if (("" == "") !== true) {
@@ -43,4 +42,3 @@ if (("1.0" == "1") !== false) {
 if (("0xff" == "255") !== false) {
   $ERROR('#7: ("0xff" == "255") === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.2.js
index a6464a519..77c8a5c86 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Number and Type(y) is String,
- * return the result of comparison x == ToNumber(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A5.2.js
- * @description x is primitive number, y is primitive string
- */
+/*---
+info: >
+    If Type(x) is Number and Type(y) is String,
+    return the result of comparison x == ToNumber(y)
+description: x is primitive number, y is primitive string
+---*/
 
 //CHECK#1
 if ((1 == "1") !== true) {
@@ -33,4 +32,3 @@ if ((255 == "0xff") !== true) {
 if ((0 == "") !== true) {
   $ERROR('#5: (0 == "") === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.3.js
index 7fb95cf74..b7cabbc12 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A5.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is String and Type(y) is Number,
- * return the result of comparison ToNumber(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A5.3.js
- * @description x is primitive string, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is String and Type(y) is Number,
+    return the result of comparison ToNumber(x) == y
+description: x is primitive string, y is primitive number
+---*/
 
 //CHECK#1
 if (("-1" == -1) !== true) {
@@ -28,5 +27,3 @@ if (("false" == 0) !== false) {
 if (("5e-324" == 5e-324) !== true) {
   $ERROR('#4: ("5e-324" == 5e-324) === true');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.1.js
index 95e8b80d7..9eb090789 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) as well as Type(y) is undefined or null, return true
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A6.1.js
- * @description Checking all combinations
- */
+/*---
+info: If Type(x) as well as Type(y) is undefined or null, return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((undefined == undefined) !== true) {
@@ -37,4 +35,3 @@ if ((null == void 0) !== true) {
 if ((null == null) !== true) {
   $ERROR('#6: (null == null) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T1.js
index 4dcf84051..1d5479bac 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If one expression is undefined or null and another is not, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A6.2_T1.js
- * @description x is null or undefined, y is not
- */
+/*---
+info: If one expression is undefined or null and another is not, return false
+description: x is null or undefined, y is not
+---*/
 
 //CHECK#1
 if ((undefined == true) !== false) {
@@ -47,4 +45,3 @@ if ((null == "null") !== false) {
 if ((null == {}) !== false) {
   $ERROR('#8: (null == {}) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T2.js
index 6f5f2ac70..4530bca34 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A6.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If one expression is undefined or null and another is not, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A6.2_T2.js
- * @description y is null or undefined, x is not
- */
+/*---
+info: If one expression is undefined or null and another is not, return false
+description: y is null or undefined, x is not
+---*/
 
 //CHECK#1
 if ((false == undefined) !== false) {
@@ -47,4 +45,3 @@ if (("null" == null) !== false) {
 if (({} == null) !== false) {
   $ERROR('#8: ({} == null) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.1.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.1.js
index b2f0d23a7..a9c76a6d2 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.1.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Object-s.
- * Return true, if x and y are references to the same Object; otherwise, return false
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.1.js
- * @description Checking Boolean object, Number object, String object, Object object
- */
+/*---
+info: >
+    Type(x) and Type(y) are Object-s.
+    Return true, if x and y are references to the same Object; otherwise, return false
+description: >
+    Checking Boolean object, Number object, String object, Object
+    object
+---*/
 
 //CHECK#1
 if ((new Boolean(true) == new Boolean(true)) !== false) {
@@ -50,4 +51,3 @@ if ((new Number(1) == new String("1")) !== false) {
 if ((new String("1") == new Boolean(true)) !== false) {
   $ERROR('#8: (new String("x") == new Boolean(true)) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.2.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.2.js
index 5704688ae..5237a4f25 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.2.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is Boolean,
- * return ToPrimitive(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.2.js
- * @description x is object, y is primitive boolean
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is Boolean,
+    return ToPrimitive(x) == y
+description: x is object, y is primitive boolean
+---*/
 
 //CHECK#1
 if ((new Boolean(true) == true) !== true) {
@@ -23,4 +22,3 @@ if ((new Number(1) == true) !== true) {
 if ((new String("1") == true) !== true) {
   $ERROR('#3: (new String("1") == true) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.3.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.3.js
index c0c89cea0..83ec375ee 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.3.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Boolean and Type(y) is Object,
- * return x == ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.3.js
- * @description y is object, x is primitive boolean
- */
+/*---
+info: >
+    If Type(x) is Boolean and Type(y) is Object,
+    return x == ToPrimitive(y)
+description: y is object, x is primitive boolean
+---*/
 
 //CHECK#1
 if ((true == new Boolean(true)) !== true) {
@@ -23,4 +22,3 @@ if ((true == new Number(1)) !== true) {
 if ((true == new String("+1")) !== true) {
   $ERROR('#3: (true == new String("+1")) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.4.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.4.js
index 65ce2df60..afe13d045 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.4.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is Number,
- * return ToPrimitive(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.4.js
- * @description x is object, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is Number,
+    return ToPrimitive(x) == y
+description: x is object, y is primitive number
+---*/
 
 //CHECK#1
 if ((new Boolean(true) == 1) !== true) {
@@ -23,4 +22,3 @@ if ((new Number(-1) == -1) !== true) {
 if ((new String("-1") == -1) !== true) {
   $ERROR('#3: (new String("-1") == -1) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.5.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.5.js
index 87cbe6eed..d878f58ff 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.5.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Number and Type(y) is Object,
- * return x == ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.5.js
- * @description y is object, x is primitive number
- */
+/*---
+info: >
+    If Type(x) is Number and Type(y) is Object,
+    return x == ToPrimitive(y)
+description: y is object, x is primitive number
+---*/
 
 //CHECK#1
 if ((1 == new Boolean(true)) !== true) {
@@ -23,4 +22,3 @@ if ((-1 == new Number(-1)) !== true) {
 if ((-1 == new String("-1")) !== true) {
   $ERROR('#3: (-1 == new String("-1")) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.6.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.6.js
index 986f66b90..4bb1a7e8c 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.6.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is String,
- * return ToPrimitive(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.6.js
- * @description x is object, y is primitive string
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is String,
+    return ToPrimitive(x) == y
+description: x is object, y is primitive string
+---*/
 
 //CHECK#1
 if ((new Boolean(true) == "1") !== true) {
@@ -23,4 +22,3 @@ if ((new Number(-1) == "-1") !== true) {
 if ((new String("x") == "x") !== true) {
   $ERROR('#3: (new String("x") == "x") === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.7.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.7.js
index 4d8412d30..5729b054a 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.7.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is String and Type(y) is Object,
- * return x == ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.7.js
- * @description y is object, x is primitive string
- */
+/*---
+info: >
+    If Type(x) is String and Type(y) is Object,
+    return x == ToPrimitive(y)
+description: y is object, x is primitive string
+---*/
 
 //CHECK#1
 if (("1" == new Boolean(true)) !== true) {
@@ -23,4 +22,3 @@ if (("-1" == new Number(-1)) !== true) {
 if (("x" == new String("x")) !== true) {
   $ERROR('#3: ("x" == new String("x")) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.8.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.8.js
index 9aa54434e..3f5d3421c 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.8.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is primitive type,
- * return ToPrimitive(x) == y
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.8.js
- * @description x is object, y is primtitive
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is primitive type,
+    return ToPrimitive(x) == y
+description: x is object, y is primtitive
+---*/
 
 //CHECK#1
 if (({valueOf: function() {return 1}} == true) !== true) {
@@ -73,4 +72,3 @@ catch (e) {
     $ERROR('#8.2: ({valueOf: function() {return {}}, toString: function() {return {}}} == 1) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.9.js b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.9.js
index ba4d0f38d..052bb8c55 100644
--- a/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.9.js
+++ b/test/suite/ch11/11.9/11.9.1/S11.9.1_A7.9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is primitive type and Type(y) is Object,
- * return x == ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.1/S11.9.1_A7.9.js
- * @description y is object, x is primtitive
- */
+/*---
+info: >
+    If Type(x) is primitive type and Type(y) is Object,
+    return x == ToPrimitive(y)
+description: y is object, x is primtitive
+---*/
 
 //CHECK#1
 if ((true == {valueOf: function() {return 1}}) !== true) {
@@ -73,4 +72,3 @@ catch (e) {
     $ERROR('#8.2: (1 == {valueOf: function() {return {}}, toString: function() {return {}}}) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A1.js
index 5478e2d8c..e78c7d46d 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between EqualityExpression and "!=" or between "!=" and RelationalExpression are allowed
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between EqualityExpression and "!=" or
+    between "!=" and RelationalExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("true\u0009!=\u00091") !== false) {
@@ -57,4 +57,3 @@ if (eval("true\u2029!=\u20291") !== false) {
 if (eval("true\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029!=\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291") !== false) {
   $ERROR('#10: (true\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029!=\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T1.js
index 12b5bbe42..89ad1586d 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x != y uses GetValue
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x != y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if ((1 != 1) !== false) {
@@ -40,4 +38,3 @@ objecty.prop = 1;
 if ((objectx.prop != objecty.prop) !== false) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; (objectx.prop != objecty.prop) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T2.js
index aaf6f6a8c..d402b603f 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x != y uses GetValue
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x != y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x != 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T3.js
index f8e65a173..8dd294198 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x != y uses GetValue
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x != y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 != y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T1.js
index 5cb029e4f..a9ed305de 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if ((x != (x = 1)) !== true) {
   $ERROR('#2: var x = 0; (x != (x = 1)) === true');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T2.js
index 6570ee33b..85a9cd058 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T3.js
index 93cde317e..1a49ae5f0 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if (((y = 1) != y) !== false) {
   $ERROR('#2: ((y = 1) != y) === false');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.1.js
index 79921a295..8afcdb447 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return false, if x and y are both true or both false; otherwise, return true
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A3.1.js
- * @description x and y are boolean primitives
- */
+/*---
+info: >
+    Return false, if x and y are both true or both false; otherwise, return
+    true
+description: x and y are boolean primitives
+---*/
 
 //CHECK#1
 if ((true != true) !== false) {
@@ -27,4 +27,3 @@ if ((true != false) !== true) {
 if ((false != true) !== true) {
   $ERROR('#4: (false != true) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.2.js
index ff0f9c832..1bffe145b 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Boolean and Type(y) is Number,
- * return the result of comparison ToNumber(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A3.2.js
- * @description x is primitive boolean, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is Boolean and Type(y) is Number,
+    return the result of comparison ToNumber(x) != y
+description: x is primitive boolean, y is primitive number
+---*/
 
 //CHECK#1
 if ((true != 1) !== false) {
@@ -28,5 +27,3 @@ if ((true != new Boolean(true)) !== false) {
 if ((true != {valueOf: function () {return 1}}) !== false) {
   $ERROR('#4: (true != {valueOf: function () {return 1}}) === false');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.3.js
index b32bf7fbd..c15ae3a83 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A3.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(y) is Number and Type(y) is Boolean,
- * return the result of comparison x != ToNumber(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A3.3.js
- * @description x is primitive number, y is primitive boolean
- */
+/*---
+info: >
+    If Type(y) is Number and Type(y) is Boolean,
+    return the result of comparison x != ToNumber(y)
+description: x is primitive number, y is primitive boolean
+---*/
 
 //CHECK#1
 if ((0 != false) !== false) {
@@ -28,4 +27,3 @@ if ((new Boolean(false) != false) !== false) {
 if (({valueOf: function () {return "0"}} != false) !== false) {
   $ERROR('#4: ({valueOf: function () {return "0"}} != false) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T1.js
index 98b9d074b..98a5e9c7c 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return true
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A4.1_T1.js
- * @description x is NaN
- */
+/*---
+info: If x or y is NaN, return true
+description: x is NaN
+---*/
 
 //CHECK#1
 if ((Number.NaN != true) !== true) {
@@ -52,5 +50,3 @@ if ((Number.NaN != "string") !== true) {
 if ((Number.NaN != new Object()) !== true) {
   $ERROR('#9: (NaN != new Object()) === true');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T2.js
index 471bcb6f6..42b2a9dc7 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return true
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A4.1_T2.js
- * @description y is NaN
- */
+/*---
+info: If x or y is NaN, return true
+description: y is NaN
+---*/
 
 //CHECK#1
 if ((true != Number.NaN) !== true) {
@@ -52,4 +50,3 @@ if (("string" != Number.NaN) !== true) {
 if ((new Object() != Number.NaN) !== true) {
   $ERROR('#9: (new Object() != NaN) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.2.js
index b8045a6a0..725079ab2 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0(-0) and y is -0(+0), return false
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A4.2.js
- * @description Checking all combinations
- */
+/*---
+info: If x is +0(-0) and y is -0(+0), return false
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((+0 != -0) !== false) {
@@ -17,4 +15,3 @@ if ((+0 != -0) !== false) {
 if ((-0 != +0) !== false) {
   $ERROR('#2: (-0 != +0) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.3.js
index 21cc16ee1..c16bd41db 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A4.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Number-s minus NaN, +0, -0.
- * Return false, if x is the same number value as y; otherwise, return true
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A4.3.js
- * @description x and y are primitive numbers
- */
+/*---
+info: >
+    Type(x) and Type(y) are Number-s minus NaN, +0, -0.
+    Return false, if x is the same number value as y; otherwise, return true
+description: x and y are primitive numbers
+---*/
 
 //CHECK#1
 if ((Number.POSITIVE_INFINITY != Number.POSITIVE_INFINITY) !== false) {
@@ -33,4 +32,3 @@ if ((1 != 0.999999999999) !== true) {
 if ((1.0 != 1) !== false) {
   $ERROR('#5: (1.0 != 1) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.1.js
index 9476d907a..815948ff2 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are String-s.
- * Return true, if x and y are exactly the same sequence of characters; otherwise, return false
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A5.1.js
- * @description x and y are primitive strings
- */
+/*---
+info: >
+    Type(x) and Type(y) are String-s.
+    Return true, if x and y are exactly the same sequence of characters; otherwise, return false
+description: x and y are primitive strings
+---*/
 
 //CHECK#1
 if (("" != "") !== false) {
@@ -43,4 +42,3 @@ if (("1.0" != "1") !== true) {
 if (("0xff" != "255") !== true) {
   $ERROR('#7: ("0xff" != "255") === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.2.js
index f63ffc17d..f0b708ed8 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Number and Type(y) is String,
- * return the result of comparison x != ToNumber(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A5.2.js
- * @description x is primitive number, y is primitive string
- */
+/*---
+info: >
+    If Type(x) is Number and Type(y) is String,
+    return the result of comparison x != ToNumber(y)
+description: x is primitive number, y is primitive string
+---*/
 
 //CHECK#1
 if ((1 != "1") !== false) {
@@ -33,4 +32,3 @@ if ((255 != "0xff") !== false) {
 if ((0 != "") !== false) {
   $ERROR('#5: (0 != "") === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.3.js
index dedd18ce0..c3b29e794 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A5.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is String and Type(y) is Number,
- * return the result of comparison ToNumber(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A5.3.js
- * @description x is primitive string, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is String and Type(y) is Number,
+    return the result of comparison ToNumber(x) != y
+description: x is primitive string, y is primitive number
+---*/
 
 //CHECK#1
 if (("-1" != -1) !== false) {
@@ -28,5 +27,3 @@ if (("false" != 0) !== true) {
 if (("5e-324" != 5e-324) !== false) {
   $ERROR('#4: ("5e-324" != 5e-324) === false');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.1.js
index 8d0cfcd35..07fefecd5 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) as well as Type(y) is Undefined or Null, return true
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A6.1.js
- * @description Checking all combinations
- */
+/*---
+info: If Type(x) as well as Type(y) is Undefined or Null, return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if ((undefined != undefined) !== false) {
@@ -37,4 +35,3 @@ if ((null != void 0) !== false) {
 if ((null != null) !== false) {
   $ERROR('#6: (null != null) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T1.js
index e9a60e124..db98e65a1 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If one expression is undefined or null and another is not, return false
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A6.2_T1.js
- * @description x is null or undefined, y is not
- */
+/*---
+info: If one expression is undefined or null and another is not, return false
+description: x is null or undefined, y is not
+---*/
 
 //CHECK#1
 if ((undefined != true) !== true) {
@@ -47,4 +45,3 @@ if ((null != "null") !== true) {
 if ((null != {}) !== true) {
   $ERROR('#8: (null != {}) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T2.js
index 05b592b48..f9521c352 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A6.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If one expression is undefined or null and another is not, return false
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A6.2_T2.js
- * @description y is null or undefined, x is not
- */
+/*---
+info: If one expression is undefined or null and another is not, return false
+description: y is null or undefined, x is not
+---*/
 
 //CHECK#1
 if ((false != undefined) !== true) {
@@ -47,4 +45,3 @@ if (("null" != null) !== true) {
 if (({} != null) !== true) {
   $ERROR('#8: ({} != null) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.1.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.1.js
index 66b468892..9248f8ab5 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.1.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Object-s.
- * Return true, if x and y are references to the same Object; otherwise, return false
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.1.js
- * @description Checking Boolean object, Number object, String object, Object object
- */
+/*---
+info: >
+    Type(x) and Type(y) are Object-s.
+    Return true, if x and y are references to the same Object; otherwise, return false
+description: >
+    Checking Boolean object, Number object, String object, Object
+    object
+---*/
 
 //CHECK#1
 if ((new Boolean(true) != new Boolean(true)) !== true) {
@@ -50,4 +51,3 @@ if ((new Number(1) != new String("1")) !== true) {
 if ((new String("1") != new Boolean(true)) !== true) {
   $ERROR('#8: (new String("x") != new Boolean(true)) === true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.2.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.2.js
index 44252a045..75a4afc47 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.2.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is Boolean,
- * return ToPrimitive(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.2.js
- * @description x is object, y is primitive boolean
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is Boolean,
+    return ToPrimitive(x) != y
+description: x is object, y is primitive boolean
+---*/
 
 //CHECK#1
 if ((new Boolean(true) != true) !== false) {
@@ -23,4 +22,3 @@ if ((new Number(1) != true) !== false) {
 if ((new String("1") != true) !== false) {
   $ERROR('#3: (new String("1") != true) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.3.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.3.js
index 7bd33386e..efb7d4d84 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.3.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Boolean and Type(y) is Object,
- * return x != ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.3.js
- * @description y is object, x is primitive boolean
- */
+/*---
+info: >
+    If Type(x) is Boolean and Type(y) is Object,
+    return x != ToPrimitive(y)
+description: y is object, x is primitive boolean
+---*/
 
 //CHECK#1
 if ((true != new Boolean(true)) !== false) {
@@ -23,4 +22,3 @@ if ((true != new Number(1)) !== false) {
 if ((true != new String("+1")) !== false) {
   $ERROR('#3: (true != new String("+1")) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.4.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.4.js
index c13672d52..76f8209af 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.4.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is Number,
- * return ToPrimitive(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.4.js
- * @description x is object, y is primitive number
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is Number,
+    return ToPrimitive(x) != y
+description: x is object, y is primitive number
+---*/
 
 //CHECK#1
 if ((new Boolean(true) != 1) !== false) {
@@ -23,4 +22,3 @@ if ((new Number(-1) != -1) !== false) {
 if ((new String("-1") != -1) !== false) {
   $ERROR('#3: (new String("-1") != -1) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.5.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.5.js
index c6cfc4976..e4a870a9b 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.5.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Number and Type(y) is Object,
- * return x != ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.5.js
- * @description y is object, x is primitive number
- */
+/*---
+info: >
+    If Type(x) is Number and Type(y) is Object,
+    return x != ToPrimitive(y)
+description: y is object, x is primitive number
+---*/
 
 //CHECK#1
 if ((1 != new Boolean(true)) !== false) {
@@ -23,4 +22,3 @@ if ((-1 != new Number(-1)) !== false) {
 if ((-1 != new String("-1")) !== false) {
   $ERROR('#3: (-1 != new String("-1")) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.6.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.6.js
index 286b9d4d0..9de2cf237 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.6.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is String,
- * return ToPrimitive(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.6.js
- * @description x is object, y is primitive string
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is String,
+    return ToPrimitive(x) != y
+description: x is object, y is primitive string
+---*/
 
 //CHECK#1
 if ((new Boolean(true) != "1") !== false) {
@@ -23,4 +22,3 @@ if ((new Number(-1) != "-1") !== false) {
 if ((new String("x") != "x") !== false) {
   $ERROR('#3: (new String("x") != "x") === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.7.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.7.js
index cdc8161e0..3c53f6372 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.7.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is String and Type(y) is Object,
- * return x != ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.7.js
- * @description y is object, x is primitive string
- */
+/*---
+info: >
+    If Type(x) is String and Type(y) is Object,
+    return x != ToPrimitive(y)
+description: y is object, x is primitive string
+---*/
 
 //CHECK#1
 if (("1" != new Boolean(true)) !== false) {
@@ -23,4 +22,3 @@ if (("-1" != new Number(-1)) !== false) {
 if (("x" != new String("x")) !== false) {
   $ERROR('#3: ("x" != new String("x")) === false');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.8.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.8.js
index cf9766d79..739f4ea13 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.8.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is Object and Type(y) is primitive type,
- * return ToPrimitive(x) != y
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.8.js
- * @description x is object, y is primtitive
- */
+/*---
+info: >
+    If Type(x) is Object and Type(y) is primitive type,
+    return ToPrimitive(x) != y
+description: x is object, y is primtitive
+---*/
 
 //CHECK#1
 if ((true != {valueOf: function() {return 1}}) !== false) {
@@ -73,4 +72,3 @@ catch (e) {
     $ERROR('#8: (1 != {valueOf: function() {return {}}, toString: function() {return {}}}) throw TypeError');
   } 
 }
-
diff --git a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.9.js b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.9.js
index c1ccc5f32..6196427be 100644
--- a/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.9.js
+++ b/test/suite/ch11/11.9/11.9.2/S11.9.2_A7.9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is primitive type and Type(y) is Object,
- * return x != ToPrimitive(y)
- *
- * @path ch11/11.9/11.9.2/S11.9.2_A7.9.js
- * @description y is object, x is primtitive
- */
+/*---
+info: >
+    If Type(x) is primitive type and Type(y) is Object,
+    return x != ToPrimitive(y)
+description: y is object, x is primtitive
+---*/
 
 //CHECK#1
 if (({valueOf: function() {return 1}} != true) !== false) {
@@ -73,4 +72,3 @@ catch (e) {
     $ERROR('#8.2: ({valueOf: function() {return {}}, toString: function() {return {}}} != 1) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A1.js
index 410fe3962..28373ecfd 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between EqualityExpression and "===" or between "===" and RelationalExpression are allowed
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between EqualityExpression and "===" or
+    between "===" and RelationalExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (!(eval("1\u0009===\u00091"))) {
@@ -57,4 +57,3 @@ if (!(eval("1\u2029===\u20291"))) {
 if (!(eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029===\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291"))) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029===\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T1.js
index b9a1958cb..3ec2e8a9d 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x === y uses GetValue
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x === y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (!(1 === 1)) {
@@ -40,5 +38,3 @@ objecty.prop = 1;
 if (!(objectx.prop === objecty.prop)) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop === objecty.prop');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T2.js
index c0741ccd1..c39d13e28 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x === y uses GetValue
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x === y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x === 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T3.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T3.js
index dc50a2505..c0c6bf8b6 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T3.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x === y uses GetValue
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x === y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 === y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T1.js
index f24d933b0..410bae1e1 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (x === (x = 1)) {
   $ERROR('#2: var x = 0; x !== (x = 1)');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T2.js
index 02fe1ba7c..e2d9a7907 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T3.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T3.js
index 5b9fa7a03..d6820ed84 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T3.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A2.4_T3.js
- * @description Checking with undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if (!((y = 1) === y)) {
   $ERROR('#2: (y = 1) === y');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A3.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A3.js
index 5fc2545d4..a7e2a4d37 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A3.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Boolean-s.
- * Return true, if x and y are both true and both false; otherwise, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A3.js
- * @description x and y are primitive booleans
- */
+/*---
+info: >
+    Type(x) and Type(y) are Boolean-s.
+    Return true, if x and y are both true and both false; otherwise, return false
+description: x and y are primitive booleans
+---*/
 
 //CHECK#1
 if (!(true === true)) {
@@ -28,4 +27,3 @@ if (true === false) {
 if (false === true) {
   $ERROR('#4: false !== true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T1.js
index b742929df..eab5c2805 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A4.1_T1.js
- * @description x is NaN
- */
+/*---
+info: If x or y is NaN, return false
+description: x is NaN
+---*/
 
 //CHECK#1
 if (Number.NaN === true) {
@@ -52,5 +50,3 @@ if (Number.NaN === "string") {
 if (Number.NaN === new Object()) {
   $ERROR('#9: NaN !== new Object()');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T2.js
index 3cd02a9fd..66380be57 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A4.1_T2.js
- * @description y is NaN
- */
+/*---
+info: If x or y is NaN, return false
+description: y is NaN
+---*/
 
 //CHECK#1
 if (true === Number.NaN) {
@@ -52,4 +50,3 @@ if ("string" === Number.NaN) {
 if (new Object() === Number.NaN) {
   $ERROR('#9: new Object() !== NaN');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.2.js
index 7de56ed7d..1d0ed69c8 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0(-0) and y is -0(+0), return true
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A4.2.js
- * @description Checking all combinations
- */
+/*---
+info: If x is +0(-0) and y is -0(+0), return true
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if (!(+0 === -0)) {
@@ -17,4 +15,3 @@ if (!(+0 === -0)) {
 if (!(-0 === +0)) {
   $ERROR('#2: -0 === +0');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.3.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.3.js
index e13bea441..22ca139ea 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.3.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A4.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Number-s minus NaN, +0, -0.
- * Return true, if x is the same number value as y; otherwise, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A4.3.js
- * @description x and y are primitive numbers
- */
+/*---
+info: >
+    Type(x) and Type(y) are Number-s minus NaN, +0, -0.
+    Return true, if x is the same number value as y; otherwise, return false
+description: x and y are primitive numbers
+---*/
 
 //CHECK#1
 if (!(Number.POSITIVE_INFINITY === Number.POSITIVE_INFINITY)) {
@@ -53,4 +52,3 @@ if (1 === 0.999999999999) {
 if (!(1.0 === 1)) {
   $ERROR('#9: 1.0 === 1');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A5.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A5.js
index f32d7c5ae..3d754e32d 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A5.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are String-s.
- * Return true, if x and y are exactly the same sequence of characters; otherwise, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A5.js
- * @description x and y are primitive strings
- */
+/*---
+info: >
+    Type(x) and Type(y) are String-s.
+    Return true, if x and y are exactly the same sequence of characters; otherwise, return false
+description: x and y are primitive strings
+---*/
 
 //CHECK#1
 if (!("" === "")) {
@@ -33,4 +32,3 @@ if (" string" === "string ") {
 if ("1.0" === "1") {
   $ERROR('#5: "1.0" !== "1"');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.1.js
index b392d432a..a3d3ea58d 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) and Type(y) are Undefined-s, return true
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A6.1.js
- * @description void 0, eval("var x") is undefined
- */
+/*---
+info: If Type(x) and Type(y) are Undefined-s, return true
+description: void 0, eval("var x") is undefined
+---*/
 
 //CHECK#1
 if (!(undefined === undefined)) {
@@ -22,4 +20,3 @@ if (!(void 0 === undefined)) {
 if (!(undefined === eval("var x"))) {
   $ERROR('#3: undefined === eval("var x")');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.2.js
index 82bdbea6f..745654aad 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A6.2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) and Type(y) are Null-s, return true
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A6.2.js
- * @description null === null
- */
+/*---
+info: If Type(x) and Type(y) are Null-s, return true
+description: null === null
+---*/
 
 //CHECK#1
 if (!(null === null)) {
   $ERROR('#1: null === null');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A7.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A7.js
index 0c27f3df5..f7c7fb891 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A7.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Object-s.
- * Return true, if x and y are references to the same Object; otherwise, return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A7.js
- * @description Checking Boolean object, Number object, String object, Object object
- */
+/*---
+info: >
+    Type(x) and Type(y) are Object-s.
+    Return true, if x and y are references to the same Object; otherwise, return false
+description: >
+    Checking Boolean object, Number object, String object, Object
+    object
+---*/
 
 //CHECK#1
 if (new Object() === new Object()) {
@@ -50,4 +51,3 @@ if (new Number(1) === new String("1")) {
 if (new String("1") === new Boolean(true)) {
   $ERROR('#8: new String("x") === new Boolean(true)');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T1.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T1.js
index ce51dddef..a93ed9aef 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T1.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A8_T1.js
- * @description x or y is primitive boolean
- */
+/*---
+info: If Type(x) is different from Type(y), return false
+description: x or y is primitive boolean
+---*/
 
 //CHECK#1
 if (true === new Boolean(true)) {
@@ -62,4 +60,3 @@ if (false === new String(false)) {
 if (true === {valueOf: function () {return true}}) {
   $ERROR('#11: true === {valueOf: function () {return true}}');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T2.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T2.js
index c7bfa4d5b..34272fa19 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T2.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A8_T2.js
- * @description x or y is primitive number
- */
+/*---
+info: If Type(x) is different from Type(y), return false
+description: x or y is primitive number
+---*/
 
 //CHECK#1
 if (1 === new Number(1)) {
@@ -62,4 +60,3 @@ if (new String(0) === 0) {
 if (1 === {valueOf: function () {return 1}}) {
   $ERROR('#11: 1 === {valueOf: function () {return 1}}');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T3.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T3.js
index a448bbd70..548fb0bc8 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T3.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A8_T3.js
- * @description x or y is primitive string
- */
+/*---
+info: If Type(x) is different from Type(y), return false
+description: x or y is primitive string
+---*/
 
 //CHECK#1
 if ("1" === new String("1")) {
@@ -62,4 +60,3 @@ if (false === new Number(false)) {
 if ("1" === {valueOf: function () {return "1"}}) {
   $ERROR('#11: "1" === {valueOf: function () {return "1"}}');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T4.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T4.js
index 92aa846ca..44eb73840 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T4.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A8_T4.js
- * @description x or y is null or undefined
- */
+/*---
+info: If Type(x) is different from Type(y), return false
+description: x or y is null or undefined
+---*/
 
 //CHECK#1
 if (undefined === null) {
@@ -77,4 +75,3 @@ if (undefined === "undefined") {
 if ("undefined" === undefined) {
   $ERROR('#14: "undefined" !== undefined');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T5.js b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T5.js
index 5e6bdb2fd..4ec06d3bc 100644
--- a/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T5.js
+++ b/test/suite/ch11/11.9/11.9.4/S11.9.4_A8_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return false
- *
- * @path ch11/11.9/11.9.4/S11.9.4_A8_T5.js
- * @description Checking with such x and y that either x or y is primitive string and the other is primitive number
- */
+/*---
+info: If Type(x) is different from Type(y), return false
+description: >
+    Checking with such x and y that either x or y is primitive string
+    and the other is primitive number
+---*/
 
 //CHECK#1
 try {
@@ -24,5 +24,4 @@ try {
   if (1 === e) {
     $ERROR('#2: 1 !== throw "1"');
   }
-} 
-
+}
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A1.js
index c9e88dc0c..e228f0121 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * White Space and Line Terminator between EqualityExpression and "!==" or between "!==" and RelationalExpression are allowed
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A1.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    White Space and Line Terminator between EqualityExpression and "!==" or
+    between "!==" and RelationalExpression are allowed
+description: Checking by using eval
+---*/
 
 //CHECK#1
 if (eval("1\u0009!==\u00091")) {
@@ -57,4 +57,3 @@ if (eval("1\u2029!==\u20291")) {
 if (eval("1\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u2029!==\u0009\u000B\u000C\u0020\u00A0\u000A\u000D\u2028\u20291")) {
   $ERROR('#10: 1\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u2029!==\\u0009\\u000B\\u000C\\u0020\\u00A0\\u000A\\u000D\\u2028\\u20291');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T1.js
index 4e9c43c3b..d4f2825b1 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x !== y uses GetValue
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.1_T1.js
- * @description Either Type is not Reference or GetBase is not null
- */
+/*---
+info: Operator x !== y uses GetValue
+description: Either Type is not Reference or GetBase is not null
+---*/
 
 //CHECK#1
 if (1 !== 1) {
@@ -40,5 +38,3 @@ objecty.prop = 1;
 if (objectx.prop !== objecty.prop) {
   $ERROR('#5: var objectx = new Object(); var objecty = new Object(); objectx.prop = 1; objecty.prop = 1; objectx.prop === objecty.prop');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T2.js
index 52637ce50..155128e41 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x !== y uses GetValue
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.1_T2.js
- * @description If GetBase(x) is null, throw ReferenceError
- */
+/*---
+info: Operator x !== y uses GetValue
+description: If GetBase(x) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: x !== 1 throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T3.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T3.js
index e568cbe31..c774233f4 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T3.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator x !== y uses GetValue
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.1_T3.js
- * @description If GetBase(y) is null, throw ReferenceError
- */
+/*---
+info: Operator x !== y uses GetValue
+description: If GetBase(y) is null, throw ReferenceError
+---*/
 
 //CHECK#1
 try {
@@ -18,5 +16,3 @@ catch (e) {
     $ERROR('#1.2: 1 !== y throw ReferenceError. Actual: ' + (e));  
   }
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T1.js
index 7ed77b440..38ad4b3b7 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.4_T1.js
- * @description Checking with "="
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "="
+---*/
 
 //CHECK#1
 var x = 0; 
@@ -19,5 +17,3 @@ var x = 0;
 if (!(x !== (x = 1))) {
   $ERROR('#2: var x = 0; x !== (x = 1)');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T2.js
index b2872fcde..1782559f6 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.4_T2.js
- * @description Checking with "throw"
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking with "throw"
+---*/
 
 //CHECK#1
 var x = function () { throw "x"; };
@@ -23,4 +21,3 @@ try {
      }
    }
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T3.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T3.js
index d25f15e4d..4b9fe7a51 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T3.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A2.4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * First expression is evaluated first, and then second expression
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A2.4_T3.js
- * @description Checking undeclarated variables
- */
+/*---
+info: First expression is evaluated first, and then second expression
+description: Checking undeclarated variables
+---*/
 
 //CHECK#1
 try {
@@ -23,5 +21,3 @@ catch (e) {
 if ((y = 1) !== y) {
   $ERROR('#2: (y = 1) === y');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A3.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A3.js
index f13b4574d..50b6e4c05 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A3.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Boolean-s.
- * Return false, if x and y are both true or both false; otherwise, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A3.js
- * @description x and y are primitive booleans
- */
+/*---
+info: >
+    Type(x) and Type(y) are Boolean-s.
+    Return false, if x and y are both true or both false; otherwise, return true
+description: x and y are primitive booleans
+---*/
 
 //CHECK#1
 if (true !== true) {
@@ -28,4 +27,3 @@ if (!(true !== false)) {
 if (!(false !== true)) {
   $ERROR('#4: false !== true');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T1.js
index 44548006b..fadf740f2 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A4.1_T1.js
- * @description x is NaN
- */
+/*---
+info: If x or y is NaN, return true
+description: x is NaN
+---*/
 
 //CHECK#1
 if (!(Number.NaN !== true)) {
@@ -52,5 +50,3 @@ if (!(Number.NaN !== "string")) {
 if (!(Number.NaN !== new Object())) {
   $ERROR('#9: NaN !== new Object()');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T2.js
index 8503f0a41..38a80b11f 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x or y is NaN, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A4.1_T2.js
- * @description y is NaN
- */
+/*---
+info: If x or y is NaN, return true
+description: y is NaN
+---*/
 
 //CHECK#1
 if (!(true !== Number.NaN)) {
@@ -52,4 +50,3 @@ if (!("string" !== Number.NaN)) {
 if (!(new Object() !== Number.NaN)) {
   $ERROR('#9: new Object() !== NaN');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.2.js
index 1844bb10f..123f25975 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0(-0) and y is -0(+0), return false
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A4.2.js
- * @description Checking all combinations
- */
+/*---
+info: If x is +0(-0) and y is -0(+0), return false
+description: Checking all combinations
+---*/
 
 //CHECK#1
 if (+0 !== -0) {
@@ -17,4 +15,3 @@ if (+0 !== -0) {
 if (-0 !== +0) {
   $ERROR('#2: -0 === +0');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.3.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.3.js
index b5469c3b3..262413209 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.3.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A4.3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Number-s minus NaN, +0, -0.
- * Return false, if x is the same number value as y; otherwise, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A4.3.js
- * @description x and y are primitive numbers
- */
+/*---
+info: >
+    Type(x) and Type(y) are Number-s minus NaN, +0, -0.
+    Return false, if x is the same number value as y; otherwise, return true
+description: x and y are primitive numbers
+---*/
 
 //CHECK#1
 if (Number.POSITIVE_INFINITY !== Number.POSITIVE_INFINITY) {
@@ -53,4 +52,3 @@ if (!(1 !== 0.999999999999)) {
 if (1.0 !== 1) {
   $ERROR('#9: 1.0 === 1');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A5.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A5.js
index dabb86dbc..32b53927d 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A5.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are String-s.
- * Return false, if x and y are exactly the same sequence of characters; otherwise, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A5.js
- * @description x and y are primitive strings
- */
+/*---
+info: >
+    Type(x) and Type(y) are String-s.
+    Return false, if x and y are exactly the same sequence of characters; otherwise, return true
+description: x and y are primitive strings
+---*/
 
 //CHECK#1
 if ("" !== "") {
@@ -33,4 +32,3 @@ if (!(" string" !== "string ")) {
 if (!("1.0" !== "1")) {
   $ERROR('#5: "1.0" !== "1"');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.1.js
index 7e89a7b6d..8edb6684c 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) and Type(y) are Undefined-s, return false
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A6.1.js
- * @description void 0, eval("var x") is undefined
- */
+/*---
+info: If Type(x) and Type(y) are Undefined-s, return false
+description: void 0, eval("var x") is undefined
+---*/
 
 //CHECK#1
 if (undefined !== undefined) {
@@ -22,4 +20,3 @@ if (void 0 !== undefined) {
 if (undefined !== eval("var x")) {
   $ERROR('#3: undefined === eval("var x")');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.2.js
index 9657e153f..54bf6eb65 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A6.2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) and Type(y) are Null-s, return false
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A6.2.js
- * @description null === null
- */
+/*---
+info: If Type(x) and Type(y) are Null-s, return false
+description: null === null
+---*/
 
 //CHECK#1
 if (null !== null) {
   $ERROR('#1: null === null');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A7.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A7.js
index 1102b7a12..bfd2af15d 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A7.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Type(x) and Type(y) are Object-s.
- * Return false, if x and y are references to the same Object; otherwise, return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A7.js
- * @description Checking Boolean object, Number object, String object, Object object
- */
+/*---
+info: >
+    Type(x) and Type(y) are Object-s.
+    Return false, if x and y are references to the same Object; otherwise, return true
+description: >
+    Checking Boolean object, Number object, String object, Object
+    object
+---*/
 
 //CHECK#1
 if (!(new Object() !== new Object())) {
@@ -50,6 +51,3 @@ if (!(new Number(1) !== new String("1"))) {
 if (!(new String("1") !== new Boolean(true))) {
   $ERROR('#8: new String("x") !== new Boolean(true)');
 }
-
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T1.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T1.js
index 8e342212e..4957d05f4 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T1.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A8_T1.js
- * @description x or y is primitive boolean
- */
+/*---
+info: If Type(x) is different from Type(y), return true
+description: x or y is primitive boolean
+---*/
 
 //CHECK#1
 if (!(true !== new Boolean(true))) {
@@ -62,4 +60,3 @@ if (!(false !== new String(false))) {
 if (!(true !== {valueOf: function () {return true}})) {
   $ERROR('#11: true !== {valueOf: function () {return true}}');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T2.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T2.js
index 780807c97..30e6f7be3 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T2.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A8_T2.js
- * @description x or y is primitive number
- */
+/*---
+info: If Type(x) is different from Type(y), return true
+description: x or y is primitive number
+---*/
 
 //CHECK#1
 if (!(1 !== new Number(1))) {
@@ -62,4 +60,3 @@ if (!(new String(0) !== 0)) {
 if (!(1 !== {valueOf: function () {return 1}})) {
   $ERROR('#11: 1 !== {valueOf: function () {return 1}}');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T3.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T3.js
index 3206868db..8dd17f818 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T3.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A8_T3.js
- * @description x or y is primitive string
- */
+/*---
+info: If Type(x) is different from Type(y), return true
+description: x or y is primitive string
+---*/
 
 //CHECK#1
 if (!("1" !== new String("1"))) {
@@ -62,5 +60,3 @@ if (!(false !== new Number(false))) {
 if (!("1" !== {valueOf: function () {return "1"}})) {
   $ERROR('#11: "1" !== {valueOf: function () {return "1"}}');
 }
-
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T4.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T4.js
index 004549142..f51c9b5d8 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T4.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A8_T4.js
- * @description x or y is null or undefined
- */
+/*---
+info: If Type(x) is different from Type(y), return true
+description: x or y is null or undefined
+---*/
 
 //CHECK#1
 if (!(undefined !== null)) {
@@ -77,4 +75,3 @@ if (!(undefined !== "undefined")) {
 if (!("undefined" !== undefined)) {
   $ERROR('#14: "undefined" !== undefined');
 }
-
diff --git a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T5.js b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T5.js
index 3f2c4a627..1eac7b838 100644
--- a/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T5.js
+++ b/test/suite/ch11/11.9/11.9.5/S11.9.5_A8_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Type(x) is different from Type(y), return true
- *
- * @path ch11/11.9/11.9.5/S11.9.5_A8_T5.js
- * @description Checking such x and y that either x or y is primitive string and the other is primitive number
- */
+/*---
+info: If Type(x) is different from Type(y), return true
+description: >
+    Checking such x and y that either x or y is primitive string and
+    the other is primitive number
+---*/
 
 //CHECK#1
 try {
@@ -24,5 +24,4 @@ try {
   if (!(1 !== e)) {
     $ERROR('#2: 1 !== throw "1"');
   }
-} 
-
+}
diff --git a/test/suite/ch12/12.1/12.1-1.js b/test/suite/ch12/12.1/12.1-1.js
index e5311368f..6340e57d6 100644
--- a/test/suite/ch12/12.1/12.1-1.js
+++ b/test/suite/ch12/12.1/12.1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-1.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: try-catch

- */

-

-

-function testcase() {

-        try {

-            eval("try{};catch(){}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "12.1 - block '{ StatementListopt };' is not allowed: try-catch"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("try{};catch(){}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-2.js b/test/suite/ch12/12.1/12.1-2.js
index ab1d4668e..95ce548b5 100644
--- a/test/suite/ch12/12.1/12.1-2.js
+++ b/test/suite/ch12/12.1/12.1-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-2.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: try-catch-finally

- */

-

-

-function testcase() {

-        try {

-            eval("try{};catch{};finally{}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    12.1 - block '{ StatementListopt };' is not allowed:
+    try-catch-finally
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("try{};catch{};finally{}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-3.js b/test/suite/ch12/12.1/12.1-3.js
index e0ccd4f58..d8cecc0a7 100644
--- a/test/suite/ch12/12.1/12.1-3.js
+++ b/test/suite/ch12/12.1/12.1-3.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-3.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: try-finally

- */

-

-

-function testcase() {

-        try {

-            eval("try{};finally{}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "12.1 - block '{ StatementListopt };' is not allowed: try-finally"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("try{};finally{}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-4.js b/test/suite/ch12/12.1/12.1-4.js
index 4df0c5604..02d046985 100644
--- a/test/suite/ch12/12.1/12.1-4.js
+++ b/test/suite/ch12/12.1/12.1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-4.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: if-else

- */

-

-

-function testcase() {

-        try {

-            eval("if{};else{}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "12.1 - block '{ StatementListopt };' is not allowed: if-else"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("if{};else{}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-5.js b/test/suite/ch12/12.1/12.1-5.js
index 4d2238962..3659c3443 100644
--- a/test/suite/ch12/12.1/12.1-5.js
+++ b/test/suite/ch12/12.1/12.1-5.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-5.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: if-else-if

- */

-

-

-function testcase() {

-        try {

-            eval("if{};else if{}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "12.1 - block '{ StatementListopt };' is not allowed: if-else-if"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("if{};else if{}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-6.js b/test/suite/ch12/12.1/12.1-6.js
index d6907d9c6..f8b6d4b6e 100644
--- a/test/suite/ch12/12.1/12.1-6.js
+++ b/test/suite/ch12/12.1/12.1-6.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-6.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: if-else-if-else

- */

-

-

-function testcase() {

-        try {

-            eval("if{};else if{};else{}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    12.1 - block '{ StatementListopt };' is not allowed:
+    if-else-if-else
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("if{};else if{};else{}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/12.1-7.js b/test/suite/ch12/12.1/12.1-7.js
index ab89adc8b..00c59e92e 100644
--- a/test/suite/ch12/12.1/12.1-7.js
+++ b/test/suite/ch12/12.1/12.1-7.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.1/12.1-7.js

- * @description 12.1 - block '{ StatementListopt };' is not allowed: do-while

- */

-

-

-function testcase() {

-        try {

-            eval("do{};while()");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "12.1 - block '{ StatementListopt };' is not allowed: do-while"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("do{};while()");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.1/S12.1_A2.js b/test/suite/ch12/12.1/S12.1_A2.js
index eed2e89d4..986320957 100644
--- a/test/suite/ch12/12.1/S12.1_A2.js
+++ b/test/suite/ch12/12.1/S12.1_A2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production StatementList  Statement is evaluated as follows
- * 1. Evaluate Statement.
- * 2. If an exception was thrown, return (throw, V, empty) where V is the exception
- *
- * @path ch12/12.1/S12.1_A2.js
- * @description Throwing exception within a Block
- */
+/*---
+info: >
+    The production StatementList  Statement is evaluated as follows
+    1. Evaluate Statement.
+    2. If an exception was thrown, return (throw, V, empty) where V is the exception
+description: Throwing exception within a Block
+includes: [$PRINT.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -34,4 +34,3 @@ try {
 
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.1/S12.1_A4_T1.js b/test/suite/ch12/12.1/S12.1_A4_T1.js
index 8acad6f1c..029361a6b 100644
--- a/test/suite/ch12/12.1/S12.1_A4_T1.js
+++ b/test/suite/ch12/12.1/S12.1_A4_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Block can't be inside of expression
- *
- * @path ch12/12.1/S12.1_A4_T1.js
- * @description Checking if execution of "y={__func}()" fails
- * @negative
- */
+/*---
+info: The production Block can't be inside of expression
+description: Checking if execution of "y={__func}()" fails
+flags: [negative]
+---*/
 
 function __func(){};
 
@@ -16,4 +14,3 @@ function __func(){};
 y={__func}();
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.1/S12.1_A4_T2.js b/test/suite/ch12/12.1/S12.1_A4_T2.js
index 510d6f7b0..67bf683af 100644
--- a/test/suite/ch12/12.1/S12.1_A4_T2.js
+++ b/test/suite/ch12/12.1/S12.1_A4_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Block can't be inside of expression
- *
- * @path ch12/12.1/S12.1_A4_T2.js
- * @description Checking if execution of "y={x}" fails
- * @negative
- */
+/*---
+info: The production Block can't be inside of expression
+description: Checking if execution of "y={x}" fails
+flags: [negative]
+---*/
 
 x=1;
 
@@ -16,4 +14,3 @@ x=1;
 y={x};
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.1/S12.1_A5.js b/test/suite/ch12/12.1/S12.1_A5.js
index 00356061f..ed3e3601d 100644
--- a/test/suite/ch12/12.1/S12.1_A5.js
+++ b/test/suite/ch12/12.1/S12.1_A5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * StatementList: StatementList Statement inside the Block is evaluated from left to right
- *
- * @path ch12/12.1/S12.1_A5.js
- * @description Throwing exceptions within embedded/sequence Blocks
- */
+/*---
+info: >
+    StatementList: StatementList Statement inside the Block is evaluated from
+    left to right
+description: Throwing exceptions within embedded/sequence Blocks
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -53,5 +53,3 @@ try {
 	}
 }
 ////////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.10/12.10-0-1.js b/test/suite/ch12/12.10/12.10-0-1.js
index b1da0a5b7..7f60793eb 100644
--- a/test/suite/ch12/12.10/12.10-0-1.js
+++ b/test/suite/ch12/12.10/12.10-0-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-1.js

- * @description with does not change declaration scope - vars in with are visible outside

- */

-

-

-function testcase() {

-  var o = {};

-  var f = function () {

-	/* capture foo binding before executing with */

-	return foo;

-      }

-

-  with (o) {

-    var foo = "12.10-0-1";

-  }

-

-  return f()==="12.10-0-1"

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with does not change declaration scope - vars in with are visible
+    outside
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+  var f = function () {
+	/* capture foo binding before executing with */
+	return foo;
+      }
+
+  with (o) {
+    var foo = "12.10-0-1";
+  }
+
+  return f()==="12.10-0-1"
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-10.js b/test/suite/ch12/12.10/12.10-0-10.js
index 60e67f5aa..c9bcd7999 100644
--- a/test/suite/ch12/12.10/12.10-0-10.js
+++ b/test/suite/ch12/12.10/12.10-0-10.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-10.js

- * @description with introduces scope - name lookup finds function parameter

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o, x) {

-      with (o) {

-        return x;

-      }

-    }

-

-    return innerf(o, 42);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - name lookup finds function parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o, x) {
+      with (o) {
+        return x;
+      }
+    }
+
+    return innerf(o, 42);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-11.js b/test/suite/ch12/12.10/12.10-0-11.js
index 183ee45f7..79a9934df 100644
--- a/test/suite/ch12/12.10/12.10-0-11.js
+++ b/test/suite/ch12/12.10/12.10-0-11.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-11.js

- * @description with introduces scope - name lookup finds inner variable

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o) {

-      var x = 42;

-

-      with (o) {

-        return x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - name lookup finds inner variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o) {
+      var x = 42;
+
+      with (o) {
+        return x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-12.js b/test/suite/ch12/12.10/12.10-0-12.js
index a2a22518b..24d1c7dd2 100644
--- a/test/suite/ch12/12.10/12.10-0-12.js
+++ b/test/suite/ch12/12.10/12.10-0-12.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-12.js

- * @description with introduces scope - name lookup finds property

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o) {

-      with (o) {

-        return x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({x:42}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - name lookup finds property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o) {
+      with (o) {
+        return x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({x:42}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-3.js b/test/suite/ch12/12.10/12.10-0-3.js
index 22d67781e..fd804c5ff 100644
--- a/test/suite/ch12/12.10/12.10-0-3.js
+++ b/test/suite/ch12/12.10/12.10-0-3.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-3.js

- * @description with introduces scope - that is captured by function expression

- */

-

-

-function testcase() {

-  var o = {prop: "12.10-0-3 before"};

-  var f;

-

-  with (o) {

-    f = function () { return prop; }

-  }

-  o.prop = "12.10-0-3 after";

-  return f()==="12.10-0-3 after"

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - that is captured by function expression
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {prop: "12.10-0-3 before"};
+  var f;
+
+  with (o) {
+    f = function () { return prop; }
+  }
+  o.prop = "12.10-0-3 after";
+  return f()==="12.10-0-3 after"
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-7.js b/test/suite/ch12/12.10/12.10-0-7.js
index 0f780d59e..11a6f40d3 100644
--- a/test/suite/ch12/12.10/12.10-0-7.js
+++ b/test/suite/ch12/12.10/12.10-0-7.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-7.js

- * @description with introduces scope - scope removed when exiting with statement

- */

-

-

-function testcase() {

-  var o = {foo: 1};

-

-  with (o) {

-    foo = 42;

-  }

-

-  try {

-    foo;

-  }

-  catch (e) {

-     return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - scope removed when exiting with statement
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {foo: 1};
+
+  with (o) {
+    foo = 42;
+  }
+
+  try {
+    foo;
+  }
+  catch (e) {
+     return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-8.js b/test/suite/ch12/12.10/12.10-0-8.js
index 613734890..997feaab8 100644
--- a/test/suite/ch12/12.10/12.10-0-8.js
+++ b/test/suite/ch12/12.10/12.10-0-8.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-8.js

- * @description with introduces scope - var initializer sets like named property

- */

-

-

-function testcase() {

-  var o = {foo: 42};

-

-  with (o) {

-    var foo = "set in with";

-  }

-

-  return o.foo === "set in with";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - var initializer sets like named property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {foo: 42};
+
+  with (o) {
+    var foo = "set in with";
+  }
+
+  return o.foo === "set in with";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-0-9.js b/test/suite/ch12/12.10/12.10-0-9.js
index 746542ffa..a81513c2c 100644
--- a/test/suite/ch12/12.10/12.10-0-9.js
+++ b/test/suite/ch12/12.10/12.10-0-9.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-0-9.js

- * @description with introduces scope - name lookup finds outer variable

- */

-

-

-function testcase() {

-  function f(o) {

-    var x = 42;

-

-    function innerf(o) {

-      with (o) {

-        return x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - name lookup finds outer variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+    var x = 42;
+
+    function innerf(o) {
+      with (o) {
+        return x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-2-1.js b/test/suite/ch12/12.10/12.10-2-1.js
index 3ba1eb1eb..34956efd1 100644
--- a/test/suite/ch12/12.10/12.10-2-1.js
+++ b/test/suite/ch12/12.10/12.10-2-1.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-2-1.js

- * @description with - expression being Number

- */

-

-

-function testcase() {

-  var o = 2;

-  var foo = 1;

-  try

-  {

-    with (o) {

-      foo = 42;

-    }

-  }

-  catch(e)

-  {

-  }

-  return true;

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with - expression being Number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = 2;
+  var foo = 1;
+  try
+  {
+    with (o) {
+      foo = 42;
+    }
+  }
+  catch(e)
+  {
+  }
+  return true;
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-2-2.js b/test/suite/ch12/12.10/12.10-2-2.js
index a4de02221..8dadb883d 100644
--- a/test/suite/ch12/12.10/12.10-2-2.js
+++ b/test/suite/ch12/12.10/12.10-2-2.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-2-2.js

- * @description with - expression being Boolean

- */

-

-

-function testcase() {

-  var o = true;

-  var foo = 1;

-  try

-  {

-    with (o) {

-      foo = 42;

-    }

-  }

-  catch(e)

-  {

-  }

-  return true;

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with - expression being Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = true;
+  var foo = 1;
+  try
+  {
+    with (o) {
+      foo = 42;
+    }
+  }
+  catch(e)
+  {
+  }
+  return true;
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-2-3.js b/test/suite/ch12/12.10/12.10-2-3.js
index 07003092c..9ef0be71f 100644
--- a/test/suite/ch12/12.10/12.10-2-3.js
+++ b/test/suite/ch12/12.10/12.10-2-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-2-3.js

- * @description with - expression being string

- */

-

-

-function testcase() {

-  var o = "str";

-  var foo = 1;

-  try

-  {

-    with (o) {

-      foo = 42;

-    }

-  }

-  catch(e)

-  {

-  }

-  return true;

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with - expression being string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = "str";
+  var foo = 1;
+  try
+  {
+    with (o) {
+      foo = 42;
+    }
+  }
+  catch(e)
+  {
+  }
+  return true;
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10-7-1.js b/test/suite/ch12/12.10/12.10-7-1.js
index 6292efd97..e5b1d7408 100644
--- a/test/suite/ch12/12.10/12.10-7-1.js
+++ b/test/suite/ch12/12.10/12.10-7-1.js
@@ -1,32 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10-7-1.js

- * @description with introduces scope - restores the earlier environment on exit

- */

-

-

-function testcase() {

-  var a = 1;

-

-  var o = {a : 2};

-  try

-  {

-    with (o) {

-      a = 3;

-      throw 1;

-      a = 4;

-    }

-  }

-  catch(e)

-  {}

-

-  if (a === 1 && o.a === 3) {

-      return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with introduces scope - restores the earlier environment on exit
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = 1;
+
+  var o = {a : 2};
+  try
+  {
+    with (o) {
+      a = 3;
+      throw 1;
+      a = 4;
+    }
+  }
+  catch(e)
+  {}
+
+  if (a === 1 && o.a === 3) {
+      return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
index 3c042e412..9d5386f08 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-1-s.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-1-s.js

- * @description with statement in strict mode throws SyntaxError (strict function)

- * @onlyStrict

- */

-

-

-function testcase() {

-

-  try {

-    // wrapping it in eval since this needs to be a syntax error. The

-    // exception thrown must be a SyntaxError exception.

-    eval("\

-          function f() {\

-            \'use strict\';\

-            var o = {}; \

-            with (o) {};\

-          }\

-        ");

-    return false;

-  }

-  catch (e) {

-    return(e instanceof SyntaxError); 

-	}

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+          function f() {\
+            \'use strict\';\
+            var o = {}; \
+            with (o) {};\
+          }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return(e instanceof SyntaxError); 
+	}
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
index 4e470b517..e0128a763 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-10-s.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-10-s.js

- * @description with statement in strict mode throws SyntaxError (eval, where the container function is strict)

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-  // wrapping it in eval since this needs to be a syntax error. The

-  // exception thrown must be a SyntaxError exception. Note that eval

-  // inherits the strictness of its calling context.  

-  try {

-    eval("\

-          var o = {};\

-          with (o) {}\

-       ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (eval, where the
+    container function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+  // wrapping it in eval since this needs to be a syntax error. The
+  // exception thrown must be a SyntaxError exception. Note that eval
+  // inherits the strictness of its calling context.  
+  try {
+    eval("\
+          var o = {};\
+          with (o) {}\
+       ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
index 3c4e81daa..86a193211 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-11-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-11-s.js

- * @description Strict Mode - SyntaxError is thrown when using WithStatement in strict mode code

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("with ({}) { throw new Error();}");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when using WithStatement in
+    strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("with ({}) { throw new Error();}");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js b/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
index b40b37236..7e0ff8cea 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-11gs.js
@@ -1,16 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch12/12.10/12.10.1/12.10.1-11gs.js

- * @description Strict Mode - SyntaxError is thrown when using with statement

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-with ({}) { }

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Strict Mode - SyntaxError is thrown when using with statement
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+with ({}) { }
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
index 0f327297d..511599e5e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-12-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-12-s.js

- * @description with statement in strict mode throws SyntaxError (strict eval)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    eval("\

-          'use strict'; \

-          var o = {}; \

-          with (o) {}\

-        ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError) ;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict eval)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("\
+          'use strict'; \
+          var o = {}; \
+          with (o) {}\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
index 39d56659e..a0ebf38d8 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-13-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-13-s.js

- * @description Strict Mode - SyntaxError isn't thrown when WithStatement body is in strict mode code

- * @noStrict

- */

-

-

-function testcase() {

-        with ({}) {

-            "use strict";

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown when WithStatement body is
+    in strict mode code
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        with ({}) {
+            "use strict";
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
index 0e7e685b7..85b932900 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-14-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-14-s.js

- * @description Strict Mode - SyntaxError is thrown when the getter of a literal object utilizes WithStatement

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var obj = { get: function (a) { with(a){} } }; ");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the getter of a literal
+    object utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = { get: function (a) { with(a){} } }; ");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
index 8621631f6..5ea00618e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-15-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-15-s.js

- * @description Strict Mode - SyntaxError is thrown when the RHS of a dot property assignment utilizes WithStatement

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var obj = {}; obj.get = function (a) { with(a){} }; ");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the RHS of a dot property
+    assignment utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {}; obj.get = function (a) { with(a){} }; ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
index e798b5715..95f03117e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-16-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-16-s.js

- * @description Strict Mode - SyntaxError is thrown when the RHS of an object indexer assignment utilizes WithStatement

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var obj = {}; obj['get'] = function (a) { with(a){} };  ");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown when the RHS of an object
+    indexer assignment utilizes WithStatement
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var obj = {}; obj['get'] = function (a) { with(a){} };  ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
index 211a1386e..366ef438e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-2-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-2-s.js

- * @description with statement in strict mode throws SyntaxError (nested function where container is strict)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    // wrapping it in eval since this needs to be a syntax error. The

-    // exception thrown must be a SyntaxError exception.

-    eval("\

-          function foo() {\

-            \'use strict\'; \

-            function f() {\

-                var o = {}; \

-                with (o) {};\

-            }\

-          }\

-        ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (nested function
+    where container is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+          function foo() {\
+            \'use strict\'; \
+            function f() {\
+                var o = {}; \
+                with (o) {};\
+            }\
+          }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
index 8b0d2961b..e0788cded 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-3-s.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-3-s.js

- * @description with statement in strict mode throws SyntaxError (nested strict function)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    // wrapping it in eval since this needs to be a syntax error. The

-    // exception thrown must be a SyntaxError exception.

-    eval("\

-            function foo() {\

-                function f() {\

-                  \'use strict\'; \

-                  var o = {}; \

-                  with (o) {};\

-                }\

-              }\

-        ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (nested strict
+    function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    // wrapping it in eval since this needs to be a syntax error. The
+    // exception thrown must be a SyntaxError exception.
+    eval("\
+            function foo() {\
+                function f() {\
+                  \'use strict\'; \
+                  var o = {}; \
+                  with (o) {};\
+                }\
+              }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
index adb09673b..2c520f37e 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-4-s.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-4-s.js

- * @description with statement in strict mode throws SyntaxError (strict Function)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    var f = Function("\

-                      \'use strict\';  \

-                      var o = {}; \

-                      with (o) {};\

-                    ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-	

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: with statement in strict mode throws SyntaxError (strict Function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    var f = Function("\
+                      \'use strict\';  \
+                      var o = {}; \
+                      with (o) {};\
+                    ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+	
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
index 3a1ea1ad8..e67ad88f3 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-5-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-5-s.js

- * @description with statement allowed in nested Function even if its container Function is strict)

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-    Function("\'use strict\'; var f1 = Function( \"var o = {}; with (o) {};\")");

-    return true;

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement allowed in nested Function even if its container
+    Function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+    Function("\'use strict\'; var f1 = Function( \"var o = {}; with (o) {};\")");
+    return true;
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
index 0ceb2097e..9fe0076bb 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-7-s.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-7-s.js

- * @description with statement in strict mode throws SyntaxError (function expression, where the container function is directly evaled from strict code)

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval("var f = function () {\

-                var o = {}; \

-                with (o) {}; \

-             }\

-        ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (function
+    expression, where the container function is directly evaled from
+    strict code)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval("var f = function () {\
+                var o = {}; \
+                with (o) {}; \
+             }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
index 55cfa8e4e..4c9685a89 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-8-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-8-s.js

- * @description with statement in strict mode throws SyntaxError (function expression, where the container Function is strict)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    Function("\

-              \'use strict\'; \

-              var f1 = function () {\

-                  var o = {}; \

-                  with (o) {}; \

-                }\

-            ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (function
+    expression, where the container Function is strict)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Function("\
+              \'use strict\'; \
+              var f1 = function () {\
+                  var o = {}; \
+                  with (o) {}; \
+                }\
+            ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js b/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
index b0e29e256..2ed45bd8c 100644
--- a/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
+++ b/test/suite/ch12/12.10/12.10.1/12.10.1-9-s.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.10/12.10.1/12.10.1-9-s.js

- * @description with statement in strict mode throws SyntaxError (strict function expression)

- * @onlyStrict

- */

-

-

-function testcase() {

-  try {

-    eval("\

-          var f = function () {\

-                \'use strict\';\

-                var o = {}; \

-                with (o) {}; \

-              }\

-        ");

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError) ;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    with statement in strict mode throws SyntaxError (strict function
+    expression)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    eval("\
+          var f = function () {\
+                \'use strict\';\
+                var o = {}; \
+                with (o) {}; \
+              }\
+        ");
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.10/S12.10_A1.10_T1.js b/test/suite/ch12/12.10/S12.10_A1.10_T1.js
index 2256e66b7..149a19701 100644
--- a/test/suite/ch12/12.10/S12.10_A1.10_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.10_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.10_T1.js
- * @description Using interation statement within "with" statement leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using interation statement within "with" statement leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -136,4 +137,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.10_T2.js b/test/suite/ch12/12.10/S12.10_A1.10_T2.js
index 35978c0d3..67c537df5 100644
--- a/test/suite/ch12/12.10/S12.10_A1.10_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.10_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.10_T2.js
- * @description Using iteration statement within "with" statement leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using iteration statement within "with" statement leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -145,4 +146,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.10_T3.js b/test/suite/ch12/12.10/S12.10_A1.10_T3.js
index b7f67f521..0af7d4fcb 100644
--- a/test/suite/ch12/12.10/S12.10_A1.10_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.10_T3.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.10_T3.js
- * @description Using iteration statment withing "with" statement leading to completion by exception
- * iteration statement inside with statement - exception completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using iteration statment withing "with" statement leading to
+    completion by exception  iteration statement inside with statement
+    - exception completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -148,4 +149,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.10_T4.js b/test/suite/ch12/12.10/S12.10_A1.10_T4.js
index 87ba7f654..ab6f8f42b 100644
--- a/test/suite/ch12/12.10/S12.10_A1.10_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.10_T4.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.10_T4.js
- * @description Using iteration statement witthin "with" staement leading to completion by break
- * iteration statement inside with statement - break completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using iteration statement witthin "with" staement leading to
+    completion by break  iteration statement inside with statement -
+    break completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -138,4 +139,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.10_T5.js b/test/suite/ch12/12.10/S12.10_A1.10_T5.js
index 05d7d8d04..43cdcdffd 100644
--- a/test/suite/ch12/12.10/S12.10_A1.10_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.10_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.10_T5.js
- * @description Using iteration statement within "with" statement leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using iteration statement within "with" statement leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -139,4 +140,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.11_T1.js b/test/suite/ch12/12.10/S12.10_A1.11_T1.js
index a939778d8..5761cfc6d 100644
--- a/test/suite/ch12/12.10/S12.10_A1.11_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.11_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.11_T1.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.11_T2.js b/test/suite/ch12/12.10/S12.10_A1.11_T2.js
index cfbefef48..57cc3ded0 100644
--- a/test/suite/ch12/12.10/S12.10_A1.11_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.11_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.11_T2.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -149,4 +150,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.11_T3.js b/test/suite/ch12/12.10/S12.10_A1.11_T3.js
index 9d68c9c9d..a8dd20333 100644
--- a/test/suite/ch12/12.10/S12.10_A1.11_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.11_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.11_T3.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -149,4 +150,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.11_T4.js b/test/suite/ch12/12.10/S12.10_A1.11_T4.js
index d2fc84a75..62261c90e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.11_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.11_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.11_T4.js
- * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,4 +153,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.11_T5.js b/test/suite/ch12/12.10/S12.10_A1.11_T5.js
index 9dfc0e5dc..7269d5bda 100644
--- a/test/suite/ch12/12.10/S12.10_A1.11_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.11_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.11_T5.js
- * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,4 +153,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.12_T1.js b/test/suite/ch12/12.10/S12.10_A1.12_T1.js
index 6ccbf0ca7..cd4ff867a 100644
--- a/test/suite/ch12/12.10/S12.10_A1.12_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.12_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.12_T1.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.12_T2.js b/test/suite/ch12/12.10/S12.10_A1.12_T2.js
index bd0cbe0f8..0ee7ca77e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.12_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.12_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.12_T2.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -147,4 +148,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.12_T3.js b/test/suite/ch12/12.10/S12.10_A1.12_T3.js
index 39ab7d395..b5c002b05 100644
--- a/test/suite/ch12/12.10/S12.10_A1.12_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.12_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.12_T3.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -148,5 +149,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.12_T4.js b/test/suite/ch12/12.10/S12.10_A1.12_T4.js
index 49b58c6d5..794ef1afa 100644
--- a/test/suite/ch12/12.10/S12.10_A1.12_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.12_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.12_T4.js
- * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -149,4 +150,3 @@ try {
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.12_T5.js b/test/suite/ch12/12.10/S12.10_A1.12_T5.js
index 2e3534367..37b814be8 100644
--- a/test/suite/ch12/12.10/S12.10_A1.12_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.12_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.12_T5.js
- * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,5 +153,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.1_T1.js b/test/suite/ch12/12.10/S12.10_A1.1_T1.js
index a749c9c20..1fe5ce969 100644
--- a/test/suite/ch12/12.10/S12.10_A1.1_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.1_T1.js
- * @description Using "with" inside of global context leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: Using "with" inside of global context leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -133,4 +132,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.1_T2.js b/test/suite/ch12/12.10/S12.10_A1.1_T2.js
index d07cb0e69..fd1bdf2b6 100644
--- a/test/suite/ch12/12.10/S12.10_A1.1_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.1_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.1_T2.js
- * @description Using "with" inside of global context leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" inside of global context leading to completion by
+    exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -142,4 +143,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.1_T3.js b/test/suite/ch12/12.10/S12.10_A1.1_T3.js
index 200209019..e41d146e5 100644
--- a/test/suite/ch12/12.10/S12.10_A1.1_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.1_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.1_T3.js
- * @description Using "with" inside of global context leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" inside of global context leading to completion by
+    exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.2_T1.js b/test/suite/ch12/12.10/S12.10_A1.2_T1.js
index 20a344d48..562c6063e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.2_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.2_T1.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.2_T1.js
- * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement when the statement
+    itself is declared within the function declaration, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +143,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.2_T2.js b/test/suite/ch12/12.10/S12.10_A1.2_T2.js
index 39312c70a..6de9dbcc3 100644
--- a/test/suite/ch12/12.10/S12.10_A1.2_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.2_T2.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.2_T2.js
- * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement when the statement
+    itself is declared within the function declaration, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -146,4 +148,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.2_T3.js b/test/suite/ch12/12.10/S12.10_A1.2_T3.js
index f34c7cb94..72d59861d 100644
--- a/test/suite/ch12/12.10/S12.10_A1.2_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.2_T3.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.2_T3.js
- * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement when the statement
+    itself is declared within the function declaration, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -148,5 +150,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.2_T4.js b/test/suite/ch12/12.10/S12.10_A1.2_T4.js
index f8bff8e20..ccb9ee31e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.2_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.2_T4.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.2_T4.js
- * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement when the statement
+    itself is declared within the function declaration, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -150,4 +152,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.2_T5.js b/test/suite/ch12/12.10/S12.10_A1.2_T5.js
index d67f69d6d..eecd2176e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.2_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.2_T5.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.2_T5.js
- * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function without "with" statement when the statement
+    itself is declared within the function declaration, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -148,4 +150,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.3_T1.js b/test/suite/ch12/12.10/S12.10_A1.3_T1.js
index 3e453847b..5fa67fef9 100644
--- a/test/suite/ch12/12.10/S12.10_A1.3_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.3_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.3_T1.js
- * @description Using "with" statement within function constructor, leading to normal completition
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within function constructor, leading to
+    normal completition
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.3_T2.js b/test/suite/ch12/12.10/S12.10_A1.3_T2.js
index 183d0dabf..fa283642a 100644
--- a/test/suite/ch12/12.10/S12.10_A1.3_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.3_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.3_T2.js
- * @description Using "with" statement within function constructor, leading to normal completition by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within function constructor, leading to
+    normal completition by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -142,4 +143,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.3_T3.js b/test/suite/ch12/12.10/S12.10_A1.3_T3.js
index e413f3918..6adbccbba 100644
--- a/test/suite/ch12/12.10/S12.10_A1.3_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.3_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.3_T3.js
- * @description Using "with" statement within function constructor, leading to normal completition by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within function constructor, leading to
+    normal completition by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,5 +145,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.3_T4.js b/test/suite/ch12/12.10/S12.10_A1.3_T4.js
index 7ac5823f7..50c5f9795 100644
--- a/test/suite/ch12/12.10/S12.10_A1.3_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.3_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.3_T4.js
- * @description Using "with" statement within function constructor, leading to completition by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within function constructor, leading to
+    completition by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -146,4 +147,3 @@ catch(e){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.3_T5.js b/test/suite/ch12/12.10/S12.10_A1.3_T5.js
index 41b85c6dc..9947b05cc 100644
--- a/test/suite/ch12/12.10/S12.10_A1.3_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.3_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.3_T5.js
- * @description Using "with" statement within function constructor, leading to completition by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within function constructor, leading to
+    completition by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,5 +153,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.4_T1.js b/test/suite/ch12/12.10/S12.10_A1.4_T1.js
index 2bbec00ec..289c98a5e 100644
--- a/test/suite/ch12/12.10/S12.10_A1.4_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.4_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.4_T1.js
- * @description Using "with" statement within iteration statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within iteration statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -136,4 +137,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.4_T2.js b/test/suite/ch12/12.10/S12.10_A1.4_T2.js
index 9bafbb075..02f541736 100644
--- a/test/suite/ch12/12.10/S12.10_A1.4_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.4_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.4_T2.js
- * @description Using "with" statement within iteration statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -145,4 +146,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.4_T3.js b/test/suite/ch12/12.10/S12.10_A1.4_T3.js
index 3b3e72f8a..43535c78c 100644
--- a/test/suite/ch12/12.10/S12.10_A1.4_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.4_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.4_T3.js
- * @description Using "with" statement within iteration statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -147,4 +148,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.4_T4.js b/test/suite/ch12/12.10/S12.10_A1.4_T4.js
index b9209bb67..3d531624b 100644
--- a/test/suite/ch12/12.10/S12.10_A1.4_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.4_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.4_T4.js
- * @description Using "with" statement within iteration statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -137,4 +138,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.4_T5.js b/test/suite/ch12/12.10/S12.10_A1.4_T5.js
index b942e2b41..7773987d6 100644
--- a/test/suite/ch12/12.10/S12.10_A1.4_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.4_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.4_T5.js
- * @description Using "with" statement within iteration statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -139,4 +140,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.5_T1.js b/test/suite/ch12/12.10/S12.10_A1.5_T1.js
index a45cd5df1..ffaae5d7a 100644
--- a/test/suite/ch12/12.10/S12.10_A1.5_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.5_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.5_T1.js
- * @description Using "with" statement within "for-in" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.5_T2.js b/test/suite/ch12/12.10/S12.10_A1.5_T2.js
index 4efa5a216..c9afb655f 100644
--- a/test/suite/ch12/12.10/S12.10_A1.5_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.5_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.5_T2.js
- * @description Using "with" statement within "for-in" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.5_T3.js b/test/suite/ch12/12.10/S12.10_A1.5_T3.js
index e4cace7e1..8870e8e0d 100644
--- a/test/suite/ch12/12.10/S12.10_A1.5_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.5_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.5_T3.js
- * @description Using "with" statement within "for-in" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,4 +153,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.5_T4.js b/test/suite/ch12/12.10/S12.10_A1.5_T4.js
index 6655901d6..d275a7a3b 100644
--- a/test/suite/ch12/12.10/S12.10_A1.5_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.5_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.5_T4.js
- * @description Using "with" statement within "for-in" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -136,4 +137,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.5_T5.js b/test/suite/ch12/12.10/S12.10_A1.5_T5.js
index 1273f5166..9e676a9ab 100644
--- a/test/suite/ch12/12.10/S12.10_A1.5_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.5_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.5_T5.js
- * @description Using "with" statement within "for-in" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.6_T1.js b/test/suite/ch12/12.10/S12.10_A1.6_T1.js
index 608ceef9f..7eb5d39d6 100644
--- a/test/suite/ch12/12.10/S12.10_A1.6_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.6_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.6_T1.js
- * @description Using "with" statement within another "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within another "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -135,4 +136,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.6_T2.js b/test/suite/ch12/12.10/S12.10_A1.6_T2.js
index 8cfae1a8b..b6ca245bc 100644
--- a/test/suite/ch12/12.10/S12.10_A1.6_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.6_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.6_T2.js
- * @description Using "with" statement within another "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within another "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.6_T3.js b/test/suite/ch12/12.10/S12.10_A1.6_T3.js
index 4774eb44d..c82daf6da 100644
--- a/test/suite/ch12/12.10/S12.10_A1.6_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.6_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.6_T3.js
- * @description Using "with" statement within another "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "with" statement within another "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -146,4 +147,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.7_T1.js b/test/suite/ch12/12.10/S12.10_A1.7_T1.js
index 134af702c..ca06da099 100644
--- a/test/suite/ch12/12.10/S12.10_A1.7_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.7_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.7_T1.js
- * @description Calling a function within "with" statement declared within the statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared within the
+    statement, leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.7_T2.js b/test/suite/ch12/12.10/S12.10_A1.7_T2.js
index 3efde0328..5266281b9 100644
--- a/test/suite/ch12/12.10/S12.10_A1.7_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.7_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.7_T2.js
- * @description Calling a function within "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -146,4 +147,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.7_T3.js b/test/suite/ch12/12.10/S12.10_A1.7_T3.js
index d43395763..3e14b476f 100644
--- a/test/suite/ch12/12.10/S12.10_A1.7_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.7_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.7_T3.js
- * @description Calling a function within "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -148,4 +149,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.7_T4.js b/test/suite/ch12/12.10/S12.10_A1.7_T4.js
index 9ca70ef1c..8dfe75650 100644
--- a/test/suite/ch12/12.10/S12.10_A1.7_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.7_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.7_T4.js
- * @description Calling a function within "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -150,4 +151,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.7_T5.js b/test/suite/ch12/12.10/S12.10_A1.7_T5.js
index d7070388b..eabad4816 100644
--- a/test/suite/ch12/12.10/S12.10_A1.7_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.7_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.7_T5.js
- * @description Calling a function within "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Calling a function within "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,4 +153,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.8_T1.js b/test/suite/ch12/12.10/S12.10_A1.8_T1.js
index 73519377b..7414e616d 100644
--- a/test/suite/ch12/12.10/S12.10_A1.8_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.8_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.8_T1.js
- * @description Declaring function constructor within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.8_T2.js b/test/suite/ch12/12.10/S12.10_A1.8_T2.js
index fd81d2bfc..fb83d3c89 100644
--- a/test/suite/ch12/12.10/S12.10_A1.8_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.8_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.8_T2.js
- * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.8_T3.js b/test/suite/ch12/12.10/S12.10_A1.8_T3.js
index 39a648266..7ab9f9398 100644
--- a/test/suite/ch12/12.10/S12.10_A1.8_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.8_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.8_T3.js
- * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.8_T4.js b/test/suite/ch12/12.10/S12.10_A1.8_T4.js
index f6eed2043..e86dc2220 100644
--- a/test/suite/ch12/12.10/S12.10_A1.8_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A1.8_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.8_T4.js
- * @description Declaring function constructor within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Declaring function constructor within "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -149,4 +150,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.8_T5.js b/test/suite/ch12/12.10/S12.10_A1.8_T5.js
index c2425b1f1..28b587896 100644
--- a/test/suite/ch12/12.10/S12.10_A1.8_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A1.8_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.8_T5.js
- * @description Declaring function constructor within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Declaring function constructor within "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -152,4 +153,3 @@ catch(e){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.9_T1.js b/test/suite/ch12/12.10/S12.10_A1.9_T1.js
index 629b517b4..26fda66ed 100644
--- a/test/suite/ch12/12.10/S12.10_A1.9_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A1.9_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.9_T1.js
- * @description Using "for-in" statement within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -141,4 +142,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.9_T2.js b/test/suite/ch12/12.10/S12.10_A1.9_T2.js
index 8e82e60eb..6e015eabf 100644
--- a/test/suite/ch12/12.10/S12.10_A1.9_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A1.9_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.9_T2.js
- * @description Using "for-in" statement within "with" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -136,4 +137,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "value")){
   $ERROR('#19: myObj.value === "value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A1.9_T3.js b/test/suite/ch12/12.10/S12.10_A1.9_T3.js
index 52ba815fc..5a89b0e81 100644
--- a/test/suite/ch12/12.10/S12.10_A1.9_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A1.9_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The with statement adds a computed object to the front of the
- * scope chain of the current execution context
- *
- * @path ch12/12.10/S12.10_A1.9_T3.js
- * @description Using "for-in" statement within "with" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    The with statement adds a computed object to the front of the
+    scope chain of the current execution context
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 this.p2 = 2;
@@ -144,4 +145,3 @@ if(!(value === undefined)){
 if(!(myObj.value === "myObj_value")){
   $ERROR('#19: myObj.value === "myObj_value". Actual:  myObj.value ==='+ myObj.value  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.10_T1.js b/test/suite/ch12/12.10/S12.10_A3.10_T1.js
index 17fd49b0a..4d47f48c5 100644
--- a/test/suite/ch12/12.10/S12.10_A3.10_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.10_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.10_T1.js
- * @description Using iteration statement within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using iteration statement within "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -41,7 +42,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.10_T2.js b/test/suite/ch12/12.10/S12.10_A3.10_T2.js
index 12c26bd86..1087c4e20 100644
--- a/test/suite/ch12/12.10/S12.10_A3.10_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.10_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.10_T2.js
- * @description Using iteration statement within "with" statement, leading completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using iteration statement within "with" statement, leading
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.10_T3.js b/test/suite/ch12/12.10/S12.10_A3.10_T3.js
index 32c27cce4..d4a006d1a 100644
--- a/test/suite/ch12/12.10/S12.10_A3.10_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.10_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.10_T3.js
- * @description Using iteration statement within "with" statement, leading completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using iteration statement within "with" statement, leading
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.10_T4.js b/test/suite/ch12/12.10/S12.10_A3.10_T4.js
index 5f55777e2..3c3800a9f 100644
--- a/test/suite/ch12/12.10/S12.10_A3.10_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.10_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.10_T4.js
- * @description Using iteration statement within "with" statement, leading completion be break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using iteration statement within "with" statement, leading
+    completion be break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,6 +43,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.10_T5.js b/test/suite/ch12/12.10/S12.10_A3.10_T5.js
index b26cd9d43..768df74b2 100644
--- a/test/suite/ch12/12.10/S12.10_A3.10_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.10_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.10_T5.js
- * @description Using iteration statement within "with" statement, leading completion be break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using iteration statement within "with" statement, leading
+    completion be break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,4 +43,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.11_T1.js b/test/suite/ch12/12.10/S12.10_A3.11_T1.js
index 8d15c1486..10ad5d3ef 100644
--- a/test/suite/ch12/12.10/S12.10_A3.11_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.11_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.11_T1.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -32,4 +33,3 @@ if(!(p1 === "x1")){
 if(!(myObj.p1 === "a")){
   $ERROR('#2: myObj.p1 === "a". Actual:  myObj.p1 ==='+ myObj.p1  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.11_T2.js b/test/suite/ch12/12.10/S12.10_A3.11_T2.js
index 81cdcc6af..bce1a2cf1 100644
--- a/test/suite/ch12/12.10/S12.10_A3.11_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.11_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.11_T2.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -38,4 +39,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "value")){
   $ERROR('#3: result === "value". Actual:  result ==='+ result  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.11_T3.js b/test/suite/ch12/12.10/S12.10_A3.11_T3.js
index 35e24fee0..d0acd3536 100644
--- a/test/suite/ch12/12.10/S12.10_A3.11_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.11_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.11_T3.js
- * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -38,5 +39,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "value")){
   $ERROR('#3: result === "value". Actual:  result ==='+ result  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.11_T4.js b/test/suite/ch12/12.10/S12.10_A3.11_T4.js
index 7056d6181..df1d74c40 100644
--- a/test/suite/ch12/12.10/S12.10_A3.11_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.11_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.11_T4.js
- * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -42,6 +43,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "value")){
   $ERROR('#3: result === "value". Actual:  result ==='+ result  );
 }
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.11_T5.js b/test/suite/ch12/12.10/S12.10_A3.11_T5.js
index ebce27c9f..1039105c6 100644
--- a/test/suite/ch12/12.10/S12.10_A3.11_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.11_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.11_T5.js
- * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function within "with" statement declared without the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -41,5 +42,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "value")){
   $ERROR('#3: result === "value". Actual:  result ==='+ result  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.12_T1.js b/test/suite/ch12/12.10/S12.10_A3.12_T1.js
index 1ec9f7607..033dd69d5 100644
--- a/test/suite/ch12/12.10/S12.10_A3.12_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.12_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.12_T1.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -32,4 +33,3 @@ if(!(p1 === 1)){
 if(!(myObj.p1 === "x1")){
   $ERROR('#2: myObj.p1 === "x1". Actual:  myObj.p1 ==='+ myObj.p1  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.12_T2.js b/test/suite/ch12/12.10/S12.10_A3.12_T2.js
index 171ef5808..7f5e1f05c 100644
--- a/test/suite/ch12/12.10/S12.10_A3.12_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.12_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.12_T2.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -38,4 +39,3 @@ if(!(myObj.p1 === "x1")){
 if(!(result === "myObj_value")){
   $ERROR('#3: result === "myObj_value". Actual:  result ==='+ result  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.12_T3.js b/test/suite/ch12/12.10/S12.10_A3.12_T3.js
index 3cea6bc58..438e7f642 100644
--- a/test/suite/ch12/12.10/S12.10_A3.12_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.12_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.12_T3.js
- * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -37,4 +38,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "myObj_value")){
   $ERROR('#3: result === "myObj_value". Actual:  result ==='+ result  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.12_T4.js b/test/suite/ch12/12.10/S12.10_A3.12_T4.js
index 1049d25fe..1da166cff 100644
--- a/test/suite/ch12/12.10/S12.10_A3.12_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.12_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.12_T4.js
- * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -41,5 +42,3 @@ if(!(myObj.p1 === "x1")){
 if(!(result === "myObj_value")){
   $ERROR('#3: result === "myObj_value". Actual:  result ==='+ result  );
 }
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.12_T5.js b/test/suite/ch12/12.10/S12.10_A3.12_T5.js
index 9d3c9fed9..c5d1576db 100644
--- a/test/suite/ch12/12.10/S12.10_A3.12_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.12_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.12_T5.js
- * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Calling a function without "with" statement declared within the
+    statement, leading to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -41,4 +42,3 @@ if(!(myObj.p1 === "a")){
 if(!(result === "myObj_value")){
   $ERROR('#3: result === "myObj_value". Actual:  result ==='+ result  );
 }
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.1_T1.js b/test/suite/ch12/12.10/S12.10_A3.1_T1.js
index 58ee15b9c..4440fbfa9 100644
--- a/test/suite/ch12/12.10/S12.10_A3.1_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.1_T1.js
- * @description Using "with" statement within global context - normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: Using "with" statement within global context - normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -40,6 +39,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.1_T2.js b/test/suite/ch12/12.10/S12.10_A3.1_T2.js
index 12b72b2c2..620fdf677 100644
--- a/test/suite/ch12/12.10/S12.10_A3.1_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.1_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.1_T2.js
- * @description Using "with" statement within global context, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within global context, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -56,4 +57,3 @@ if (myObj.p1 !== "x1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.1_T3.js b/test/suite/ch12/12.10/S12.10_A3.1_T3.js
index f78052019..e57769e17 100644
--- a/test/suite/ch12/12.10/S12.10_A3.1_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.1_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.1_T3.js
- * @description Using "with" statement within global context, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within global context, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var result = "result";
@@ -51,8 +52,3 @@ if(!(myObj.p1 === "a")){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.2_T1.js b/test/suite/ch12/12.10/S12.10_A3.2_T1.js
index 0d3e11beb..d3f60669b 100644
--- a/test/suite/ch12/12.10/S12.10_A3.2_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.2_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.2_T1.js
- * @description Declaring "with" statement within a function body, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function body, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -43,4 +44,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.2_T2.js b/test/suite/ch12/12.10/S12.10_A3.2_T2.js
index 2ef4889d4..f388a22e1 100644
--- a/test/suite/ch12/12.10/S12.10_A3.2_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.2_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.2_T2.js
- * @description Declaring "with" statement within a function body, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function body, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -44,6 +45,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.2_T3.js b/test/suite/ch12/12.10/S12.10_A3.2_T3.js
index 8f46552e7..a0ef9a859 100644
--- a/test/suite/ch12/12.10/S12.10_A3.2_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.2_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.2_T3.js
- * @description Declaring "with" statement within a function body, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function body, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -44,4 +45,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.2_T4.js b/test/suite/ch12/12.10/S12.10_A3.2_T4.js
index 3c5598088..381566d08 100644
--- a/test/suite/ch12/12.10/S12.10_A3.2_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.2_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.2_T4.js
- * @description Declaring "with" statement within a function body, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function body, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -57,4 +58,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.2_T5.js b/test/suite/ch12/12.10/S12.10_A3.2_T5.js
index 61d86905a..7b7ed77c6 100644
--- a/test/suite/ch12/12.10/S12.10_A3.2_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.2_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.2_T5.js
- * @description Declaring "with" statement within a function body, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function body, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -56,8 +57,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.3_T1.js b/test/suite/ch12/12.10/S12.10_A3.3_T1.js
index 27a310837..160bb3773 100644
--- a/test/suite/ch12/12.10/S12.10_A3.3_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.3_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.3_T1.js
- * @description Declaring "with" statement within a function constructor, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function constructor, leading
+    to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -43,6 +44,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.3_T2.js b/test/suite/ch12/12.10/S12.10_A3.3_T2.js
index de6faab31..c5198aaf8 100644
--- a/test/suite/ch12/12.10/S12.10_A3.3_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.3_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.3_T2.js
- * @description Declaring "with" statement within a function constructor, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function constructor, leading
+    to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -44,4 +45,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.3_T3.js b/test/suite/ch12/12.10/S12.10_A3.3_T3.js
index 4a981756a..749432872 100644
--- a/test/suite/ch12/12.10/S12.10_A3.3_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.3_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.3_T3.js
- * @description Declaring "with" statement within a function constructor, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring "with" statement within a function constructor, leading
+    to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -44,6 +45,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.3_T4.js b/test/suite/ch12/12.10/S12.10_A3.3_T4.js
index 3eeb2ed5e..b170a5239 100644
--- a/test/suite/ch12/12.10/S12.10_A3.3_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.3_T4.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement', the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.3_T4.js
- * @description Declaring "with" statement within a function constructor, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement', the scope chain is
+    always restored to its former state
+description: >
+    Declaring "with" statement within a function constructor, leading
+    to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -55,4 +57,3 @@ if (myObj.p1 !== "x1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.4_T1.js b/test/suite/ch12/12.10/S12.10_A3.4_T1.js
index 1ef21667b..16328eed8 100644
--- a/test/suite/ch12/12.10/S12.10_A3.4_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.4_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.4_T1.js
- * @description Using "with" statement within iteration statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within iteration statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -41,6 +42,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.4_T2.js b/test/suite/ch12/12.10/S12.10_A3.4_T2.js
index 801c592aa..dd7512f87 100644
--- a/test/suite/ch12/12.10/S12.10_A3.4_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.4_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.4_T2.js
- * @description Using "with" statement within iteration statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.4_T3.js b/test/suite/ch12/12.10/S12.10_A3.4_T3.js
index 56698024e..33fc1c344 100644
--- a/test/suite/ch12/12.10/S12.10_A3.4_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.4_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.4_T3.js
- * @description Using "with" statement within iteration statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.4_T4.js b/test/suite/ch12/12.10/S12.10_A3.4_T4.js
index 557666a9c..24d411b7c 100644
--- a/test/suite/ch12/12.10/S12.10_A3.4_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.4_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.4_T4.js
- * @description Using "with" statement within iteration statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,6 +43,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.4_T5.js b/test/suite/ch12/12.10/S12.10_A3.4_T5.js
index 06816be05..9ea05e4ad 100644
--- a/test/suite/ch12/12.10/S12.10_A3.4_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.4_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.4_T5.js
- * @description Using "with" statement within iteration statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within iteration statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,6 +43,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.5_T1.js b/test/suite/ch12/12.10/S12.10_A3.5_T1.js
index b49962dc1..3a8fb23a6 100644
--- a/test/suite/ch12/12.10/S12.10_A3.5_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.5_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.5_T1.js
- * @description Using "with" statement within "for-in" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -41,4 +42,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.5_T2.js b/test/suite/ch12/12.10/S12.10_A3.5_T2.js
index e1ec1d611..e538c025f 100644
--- a/test/suite/ch12/12.10/S12.10_A3.5_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.5_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.5_T2.js
- * @description Using "with" statement within "for-in" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.5_T3.js b/test/suite/ch12/12.10/S12.10_A3.5_T3.js
index d85bca3bf..7696be8ed 100644
--- a/test/suite/ch12/12.10/S12.10_A3.5_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.5_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.5_T3.js
- * @description Using "with" statement within "for-in" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.5_T4.js b/test/suite/ch12/12.10/S12.10_A3.5_T4.js
index f85657a82..24d82b56d 100644
--- a/test/suite/ch12/12.10/S12.10_A3.5_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.5_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.5_T4.js
- * @description Using "with" statement within "for-in" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,4 +43,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.5_T5.js b/test/suite/ch12/12.10/S12.10_A3.5_T5.js
index 78b526fc3..c1255af97 100644
--- a/test/suite/ch12/12.10/S12.10_A3.5_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.5_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.5_T5.js
- * @description Using "with" statement within "for-in" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within "for-in" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,7 +43,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.6_T1.js b/test/suite/ch12/12.10/S12.10_A3.6_T1.js
index 4042e9b71..9daea1915 100644
--- a/test/suite/ch12/12.10/S12.10_A3.6_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.6_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.6_T1.js
- * @description Using "with" statement within another "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within another "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -55,6 +56,3 @@ if(theirObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.6_T2.js b/test/suite/ch12/12.10/S12.10_A3.6_T2.js
index db1d04dfb..abfe9aded 100644
--- a/test/suite/ch12/12.10/S12.10_A3.6_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.6_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.6_T2.js
- * @description Using "with" statement within another "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within another "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -61,5 +62,3 @@ if(theirObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.6_T3.js b/test/suite/ch12/12.10/S12.10_A3.6_T3.js
index ade4cdc5f..78603a697 100644
--- a/test/suite/ch12/12.10/S12.10_A3.6_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.6_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.6_T3.js
- * @description Using "with" statement within another "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "with" statement within another "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -62,5 +63,3 @@ if(theirObj.p1 !== true){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.7_T1.js b/test/suite/ch12/12.10/S12.10_A3.7_T1.js
index b24f131a4..8f6f6dd64 100644
--- a/test/suite/ch12/12.10/S12.10_A3.7_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.7_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.7_T1.js
- * @description Declaring and calling a function within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring and calling a function within "with" statement, leading
+    to normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -41,6 +42,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.7_T2.js b/test/suite/ch12/12.10/S12.10_A3.7_T2.js
index 7494fa7f3..4ca8a954d 100644
--- a/test/suite/ch12/12.10/S12.10_A3.7_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.7_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.7_T2.js
- * @description Declaring and calling a function within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring and calling a function within "with" statement, leading
+    to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -50,6 +51,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.7_T3.js b/test/suite/ch12/12.10/S12.10_A3.7_T3.js
index d3b72e03d..984d88092 100644
--- a/test/suite/ch12/12.10/S12.10_A3.7_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.7_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.7_T3.js
- * @description Declaring and calling a function within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring and calling a function within "with" statement, leading
+    to normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -50,4 +51,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.7_T4.js b/test/suite/ch12/12.10/S12.10_A3.7_T4.js
index cd97c3c1b..5de16a5c6 100644
--- a/test/suite/ch12/12.10/S12.10_A3.7_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.7_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.7_T4.js
- * @description Declaring and calling a function within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring and calling a function within "with" statement, leading
+    to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.7_T5.js b/test/suite/ch12/12.10/S12.10_A3.7_T5.js
index c0d9d84a2..7750a825c 100644
--- a/test/suite/ch12/12.10/S12.10_A3.7_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.7_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.7_T5.js
- * @description Declaring and calling a function within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring and calling a function within "with" statement, leading
+    to completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -54,4 +55,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.8_T1.js b/test/suite/ch12/12.10/S12.10_A3.8_T1.js
index efe008e85..ff62a20ec 100644
--- a/test/suite/ch12/12.10/S12.10_A3.8_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.8_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.8_T1.js
- * @description Declaring function constructor within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,4 +43,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.8_T2.js b/test/suite/ch12/12.10/S12.10_A3.8_T2.js
index 948270d0f..98cc460d6 100644
--- a/test/suite/ch12/12.10/S12.10_A3.8_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.8_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.8_T2.js
- * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -43,4 +44,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.8_T3.js b/test/suite/ch12/12.10/S12.10_A3.8_T3.js
index f104c10f3..82cd88626 100644
--- a/test/suite/ch12/12.10/S12.10_A3.8_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.8_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.8_T3.js
- * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring function constructor within "with" statement, leading to
+    normal completion by "return"
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -43,4 +44,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.8_T4.js b/test/suite/ch12/12.10/S12.10_A3.8_T4.js
index 2f034a106..bacd7ef94 100644
--- a/test/suite/ch12/12.10/S12.10_A3.8_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A3.8_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.8_T4.js
- * @description Declaring function constructor within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring function constructor within "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -55,4 +56,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.8_T5.js b/test/suite/ch12/12.10/S12.10_A3.8_T5.js
index 7484ca06a..527d7a21a 100644
--- a/test/suite/ch12/12.10/S12.10_A3.8_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A3.8_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.8_T5.js
- * @description Declaring function constructor within "with" statement, leading to completion by exception
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Declaring function constructor within "with" statement, leading to
+    completion by exception
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -55,4 +56,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.9_T1.js b/test/suite/ch12/12.10/S12.10_A3.9_T1.js
index f54c2087b..6fc98e8ce 100644
--- a/test/suite/ch12/12.10/S12.10_A3.9_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A3.9_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.9_T1.js
- * @description Using "for-in" statement within "with" statement, leading to normal completion
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    normal completion
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -41,6 +42,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.9_T2.js b/test/suite/ch12/12.10/S12.10_A3.9_T2.js
index a1bb6dfe9..45f1146dd 100644
--- a/test/suite/ch12/12.10/S12.10_A3.9_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A3.9_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.9_T2.js
- * @description Using "for-in" statement within "with" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,5 +43,3 @@ if(myObj.p1 !== "x1"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A3.9_T3.js b/test/suite/ch12/12.10/S12.10_A3.9_T3.js
index c00200340..385072456 100644
--- a/test/suite/ch12/12.10/S12.10_A3.9_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A3.9_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * No matter how control leaves the embedded 'Statement',
- * the scope chain is always restored to its former state
- *
- * @path ch12/12.10/S12.10_A3.9_T3.js
- * @description Using "for-in" statement within "with" statement, leading to completion by break
- * @noStrict
- */
+/*---
+info: >
+    No matter how control leaves the embedded 'Statement',
+    the scope chain is always restored to its former state
+description: >
+    Using "for-in" statement within "with" statement, leading to
+    completion by break
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 
@@ -42,5 +43,3 @@ if(myObj.p1 !== "a"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T1.js b/test/suite/ch12/12.10/S12.10_A4_T1.js
index 6deef5b1a..a64cb99f3 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T1.js
- * @description Changing string property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing string property
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var myObj = {
@@ -30,4 +28,3 @@ if(myObj.p1 === 1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T2.js b/test/suite/ch12/12.10/S12.10_A4_T2.js
index e31f52b84..f26fe283c 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T2.js
- * @description Changing number property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing number property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -30,4 +28,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T3.js b/test/suite/ch12/12.10/S12.10_A4_T3.js
index 94c58701c..98428624e 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T3.js
- * @description Changing boolean property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing boolean property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -30,4 +28,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T4.js b/test/suite/ch12/12.10/S12.10_A4_T4.js
index 042d0dfc5..475c9c4db 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T4.js
- * @description Changing object property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing object property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -39,4 +37,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T5.js b/test/suite/ch12/12.10/S12.10_A4_T5.js
index 38a743b03..e9e72b9ba 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T5.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T5.js
- * @description Changing array property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing array property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -30,4 +28,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A4_T6.js b/test/suite/ch12/12.10/S12.10_A4_T6.js
index fce451118..3d71e0be6 100644
--- a/test/suite/ch12/12.10/S12.10_A4_T6.js
+++ b/test/suite/ch12/12.10/S12.10_A4_T6.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Changing property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A4_T6.js
- * @description Changing function property
- * @noStrict
- */
+/*---
+info: Changing property using "eval" statement containing "with" statement
+description: Changing function property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -30,4 +28,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T1.js b/test/suite/ch12/12.10/S12.10_A5_T1.js
index 351e4bb9d..de4a2da1d 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T1.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T1.js
- * @description Deleting string property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting string property
+flags: [noStrict]
+---*/
 
 this.p1 = 1;
 var myObj = {
@@ -47,4 +45,3 @@ if(myObj.p1 === 1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T2.js b/test/suite/ch12/12.10/S12.10_A5_T2.js
index 909d79d03..ee19b8bdf 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T2.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T2.js
- * @description Deleting number property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting number property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -47,4 +45,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T3.js b/test/suite/ch12/12.10/S12.10_A5_T3.js
index cd2ec3487..74c284164 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T3.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T3.js
- * @description Deleting boolean property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting boolean property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -48,4 +46,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T4.js b/test/suite/ch12/12.10/S12.10_A5_T4.js
index 96f2ded29..7b711b8a5 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T4.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T4.js
- * @description Deleting object property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting object property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -52,4 +50,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T5.js b/test/suite/ch12/12.10/S12.10_A5_T5.js
index f0b52d07a..e89ad1967 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T5.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T5.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T5.js
- * @description Deleting array property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting array property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -52,4 +50,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.10/S12.10_A5_T6.js b/test/suite/ch12/12.10/S12.10_A5_T6.js
index 67c79398a..e635748ff 100644
--- a/test/suite/ch12/12.10/S12.10_A5_T6.js
+++ b/test/suite/ch12/12.10/S12.10_A5_T6.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting property using "eval" statement containing "with" statement
- *
- * @path ch12/12.10/S12.10_A5_T6.js
- * @description Deleting function property
- * @noStrict
- */
+/*---
+info: Deleting property using "eval" statement containing "with" statement
+description: Deleting function property
+flags: [noStrict]
+---*/
 
 this.p1 = 'a';
 var myObj = {
@@ -52,4 +50,3 @@ if(myObj.p1 === 'a'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.11/S12.11_A1_T1.js b/test/suite/ch12/12.11/S12.11_A1_T1.js
index 0d637da55..6f6b3b44d 100644
--- a/test/suite/ch12/12.11/S12.11_A1_T1.js
+++ b/test/suite/ch12/12.11/S12.11_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result.type is break and Result.target is in the current
- * label set, return (normal, Result.value, empty)
- *
- * @path ch12/12.11/S12.11_A1_T1.js
- * @description Simple test using switch statement
- */
+/*---
+info: >
+    If Result.type is break and Result.target is in the current
+    label set, return (normal, Result.value, empty)
+description: Simple test using switch statement
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -71,4 +70,3 @@ if(!(SwitchTest(void 0) === 32)){
 if(!(SwitchTest('0') === 32)){
   $ERROR("#10: SwitchTest('0') === 32. Actual:  SwitchTest('0') ==="+ SwitchTest('0')  );
 }
-
diff --git a/test/suite/ch12/12.11/S12.11_A1_T2.js b/test/suite/ch12/12.11/S12.11_A1_T2.js
index a7b4abc59..d359fe513 100644
--- a/test/suite/ch12/12.11/S12.11_A1_T2.js
+++ b/test/suite/ch12/12.11/S12.11_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result.type is break and Result.target is in the current
- * label set, return (normal, Result.value, empty)
- *
- * @path ch12/12.11/S12.11_A1_T2.js
- * @description Switch with different types of variables
- */
+/*---
+info: >
+    If Result.type is break and Result.target is in the current
+    label set, return (normal, Result.value, empty)
+description: Switch with different types of variables
+---*/
 
 var x = new Number(2);
 
@@ -85,4 +84,3 @@ if(!(SwitchTest('0') === 32)){
 if(!(SwitchTest(x) === 128)){
   $ERROR("#10: SwitchTest(x) === 128. Actual:  SwitchTest(x) ==="+ SwitchTest(x)  );
 }
-
diff --git a/test/suite/ch12/12.11/S12.11_A1_T3.js b/test/suite/ch12/12.11/S12.11_A1_T3.js
index 3171a6661..31771244b 100644
--- a/test/suite/ch12/12.11/S12.11_A1_T3.js
+++ b/test/suite/ch12/12.11/S12.11_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result.type is break and Result.target is in the current
- * label set, return (normal, Result.value, empty)
- *
- * @path ch12/12.11/S12.11_A1_T3.js
- * @description Using case with null, NaN, Infinity
- */
+/*---
+info: >
+    If Result.type is break and Result.target is in the current
+    label set, return (normal, Result.value, empty)
+description: Using case with null, NaN, Infinity
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -89,4 +88,3 @@ if(!(SwitchTest(NaN) === 32)){
 if(!(SwitchTest(Infinity) === 768)){
   $ERROR("#10: SwitchTest(NaN) === 768. Actual:  SwitchTest(NaN) ==="+ SwitchTest(NaN)  );
 }
-
diff --git a/test/suite/ch12/12.11/S12.11_A1_T4.js b/test/suite/ch12/12.11/S12.11_A1_T4.js
index 0182397fe..3e3656307 100644
--- a/test/suite/ch12/12.11/S12.11_A1_T4.js
+++ b/test/suite/ch12/12.11/S12.11_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result.type is break and Result.target is in the current
- * label set, return (normal, Result.value, empty)
- *
- * @path ch12/12.11/S12.11_A1_T4.js
- * @description Using case with isNaN and isNaN(value)
- */
+/*---
+info: >
+    If Result.type is break and Result.target is in the current
+    label set, return (normal, Result.value, empty)
+description: Using case with isNaN and isNaN(value)
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -77,4 +76,3 @@ if(!(SwitchTest(NaN) === 32)){
 if(!(SwitchTest(Infinity) === 768)){
   $ERROR("#10: SwitchTest(NaN) === 768. Actual:  SwitchTest(NaN) ==="+ SwitchTest(NaN)  );
 }
-
diff --git a/test/suite/ch12/12.11/S12.11_A2_T1.js b/test/suite/ch12/12.11/S12.11_A2_T1.js
index 247437638..0e51a6b16 100644
--- a/test/suite/ch12/12.11/S12.11_A2_T1.js
+++ b/test/suite/ch12/12.11/S12.11_A2_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * There can be only one DefaultClause
- *
- * @path ch12/12.11/S12.11_A2_T1.js
- * @description Duplicate DefaultClause
- * @negative
- */
+/*---
+info: There can be only one DefaultClause
+description: Duplicate DefaultClause
+flags: [negative]
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -27,4 +25,3 @@ function SwitchTest(value){
 }
 
 var x = SwitchTest(0);
-
diff --git a/test/suite/ch12/12.11/S12.11_A3_T1.js b/test/suite/ch12/12.11/S12.11_A3_T1.js
index feab32852..e1ef2b635 100644
--- a/test/suite/ch12/12.11/S12.11_A3_T1.js
+++ b/test/suite/ch12/12.11/S12.11_A3_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A3_T1.js
- * @description Checking if execution of "switch() {}" fails
- * @negative
- */
+/*---
+info: Syntax constructions of switch statement
+description: Checking if execution of "switch() {}" fails
+flags: [negative]
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -24,4 +22,3 @@ function SwitchTest(value){
 }
 
 var x = SwitchTest(0);
-
diff --git a/test/suite/ch12/12.11/S12.11_A3_T2.js b/test/suite/ch12/12.11/S12.11_A3_T2.js
index d879d6028..0819f6e8a 100644
--- a/test/suite/ch12/12.11/S12.11_A3_T2.js
+++ b/test/suite/ch12/12.11/S12.11_A3_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A3_T2.js
- * @description Checking if execution of "switch {}" fails
- * @negative
- */
+/*---
+info: Syntax constructions of switch statement
+description: Checking if execution of "switch {}" fails
+flags: [negative]
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -24,4 +22,3 @@ function SwitchTest(value){
 }
 
 var x = SwitchTest(0);
-
diff --git a/test/suite/ch12/12.11/S12.11_A3_T3.js b/test/suite/ch12/12.11/S12.11_A3_T3.js
index 03d3898dc..dacfae457 100644
--- a/test/suite/ch12/12.11/S12.11_A3_T3.js
+++ b/test/suite/ch12/12.11/S12.11_A3_T3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A3_T3.js
- * @description Checking if execution of "switch(value)" fails
- * @negative
- */
+/*---
+info: Syntax constructions of switch statement
+description: Checking if execution of "switch(value)" fails
+flags: [negative]
+---*/
 
 switch(value);
-
diff --git a/test/suite/ch12/12.11/S12.11_A3_T4.js b/test/suite/ch12/12.11/S12.11_A3_T4.js
index 00def2926..bd09d1d3f 100644
--- a/test/suite/ch12/12.11/S12.11_A3_T4.js
+++ b/test/suite/ch12/12.11/S12.11_A3_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A3_T4.js
- * @description Using "case" that has no Expresson after it. "CaseClause: case Expression : [StatementList]"
- * @negative
- */
+/*---
+info: Syntax constructions of switch statement
+description: >
+    Using "case" that has no Expresson after it. "CaseClause: case
+    Expression : [StatementList]"
+flags: [negative]
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -24,4 +24,3 @@ function SwitchTest(value){
 }
 
 var x = SwitchTest(0);
-
diff --git a/test/suite/ch12/12.11/S12.11_A3_T5.js b/test/suite/ch12/12.11/S12.11_A3_T5.js
index 02cd94bd9..895c146da 100644
--- a/test/suite/ch12/12.11/S12.11_A3_T5.js
+++ b/test/suite/ch12/12.11/S12.11_A3_T5.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A3_T5.js
- * @description Introducing statement not followed by "case" keyword
- * @negative
- */
+/*---
+info: Syntax constructions of switch statement
+description: Introducing statement not followed by "case" keyword
+flags: [negative]
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -25,4 +23,3 @@ function SwitchTest(value){
 }
 
 var x = SwitchTest(0);
-
diff --git a/test/suite/ch12/12.11/S12.11_A4_T1.js b/test/suite/ch12/12.11/S12.11_A4_T1.js
index 8fbafbc81..3c06cfe03 100644
--- a/test/suite/ch12/12.11/S12.11_A4_T1.js
+++ b/test/suite/ch12/12.11/S12.11_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Embedded syntax constructions of switch statement
- *
- * @path ch12/12.11/S12.11_A4_T1.js
- * @description Nesting one "switch" statement into StatementList of the other's
- */
+/*---
+info: Embedded syntax constructions of switch statement
+description: Nesting one "switch" statement into StatementList of the other's
+---*/
 
 function SwitchTest(value){
   var result = 0;
@@ -33,4 +31,3 @@ function SwitchTest(value){
 
 var x = SwitchTest(0);
 if(x!==6) $ERROR("#1: SwitchTest(0) === 6. Actual:  SwitchTest(0) ==="+ SwitchTest(0)  );
-
diff --git a/test/suite/ch12/12.12/S12.12_A1_T1.js b/test/suite/ch12/12.12/S12.12_A1_T1.js
index c88e0650a..3d694d1fa 100644
--- a/test/suite/ch12/12.12/S12.12_A1_T1.js
+++ b/test/suite/ch12/12.12/S12.12_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Labelled statements are only used in conjunction with labelled
- * break and continue statements
- *
- * @path ch12/12.12/S12.12_A1_T1.js
- * @description Checking if labelled break works. See continue and break sections
- */
+/*---
+info: >
+    Labelled statements are only used in conjunction with labelled
+    break and continue statements
+description: Checking if labelled break works. See continue and break sections
+---*/
 
 var object = {p1: 1, p2: 1};
 var result = 0;
@@ -19,4 +18,3 @@ lbl: for(var i in object){
 if(!(result === 1)){
   $ERROR("'break label' should break execution of labelled iteration statement");
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A1.js b/test/suite/ch12/12.13/S12.13_A1.js
index bc2463577..2a20bb833 100644
--- a/test/suite/ch12/12.13/S12.13_A1.js
+++ b/test/suite/ch12/12.13/S12.13_A1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Sanity test for throw statement
- *
- * @path ch12/12.13/S12.13_A1.js
- * @description Trying to throw exception with "throw"
- * @negative
- */
+/*---
+info: Sanity test for throw statement
+description: Trying to throw exception with "throw"
+flags: [negative]
+---*/
 
 throw "error";
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T1.js b/test/suite/ch12/12.13/S12.13_A2_T1.js
index bca31ea80..9b11bf3b9 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T1.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T1.js
- * @description Throwing undefined
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing undefined
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +15,3 @@ try{
 catch(e){
   if (e!==undefined) $ERROR('#1: Exception === undefined. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T2.js b/test/suite/ch12/12.13/S12.13_A2_T2.js
index e068f39f6..be92edfa3 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T2.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T2.js
- * @description Throwing null
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing null
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +15,3 @@ try{
 catch(e){
   if (e!==null) $ERROR('#1: Exception === null. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T3.js b/test/suite/ch12/12.13/S12.13_A2_T3.js
index 37592ac19..fe5b3d2af 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T3.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T3.js
- * @description Throwing boolean
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing boolean
+---*/
 
 // CHECK#1
 try{
@@ -41,4 +41,3 @@ try{
 catch(e){
   if (e!==true) $ERROR('#4: Exception ===true. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T4.js b/test/suite/ch12/12.13/S12.13_A2_T4.js
index bddf2dac3..7ddce10b4 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T4.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T4.js
- * @description Throwing string
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing string
+---*/
 
 // CHECK#1
 try{
@@ -24,4 +24,3 @@ try{
 catch(e){
   if (e!=="exception #1") $ERROR('#2: Exception ==="exception #1". Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T5.js b/test/suite/ch12/12.13/S12.13_A2_T5.js
index 8d8084849..a1de7260f 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T5.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T5.js
- * @description Throwing number
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing number
+---*/
 
 // CHECK#1
 try{
@@ -72,4 +72,3 @@ try{
 catch(e){
   if (e!==-0) $ERROR('#8: Exception ===-0. Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T6.js b/test/suite/ch12/12.13/S12.13_A2_T6.js
index 39e799852..3f80207bb 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T6.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T6.js
- * @description Throwing object
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing object
+---*/
 
 var myObj = {p1: 'a', 
              p2: 'b', 
@@ -42,4 +42,3 @@ try{
 }
 catch(e){}
 if (myObj.i!==6) $ERROR('#4: Handling of catch must be correct');
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T7.js b/test/suite/ch12/12.13/S12.13_A2_T7.js
index bf633f868..2cf87716a 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T7.js
+++ b/test/suite/ch12/12.13/S12.13_A2_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T7.js
- * @description Throwing Array
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing Array
+---*/
 
 var mycars = new Array();
 mycars[0] = "Saab";
@@ -27,4 +27,3 @@ catch(e){
     if (e[i]!==mycars[i]) $ERROR('#1.'+i+': Exception['+i+'] === mycars['+i+']. Actual:  Exception['+i+'] ==='+ e[i]  );
   }
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T1.js b/test/suite/ch12/12.13/S12.13_A3_T1.js
index 7843a6459..8c0d8823d 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T1.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T1.js
- * @description Evaluating boolean expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating boolean expression
+---*/
 
 // CHECK#1
 var b=true;
@@ -42,4 +40,3 @@ try{
 catch(e){
   if (e!==true) $ERROR('#4: Exception === true(operaton &&). Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T2.js b/test/suite/ch12/12.13/S12.13_A3_T2.js
index f8cb92203..86573b5f0 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T2.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T2.js
- * @description Evaluating string expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating string expression
+---*/
 
 // CHECK#1
 try{
@@ -25,4 +23,3 @@ try{
 catch(e){
   if (e!=="exception #1") $ERROR('#2: Exception === "exception #1"(operaton +). Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T3.js b/test/suite/ch12/12.13/S12.13_A3_T3.js
index 44c9d075c..7699df82f 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T3.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T3.js
- * @description Evaluating number expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating number expression
+---*/
 
 // CHECK#1
 try{
@@ -89,4 +87,3 @@ try{
 catch(e){
   if (e!==23) $ERROR('#10: Exception ===23(operaton %). Actual:  Exception ==='+ e);
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T4.js b/test/suite/ch12/12.13/S12.13_A3_T4.js
index 9a6e010f0..69c0962f2 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T4.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T4.js
- * @description Evaluating array expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating array expression
+---*/
 
 var mycars = new Array();
 mycars[0] = "Saab";
@@ -53,4 +51,3 @@ catch(e){
     if (e[i]!==mycars2[i-3]) $ERROR('#3.'+i+': Exception['+i+']===mycars2['+(i-3)+'](operation .concat(new)). Actual:  Exception['+i+']==='+ e[i] );
   }
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T5.js b/test/suite/ch12/12.13/S12.13_A3_T5.js
index 69fb016d5..cbdfa83b0 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T5.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T5.js
- * @description Evaluating equation expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating equation expression
+---*/
 
 // CHECK#1
 var a=true;
@@ -17,4 +15,3 @@ try{
 catch(e){
   if (e!=="exception") $ERROR('#1: Exception ==="exception"(operaton ? , ). Actual:  Exception ==='+e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T6.js b/test/suite/ch12/12.13/S12.13_A3_T6.js
index 7191c6bd6..a5ae8725d 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T6.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T6.js
- * @description Evaluating functions
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating functions
+---*/
 
 // CHECK#1
 var i=0;
@@ -55,4 +53,3 @@ try{
 catch(e){
   if (e!==2) $ERROR('#4: Exception ===2. Actual:  Exception ==='+ e);
 }
-
diff --git a/test/suite/ch12/12.14/12.14-1.js b/test/suite/ch12/12.14/12.14-1.js
index 47bff810b..8baf17edc 100644
--- a/test/suite/ch12/12.14/12.14-1.js
+++ b/test/suite/ch12/12.14/12.14-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-1.js

- * @description catch doesn't change declaration scope - var initializer in catch with same name as catch parameter changes parameter

- */

-

-

-function testcase() {

-  foo = "prior to throw";

-  try {

-    throw new Error();

-  }

-  catch (foo) {

-    var foo = "initializer in catch";

-  }

- return foo === "prior to throw";

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    catch doesn't change declaration scope - var initializer in catch
+    with same name as catch parameter changes parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo = "prior to throw";
+  try {
+    throw new Error();
+  }
+  catch (foo) {
+    var foo = "initializer in catch";
+  }
+ return foo === "prior to throw";
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-10.js b/test/suite/ch12/12.14/12.14-10.js
index 1bdf8273d..ca0ef758d 100644
--- a/test/suite/ch12/12.14/12.14-10.js
+++ b/test/suite/ch12/12.14/12.14-10.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-10.js

- * @description catch introduces scope - name lookup finds function parameter

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o, x) {

-      try {

-        throw o;

-      }

-      catch (e) {

-        return x;

-      }

-    }

-

-    return innerf(o, 42);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: catch introduces scope - name lookup finds function parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o, x) {
+      try {
+        throw o;
+      }
+      catch (e) {
+        return x;
+      }
+    }
+
+    return innerf(o, 42);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-11.js b/test/suite/ch12/12.14/12.14-11.js
index 6fded5bee..e9d493eef 100644
--- a/test/suite/ch12/12.14/12.14-11.js
+++ b/test/suite/ch12/12.14/12.14-11.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-11.js

- * @description catch introduces scope - name lookup finds inner variable

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o) {

-      var x = 42;

-

-      try {

-        throw o;

-      }

-      catch (e) {

-        return x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: catch introduces scope - name lookup finds inner variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o) {
+      var x = 42;
+
+      try {
+        throw o;
+      }
+      catch (e) {
+        return x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-12.js b/test/suite/ch12/12.14/12.14-12.js
index c92580cfe..2ffa95f16 100644
--- a/test/suite/ch12/12.14/12.14-12.js
+++ b/test/suite/ch12/12.14/12.14-12.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-12.js

- * @description catch introduces scope - name lookup finds property

- */

-

-

-function testcase() {

-  function f(o) {

-

-    function innerf(o) {

-      try {

-        throw o;

-      }

-      catch (e) {

-        return e.x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({x:42}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: catch introduces scope - name lookup finds property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+
+    function innerf(o) {
+      try {
+        throw o;
+      }
+      catch (e) {
+        return e.x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({x:42}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-13.js b/test/suite/ch12/12.14/12.14-13.js
index 3efb98913..890d05b0f 100644
--- a/test/suite/ch12/12.14/12.14-13.js
+++ b/test/suite/ch12/12.14/12.14-13.js
@@ -1,42 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-13.js

- * @description catch introduces scope - updates are based on scope

- */

-

-

-function testcase() {

-        var res1 = false;

-        var res2 = false;

-        var res3 = false;

-

-        var x_12_14_13 = 'local';

-        try {

-            function foo() {

-                this.x_12_14_13 = 'instance';

-            }

-

-            try {

-                throw foo;

-            }

-            catch (e) {

-                res1 = (x_12_14_13 === 'local');

-                e();

-                res2 = (x_12_14_13 === 'local');

-            }

-            res3 = (x_12_14_13 === 'local');

-

-            if (res1 === true &&

-                res2 === true &&

-                res3 === true) {

-                return true;

-            }

-        } finally {

-            delete this.x_12_14_13;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: catch introduces scope - updates are based on scope
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var res1 = false;
+        var res2 = false;
+        var res3 = false;
+
+        var x_12_14_13 = 'local';
+        try {
+            function foo() {
+                this.x_12_14_13 = 'instance';
+            }
+
+            try {
+                throw foo;
+            }
+            catch (e) {
+                res1 = (x_12_14_13 === 'local');
+                e();
+                res2 = (x_12_14_13 === 'local');
+            }
+            res3 = (x_12_14_13 === 'local');
+
+            if (res1 === true &&
+                res2 === true &&
+                res3 === true) {
+                return true;
+            }
+        } finally {
+            delete this.x_12_14_13;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-14.js b/test/suite/ch12/12.14/12.14-14.js
index 40b2c82c8..b1f6970d6 100644
--- a/test/suite/ch12/12.14/12.14-14.js
+++ b/test/suite/ch12/12.14/12.14-14.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-14.js

- * @description Exception object is a function, when an exception parameter is called as a function in catch block, global object is passed as the this value

- */

-

-

-function testcase() {

-        try {

-            throw function () {

-                this._12_14_14_foo = "test";

-            };

-            return false;

-        } catch (e) {

-            e();

-            return fnGlobalObject()._12_14_14_foo === "test";

-        }

-        finally {

-           delete fnGlobalObject()._12_14_14_foo;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Exception object is a function, when an exception parameter is
+    called as a function in catch block, global object is passed as
+    the this value
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        try {
+            throw function () {
+                this._12_14_14_foo = "test";
+            };
+            return false;
+        } catch (e) {
+            e();
+            return fnGlobalObject()._12_14_14_foo === "test";
+        }
+        finally {
+           delete fnGlobalObject()._12_14_14_foo;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-15.js b/test/suite/ch12/12.14/12.14-15.js
index e4397c17c..368eca928 100644
--- a/test/suite/ch12/12.14/12.14-15.js
+++ b/test/suite/ch12/12.14/12.14-15.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-15.js

- * @description Exception object is a function which is a property of an object, when an exception parameter is called as a function in catch block, global object is passed as the this value

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.test = function () {

-            this._12_14_15_foo = "test";

-        };

-        try {

-            throw obj.test;

-            return false;

-        } catch (e) {

-            e();

-            return  fnGlobalObject()._12_14_15_foo === "test";

-        }

-        finally {

-            delete fnGlobalObject()._12_14_15_foo;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Exception object is a function which is a property of an object,
+    when an exception parameter is called as a function in catch
+    block, global object is passed as the this value
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.test = function () {
+            this._12_14_15_foo = "test";
+        };
+        try {
+            throw obj.test;
+            return false;
+        } catch (e) {
+            e();
+            return  fnGlobalObject()._12_14_15_foo === "test";
+        }
+        finally {
+            delete fnGlobalObject()._12_14_15_foo;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-16.js b/test/suite/ch12/12.14/12.14-16.js
index e160e3d37..3784caef2 100644
--- a/test/suite/ch12/12.14/12.14-16.js
+++ b/test/suite/ch12/12.14/12.14-16.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-16.js

- * @description Exception object is a function which update in catch block, when an exception parameter is called as a function in catch block, global object is passed as the this value

- */

-

-

-function testcase() {

-        try {

-            throw function () {

-                this._12_14_16_foo = "test";

-            };

-            return false;

-        } catch (e) {

-            var obj = {};

-            obj.test = function () {

-                this._12_14_16_foo = "test1";

-            };

-            e = obj.test;

-            e();

-            return fnGlobalObject()._12_14_16_foo === "test1";

-        }

-        finally {

-            delete fnGlobalObject()._12_14_16_foo;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Exception object is a function which update in catch block, when
+    an exception parameter is called as a function in catch block,
+    global object is passed as the this value
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        try {
+            throw function () {
+                this._12_14_16_foo = "test";
+            };
+            return false;
+        } catch (e) {
+            var obj = {};
+            obj.test = function () {
+                this._12_14_16_foo = "test1";
+            };
+            e = obj.test;
+            e();
+            return fnGlobalObject()._12_14_16_foo === "test1";
+        }
+        finally {
+            delete fnGlobalObject()._12_14_16_foo;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-2.js b/test/suite/ch12/12.14/12.14-2.js
index 16d08d34c..64a588a9c 100644
--- a/test/suite/ch12/12.14/12.14-2.js
+++ b/test/suite/ch12/12.14/12.14-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-2.js

- * @description catch doesn't change declaration scope - var initializer in catch with same name as catch parameter changes parameter

- */

-

-

-function testcase() {

-  function capturedFoo() {return foo};

-  foo = "prior to throw";

-  try {

-    throw new Error();

-  }

-  catch (foo) {

-    var foo = "initializer in catch";

-    return capturedFoo() !== "initializer in catch";

-  }

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    catch doesn't change declaration scope - var initializer in catch
+    with same name as catch parameter changes parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function capturedFoo() {return foo};
+  foo = "prior to throw";
+  try {
+    throw new Error();
+  }
+  catch (foo) {
+    var foo = "initializer in catch";
+    return capturedFoo() !== "initializer in catch";
+  }
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-3.js b/test/suite/ch12/12.14/12.14-3.js
index 6cd541061..4454957f9 100644
--- a/test/suite/ch12/12.14/12.14-3.js
+++ b/test/suite/ch12/12.14/12.14-3.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * local vars must not be visible outside with block

- * local functions must not be visible outside with block

- * local function expresssions should not be visible outside with block

- * local vars must shadow outer vars

- * local functions must shadow outer functions

- * local function expresssions must shadow outer function expressions

- * eval should use the appended object to the scope chain

- *

- * @path ch12/12.14/12.14-3.js

- * @description catch doesn't change declaration scope - var declaration are visible outside when name different from catch parameter

- */

-

-

-function testcase() {

-  try {

-    throw new Error();

-  }

-  catch (e) {

-    var foo = "declaration in catch";

-  }

-  

-  return foo === "declaration in catch";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    local vars must not be visible outside with block
+    local functions must not be visible outside with block
+    local function expresssions should not be visible outside with block
+    local vars must shadow outer vars
+    local functions must shadow outer functions
+    local function expresssions must shadow outer function expressions
+    eval should use the appended object to the scope chain
+description: >
+    catch doesn't change declaration scope - var declaration are
+    visible outside when name different from catch parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    throw new Error();
+  }
+  catch (e) {
+    var foo = "declaration in catch";
+  }
+  
+  return foo === "declaration in catch";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-4.js b/test/suite/ch12/12.14/12.14-4.js
index 1d3cb1b16..70bf7f35b 100644
--- a/test/suite/ch12/12.14/12.14-4.js
+++ b/test/suite/ch12/12.14/12.14-4.js
@@ -1,34 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * local vars must not be visible outside with block

- * local functions must not be visible outside with block

- * local function expresssions should not be visible outside with block

- * local vars must shadow outer vars

- * local functions must shadow outer functions

- * local function expresssions must shadow outer function expressions

- * eval should use the appended object to the scope chain

- *

- * @path ch12/12.14/12.14-4.js

- * @description catch introduces scope - block-local vars must shadow outer vars

- */

-

-

-function testcase() {

-  var o = { foo : 42};

-

-  try {

-    throw o;

-  }

-  catch (e) {

-    var foo;

-

-    if (foo === undefined) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    local vars must not be visible outside with block
+    local functions must not be visible outside with block
+    local function expresssions should not be visible outside with block
+    local vars must shadow outer vars
+    local functions must shadow outer functions
+    local function expresssions must shadow outer function expressions
+    eval should use the appended object to the scope chain
+description: catch introduces scope - block-local vars must shadow outer vars
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { foo : 42};
+
+  try {
+    throw o;
+  }
+  catch (e) {
+    var foo;
+
+    if (foo === undefined) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-6.js b/test/suite/ch12/12.14/12.14-6.js
index ae31f846e..02dcc3190 100644
--- a/test/suite/ch12/12.14/12.14-6.js
+++ b/test/suite/ch12/12.14/12.14-6.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * local vars must not be visible outside with block

- * local functions must not be visible outside with block

- * local function expresssions should not be visible outside with block

- * local vars must shadow outer vars

- * local functions must shadow outer functions

- * local function expresssions must shadow outer function expressions

- * eval should use the appended object to the scope chain

- *

- * @path ch12/12.14/12.14-6.js

- * @description catch introduces scope - block-local function expression must shadow outer function expression

- */

-

-

-function testcase() {

-  var o = {foo : function () { return 42;}};

-

-  try {

-    throw o;

-  }

-  catch (e) {

-    var foo = function () {};

-    if (foo() === undefined) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    local vars must not be visible outside with block
+    local functions must not be visible outside with block
+    local function expresssions should not be visible outside with block
+    local vars must shadow outer vars
+    local functions must shadow outer functions
+    local function expresssions must shadow outer function expressions
+    eval should use the appended object to the scope chain
+description: >
+    catch introduces scope - block-local function expression must
+    shadow outer function expression
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {foo : function () { return 42;}};
+
+  try {
+    throw o;
+  }
+  catch (e) {
+    var foo = function () {};
+    if (foo() === undefined) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-7.js b/test/suite/ch12/12.14/12.14-7.js
index b7f8dbc36..eb993a5da 100644
--- a/test/suite/ch12/12.14/12.14-7.js
+++ b/test/suite/ch12/12.14/12.14-7.js
@@ -1,39 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * local vars must not be visible outside with block

- * local functions must not be visible outside with block

- * local function expresssions should not be visible outside with block

- * local vars must shadow outer vars

- * local functions must shadow outer functions

- * local function expresssions must shadow outer function expressions

- * eval should use the appended object to the scope chain

- *

- * @path ch12/12.14/12.14-7.js

- * @description catch introduces scope - scope removed when exiting catch block

- */

-

-

-function testcase() {

-      var o = {foo: 1};

-      var catchAccessed = false;

-      

-      try {

-        throw o;

-      }

-      catch (expObj) {

-        catchAccessed = (expObj.foo == 1);

-      }

-

-      try {

-        expObj;

-      }

-      catch (e) {

-        return catchAccessed && e instanceof ReferenceError

-      }

-      return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    local vars must not be visible outside with block
+    local functions must not be visible outside with block
+    local function expresssions should not be visible outside with block
+    local vars must shadow outer vars
+    local functions must shadow outer functions
+    local function expresssions must shadow outer function expressions
+    eval should use the appended object to the scope chain
+description: catch introduces scope - scope removed when exiting catch block
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+      var o = {foo: 1};
+      var catchAccessed = false;
+      
+      try {
+        throw o;
+      }
+      catch (expObj) {
+        catchAccessed = (expObj.foo == 1);
+      }
+
+      try {
+        expObj;
+      }
+      catch (e) {
+        return catchAccessed && e instanceof ReferenceError
+      }
+      return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-8.js b/test/suite/ch12/12.14/12.14-8.js
index d2e059cd9..7ce57908e 100644
--- a/test/suite/ch12/12.14/12.14-8.js
+++ b/test/suite/ch12/12.14/12.14-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * local vars must not be visible outside with block

- * local functions must not be visible outside with block

- * local function expresssions should not be visible outside with block

- * local vars must shadow outer vars

- * local functions must shadow outer functions

- * local function expresssions must shadow outer function expressions

- * eval should use the appended object to the scope chain

- *

- * @path ch12/12.14/12.14-8.js

- * @description catch introduces scope - scope removed when exiting catch block (properties)

- */

-

-

-function testcase() {

-  var o = {foo: 42};

-

-  try {

-    throw o;

-  }

-  catch (e) {

-    var foo = 1;

-  }

-

-  if (o.foo === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    local vars must not be visible outside with block
+    local functions must not be visible outside with block
+    local function expresssions should not be visible outside with block
+    local vars must shadow outer vars
+    local functions must shadow outer functions
+    local function expresssions must shadow outer function expressions
+    eval should use the appended object to the scope chain
+description: >
+    catch introduces scope - scope removed when exiting catch block
+    (properties)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {foo: 42};
+
+  try {
+    throw o;
+  }
+  catch (e) {
+    var foo = 1;
+  }
+
+  if (o.foo === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14-9.js b/test/suite/ch12/12.14/12.14-9.js
index 2236dd169..214c926e4 100644
--- a/test/suite/ch12/12.14/12.14-9.js
+++ b/test/suite/ch12/12.14/12.14-9.js
@@ -1,32 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14-9.js

- * @description catch introduces scope - name lookup finds outer variable

- */

-

-

-function testcase() {

-  function f(o) {

-    var x = 42;

-

-    function innerf(o) {

-      try {

-        throw o;

-      }

-      catch (e) {

-        return x;

-      }

-    }

-

-    return innerf(o);

-  }

-  

-  if (f({}) === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: catch introduces scope - name lookup finds outer variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function f(o) {
+    var x = 42;
+
+    function innerf(o) {
+      try {
+        throw o;
+      }
+      catch (e) {
+        return x;
+      }
+    }
+
+    return innerf(o);
+  }
+  
+  if (f({}) === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-1-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-1-s.js
index 894a13501..691fb1b6b 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-1-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-1-s.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-1-s.js

- * @description Strict Mode - SyntaxError is thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("\

-                   try {} catch (eval) { }\

-            ");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a TryStatement with a Catch
+    occurs within strict code and the Identifier of the Catch
+    production is eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("\
+                   try {} catch (eval) { }\
+            ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-1gs.js b/test/suite/ch12/12.14/12.14.1/12.14.1-1gs.js
index 04708c31e..4c804c971 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-1gs.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-1gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch12/12.14/12.14.1/12.14.1-1gs.js

- * @description Strict Mode - SyntaxError is thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is eval

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-try { } catch (eval) { }

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a TryStatement with a Catch
+    occurs within strict code and the Identifier of the Catch
+    production is eval
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+try { } catch (eval) { }
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-2-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-2-s.js
index b0e660bd0..354e0b3a6 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-2-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-2-s.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-2-s.js

- * @description Strict Mode - SyntaxError is thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("\

-                   try {} catch (arguments) { }\

-            ");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a TryStatement with a Catch
+    occurs within strict code and the Identifier of the Catch
+    production is arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("\
+                   try {} catch (arguments) { }\
+            ");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-3-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-3-s.js
index 3c477785b..a3aaa22db 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-3-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-3-s.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-3-s.js

- * @description Strict Mode - SyntaxError isn't thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is EVAL but throws SyntaxError if it is eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-       try{ eval(" try { \

-             throw new Error(\"...\");\

-             return false;\

-         } catch (EVAL) {\

-             try\

-             {\

-               throw new Error(\"...\");\

-             }catch(eval)\

-             {\

-                 return EVAL instanceof Error;\

-              }\

-         }");

-         return false;

-        } catch(e) {

-             return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown if a TryStatement with a
+    Catch occurs within strict code and the Identifier of the Catch
+    production is EVAL but throws SyntaxError if it is eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+       try{ eval(" try { \
+             throw new Error(\"...\");\
+             return false;\
+         } catch (EVAL) {\
+             try\
+             {\
+               throw new Error(\"...\");\
+             }catch(eval)\
+             {\
+                 return EVAL instanceof Error;\
+              }\
+         }");
+         return false;
+        } catch(e) {
+             return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-4-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-4-s.js
index 58f372cba..1ec4f37a0 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-4-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-4-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-4-s.js

- * @description Strict Mode - SyntaxError isn't thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is EVAL

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            throw new Error("...");

-            return false;

-        } catch (EVAL) {

-            return EVAL instanceof Error;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown if a TryStatement with a
+    Catch occurs within strict code and the Identifier of the Catch
+    production is EVAL
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            throw new Error("...");
+            return false;
+        } catch (EVAL) {
+            return EVAL instanceof Error;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-5-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-5-s.js
index 84e85593a..87c050dfb 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-5-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-5-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-5-s.js

- * @description Strict Mode - SyntaxError isn't thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is Arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            throw new Error("...");

-            return false;

-        } catch (Arguments) {

-            return Arguments instanceof Error;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown if a TryStatement with a
+    Catch occurs within strict code and the Identifier of the Catch
+    production is Arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            throw new Error("...");
+            return false;
+        } catch (Arguments) {
+            return Arguments instanceof Error;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/12.14.1/12.14.1-6-s.js b/test/suite/ch12/12.14/12.14.1/12.14.1-6-s.js
index edd8bb558..865e90f9a 100644
--- a/test/suite/ch12/12.14/12.14.1/12.14.1-6-s.js
+++ b/test/suite/ch12/12.14/12.14.1/12.14.1-6-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.14/12.14.1/12.14.1-6-s.js

- * @description Strict Mode - SyntaxError isn't thrown if a TryStatement with a Catch occurs within strict code and the Identifier of the Catch production is ARGUMENTS

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            throw new Error("...");

-            return false;

-        } catch (ARGUMENTS) {

-            return ARGUMENTS instanceof Error;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError isn't thrown if a TryStatement with a
+    Catch occurs within strict code and the Identifier of the Catch
+    production is ARGUMENTS
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            throw new Error("...");
+            return false;
+        } catch (ARGUMENTS) {
+            return ARGUMENTS instanceof Error;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.14/S12.14_A1.js b/test/suite/ch12/12.14/S12.14_A1.js
index 894376009..303e80978 100644
--- a/test/suite/ch12/12.14/S12.14_A1.js
+++ b/test/suite/ch12/12.14/S12.14_A1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production TryStatement : try Block Catch is evaluated as follows: 2. If Result(1).type is not throw, return Result(1)
- *
- * @path ch12/12.14/S12.14_A1.js
- * @description Executing TryStatement : try Block Catch. The statements doesn't cause actual exceptions
- */
+/*---
+info: >
+    The production TryStatement : try Block Catch is evaluated as follows: 2.
+    If Result(1).type is not throw, return Result(1)
+description: >
+    Executing TryStatement : try Block Catch. The statements doesn't
+    cause actual exceptions
+---*/
 
 // CHECK#1
 try {
@@ -49,4 +51,3 @@ if(x2!==1){
 if (c2!==1){
   $ERROR('#3.3: "finally" block must be evaluated. Actual: finally Block has not been evaluated');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A10_T1.js b/test/suite/ch12/12.14/S12.14_A10_T1.js
index c7a7c4651..ed01627df 100644
--- a/test/suite/ch12/12.14/S12.14_A10_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A10_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "while" statement
- *
- * @path ch12/12.14/S12.14_A10_T1.js
- * @description Throwing exception while executing iteration statement placed into try Block
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "while"
+    statement
+description: >
+    Throwing exception while executing iteration statement placed into
+    try Block
+---*/
 
 // CHECK#1
 var i=0;
@@ -19,4 +21,3 @@ while(i<10){
 catch(e){
   if(e!==5)$ERROR('#1: Exception === 5. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A10_T2.js b/test/suite/ch12/12.14/S12.14_A10_T2.js
index 1826b48a8..3ac0c78ce 100644
--- a/test/suite/ch12/12.14/S12.14_A10_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A10_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "while" statement
- *
- * @path ch12/12.14/S12.14_A10_T2.js
- * @description Try statement inside loop, where use continue loop
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "while"
+    statement
+description: Try statement inside loop, where use continue loop
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -113,4 +113,3 @@ if(fin6!==1){
 if(c6!==2){
   $ERROR('#6.2: "try finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A10_T3.js b/test/suite/ch12/12.14/S12.14_A10_T3.js
index 88e56168a..e1ccf0c25 100644
--- a/test/suite/ch12/12.14/S12.14_A10_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A10_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "while" statement
- *
- * @path ch12/12.14/S12.14_A10_T3.js
- * @description Try statement inside loop, where use break
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "while"
+    statement
+description: Try statement inside loop, where use break
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -148,4 +148,3 @@ if(fin7!==1){
 if(c7!==1){
   $ERROR('#7.2: "try finally{break}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A10_T4.js b/test/suite/ch12/12.14/S12.14_A10_T4.js
index 926e564d3..060ffd073 100644
--- a/test/suite/ch12/12.14/S12.14_A10_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A10_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "while" statement
- *
- * @path ch12/12.14/S12.14_A10_T4.js
- * @description Try statement inside loop, where combinate using break and continue
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "while"
+    statement
+description: Try statement inside loop, where combinate using break and continue
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -53,4 +53,3 @@ if(fin2!==1){
 if(c2!==2){
   $ERROR('#2.2: "try catch{break} finally{continue} must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A10_T5.js b/test/suite/ch12/12.14/S12.14_A10_T5.js
index e840e9395..7a31c527d 100644
--- a/test/suite/ch12/12.14/S12.14_A10_T5.js
+++ b/test/suite/ch12/12.14/S12.14_A10_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "while" statement
- *
- * @path ch12/12.14/S12.14_A10_T5.js
- * @description Throw some exceptions from different place of loop body
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "while"
+    statement
+description: Throw some exceptions from different place of loop body
+---*/
 
 // CHECK#1
 var c=0, i=0;
@@ -36,4 +36,3 @@ while(i<10){
 if(fin!==10){
   $ERROR('#1.4: "finally" block must be evaluated');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A11_T1.js b/test/suite/ch12/12.14/S12.14_A11_T1.js
index 41cfdb0a5..d250562b1 100644
--- a/test/suite/ch12/12.14/S12.14_A11_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A11_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for" statement
- *
- * @path ch12/12.14/S12.14_A11_T1.js
- * @description Loop inside try Block, where throw exception
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for"
+    statement
+description: Loop inside try Block, where throw exception
+---*/
 
 // CHECK#1
 try{
@@ -17,4 +17,3 @@ try{
 catch(e){
   if(e!==5)$ERROR('#1: Exception === 5. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A11_T2.js b/test/suite/ch12/12.14/S12.14_A11_T2.js
index 7453936fd..2cd91f2b9 100644
--- a/test/suite/ch12/12.14/S12.14_A11_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A11_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for" statement
- *
- * @path ch12/12.14/S12.14_A11_T2.js
- * @description Try statement inside loop, where use continue loop
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for"
+    statement
+description: Try statement inside loop, where use continue loop
+---*/
 
 // CHECK#1
 var fin=0;
@@ -120,4 +120,3 @@ if(fin6!==1){
 if(c6!==10){
   $ERROR('#6.2: "try finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A11_T3.js b/test/suite/ch12/12.14/S12.14_A11_T3.js
index af9976a2d..3eed68318 100644
--- a/test/suite/ch12/12.14/S12.14_A11_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A11_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for" statement
- *
- * @path ch12/12.14/S12.14_A11_T3.js
- * @description Try statement inside loop, where use break
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for"
+    statement
+description: Try statement inside loop, where use break
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -147,4 +147,3 @@ if(fin7!==1){
 if(c7!==1){
   $ERROR('#7.2: "try finally{break}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A11_T4.js b/test/suite/ch12/12.14/S12.14_A11_T4.js
index 6f4762beb..6a94a84fb 100644
--- a/test/suite/ch12/12.14/S12.14_A11_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A11_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for" statement
- *
- * @path ch12/12.14/S12.14_A11_T4.js
- * @description Try statement inside loop, where combinate using break and continue
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for"
+    statement
+description: Try statement inside loop, where combinate using break and continue
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -53,4 +53,3 @@ if(fin2!==1){
 if(c2!==5){
   $ERROR('#2.2: "try catch{break} finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A12_T1.js b/test/suite/ch12/12.14/S12.14_A12_T1.js
index b6906b1b8..fa219a996 100644
--- a/test/suite/ch12/12.14/S12.14_A12_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A12_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for-in" statement
- *
- * @path ch12/12.14/S12.14_A12_T1.js
- * @description Loop inside try Block, where throw exception
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for-in"
+    statement
+description: Loop inside try Block, where throw exception
+---*/
 
 var x;
 var mycars = new Array();
@@ -23,6 +23,3 @@ try{
 catch(e){
   if(e!=="ex")$ERROR('#1: Exception ==="ex". Actual:  Exception ==='+ e  );
 }
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A12_T2.js b/test/suite/ch12/12.14/S12.14_A12_T2.js
index 6a6729962..67e81d69e 100644
--- a/test/suite/ch12/12.14/S12.14_A12_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A12_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for-in" statement
- *
- * @path ch12/12.14/S12.14_A12_T2.js
- * @description Try statement inside loop, where use continue loop
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for-in"
+    statement
+description: Try statement inside loop, where use continue loop
+---*/
 
 var x;
 var mycars = new Array();
@@ -129,4 +129,3 @@ if(fin6!==1){
 if(c6!==3){
   $ERROR('#6.2: "try finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A12_T3.js b/test/suite/ch12/12.14/S12.14_A12_T3.js
index d3b4cea0c..662dcb9f5 100644
--- a/test/suite/ch12/12.14/S12.14_A12_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A12_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for-in" statement
- *
- * @path ch12/12.14/S12.14_A12_T3.js
- * @description Try statement inside loop, where use break
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for-in"
+    statement
+description: Try statement inside loop, where use break
+---*/
 
 var x;
 var mycars = new Array();
@@ -159,4 +159,3 @@ if(fin7!==1){
 if(c7!==1){
   $ERROR('#7.2: "try finally{break}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A12_T4.js b/test/suite/ch12/12.14/S12.14_A12_T4.js
index c09b4e2e7..a684dc721 100644
--- a/test/suite/ch12/12.14/S12.14_A12_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A12_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "for-in" statement
- *
- * @path ch12/12.14/S12.14_A12_T4.js
- * @description Try statement inside loop, where combinate using break and continue
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "for-in"
+    statement
+description: Try statement inside loop, where combinate using break and continue
+---*/
 
 var x;
 var mycars = new Array();
@@ -59,4 +59,3 @@ if(fin2!==1){
 if(c2!==3){
   $ERROR('#2.2: "try catch{break} finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A13_T1.js b/test/suite/ch12/12.14/S12.14_A13_T1.js
index ab3b79d4d..ee453f38c 100644
--- a/test/suite/ch12/12.14/S12.14_A13_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A13_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement with a "return" statement
- *
- * @path ch12/12.14/S12.14_A13_T1.js
- * @description Using try/catch syntax construction
- */
+/*---
+info: Using "try" with "catch" or "finally" statement with a "return" statement
+description: Using try/catch syntax construction
+---*/
 
 // CHECK#1
 function myFunction1(){
@@ -76,4 +74,3 @@ catch(e){
     $ERROR('#4.3: Exception ==="ex2". Actual:  Exception ==='+ e  );
   }
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A13_T2.js b/test/suite/ch12/12.14/S12.14_A13_T2.js
index 947926476..c80a29709 100644
--- a/test/suite/ch12/12.14/S12.14_A13_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A13_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement with a "return" statement
- *
- * @path ch12/12.14/S12.14_A13_T2.js
- * @description Using try/finally syntax construction
- */
+/*---
+info: Using "try" with "catch" or "finally" statement with a "return" statement
+description: Using try/finally syntax construction
+---*/
 
 // CHECK#1
 var c1=0;
@@ -179,4 +177,3 @@ catch(ex1){
 if (c8!==1){
   $ERROR('#8: "finally" block must be evaluated');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A13_T3.js b/test/suite/ch12/12.14/S12.14_A13_T3.js
index 9b3e4a3e9..521c333ba 100644
--- a/test/suite/ch12/12.14/S12.14_A13_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A13_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement with a "return" statement
- *
- * @path ch12/12.14/S12.14_A13_T3.js
- * @description Using try/catch/finally syntax construction
- */
+/*---
+info: Using "try" with "catch" or "finally" statement with a "return" statement
+description: Using try/catch/finally syntax construction
+---*/
 
 // CHECK#1
 var c1=0;
@@ -183,4 +181,3 @@ try{
 }
 catch(e){}
 if(c7!==1) $ERROR('#7.2: "finally" block must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A14.js b/test/suite/ch12/12.14/S12.14_A14.js
index af2177a05..cec5c81c3 100644
--- a/test/suite/ch12/12.14/S12.14_A14.js
+++ b/test/suite/ch12/12.14/S12.14_A14.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "with" statement
- *
- * @path ch12/12.14/S12.14_A14.js
- * @description Using try/catch/finally in With and With in try/catch/finally
- * @noStrict
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "with"
+    statement
+description: Using try/catch/finally in With and With in try/catch/finally
+flags: [noStrict]
+---*/
 
 var myObj = {p1: 'a',
              p2: 'b',
@@ -76,4 +76,3 @@ try{
 }
 catch(e){}
 if(myObj.p1!=='pass') $ERROR('#4: "finally" block must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A15.js b/test/suite/ch12/12.14/S12.14_A15.js
index abd6a63a7..fbba99a7f 100644
--- a/test/suite/ch12/12.14/S12.14_A15.js
+++ b/test/suite/ch12/12.14/S12.14_A15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement within/without a "switch" statement
- *
- * @path ch12/12.14/S12.14_A15.js
- * @description Insert try/catch/finally to switch statement
- */
+/*---
+info: >
+    Using "try" with "catch" or "finally" statement within/without a "switch"
+    statement
+description: Insert try/catch/finally to switch statement
+---*/
 
 // CHECK#1
 function SwitchTest1(value){
@@ -89,4 +89,3 @@ try{
 catch(e){
   $ERROR('#3.2: Catching exception inside function does not lead to throwing exception outside this function');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T1.js b/test/suite/ch12/12.14/S12.14_A16_T1.js
index b6e39191b..9366f2f2f 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T1.js
- * @description Checking if pure "try" syntax construction passes
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Checking if pure "try" syntax construction passes
+flags: [negative]
+---*/
 
 // CHECK#1
 try
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T10.js b/test/suite/ch12/12.14/S12.14_A16_T10.js
index 2baef30d0..ac4616704 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T10.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T10.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T10.js
- * @description Catch: "catch (Identifier ) Block"
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: "Catch: \"catch (Identifier ) Block\""
+flags: [negative]
+---*/
 
 // CHECK#1
 try{}
 catch(){}
 finally{}
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T11.js b/test/suite/ch12/12.14/S12.14_A16_T11.js
index 8d8699e6b..0a0e3e936 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T11.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T11.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T11.js
- * @description Catch and Finally are placed into the Block of "try" (whitle expected outside)
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Catch and Finally are placed into the Block of "try" (whitle
+    expected outside)
+flags: [negative]
+---*/
 
 // CHECK#1
 try{
@@ -16,5 +18,3 @@ try{
   catch(e){}
   finally{}
 }
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T12.js b/test/suite/ch12/12.14/S12.14_A16_T12.js
index dacc1a6a6..f84bcd97f 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T12.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T12.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T12.js
- * @description Embedded "try" statements followed by two "catch" statements
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Embedded "try" statements followed by two "catch" statements
+flags: [negative]
+---*/
 
 // CHECK#1
 try
@@ -18,6 +18,3 @@ try
 }
 catch(e1){}
 catch(e2){}
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T13.js b/test/suite/ch12/12.14/S12.14_A16_T13.js
index 20b475499..9ffbedc83 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T13.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T13.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T13.js
- * @description Catch: "catch (Identifier ) Block". Checking if execution of "22" passes at the place of Identifier of "catch"
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Catch: "catch (Identifier ) Block". Checking if execution of "22"
+    passes at the place of Identifier of "catch"
+flags: [negative]
+---*/
 
 // CHECK#1
 try
@@ -16,7 +18,3 @@ try
 catch("22")
 {
 }
-
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T14.js b/test/suite/ch12/12.14/S12.14_A16_T14.js
index dfcbc2c65..021527410 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T14.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T14.js
@@ -1,19 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T14.js
- * @description Checking if passing argument to "try" statement fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Checking if passing argument to "try" statement fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try(e1){	
 }
 catch(e){}
-
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T15.js b/test/suite/ch12/12.14/S12.14_A16_T15.js
index 720bf61dd..186a0c12e 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T15.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T15.js
@@ -1,20 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T15.js
- * @description Finally: "finally Block". Checking if passing argument to "try" statement fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Finally: "finally Block". Checking if passing argument to "try"
+    statement fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{	
 }
 finally(e){}
-
-
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T2.js b/test/suite/ch12/12.14/S12.14_A16_T2.js
index a3e9421d5..325155cc1 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T2.js
- * @description Checking if execution of "catch" with no "try" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Checking if execution of "catch" with no "try" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 catch
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T3.js b/test/suite/ch12/12.14/S12.14_A16_T3.js
index 237580b02..838b0ba37 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T3.js
- * @description Checking if execution of "finally" with no "try" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Checking if execution of "finally" with no "try" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 finally
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T4.js b/test/suite/ch12/12.14/S12.14_A16_T4.js
index ae3e45bba..c757f5a69 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T4.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T4.js
- * @description Catch: "catch (Identifier ) Block". Checking if execution of "catch" that takes no arguments fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Catch: "catch (Identifier ) Block". Checking if execution of
+    "catch" that takes no arguments fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{}
 catch{}
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T5.js b/test/suite/ch12/12.14/S12.14_A16_T5.js
index a825e889a..5998df4ad 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T5.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T5.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T5.js
- * @description Catch: "catch (Identifier ) Block". Checking if execution of "catch" with no Block fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Catch: "catch (Identifier ) Block". Checking if execution of
+    "catch" with no Block fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{}
 catch()
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T6.js b/test/suite/ch12/12.14/S12.14_A16_T6.js
index 8210671c4..0d2251ab5 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T6.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T6.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T6.js
- * @description Block: "{ StatementList }". Checking if execution of "try{ catch{}{}" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Block: "{ StatementList }". Checking if execution of "try{
+    catch{}{}" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{
 catch(){}
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T7.js b/test/suite/ch12/12.14/S12.14_A16_T7.js
index 76990243d..0a0ea3265 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T7.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T7.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T7.js
- * @description Block: "{ StatementList }". Checking if execution of "try{} catch(){" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Block: "{ StatementList }". Checking if execution of "try{}
+    catch(){" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{}
 catch(){
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T8.js b/test/suite/ch12/12.14/S12.14_A16_T8.js
index 93774a7b6..334fdb86f 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T8.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T8.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T8.js
- * @description Block: "{ StatementList }". Catch: "catch (Identifier ) Block". Checking if execution of "try{} catch(){finally{}" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: >
+    Block: "{ StatementList }". Catch: "catch (Identifier ) Block".
+    Checking if execution of "try{} catch(){finally{}" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 try{}
 catch(){
 finally{}
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A16_T9.js b/test/suite/ch12/12.14/S12.14_A16_T9.js
index d7fb3308e..e50d73992 100644
--- a/test/suite/ch12/12.14/S12.14_A16_T9.js
+++ b/test/suite/ch12/12.14/S12.14_A16_T9.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * TryStatement: "try Block Catch" or "try Block Finally" or "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A16_T9.js
- * @description Checking if execution of "catch(){} finally{}" fails
- * @negative
- */
+/*---
+info: >
+    TryStatement: "try Block Catch" or "try Block Finally" or "try Block
+    Catch Finally"
+description: Checking if execution of "catch(){} finally{}" fails
+flags: [negative]
+---*/
 
 // CHECK#1
 catch(){}
 finally{}
-
-
-
diff --git a/test/suite/ch12/12.14/S12.14_A17.js b/test/suite/ch12/12.14/S12.14_A17.js
index 6878502e6..88adfd06e 100644
--- a/test/suite/ch12/12.14/S12.14_A17.js
+++ b/test/suite/ch12/12.14/S12.14_A17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "try" with "catch" or "finally" statement in a constructor
- *
- * @path ch12/12.14/S12.14_A17.js
- * @description Creating exceptions within constructor
- */
+/*---
+info: Using "try" with "catch" or "finally" statement in a constructor
+description: Creating exceptions within constructor
+---*/
 
 var i=1;
 function Integer( value, exception ) {
@@ -42,4 +40,3 @@ new Integer(Infinity, false);
 new Integer(-1.23, true);
 // CHECK#6
 new Integer(Math.LN2, true);
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T1.js b/test/suite/ch12/12.14/S12.14_A18_T1.js
index 635c235d0..c64b2d487 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T1.js
- * @description Catching undefined
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching undefined
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +13,3 @@ try{
 catch(e){
   if (e!==undefined) $ERROR('#1: Exception === undefined. Actual: '+e);
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T2.js b/test/suite/ch12/12.14/S12.14_A18_T2.js
index f6499be27..275469a09 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T2.js
- * @description Catching null
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching null
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +13,3 @@ try{
 catch(e){
   if (e!==null) $ERROR('#1: Exception ===null. Actual: '+e);
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T3.js b/test/suite/ch12/12.14/S12.14_A18_T3.js
index 1ee0644d1..68a5ec689 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T3.js
- * @description Catching boolean
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching boolean
+---*/
 
 // CHECK#1
 try{
@@ -59,4 +57,3 @@ try{
 catch(e){
   if (e!==true) $ERROR('#6: Exception ===true. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T4.js b/test/suite/ch12/12.14/S12.14_A18_T4.js
index 3cd7d9064..3e29745d8 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T4.js
- * @description Catching string
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching string
+---*/
 
 // CHECK#1
 try{
@@ -42,4 +40,3 @@ try{
 catch(e){
   if (e!=="exception #1") $ERROR('#4: Exception ==="exception #1". Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T5.js b/test/suite/ch12/12.14/S12.14_A18_T5.js
index c46c421be..1e45d7e72 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T5.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T5.js
- * @description Catching Number
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching Number
+---*/
 
 // CHECK#1
 try{
@@ -99,4 +97,3 @@ try{
 catch(e){
   if (e!==-0) $ERROR('#11: Exception ===-0. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T6.js b/test/suite/ch12/12.14/S12.14_A18_T6.js
index ca17450b3..e102a5f85 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T6.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T6.js
- * @description Catching Object
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching Object
+---*/
 
 var myObj = {p1: 'a', 
              p2: 'b', 
@@ -52,4 +50,3 @@ catch(e){
   e.i=10;
 }
 if (myObj.i!==10) $ERROR('#5: Handling of catch must be correct');
-
diff --git a/test/suite/ch12/12.14/S12.14_A18_T7.js b/test/suite/ch12/12.14/S12.14_A18_T7.js
index 905cfa0bc..b37327740 100644
--- a/test/suite/ch12/12.14/S12.14_A18_T7.js
+++ b/test/suite/ch12/12.14/S12.14_A18_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching objects with try/catch/finally statement
- *
- * @path ch12/12.14/S12.14_A18_T7.js
- * @description Catching Array
- */
+/*---
+info: Catching objects with try/catch/finally statement
+description: Catching Array
+---*/
 
 var mycars = new Array();
 mycars[0] = "Saab";
@@ -63,4 +61,3 @@ catch(e){
     if (e[i]!==mycars2[i-3]) $ERROR('#4.'+i+': Exception['+i+']===mycars2['+(i-3)+']. Actual:  Exception['+i+']==='+ e[i]);
   }
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A19_T1.js b/test/suite/ch12/12.14/S12.14_A19_T1.js
index c2e8d27a4..312d9e23f 100644
--- a/test/suite/ch12/12.14/S12.14_A19_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A19_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching system exceptions of different types with try statement
- *
- * @path ch12/12.14/S12.14_A19_T1.js
- * @description Testing try/catch syntax construction
- */
+/*---
+info: Catching system exceptions of different types with try statement
+description: Testing try/catch syntax construction
+---*/
 
 // CHECK#1
 try{
@@ -65,4 +63,3 @@ try{
 catch(e){
   if (e.toString()!=="URIError: message") $ERROR('#7: Exception.toString()==="URIError: message". Actual: Exception is '+e);
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A19_T2.js b/test/suite/ch12/12.14/S12.14_A19_T2.js
index acc465ea1..aee161251 100644
--- a/test/suite/ch12/12.14/S12.14_A19_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A19_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching system exceptions of different types with try statement
- *
- * @path ch12/12.14/S12.14_A19_T2.js
- * @description Testing try/catch/finally syntax construction
- */
+/*---
+info: Catching system exceptions of different types with try statement
+description: Testing try/catch/finally syntax construction
+---*/
 
 var fin=0;
 // CHECK#1
@@ -98,5 +96,4 @@ catch(e){
 finally{
   fin=1;
 }
-if (fin!==1) $ERROR('#7.2: "finally" block must be evaluated'); 
-
+if (fin!==1) $ERROR('#7.2: "finally" block must be evaluated');
diff --git a/test/suite/ch12/12.14/S12.14_A2.js b/test/suite/ch12/12.14/S12.14_A2.js
index 4185b346f..c3b8c8ead 100644
--- a/test/suite/ch12/12.14/S12.14_A2.js
+++ b/test/suite/ch12/12.14/S12.14_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Throwing exception with "throw" and catching it with "try" statement
- *
- * @path ch12/12.14/S12.14_A2.js
- * @description Checking if execution of "catch" catches an exception thrown with "throw"
- */
+/*---
+info: Throwing exception with "throw" and catching it with "try" statement
+description: >
+    Checking if execution of "catch" catches an exception thrown with
+    "throw"
+---*/
 
 // CHECK#1
 try {
@@ -49,4 +49,3 @@ if (x3!==1){
 if (c3!==1){
   $ERROR('#3.3: "finally" block must be evaluated');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A3.js b/test/suite/ch12/12.14/S12.14_A3.js
index b87f6d57c..bce8ce2b1 100644
--- a/test/suite/ch12/12.14/S12.14_A3.js
+++ b/test/suite/ch12/12.14/S12.14_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Catching system exception with "try" statement
- *
- * @path ch12/12.14/S12.14_A3.js
- * @description Checking if execution of "catch" catches system exceptions
- */
+/*---
+info: Catching system exception with "try" statement
+description: Checking if execution of "catch" catches system exceptions
+---*/
 
 // CHECK#1
 try{
@@ -50,4 +48,3 @@ if (x3!==1){
 if (c3!==1){
   $ERROR('#3.3: "finally" block must be evaluated');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A4.js b/test/suite/ch12/12.14/S12.14_A4.js
index e904f5c9e..9850eea0a 100644
--- a/test/suite/ch12/12.14/S12.14_A4.js
+++ b/test/suite/ch12/12.14/S12.14_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Sanity test for "catch(Indetifier) statement"
- *
- * @path ch12/12.14/S12.14_A4.js
- * @description Checking if deleting an exception fails
- * @noStrict
- */
+/*---
+info: Sanity test for "catch(Indetifier) statement"
+description: Checking if deleting an exception fails
+flags: [noStrict]
+---*/
 
 // CHECK#1
 try {
@@ -34,4 +32,3 @@ try{
   $ERROR('#2.2: Deleting catching exception after ending "catch" block');
 }
 catch(err){}
-
diff --git a/test/suite/ch12/12.14/S12.14_A5.js b/test/suite/ch12/12.14/S12.14_A5.js
index f7620908b..90a9a5c0d 100644
--- a/test/suite/ch12/12.14/S12.14_A5.js
+++ b/test/suite/ch12/12.14/S12.14_A5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production TryStatement: "try Block Finally" and the production TryStatement: "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A5.js
- * @description Checking "catch" catches the Identifier in appropriate way
- */
+/*---
+info: >
+    The production TryStatement: "try Block Finally" and the production
+    TryStatement: "try Block Catch Finally"
+description: Checking "catch" catches the Identifier in appropriate way
+---*/
 
 // CHECK#1
 try {
@@ -48,4 +48,3 @@ function SwitchTest1(value){
 }
 if (SwitchTest1(1)!==4) $ERROR('#2.3: "finally" block must be evaluated');
 if (SwitchTest1(4)!==64)$ERROR('#2.4: "finally" block must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A6.js b/test/suite/ch12/12.14/S12.14_A6.js
index 96b30dbc0..7283e7364 100644
--- a/test/suite/ch12/12.14/S12.14_A6.js
+++ b/test/suite/ch12/12.14/S12.14_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production TryStatement: "try Block Catch Finally"
- *
- * @path ch12/12.14/S12.14_A6.js
- * @description Executing sequence of "try" statements, using counters with varying values within
- */
+/*---
+info: "The production TryStatement: \"try Block Catch Finally\""
+description: >
+    Executing sequence of "try" statements, using counters with
+    varying values within
+---*/
 
 // CHECK#1
 var c1=0;
@@ -63,5 +63,4 @@ finally{
 }
 if (c4!==2){
   $ERROR('#4: Sequence evaluation of commands try/catch/finally(without exception) is 1. try, 2. finally');
-}	
-
+}
diff --git a/test/suite/ch12/12.14/S12.14_A7_T1.js b/test/suite/ch12/12.14/S12.14_A7_T1.js
index 86efa4fad..74e2f1bf6 100644
--- a/test/suite/ch12/12.14/S12.14_A7_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A7_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluating the nested productions TryStatement
- *
- * @path ch12/12.14/S12.14_A7_T1.js
- * @description Checking if the production of nested TryStatement statements evaluates correct
- */
+/*---
+info: Evaluating the nested productions TryStatement
+description: >
+    Checking if the production of nested TryStatement statements
+    evaluates correct
+---*/
 
 // CHECK#1
 try{
@@ -135,4 +135,3 @@ catch(er1){
   if (er1!=="ex1") $ERROR('#7.3: Exception ==="ex1". Actual:  Exception ==='+ er1  );
 }
 if (c7!==2) $ERROR('#7.4: "finally" block must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A7_T2.js b/test/suite/ch12/12.14/S12.14_A7_T2.js
index 94a8c343d..5eb6fef00 100644
--- a/test/suite/ch12/12.14/S12.14_A7_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A7_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluating the nested productions TryStatement
- *
- * @path ch12/12.14/S12.14_A7_T2.js
- * @description Checking if the production of nested TryStatement statements evaluates correct
- */
+/*---
+info: Evaluating the nested productions TryStatement
+description: >
+    Checking if the production of nested TryStatement statements
+    evaluates correct
+---*/
 
 // CHECK#1
 try{
@@ -149,4 +149,3 @@ catch(er1){
   if (er1!=="ex3") $ERROR('#7.1: Exception === "ex3". Actual:  Exception ==='+er1 );
 }
 if (c7!==2) $ERROR('#7.2: Embedded "try/finally" blocks must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A7_T3.js b/test/suite/ch12/12.14/S12.14_A7_T3.js
index 183ab7d22..03fc5b6f9 100644
--- a/test/suite/ch12/12.14/S12.14_A7_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A7_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Evaluating the nested productions TryStatement
- *
- * @path ch12/12.14/S12.14_A7_T3.js
- * @description Checking if the production of nested TryStatement statements evaluates correct
- */
+/*---
+info: Evaluating the nested productions TryStatement
+description: >
+    Checking if the production of nested TryStatement statements
+    evaluates correct
+---*/
 
 // CHECK#1
 try{
@@ -166,4 +166,3 @@ catch(er1){
   if (er1!=="ex1") $ERROR('#7.3: Exception === "ex1". Actual:  Exception ==='+er1);
 }
 if (c7!==4) $ERROR('#7.4: "finally" block must be evaluated');
-
diff --git a/test/suite/ch12/12.14/S12.14_A8.js b/test/suite/ch12/12.14/S12.14_A8.js
index 4ac0574a2..f601edeca 100644
--- a/test/suite/ch12/12.14/S12.14_A8.js
+++ b/test/suite/ch12/12.14/S12.14_A8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "if" statement
- *
- * @path ch12/12.14/S12.14_A8.js
- * @description Throwing exception within an "if" statement
- */
+/*---
+info: "\"try\" with \"catch\" or \"finally\" statement within/without an \"if\" statement"
+description: Throwing exception within an "if" statement
+---*/
 
 // CHECK#1
 var c1=1;
@@ -32,4 +30,3 @@ if(c2===1){
     if(er1!="ex1") $ERROR('#2.2: Exception ==="ex1". Actual:  Exception ==='+er1);
   }
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A9_T1.js b/test/suite/ch12/12.14/S12.14_A9_T1.js
index 974b9e725..a7b195529 100644
--- a/test/suite/ch12/12.14/S12.14_A9_T1.js
+++ b/test/suite/ch12/12.14/S12.14_A9_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "do while" statement
- *
- * @path ch12/12.14/S12.14_A9_T1.js
- * @description Loop within a "try" Block, from where exception is thrown
- */
+/*---
+info: >
+    "try" with "catch" or "finally" statement within/without an "do while"
+    statement
+description: Loop within a "try" Block, from where exception is thrown
+---*/
 
 // CHECK#1
 var i=0;
@@ -20,4 +20,3 @@ try{
 catch(e){
   if(e!==5)$ERROR('#1: Exception ===5. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A9_T2.js b/test/suite/ch12/12.14/S12.14_A9_T2.js
index 9b36f31fb..33c6c0c63 100644
--- a/test/suite/ch12/12.14/S12.14_A9_T2.js
+++ b/test/suite/ch12/12.14/S12.14_A9_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "do while" statement
- *
- * @path ch12/12.14/S12.14_A9_T2.js
- * @description "try" statement within a loop, the statement contains "continue" statement
- */
+/*---
+info: >
+    "try" with "catch" or "finally" statement within/without an "do while"
+    statement
+description: >
+    "try" statement within a loop, the statement contains "continue"
+    statement
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -119,4 +121,3 @@ if(fin6!==1){
 if(c6!==2){
   $ERROR('#6.2: "try finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A9_T3.js b/test/suite/ch12/12.14/S12.14_A9_T3.js
index 60bdd4b30..449332e82 100644
--- a/test/suite/ch12/12.14/S12.14_A9_T3.js
+++ b/test/suite/ch12/12.14/S12.14_A9_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "do while" statement
- *
- * @path ch12/12.14/S12.14_A9_T3.js
- * @description "try" statement within a loop, the statement contains "break" statement
- */
+/*---
+info: >
+    "try" with "catch" or "finally" statement within/without an "do while"
+    statement
+description: >
+    "try" statement within a loop, the statement contains "break"
+    statement
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -155,4 +157,3 @@ if(fin7!==1){
 if(c7!==1){
   $ERROR('#7.2: try finally{break} error');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A9_T4.js b/test/suite/ch12/12.14/S12.14_A9_T4.js
index 06542b1d1..9d202c045 100644
--- a/test/suite/ch12/12.14/S12.14_A9_T4.js
+++ b/test/suite/ch12/12.14/S12.14_A9_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "do while" statement
- *
- * @path ch12/12.14/S12.14_A9_T4.js
- * @description "try" statement within a loop, the statement contains "continue" and "break" statements
- */
+/*---
+info: >
+    "try" with "catch" or "finally" statement within/without an "do while"
+    statement
+description: >
+    "try" statement within a loop, the statement contains "continue"
+    and "break" statements
+---*/
 
 // CHECK#1
 var c1=0,fin=0;
@@ -55,4 +57,3 @@ if(fin2!==1){
 if(c2!==2){
   $ERROR('#2.2: "try catch{break} finally{continue}" must work correctly');
 }
-
diff --git a/test/suite/ch12/12.14/S12.14_A9_T5.js b/test/suite/ch12/12.14/S12.14_A9_T5.js
index dd16dfe2d..c4056cb21 100644
--- a/test/suite/ch12/12.14/S12.14_A9_T5.js
+++ b/test/suite/ch12/12.14/S12.14_A9_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "try" with "catch" or "finally" statement within/without an "do while" statement
- *
- * @path ch12/12.14/S12.14_A9_T5.js
- * @description Checking if exceptions are thrown correctly from wherever of loop body
- */
+/*---
+info: >
+    "try" with "catch" or "finally" statement within/without an "do while"
+    statement
+description: >
+    Checking if exceptions are thrown correctly from wherever of loop
+    body
+---*/
 
 // CHECK#1
 var c=0, i=0;
@@ -37,5 +39,3 @@ while(i<10);
 if(fin!==10){
   $ERROR('#1.4: "finally" block must be evaluated');
 }
-
-
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-1-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-1-s.js
index 102f9fdb0..d46cf707f 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-1-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-1-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-1-s.js

- * @description eval - a function declaring a var named 'eval' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var eval; }');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a function declaring a var named 'eval' throws SyntaxError
+    in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var eval; }');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-10-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-10-s.js
index 8f442fc90..90ab37d51 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-10-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-10-s.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-10-s.js

- * @description Strict Mode: an indirect eval assigning into 'eval' does not throw

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  var s = eval;

-  s('eval = 42;');

-  return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "Strict Mode: an indirect eval assigning into 'eval' does not throw"
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  var s = eval;
+  s('eval = 42;');
+  return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-11.js b/test/suite/ch12/12.2/12.2.1/12.2.1-11.js
index 650835ee1..f8f37eb21 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-11.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-11.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-11.js

- * @description arguments as var identifier in eval code is allowed

- */

-

-

-function testcase() {

-    eval("var arguments;");

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as var identifier in eval code is allowed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    eval("var arguments;");
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-12-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-12-s.js
index 7d96f25fe..39ab8a95a 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-12-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-12-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-12-s.js

- * @description arguments as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var arguments;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var arguments;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-12.js b/test/suite/ch12/12.2/12.2.1/12.2.1-12.js
index f5ba2925d..63a7732cb 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-12.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-12.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-12.js

- * @description arguments as local var identifier is allowed

- */

-

-

-function testcase() {

-    eval("(function (){var arguments;})");

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as local var identifier is allowed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    eval("(function (){var arguments;})");
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-13-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-13-s.js
index d34ab90d1..e695ce5c0 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-13-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-13-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-13-s.js

- * @description arguments assignment throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { arguments = 42; }; foo()');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments assignment throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { arguments = 42; }; foo()');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-14-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-14-s.js
index 252688c96..47e8ab9cf 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-14-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-14-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-14-s.js

- * @description arguments - a function expr declaring a var named 'arguments' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('(function (){var arguments;});');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments - a function expr declaring a var named 'arguments'
+    throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('(function (){var arguments;});');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-15-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-15-s.js
index 185ba5156..b68444270 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-15-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-15-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-15-s.js

- * @description arguments - a function expr assigning into 'arguments' throws a SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('(function () {arguments = 42;})()');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments - a function expr assigning into 'arguments' throws a
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('(function () {arguments = 42;})()');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-16-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-16-s.js
index d39963bc7..25ad409fe 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-16-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-16-s.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-16-s.js

- * @description A Function constructor (called as a function) declaring a var named 'arguments' does not throw a SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-    

-

-function testcase() {

-        'use strict';

-        Function('var arguments;');

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A Function constructor (called as a function) declaring a var
+    named 'arguments' does not throw a SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        'use strict';
+        Function('var arguments;');
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-17-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-17-s.js
index c53dce258..e587cba91 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-17-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-17-s.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-17-s.js

- * @description A Function constructor (called as a function) assigning into 'arguments' will not throw any error if contained within strict mode and its body does not start with strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-  

-    var f = Function('arguments = 42;');

-    f();

-    return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A Function constructor (called as a function) assigning into
+    'arguments' will not throw any error if contained within strict
+    mode and its body does not start with strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+    var f = Function('arguments = 42;');
+    f();
+    return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-18-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-18-s.js
index fb4afd3c2..f461c7840 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-18-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-18-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-18-s.js

- * @description A direct eval declaring a var named 'arguments' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('var arguments;');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A direct eval declaring a var named 'arguments' throws SyntaxError
+    in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('var arguments;');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-19-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-19-s.js
index 18fcc5d18..7d248df1a 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-19-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-19-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-19-s.js

- * @description A direct eval assigning into 'arguments' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('arguments = 42;');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError) ;

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A direct eval assigning into 'arguments' throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('arguments = 42;');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-1gs.js b/test/suite/ch12/12.2/12.2.1/12.2.1-1gs.js
index a93b2aae7..f08c073f3 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-1gs.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-1gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-1gs.js

- * @description Strict Mode - SyntaxError is thrown if a VariableDeclaration occurs within strict code and its Identifier is eval

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-for (var eval in arrObj) { }
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a VariableDeclaration
+    occurs within strict code and its Identifier is eval
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+for (var eval in arrObj) { }
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-2-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-2-s.js
index 8b9848c54..5a1aaa3b6 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-2-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-2-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-2-s.js

- * @description eval - a function assigning into 'eval' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { eval = 42; }; foo()');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a function assigning into 'eval' throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { eval = 42; }; foo()');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-20-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-20-s.js
index 230340fda..2948c5d71 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-20-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-20-s.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-20-s.js

- * @description Strict Mode: an indirect eval declaring a var named 'arguments' does not throw

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-  var s = eval;

-  s('var arguments;');

-  return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode: an indirect eval declaring a var named 'arguments'
+    does not throw
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  var s = eval;
+  s('var arguments;');
+  return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-21-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-21-s.js
index 2d1907b01..1f8c8f6d9 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-21-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-21-s.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-21-s.js

- * @description Strict Mode: an indirect eval assigning into 'arguments' does not throw

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-  var s = eval;

-  s('arguments = 42;');

-  return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode: an indirect eval assigning into 'arguments' does not
+    throw
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  var s = eval;
+  s('arguments = 42;');
+  return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-22-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-22-s.js
index 943360cda..2c70d7741 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-22-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-22-s.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-22-s.js

- * @description arguments as global var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-

-    var indirectEval = eval;

-	

-    try {

-	    indirectEval("'use strict'; var arguments;");

-        return false;

-	}

-    catch (e) {

-        return (e instanceof SyntaxError);

-	}

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments as global var identifier throws SyntaxError in strict
+    mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    var indirectEval = eval;
+	
+    try {
+	    indirectEval("'use strict'; var arguments;");
+        return false;
+	}
+    catch (e) {
+        return (e instanceof SyntaxError);
+	}
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-23-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-23-s.js
index 29d667897..b770ffa50 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-23-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-23-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-23-s.js

- * @description arguments as local var identifier assigned to throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var arguments = 42;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments as local var identifier assigned to throws SyntaxError
+    in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var arguments = 42;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-24-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-24-s.js
index bd9cc069d..5234cc3a6 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-24-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-24-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-24-s.js

- * @description eval as local var identifier assigned to throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var eval = 42;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval as local var identifier assigned to throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var eval = 42;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-25-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-25-s.js
index f28397959..50f1eab51 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-25-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-25-s.js
@@ -1,26 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-25-s.js

- * @description arguments as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var arguments, a;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var arguments, a;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-26-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-26-s.js
index b4e24356f..4e9af9d92 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-26-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-26-s.js
@@ -1,26 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-26-s.js

- * @description eval as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var a, eval;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: eval as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var a, eval;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-27-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-27-s.js
index 8f08b1b2a..9ea776324 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-27-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-27-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-27-s.js

- * @description eval as local var identifier assigned to throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var eval = 42, a;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval as local var identifier assigned to throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var eval = 42, a;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-28-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-28-s.js
index ea6d73a0c..0f4271b3a 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-28-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-28-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-28-s.js

- * @description arguments as local var identifier assigned to throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var a, arguments = 42;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments as local var identifier assigned to throws SyntaxError
+    in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var a, arguments = 42;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-29-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-29-s.js
index 4b389d966..8c2548ac7 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-29-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-29-s.js
@@ -1,26 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-29-s.js

- * @description eval as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var eval, a = 42;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: eval as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var eval, a = 42;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-3-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-3-s.js
index 6f207527e..6b439968c 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-3-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-3-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-3-s.js

- * @description eval - a function expr declaring a var named 'eval' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('(function () { var eval; })');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a function expr declaring a var named 'eval' throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('(function () { var eval; })');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-30-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-30-s.js
index 8998405d0..a654c4519 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-30-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-30-s.js
@@ -1,26 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-30-s.js

- * @description arguments as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var a = 42, arguments;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var a = 42, arguments;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-31-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-31-s.js
index 305af43d2..9c0ea9ea2 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-31-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-31-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-31-s.js

- * @description eval as local var identifier defined twice throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var eval, eval;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval as local var identifier defined twice throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var eval, eval;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-32-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-32-s.js
index b68ecb63d..5074aae67 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-32-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-32-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-32-s.js

- * @description arguments as local var identifier defined twice and assigned once throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var arguments, arguments = 42;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments as local var identifier defined twice and assigned once
+    throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var arguments, arguments = 42;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-33-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-33-s.js
index 1a54c5e5b..6aed7ea0a 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-33-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-33-s.js
@@ -1,26 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-33-s.js

- * @description arguments as local var identifier throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('function foo() { var a, arguments, b;}');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: arguments as local var identifier throws SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('function foo() { var a, arguments, b;}');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-34-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-34-s.js
index c41cb67a6..c07b55639 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-34-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-34-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-34-s.js

- * @description 'for(var eval in ...) {...}' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('for (var eval in null) {};');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'for(var eval in ...) {...}' throws SyntaxError in strict mode"
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('for (var eval in null) {};');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-35-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-35-s.js
index 41eaacabf..c13914cc4 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-35-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-35-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-35-s.js

- * @description 'for(var eval = 42 in ...) {...}' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('for (var eval = 42 in null) {};');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'for(var eval = 42 in ...) {...}' throws SyntaxError in strict mode"
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('for (var eval = 42 in null) {};');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-36-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-36-s.js
index f33169483..3283e9231 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-36-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-36-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-36-s.js

- * @description 'for(var arguments in ...) {...}' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('for (var arguments in null) {};');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'for(var arguments in ...) {...}' throws SyntaxError in strict mode"
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('for (var arguments in null) {};');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-37-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-37-s.js
index 2a134a665..d147d337d 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-37-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-37-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-37-s.js

- * @description 'for(var arguments = 42 in ...) {...}' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('for (var arguments = 42 in null) {};');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'for(var arguments = 42 in ...) {...}' throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('for (var arguments = 42 in null) {};');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-4-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-4-s.js
index 2eef4faaa..b33df3564 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-4-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-4-s.js

- * @description eval - a function expr assigning into 'eval' throws a SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('(function () { eval = 42; })()');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a function expr assigning into 'eval' throws a SyntaxError
+    in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('(function () { eval = 42; })()');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-4gs.js b/test/suite/ch12/12.2/12.2.1/12.2.1-4gs.js
index add5e144d..0381cbf1f 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-4gs.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-4gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-4gs.js

- * @description Strict Mode - SyntaxError is thrown if a VariableDeclarationNoIn occurs within strict code and its Identifier is arguments

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-var arguments;
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a VariableDeclarationNoIn
+    occurs within strict code and its Identifier is arguments
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var arguments;
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-5-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-5-s.js
index 8644c4a20..9b80b2d16 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-5-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-5-s.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-5-s.js

- * @description Strict Mode - a Function declaring var named 'eval' does not throw SyntaxError

- * @onlyStrict

- */

-

-

-function testcase() {

-        'use strict';

-        Function('var eval;');

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - a Function declaring var named 'eval' does not throw
+    SyntaxError
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        'use strict';
+        Function('var eval;');
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-6-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-6-s.js
index 2db1c2bf8..64a5d3e6f 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-6-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-6-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-6-s.js

- * @description eval - a Function assigning into 'eval' will not throw any error if contained within strict mode and its body does not start with strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  

-    var f = Function('eval = 42;');

-    f();

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a Function assigning into 'eval' will not throw any error
+    if contained within strict mode and its body does not start with
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  
+    var f = Function('eval = 42;');
+    f();
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-7-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-7-s.js
index fec5ae659..4554aa888 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-7-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-7-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-7-s.js

- * @description eval - a direct eval declaring a var named 'eval' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('var eval;');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a direct eval declaring a var named 'eval' throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('var eval;');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-8-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-8-s.js
index 385808d44..1f01ffff8 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-8-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-8-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-8-s.js

- * @description eval - a direct eval assigning into 'eval' throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-

-  try {

-    eval('eval = 42;');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError) ;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval - a direct eval assigning into 'eval' throws SyntaxError in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+
+  try {
+    eval('eval = 42;');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError) ;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/12.2.1/12.2.1-9-s.js b/test/suite/ch12/12.2/12.2.1/12.2.1-9-s.js
index 6479cc174..5befdf6d3 100644
--- a/test/suite/ch12/12.2/12.2.1/12.2.1-9-s.js
+++ b/test/suite/ch12/12.2/12.2.1/12.2.1-9-s.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.2/12.2.1/12.2.1-9-s.js

- * @description Strict Mode: an indirect eval declaring a var named 'eval' does not throw

- * @onlyStrict

- */

-

-

-function testcase() {

-  'use strict';

-  var s = eval;

-  s('var eval;');

-  return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode: an indirect eval declaring a var named 'eval' does
+    not throw
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  'use strict';
+  var s = eval;
+  s('var eval;');
+  return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.2/S12.2_A1.js b/test/suite/ch12/12.2/S12.2_A1.js
index 520daebf5..40294a081 100644
--- a/test/suite/ch12/12.2/S12.2_A1.js
+++ b/test/suite/ch12/12.2/S12.2_A1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variables are created when the program is entered. Variables are initialised to "undefined"
- * when created. A variable with an Initialiser is assigned the value of its AssignmentExpression when the
- * VariableStatement is executed, not when the variable is created
- *
- * @path ch12/12.2/S12.2_A1.js
- * @description Creating variables after entering the execution scope
- */
+/*---
+info: >
+    Variables are created when the program is entered. Variables are initialised to "undefined"
+    when created. A variable with an Initialiser is assigned the value of its AssignmentExpression when the
+    VariableStatement is executed, not when the variable is created
+description: Creating variables after entering the execution scope
+includes: [$PRINT.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -50,4 +50,3 @@ if (!__y&!(__z = "smeagol")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A10.js b/test/suite/ch12/12.2/S12.2_A10.js
index b85f957b2..d48fe62fe 100644
--- a/test/suite/ch12/12.2/S12.2_A10.js
+++ b/test/suite/ch12/12.2/S12.2_A10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "var" statement within "for" statement is allowed
- *
- * @path ch12/12.2/S12.2_A10.js
- * @description Declaring variable within a "for" IterationStatement
- */
+/*---
+info: "\"var\" statement within \"for\" statement is allowed"
+description: Declaring variable within a "for" IterationStatement
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -21,4 +19,3 @@ try {
 for (var __ind;;){
     break;
 }
-
diff --git a/test/suite/ch12/12.2/S12.2_A11.js b/test/suite/ch12/12.2/S12.2_A11.js
index 392d4e74b..9641c113b 100644
--- a/test/suite/ch12/12.2/S12.2_A11.js
+++ b/test/suite/ch12/12.2/S12.2_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When using property attributes, {ReadOnly} is not used
- *
- * @path ch12/12.2/S12.2_A11.js
- * @description Changing variable value using property attributes
- */
+/*---
+info: When using property attributes, {ReadOnly} is not used
+description: Changing variable value using property attributes
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -26,4 +24,3 @@ if (__declared__var !== "baloon") {
 //////////////////////////////////////////////////////////////////////////////
 
 var __declared__var;
-
diff --git a/test/suite/ch12/12.2/S12.2_A12.js b/test/suite/ch12/12.2/S12.2_A12.js
index d69e27539..f03a6412b 100644
--- a/test/suite/ch12/12.2/S12.2_A12.js
+++ b/test/suite/ch12/12.2/S12.2_A12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration within "do-while" loop is allowed
- *
- * @path ch12/12.2/S12.2_A12.js
- * @description Declaring variable within "do-while" statement
- */
+/*---
+info: VariableDeclaration within "do-while" loop is allowed
+description: Declaring variable within "do-while" statement
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -19,4 +17,3 @@ try {
 //////////////////////////////////////////////////////////////////////////////
 
 do var x; while (false);
-
diff --git a/test/suite/ch12/12.2/S12.2_A2.js b/test/suite/ch12/12.2/S12.2_A2.js
index 5f7de5abc..bdbaa0eed 100644
--- a/test/suite/ch12/12.2/S12.2_A2.js
+++ b/test/suite/ch12/12.2/S12.2_A2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variables are defined with global scope (that is, they are created as members of the global object, as described in 10.1.3) using property attributes { DontDelete}
- *
- * @path ch12/12.2/S12.2_A2.js
- * @description Checking if deleting global variables that have the attributes {DontDelete} fails
- */
+/*---
+info: >
+    Variables are defined with global scope (that is, they are created as
+    members of the global object, as described in 10.1.3) using property
+    attributes { DontDelete}
+description: >
+    Checking if deleting global variables that have the attributes
+    {DontDelete} fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -43,5 +46,3 @@ if ((__variable !== "defined")|(this["__variable"] !=="defined")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.2/S12.2_A3.js b/test/suite/ch12/12.2/S12.2_A3.js
index 5c0845ad2..11ef08907 100644
--- a/test/suite/ch12/12.2/S12.2_A3.js
+++ b/test/suite/ch12/12.2/S12.2_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration produces a new scope
- *
- * @path ch12/12.2/S12.2_A3.js
- * @description Using Global scope and Function scope together
- */
+/*---
+info: FunctionDeclaration produces a new scope
+description: Using Global scope and Function scope together
+---*/
 
 var __var = "OUT";
 
@@ -52,4 +50,3 @@ if (__var!=="INNERED") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A4.js b/test/suite/ch12/12.2/S12.2_A4.js
index 17f5c6a87..224a25687 100644
--- a/test/suite/ch12/12.2/S12.2_A4.js
+++ b/test/suite/ch12/12.2/S12.2_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Unicode characters in variable Identifier are allowed
- *
- * @path ch12/12.2/S12.2_A4.js
- * @description Create and use unicode characters in variable Identifier
- */
+/*---
+info: Unicode characters in variable Identifier are allowed
+description: Create and use unicode characters in variable Identifier
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +25,3 @@ if (__var !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A5.js b/test/suite/ch12/12.2/S12.2_A5.js
index c168bfd2b..9c1bd6631 100644
--- a/test/suite/ch12/12.2/S12.2_A5.js
+++ b/test/suite/ch12/12.2/S12.2_A5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration within Eval statement is initialized as the program reaches the eval statement
- *
- * @path ch12/12.2/S12.2_A5.js
- * @description Executing eval("var x")
- */
+/*---
+info: >
+    VariableDeclaration within Eval statement is initialized as the program
+    reaches the eval statement
+description: Executing eval("var x")
+includes: [$PRINT.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -30,4 +31,3 @@ try{
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A6_T1.js b/test/suite/ch12/12.2/S12.2_A6_T1.js
index 34e7f0e7a..825751e8f 100644
--- a/test/suite/ch12/12.2/S12.2_A6_T1.js
+++ b/test/suite/ch12/12.2/S12.2_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration within "try-catch" statement is allowed
- *
- * @path ch12/12.2/S12.2_A6_T1.js
- * @description Declaring variable within "try-catch" statement
- */
+/*---
+info: VariableDeclaration within "try-catch" statement is allowed
+description: Declaring variable within "try-catch" statement
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -33,4 +31,3 @@ try{
 }catch(e){
     var incatch__var;
 };
-
diff --git a/test/suite/ch12/12.2/S12.2_A6_T2.js b/test/suite/ch12/12.2/S12.2_A6_T2.js
index 4b586e0ab..aa725a01a 100644
--- a/test/suite/ch12/12.2/S12.2_A6_T2.js
+++ b/test/suite/ch12/12.2/S12.2_A6_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration within "try-catch" statement is allowed
- *
- * @path ch12/12.2/S12.2_A6_T2.js
- * @description Declaring variables within "try-catch" statement
- */
+/*---
+info: VariableDeclaration within "try-catch" statement is allowed
+description: Declaring variables within "try-catch" statement
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -35,4 +33,3 @@ try{
     }
     
 };
-
diff --git a/test/suite/ch12/12.2/S12.2_A7.js b/test/suite/ch12/12.2/S12.2_A7.js
index 167355a9f..76ca62e7a 100644
--- a/test/suite/ch12/12.2/S12.2_A7.js
+++ b/test/suite/ch12/12.2/S12.2_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration within "for" statement is allowed
- *
- * @path ch12/12.2/S12.2_A7.js
- * @description Declaring variable within "for" statement
- */
+/*---
+info: VariableDeclaration within "for" statement is allowed
+description: Declaring variable within "for" statement
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -22,4 +20,3 @@ for (;;){
     break;
     var infor_var;
 }
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T1.js b/test/suite/ch12/12.2/S12.2_A8_T1.js
index c9466b665..161ebfea0 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T1.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T1.js
- * @description Checking if execution of "var x += 1" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x += 1" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x += 1;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T2.js b/test/suite/ch12/12.2/S12.2_A8_T2.js
index f5b9edc5f..69f173008 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T2.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T2.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T2.js
- * @description Checking if execution of "var x | true" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x | true" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x | true;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T3.js b/test/suite/ch12/12.2/S12.2_A8_T3.js
index 4272e5c1b..726faa8fe 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T3.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T3.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T3.js
- * @description Checking if execution of "var x && 1" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x && 1" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x && 1;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T4.js b/test/suite/ch12/12.2/S12.2_A8_T4.js
index 1f4641770..ae8601f10 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T4.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T4.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T4.js
- * @description Checking if execution of "var x++" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x++" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x++;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T5.js b/test/suite/ch12/12.2/S12.2_A8_T5.js
index 1c414f6dd..6e0e2279b 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T5.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T5.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T5.js
- * @description Checking if execution of "var --x" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var --x" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var --x;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T6.js b/test/suite/ch12/12.2/S12.2_A8_T6.js
index c763f07aa..4d72fa326 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T6.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T6.js
@@ -1,18 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T6.js
- * @description Checking if execution of "var x*1" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x*1" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x*1;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T7.js b/test/suite/ch12/12.2/S12.2_A8_T7.js
index 86d1c3398..5a173c6db 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T7.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T7.js
@@ -1,18 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T7.js
- * @description Checking if execution of "var x>>1" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x>>1" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x>>1;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.2/S12.2_A8_T8.js b/test/suite/ch12/12.2/S12.2_A8_T8.js
index d798757d6..5b89a750e 100644
--- a/test/suite/ch12/12.2/S12.2_A8_T8.js
+++ b/test/suite/ch12/12.2/S12.2_A8_T8.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only AssignmentExpression is admitted when variable is initialized
- *
- * @path ch12/12.2/S12.2_A8_T8.js
- * @description Checking if execution of "var x in __arr" fails
- * @negative
- */
+/*---
+info: Only AssignmentExpression is admitted when variable is initialized
+description: Checking if execution of "var x in __arr" fails
+flags: [negative]
+---*/
 
 __arr = [];
 
@@ -16,5 +14,3 @@ __arr = [];
 var x in __arr;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.2/S12.2_A9.js b/test/suite/ch12/12.2/S12.2_A9.js
index 261599a65..3d6eeebcb 100644
--- a/test/suite/ch12/12.2/S12.2_A9.js
+++ b/test/suite/ch12/12.2/S12.2_A9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When using property attributes, {DontEnum} is not used
- *
- * @path ch12/12.2/S12.2_A9.js
- * @description Enumerating property attributes of "this" and then searching for the declared variable
- */
+/*---
+info: When using property attributes, {DontEnum} is not used
+description: >
+    Enumerating property attributes of "this" and then searching for
+    the declared variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -21,4 +21,3 @@ if (!(enumed)) {
 //////////////////////////////////////////////////////////////////////////////
 
 var __declared__var;
-
diff --git a/test/suite/ch12/12.3/S12.3_A1.js b/test/suite/ch12/12.3/S12.3_A1.js
index e314b179e..8d314851d 100644
--- a/test/suite/ch12/12.3/S12.3_A1.js
+++ b/test/suite/ch12/12.3/S12.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production EmptyStatement ; is evaluated as follows Return (normal, empty, empty)
- *
- * @path ch12/12.3/S12.3_A1.js
- * @description Using EmptyStatement ;
- */
+/*---
+info: >
+    The production EmptyStatement ; is evaluated as follows Return (normal,
+    empty, empty)
+description: Using EmptyStatement ;
+---*/
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;;   ;;;;;;  ;;      ;;  ;;;;;;   ;;;;;;;;  ;;    ;;     ;;;;;
@@ -15,4 +15,3 @@
 ;;;;;   ;;      ;;  ;;  ;;  ;;          ;;        ;;        ;;;;;
 ;;;;;   ;;;;;;  ;;      ;;  ;;          ;;        ;;        ;;;;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
diff --git a/test/suite/ch12/12.4/S12.4_A1.js b/test/suite/ch12/12.4/S12.4_A1.js
index 0754d791e..66553b119 100644
--- a/test/suite/ch12/12.4/S12.4_A1.js
+++ b/test/suite/ch12/12.4/S12.4_A1.js
@@ -1,17 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An ExpressionStatement can not start with the function keyword because that might make it ambiguous with a FunctionDeclaration
- *
- * @path ch12/12.4/S12.4_A1.js
- * @description Checking if execution of "function(){}()" fails
- * @negative
- */
+/*---
+info: >
+    An ExpressionStatement can not start with the function keyword because
+    that might make it ambiguous with a FunctionDeclaration
+description: Checking if execution of "function(){}()" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 function(){}();
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.4/S12.4_A2_T1.js b/test/suite/ch12/12.4/S12.4_A2_T1.js
index 70d0aa62d..2a3fa574c 100644
--- a/test/suite/ch12/12.4/S12.4_A2_T1.js
+++ b/test/suite/ch12/12.4/S12.4_A2_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production ExpressionStatement : [lookahead \notin {{, function}] Expression; is evaluated as follows:
- * 1. Evaluate Expression.
- * 2. Call GetValue(Result(1)).
- * 3. Return (normal, Result(2), empty)
- *
- * @path ch12/12.4/S12.4_A2_T1.js
- * @description Checking by using eval "(eval("x+1+x==1"))"
- */
+/*---
+info: >
+    The production ExpressionStatement : [lookahead \notin {{, function}] Expression; is evaluated as follows:
+    1. Evaluate Expression.
+    2. Call GetValue(Result(1)).
+    3. Return (normal, Result(2), empty)
+description: Checking by using eval "(eval("x+1+x==1"))"
+---*/
 
 x=1;
 
@@ -32,4 +31,3 @@ if (__evaluated !== false) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.4/S12.4_A2_T2.js b/test/suite/ch12/12.4/S12.4_A2_T2.js
index 2fdadc008..679c942a6 100644
--- a/test/suite/ch12/12.4/S12.4_A2_T2.js
+++ b/test/suite/ch12/12.4/S12.4_A2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production ExpressionStatement : [lookahead \notin {{, function}] Expression; is evaluated as follows:
- * 1. Evaluate Expression.
- * 2. Call GetValue(Result(1)).
- * 3. Return (normal, Result(2), empty)
- *
- * @path ch12/12.4/S12.4_A2_T2.js
- * @description Checking by using eval(eval(x), where x is any string)
- */
+/*---
+info: >
+    The production ExpressionStatement : [lookahead \notin {{, function}] Expression; is evaluated as follows:
+    1. Evaluate Expression.
+    2. Call GetValue(Result(1)).
+    3. Return (normal, Result(2), empty)
+description: Checking by using eval(eval(x), where x is any string)
+---*/
 
 x="5+1|0===0";
 
@@ -32,4 +31,3 @@ if (__evaluated !== 11) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A1.1_T1.js b/test/suite/ch12/12.5/S12.5_A1.1_T1.js
index ae2038c98..db23e2fd0 100644
--- a/test/suite/ch12/12.5/S12.5_A1.1_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A1.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 0, null, undefined, false, empty string, NaN in expression is evaluated to false
- *
- * @path ch12/12.5/S12.5_A1.1_T1.js
- * @description Using "if" without "else" construction
- */
+/*---
+info: >
+    0, null, undefined, false, empty string, NaN in expression is evaluated
+    to false
+description: Using "if" without "else" construction
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -50,4 +50,3 @@ if(NaN)
     $ERROR('#5: NaN in expression is evaluated to false ');
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A1.1_T2.js b/test/suite/ch12/12.5/S12.5_A1.1_T2.js
index ba5d8e3cb..fc30b6300 100644
--- a/test/suite/ch12/12.5/S12.5_A1.1_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A1.1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 0, null, undefined, false, empty string, NaN in expression is evaluated to false
- *
- * @path ch12/12.5/S12.5_A1.1_T2.js
- * @description Using "if/else" construction
- */
+/*---
+info: >
+    0, null, undefined, false, empty string, NaN in expression is evaluated
+    to false
+description: Using "if/else" construction
+---*/
 
 var c=0;
 //////////////////////////////////////////////////////////////////////////////
@@ -68,4 +68,3 @@ else
 if (c!=6) $ERROR('#6.2: else branch don`t execute');
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A1.2_T1.js b/test/suite/ch12/12.5/S12.5_A1.2_T1.js
index 19ba4cdd1..9c41a9b45 100644
--- a/test/suite/ch12/12.5/S12.5_A1.2_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A1.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1, true, non-empty string and others in expression is evaluated to true when using operator "new"
- *
- * @path ch12/12.5/S12.5_A1.2_T1.js
- * @description Using "if" without "else" construction
- */
+/*---
+info: >
+    1, true, non-empty string and others in expression is evaluated to true
+    when using operator "new"
+description: Using "if" without "else" construction
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -70,4 +70,3 @@ if(!(new String("")))
     $ERROR('#9: new empty string in expression is evaluated to true ');
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A1.2_T2.js b/test/suite/ch12/12.5/S12.5_A1.2_T2.js
index b384311f1..2bbd15ea7 100644
--- a/test/suite/ch12/12.5/S12.5_A1.2_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A1.2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1, true, non-empty string and others in expression is evaluated to true when using operator "new"
- *
- * @path ch12/12.5/S12.5_A1.2_T2.js
- * @description Using "if/else" construction
- */
+/*---
+info: >
+    1, true, non-empty string and others in expression is evaluated to true
+    when using operator "new"
+description: Using "if/else" construction
+---*/
 
 var c=0;
 //////////////////////////////////////////////////////////////////////////////
@@ -98,4 +98,3 @@ else
 if (c!=9) $ERROR('#9.2: else branch don`t execute');
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A10_T1.js b/test/suite/ch12/12.5/S12.5_A10_T1.js
index 4995fe1c2..b1c04d2bb 100644
--- a/test/suite/ch12/12.5/S12.5_A10_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A10_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function expession inside the "if" expression is allowed
- *
- * @path ch12/12.5/S12.5_A10_T1.js
- * @description Using function expession(function __func(){return 0;}) inside the "if" expression
- */
+/*---
+info: Function expession inside the "if" expression is allowed
+description: >
+    Using function expession(function __func(){return 0;}) inside the
+    "if" expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -17,4 +17,3 @@ if(function __func(){return 0;}){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A10_T2.js b/test/suite/ch12/12.5/S12.5_A10_T2.js
index bcb187b08..1c77d81c9 100644
--- a/test/suite/ch12/12.5/S12.5_A10_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A10_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function expession inside the "if" expression is allowed
- *
- * @path ch12/12.5/S12.5_A10_T2.js
- * @description Using function expession "function __func(){return 0;}()" within "if" expression
- */
+/*---
+info: Function expession inside the "if" expression is allowed
+description: >
+    Using function expession "function __func(){return 0;}()" within
+    "if" expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -17,4 +17,3 @@ if(function __func(){return 0;}()){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A11.js b/test/suite/ch12/12.5/S12.5_A11.js
index 250b29f50..7f7c1dc78 100644
--- a/test/suite/ch12/12.5/S12.5_A11.js
+++ b/test/suite/ch12/12.5/S12.5_A11.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * {} within the "if" expression is not allowed
- *
- * @path ch12/12.5/S12.5_A11.js
- * @description Checking if execution of "if({1})" fails
- * @negative
- */
+/*---
+info: "{} within the \"if\" expression is not allowed"
+description: Checking if execution of "if({1})" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -20,4 +18,3 @@ if({1})
   }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A12_T1.js b/test/suite/ch12/12.5/S12.5_A12_T1.js
index 43f858b09..86587572d 100644
--- a/test/suite/ch12/12.5/S12.5_A12_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A12_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Embedded "if/else" constructions are allowed
- *
- * @path ch12/12.5/S12.5_A12_T1.js
- * @description Using embedded "if/else" into "if/else" constructions
- */
+/*---
+info: Embedded "if/else" constructions are allowed
+description: Using embedded "if/else" into "if/else" constructions
+---*/
 
 //CHECK# 1
 if(true)
@@ -55,4 +53,3 @@ else
     $ERROR('#4.3: At embedded "if/else" constructions engine must select right branches');
   else
     ;
-
diff --git a/test/suite/ch12/12.5/S12.5_A12_T2.js b/test/suite/ch12/12.5/S12.5_A12_T2.js
index c9115994b..ad8918d34 100644
--- a/test/suite/ch12/12.5/S12.5_A12_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A12_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Embedded "if/else" constructions are allowed
- *
- * @path ch12/12.5/S12.5_A12_T2.js
- * @description Using embedded "if" into "if/else" constructions
- */
+/*---
+info: Embedded "if/else" constructions are allowed
+description: Using embedded "if" into "if/else" constructions
+---*/
 
 //CHECK# 1
 if(true){
@@ -47,4 +45,3 @@ else{
   if (false)
     $ERROR('#4.3: At embedded "if/else" constructions engine must select right branches');
 }
-
diff --git a/test/suite/ch12/12.5/S12.5_A12_T3.js b/test/suite/ch12/12.5/S12.5_A12_T3.js
index a17cff21f..7331b998c 100644
--- a/test/suite/ch12/12.5/S12.5_A12_T3.js
+++ b/test/suite/ch12/12.5/S12.5_A12_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Embedded "if/else" constructions are allowed
- *
- * @path ch12/12.5/S12.5_A12_T3.js
- * @description Using embedded "if/else" into "if" without "else" constructions
- */
+/*---
+info: Embedded "if/else" constructions are allowed
+description: Using embedded "if/else" into "if" without "else" constructions
+---*/
 
 //CHECK# 1
 if(true)
@@ -35,4 +33,3 @@ if(false)
     $ERROR('#4.1: At embedded "if/else" constructions engine must select right branches');
   else
     $ERROR('#4.2: At embedded "if/else" constructions engine must select right branches');
-
diff --git a/test/suite/ch12/12.5/S12.5_A12_T4.js b/test/suite/ch12/12.5/S12.5_A12_T4.js
index 03f643d62..0900bbe7d 100644
--- a/test/suite/ch12/12.5/S12.5_A12_T4.js
+++ b/test/suite/ch12/12.5/S12.5_A12_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Embedded "if/else" constructions are allowed
- *
- * @path ch12/12.5/S12.5_A12_T4.js
- * @description Using embedded "if" into "if" constructions
- */
+/*---
+info: Embedded "if/else" constructions are allowed
+description: Using embedded "if" into "if" constructions
+---*/
 
 //CHECK# 1
 if(true)
@@ -30,4 +28,3 @@ if(false)
 if(false)
   if (true)
     $ERROR('#4.1: At embedded "if/else" constructions engine must select right branches');
-
diff --git a/test/suite/ch12/12.5/S12.5_A1_T1.js b/test/suite/ch12/12.5/S12.5_A1_T1.js
index df6f327d4..780a48aed 100644
--- a/test/suite/ch12/12.5/S12.5_A1_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1, true, non-empty string in expression is evaluated to true
- *
- * @path ch12/12.5/S12.5_A1_T1.js
- * @description Using "if" without "else" construction
- */
+/*---
+info: 1, true, non-empty string in expression is evaluated to true
+description: Using "if" without "else" construction
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -35,5 +33,3 @@ if(!("A"))
 	$ERROR('#4: "A" in expression is evaluated to true');
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A1_T2.js b/test/suite/ch12/12.5/S12.5_A1_T2.js
index ea952a930..f90521132 100644
--- a/test/suite/ch12/12.5/S12.5_A1_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * 1, true, non-empty string in expression is evaluated to true
- *
- * @path ch12/12.5/S12.5_A1_T2.js
- * @description Using "if/else" construction
- */
+/*---
+info: 1, true, non-empty string in expression is evaluated to true
+description: Using "if/else" construction
+---*/
 
 var c=0;
 //////////////////////////////////////////////////////////////////////////////
@@ -48,5 +46,3 @@ else
 if (c!=4) $ERROR('#4.2: else branch don`t execute');
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A2.js b/test/suite/ch12/12.5/S12.5_A2.js
index c953c29cd..c2d9b8577 100644
--- a/test/suite/ch12/12.5/S12.5_A2.js
+++ b/test/suite/ch12/12.5/S12.5_A2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In the "if" Statement eval in Expression is admitted
- *
- * @path ch12/12.5/S12.5_A2.js
- * @description Checking by using eval "eval("true")"
- * @negative
- */
+/*---
+info: In the "if" Statement eval in Expression is admitted
+description: Checking by using eval "eval("true")"
+flags: [negative]
+includes: [$FAIL.js]
+---*/
 
 if (eval("true")) $FAIL('#1: In the "if" Statement eval as Expression is admitted');
-
diff --git a/test/suite/ch12/12.5/S12.5_A3.js b/test/suite/ch12/12.5/S12.5_A3.js
index 3eb41d59b..a8a354bbf 100644
--- a/test/suite/ch12/12.5/S12.5_A3.js
+++ b/test/suite/ch12/12.5/S12.5_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the production "IfStatement: if ( Expression ) Statement else Statement" is evaluated, Expression is evaluated first
- *
- * @path ch12/12.5/S12.5_A3.js
- * @description The Expression is "(function(){throw 1})()"
- */
+/*---
+info: >
+    When the production "IfStatement: if ( Expression ) Statement else
+    Statement" is evaluated, Expression is evaluated first
+description: The Expression is "(function(){throw 1})()"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,5 +31,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A4.js b/test/suite/ch12/12.5/S12.5_A4.js
index 73babcfea..69ddb92ea 100644
--- a/test/suite/ch12/12.5/S12.5_A4.js
+++ b/test/suite/ch12/12.5/S12.5_A4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the production "IfStatement: if ( Expression ) Statement else Statement" is evaluated, Statement(s) is(are) evaluated second
- *
- * @path ch12/12.5/S12.5_A4.js
- * @description The first statement is "(function(){throw "instatement"})()"
- */
+/*---
+info: >
+    When the production "IfStatement: if ( Expression ) Statement else
+    Statement" is evaluated, Statement(s) is(are) evaluated second
+description: The first statement is "(function(){throw "instatement"})()"
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -33,5 +34,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A5.js b/test/suite/ch12/12.5/S12.5_A5.js
index 72c334a67..09c9ba1b6 100644
--- a/test/suite/ch12/12.5/S12.5_A5.js
+++ b/test/suite/ch12/12.5/S12.5_A5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration inside the "if" Expression is evaluated as true and function will not be declarated
- *
- * @path ch12/12.5/S12.5_A5.js
- * @description The "if" Expression is "function __func(){throw "FunctionExpression";}"
- */
+/*---
+info: >
+    FunctionDeclaration inside the "if" Expression is evaluated as true and
+    function will not be declarated
+description: >
+    The "if" Expression is "function __func(){throw
+    "FunctionExpression";}"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -42,7 +44,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A6_T1.js b/test/suite/ch12/12.5/S12.5_A6_T1.js
index 76aabe63c..8d822d677 100644
--- a/test/suite/ch12/12.5/S12.5_A6_T1.js
+++ b/test/suite/ch12/12.5/S12.5_A6_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In the If statement expression must be enclosed in braces
- *
- * @path ch12/12.5/S12.5_A6_T1.js
- * @description Checking if execution of "if true" fails
- * @negative
- */
+/*---
+info: In the If statement expression must be enclosed in braces
+description: Checking if execution of "if true" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if true;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A6_T2.js b/test/suite/ch12/12.5/S12.5_A6_T2.js
index 1b6f383ab..8c1b46784 100644
--- a/test/suite/ch12/12.5/S12.5_A6_T2.js
+++ b/test/suite/ch12/12.5/S12.5_A6_T2.js
@@ -1,18 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In the If statement expression must be enclosed in braces
- *
- * @path ch12/12.5/S12.5_A6_T2.js
- * @description Checking if execution of "if false" fails
- * @negative
- */
+/*---
+info: In the If statement expression must be enclosed in braces
+description: Checking if execution of "if false" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#2
 if false;
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.5/S12.5_A7.js b/test/suite/ch12/12.5/S12.5_A7.js
index f450d6aea..d8eed0468 100644
--- a/test/suite/ch12/12.5/S12.5_A7.js
+++ b/test/suite/ch12/12.5/S12.5_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In the "if" statement empty statement is allowed and is evaluated to "undefined"
- *
- * @path ch12/12.5/S12.5_A7.js
- * @description Checking by using eval "eval("if(1);"))"
- */
+/*---
+info: >
+    In the "if" statement empty statement is allowed and is evaluated to
+    "undefined"
+description: Checking by using eval "eval("if(1);"))"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -22,4 +22,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.5/S12.5_A8.js b/test/suite/ch12/12.5/S12.5_A8.js
index 7a2d4b9c6..5bbc1ad15 100644
--- a/test/suite/ch12/12.5/S12.5_A8.js
+++ b/test/suite/ch12/12.5/S12.5_A8.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In the "if" Statement empty expression is not allowed
- *
- * @path ch12/12.5/S12.5_A8.js
- * @description Checking if execution of "if()" fails
- * @negative
- */
+/*---
+info: In the "if" Statement empty expression is not allowed
+description: Checking if execution of "if()" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 if();
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A1.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A1.js
index b4cf09ab9..af965bd2b 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A1.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the production "do Statement while ( Expression )" is evaluated, Statement is evaluated first
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A1.js
- * @description Evaluating various Expressions
- */
+/*---
+info: >
+    When the production "do Statement while ( Expression )" is evaluated,
+    Statement is evaluated first
+description: Evaluating various Expressions
+---*/
 
 var __in__do;
 
@@ -39,4 +39,3 @@ if (__in__do!==3) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A10.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A10.js
index 0c01a5e2e..335b86261 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A10.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "do-while" statement is allowed, but no function with the given name will appear in the global context
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A10.js
- * @description Also this a test on FunctionExpression
- */
+/*---
+info: >
+    FunctionExpression within a "do-while" statement is allowed, but no
+    function with the given name will appear in the global context
+description: Also this a test on FunctionExpression
+---*/
 
 var check = 0;
 do {    
@@ -26,4 +26,3 @@ if (check !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A11.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A11.js
index 60071bd6b..942ee91f4 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A11.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Block "{}" in a "do-while" Expression is evaluated to true
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A11.js
- * @description Checking if execution of "do {} while({})" passes
- */
+/*---
+info: Block "{}" in a "do-while" Expression is evaluated to true
+description: Checking if execution of "do {} while({})" passes
+---*/
 
 do {
     var __in__do=1;
@@ -20,4 +18,3 @@ if (__in__do !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A12.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A12.js
index 1e623bc43..203054a67 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A12.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A12.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Any statement within "do-while" construction must be a compound
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A12.js
- * @description Checking if execution of "do var x=1; var y =2; while (0)" fails
- * @negative
- */
+/*---
+info: Any statement within "do-while" construction must be a compound
+description: Checking if execution of "do var x=1; var y =2; while (0)" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do var x=1; var y =2; while (0);
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T1.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T1.js
index 38bc21491..d521ddf7c 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T1.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "do-while" Expression is allowed
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A14_T1.js
- * @description Using FunctionExpression "function __func(){return 0;}" as an Expression
- */
+/*---
+info: FunctionExpression within a "do-while" Expression is allowed
+description: >
+    Using FunctionExpression "function __func(){return 0;}" as an
+    Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -24,4 +24,3 @@ if (__reached !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T2.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T2.js
index 9ae3ad763..2507e55b9 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T2.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A14_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "do-while" Expression is allowed
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A14_T2.js
- * @description Using FunctionExpression "function __func(){return 0;}()" as an Expression
- */
+/*---
+info: FunctionExpression within a "do-while" Expression is allowed
+description: >
+    Using FunctionExpression "function __func(){return 0;}()" as an
+    Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -24,4 +24,3 @@ if (__reached !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A15.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A15.js
index 65588750c..9e8783a88 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A15.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A15.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Block within a "do-while" Expression is not allowed
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A15.js
- * @description Using "{0}" Block as an Expression
- * @negative
- */
+/*---
+info: Block within a "do-while" Expression is not allowed
+description: Using "{0}" Block as an Expression
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -16,4 +14,3 @@ do{
 }while({0});
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A2.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A2.js
index 023c7d4a2..b54e2fe8c 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A2.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A2.js
@@ -1,17 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "do Statement while ( Expression )", Statement is evaluated first and only after it is done Expression is checked
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A2.js
- * @description Evaluating Statement with error Expression
- */
+/*---
+info: >
+    While evaluating "do Statement while ( Expression )", Statement is
+    evaluated first and only after it is done Expression is checked
+description: Evaluating Statement with error Expression
+includes: [Test262Error.js]
+---*/
 
 try {
 	do __in__do = "reached"; while (abbracadabra);
-	$ERROR('#1: \'do __in__do = "reached"; while (abbracadabra)\' lead to throwing exception');

-} catch (e) {

+	$ERROR('#1: \'do __in__do = "reached"; while (abbracadabra)\' lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 
@@ -22,6 +23,3 @@ if (__in__do !== "reached") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A3.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A3.js
index 5f5f0ed69..3a27a2d6a 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A3.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the production "do Statement while ( Expression )" is evaluated, then (normal, V, empty) is returned
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A3.js
- * @description Using eval "eval("do __in__do=1; while (false)")"
- */
+/*---
+info: >
+    When the production "do Statement while ( Expression )" is evaluated,
+    then (normal, V, empty) is returned
+description: Using eval "eval("do __in__do=1; while (false)")"
+---*/
 
 __evaluated = eval("do __in__do=1; while (false)");
 
@@ -25,4 +25,3 @@ if (__evaluated !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T1.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T1.js
index 917afe329..5a9903ff4 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T1.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "do-while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A4_T1.js
- * @description Using "break" within a "do-while" loop
- */
+/*---
+info: >
+    "break" within a "do-while" Statement is allowed and performed as
+    described in 12.8
+description: Using "break" within a "do-while" loop
+---*/
 
 do {
     __in__do__before__break="reached"; 
@@ -29,4 +29,3 @@ if (typeof __in__do__after__break !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T2.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T2.js
index 72e01a07d..c703903e0 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T2.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "do-while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A4_T2.js
- * @description "break" and VariableDeclaration within a "do-while" statement
- */
+/*---
+info: >
+    "break" within a "do-while" Statement is allowed and performed as
+    described in 12.8
+description: "\"break\" and VariableDeclaration within a \"do-while\" statement"
+---*/
 
 do_out : do {
     var __in__do__before__break="black";
@@ -25,4 +25,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T3.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T3.js
index a6adc0836..fc7381faf 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T3.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "do-while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A4_T3.js
- * @description "break" and VariableDeclaration within a "do-while" statement
- */
+/*---
+info: >
+    "break" within a "do-while" Statement is allowed and performed as
+    described in 12.8
+description: "\"break\" and VariableDeclaration within a \"do-while\" statement"
+---*/
 
 do_out : do {
     var __in__do__before__break="once";
@@ -25,4 +25,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T4.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T4.js
index 52cb23cc9..1cf35fd09 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T4.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "do-while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A4_T4.js
- * @description "break" and VariableDeclaration within a "do-while" statement
- */
+/*---
+info: >
+    "break" within a "do-while" Statement is allowed and performed as
+    described in 12.8
+description: "\"break\" and VariableDeclaration within a \"do-while\" statement"
+---*/
 
 do_out : do {
     var __in__do__before__break="reached";
@@ -25,5 +25,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T5.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T5.js
index 97f65bf59..a80e09223 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T5.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "do-while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A4_T5.js
- * @description Using labeled "break" in order to continue a loop
- */
+/*---
+info: >
+    "break" within a "do-while" Statement is allowed and performed as
+    described in 12.8
+description: Using labeled "break" in order to continue a loop
+---*/
 
 //CHECK#1
 var i=0;
@@ -20,4 +20,3 @@ woohoo:{
   } while ( true );
   if (i!==10) $ERROR('#1.2: i===10. Actual:  i==='+ i );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A5.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A5.js
index 67bc20de2..a3ae2adda 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A5.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * After "do-while" is broken, (normal, V, empty) is returned
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A5.js
- * @description Using eval
- */
+/*---
+info: After "do-while" is broken, (normal, V, empty) is returned
+description: Using eval
+---*/
 
 __evaluated = eval("do {__in__do__before__break=1; break; __in__do__after__break=2;} while(0)");
 
@@ -33,4 +31,3 @@ if (__evaluated !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T1.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T1.js
index 40af77c63..719e11fb7 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T1.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T1.js
- * @description Checking if execution of "do{} while 1" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{} while 1" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while 1;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T2.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T2.js
index 06fb063ca..14c81612a 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T2.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T2.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T2.js
- * @description Checking if execution of "do{} while 0" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{} while 0" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while 0;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T3.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T3.js
index b29c7c83f..fb782aced 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T3.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T3.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T3.js
- * @description Checking if execution of "do{}while true" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{}while true" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while true;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T4.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T4.js
index 55b670506..620291efb 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T4.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T4.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T4.js
- * @description Checking if execution of "do{}while false" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{}while false" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while false;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T5.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T5.js
index 4b0b06202..342bd5ac1 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T5.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T5.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T5.js
- * @description Checking if execution of "do{}while ''" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{}while ''" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while '';
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T6.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T6.js
index 35e96f41e..fcb23fa93 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T6.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A6_T6.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "do-while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A6_T6.js
- * @description Checking if execution of "do{}while 'hood'" fails
- * @negative
- */
+/*---
+info: Expression in "do-while" IterationStatement is bracketed with braces
+description: Checking if execution of "do{}while 'hood'" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 do break; while 'hood';
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A7.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A7.js
index 78ca8c4ec..7f89e9340 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A7.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "do-while" Statement is evaluted according to 12.6.1 and returns (normal, V, empty)
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A7.js
- * @description Using eval
- */
+/*---
+info: >
+    The "do-while" Statement is evaluted according to 12.6.1 and returns
+    (normal, V, empty)
+description: Using eval
+---*/
 
 var __condition=0
 
@@ -27,5 +27,3 @@ if (__evaluated !== 4) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A8.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A8.js
index 2f7c7e742..8261c98c3 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A8.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "continue" statement within a "do-while" Statement is allowed
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A8.js
- * @description Using eval
- */
+/*---
+info: "\"continue\" statement within a \"do-while\" Statement is allowed"
+description: Using eval
+---*/
 
 var __condition = 0, __odds=0;
 
@@ -27,5 +25,3 @@ if (__evaluated !== 4) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.1/S12.6.1_A9.js b/test/suite/ch12/12.6/12.6.1/S12.6.1_A9.js
index e9e831b07..78de25003 100644
--- a/test/suite/ch12/12.6/12.6.1/S12.6.1_A9.js
+++ b/test/suite/ch12/12.6/12.6.1/S12.6.1_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "do-while" Statement is evaluated without syntax checks
- *
- * @path ch12/12.6/12.6.1/S12.6.1_A9.js
- * @description Throwing system exception whithin a "do-while" loop
- */
+/*---
+info: "\"do-while\" Statement is evaluated without syntax checks"
+description: Throwing system exception whithin a "do-while" loop
+includes: [Test262Error.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,9 +14,9 @@ try {
 	    var x = 1; 
 	    abaracadabara;
 	} while(0);
-	$ERROR('#1: "abbracadabra" lead to throwing exception');

-

-} catch (e) {

+	$ERROR('#1: "abbracadabra" lead to throwing exception');
+
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 
@@ -26,4 +25,3 @@ if (x !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A1.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A1.js
index cb7fff722..cfb5627cc 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A1.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression from "while" IterationStatement is evaluated first; "false", "0", "null", "undefined" and "empty" strings used as the Expression are evaluated to "false"
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A1.js
- * @description Evaluating various Expressions
- */
+/*---
+info: >
+    Expression from "while" IterationStatement is evaluated first; "false",
+    "0", "null", "undefined" and "empty" strings used as the Expression are
+    evaluated to "false"
+description: Evaluating various Expressions
+---*/
 
 var __in__do;
 
@@ -59,4 +60,3 @@ if (__in__do !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A10.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A10.js
index 9a05fe317..922a1b1ae 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A10.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "while" IterationStatement is allowed, but no function with the given name will appear in the global context
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A10.js
- * @description Testing FunctionExpression too
- */
+/*---
+info: >
+    FunctionExpression within a "while" IterationStatement is allowed, but no
+    function with the given name will appear in the global context
+description: Testing FunctionExpression too
+---*/
 
 var check=0;
 while(function f(){}){    
@@ -26,4 +26,3 @@ if (check !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A11.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A11.js
index 6ff4c779c..883e40e72 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A11.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "{}" Block within a "while" Expression is evaluated to true
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A11.js
- * @description Checking if execution of "while({}){}" passes
- */
+/*---
+info: "\"{}\" Block within a \"while\" Expression is evaluated to true"
+description: Checking if execution of "while({}){}" passes
+---*/
 
 while({}){
     var __in__do=1;
@@ -20,4 +18,3 @@ if (__in__do !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T1.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T1.js
index f27b9df26..e18d31512 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T1.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "while" Expression is allowed
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A14_T1.js
- * @description Using "function __func(){return 0;}" as an Expression
- */
+/*---
+info: FunctionExpression within a "while" Expression is allowed
+description: Using "function __func(){return 0;}" as an Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -24,4 +22,3 @@ if (__reached !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T2.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T2.js
index cd867ea97..0f8c19edf 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T2.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A14_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a "while" Expression is allowed
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A14_T2.js
- * @description Using function call as an Expression
- */
+/*---
+info: FunctionExpression within a "while" Expression is allowed
+description: Using function call as an Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -24,4 +22,3 @@ if (__reached !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A15.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A15.js
index e1e231dd4..abe77952c 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A15.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A15.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Block within a "while" Expression is not allowed
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A15.js
- * @description Expression is "{0}"
- * @negative
- */
+/*---
+info: Block within a "while" Expression is not allowed
+description: Expression is "{0}"
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -16,4 +14,3 @@ while({1}){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A2.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A2.js
index e3994d474..dee01bbf9 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A2.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating The production IterationStatement: "while ( Expression ) Statement", Expression is evaluated first
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A2.js
- * @description Evaluating Statement with error Expression
- */
+/*---
+info: >
+    While evaluating The production IterationStatement: "while ( Expression )
+    Statement", Expression is evaluated first
+description: Evaluating Statement with error Expression
+---*/
 
 try {
 	while ((function(){throw 1})()) __in__while = "reached"; 
@@ -24,6 +24,3 @@ if (typeof __in__while !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A3.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A3.js
index ec8934e8e..82afb9201 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A3.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "while" IterationStatement is evaluated, (normal, V, empty) is returned
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A3.js
- * @description Using eval
- */
+/*---
+info: >
+    When "while" IterationStatement is evaluated, (normal, V, empty) is
+    returned
+description: Using eval
+---*/
 
 var __in__do;
 
@@ -27,4 +27,3 @@ if (__evaluated !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T1.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T1.js
index 5e20d53ba..e94cb3a38 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T1.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A4_T1.js
- * @description "break" within a "while" Statement
- */
+/*---
+info: >
+    "break" within a "while" Statement is allowed and performed as described
+    in 12.8
+description: "\"break\" within a \"while\" Statement"
+---*/
 
 while(1===1){
     __in__do__before__break="reached"; 
@@ -29,4 +29,3 @@ if (typeof __in__do__after__break !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T2.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T2.js
index 616145c02..53cb38fdc 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T2.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A4_T2.js
- * @description "break" and VariableDeclaration within a "while" Statement
- */
+/*---
+info: >
+    "break" within a "while" Statement is allowed and performed as described
+    in 12.8
+description: "\"break\" and VariableDeclaration within a \"while\" Statement"
+---*/
 
 do_out : while(1===1) {
     if (__in__do__before__break) break;
@@ -26,4 +26,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T3.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T3.js
index a86e95705..ec744ec30 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T3.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A4_T3.js
- * @description "break" and VariableDeclaration within a "while" Statement
- */
+/*---
+info: >
+    "break" within a "while" Statement is allowed and performed as described
+    in 12.8
+description: "\"break\" and VariableDeclaration within a \"while\" Statement"
+---*/
 
 do_out : while(1===1) {
     if (__in__do__before__break) break;
@@ -26,4 +26,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T4.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T4.js
index 4dc75f137..8af69506d 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T4.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A4_T4.js
- * @description "break" and VariableDeclaration within a "while" Statement
- */
+/*---
+info: >
+    "break" within a "while" Statement is allowed and performed as described
+    in 12.8
+description: "\"break\" and VariableDeclaration within a \"while\" Statement"
+---*/
 
 do_out : while(1===1) {
     if(__in__do__before__break)break;
@@ -26,5 +26,3 @@ if (!(__in__do__before__break&&__in__do__IN__before__break&&!__in__do__IN__after
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T5.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T5.js
index 46e5b95c7..258288937 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T5.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "break" within a "while" Statement is allowed and performed as described in 12.8
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A4_T5.js
- * @description Using labeled "break" in order to continue a "while" loop
- */
+/*---
+info: >
+    "break" within a "while" Statement is allowed and performed as described
+    in 12.8
+description: Using labeled "break" in order to continue a "while" loop
+---*/
 
 //CHECK#1
 var i=0;
@@ -20,4 +20,3 @@ woohoo:{
   }
   if (i!==10) $ERROR('#1.2: i===10. Actual:  i==='+ i );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A5.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A5.js
index 899837466..4263d64a2 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A5.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While using "while" within an eval statement, source "break" is allowed and (normal, V, empty) is returned
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A5.js
- * @description Using eval
- */
+/*---
+info: >
+    While using "while" within an eval statement, source "break" is allowed
+    and (normal, V, empty) is returned
+description: Using eval
+---*/
 
 __evaluated = eval("while(1) {__in__do__before__break=1; break; __in__do__after__break=2;}");
 
@@ -33,4 +33,3 @@ if (__evaluated !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T1.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T1.js
index f9a4e9744..b86b36c11 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T1.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T1.js
- * @description Checking if execution of "while 1 break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while 1 break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while 1 break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T2.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T2.js
index b7f61b8b4..56c8b4d5b 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T2.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T2.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T2.js
- * @description Checking if execution of "while 0 break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while 0 break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while 0 break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T3.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T3.js
index 4b0eaea03..5496e30be 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T3.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T3.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T3.js
- * @description Checking if execution of "while true break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while true break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while true break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T4.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T4.js
index 8d17ce8f1..d3de35f74 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T4.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T4.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T4.js
- * @description Checking if execution of "while false break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while false break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while false break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T5.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T5.js
index e1b677741..e928d4f29 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T5.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T5.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T5.js
- * @description Checking if execution of "while '' break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while '' break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while '' break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T6.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T6.js
index 78ce3abdb..8a3e4828b 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T6.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A6_T6.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Expression in "while" IterationStatement is bracketed with braces
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A6_T6.js
- * @description Checking if execution of "while 'hood' break" fails
- * @negative
- */
+/*---
+info: Expression in "while" IterationStatement is bracketed with braces
+description: Checking if execution of "while 'hood' break" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 while 'hood' break;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A7.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A7.js
index 5743cd6d4..25947fd26 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A7.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "while" Statement is evaluted according to 12.6.2 and returns (normal, V, empty)
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A7.js
- * @description using eval
- */
+/*---
+info: >
+    The "while" Statement is evaluted according to 12.6.2 and returns
+    (normal, V, empty)
+description: using eval
+---*/
 
 var __condition=0
 
@@ -27,5 +27,3 @@ if (__evaluated !== 4) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A8.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A8.js
index a5af5748d..a6c6ba431 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A8.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "continue" statement within a "while" Statement is allowed
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A8.js
- * @description using eval
- */
+/*---
+info: "\"continue\" statement within a \"while\" Statement is allowed"
+description: using eval
+---*/
 
 var __condition = 0, __odds=0;
 
@@ -27,5 +25,3 @@ if (__evaluated !== 4) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.2/S12.6.2_A9.js b/test/suite/ch12/12.6/12.6.2/S12.6.2_A9.js
index f8cbed0a1..490903e42 100644
--- a/test/suite/ch12/12.6/12.6.2/S12.6.2_A9.js
+++ b/test/suite/ch12/12.6/12.6.2/S12.6.2_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "while" Statement is evaluated without syntax checks
- *
- * @path ch12/12.6/12.6.2/S12.6.2_A9.js
- * @description Throwing system exception inside "while" loop
- */
+/*---
+info: "\"while\" Statement is evaluated without syntax checks"
+description: Throwing system exception inside "while" loop
+includes: [Test262Error.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,9 +14,9 @@ try {
 	    var x = 1; 
 	    abaracadabara;
 	};
-	$ERROR('#1: "abbracadabra" lead to throwing exception');

-

-} catch (e) {

+	$ERROR('#1: "abbracadabra" lead to throwing exception');
+
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 
@@ -26,4 +25,3 @@ if (x !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-1.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-1.js
index a0aa03156..0399ea202 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-1.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-1.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is an Object with value false

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj = { value: false };

-        for (var i = 0; obj; ) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is an Object with value false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj = { value: false };
+        for (var i = 0; obj; ) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-10.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-10.js
index cc1cb63d6..f70ca0e65 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-10.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-10.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-10.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a String object (value is '1')

- */

-

-

-function testcase() {

-        var accessed = false;

-        var strObj = new String("1");

-        for (var i = 0; strObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a String object (value is '1')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var strObj = new String("1");
+        for (var i = 0; strObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-11.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-11.js
index 2bccf56df..945e111af 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-11.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-11.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-11.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is undefined

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; undefined;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; undefined;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-12.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-12.js
index 6698b966b..166c0d55a 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-12.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-12.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-12.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is null

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; null;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; null;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-13.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-13.js
index 4e7d39333..5eb6f1376 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-13.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-13.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-13.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a boolean (value is false)

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; false;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a boolean (value is false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; false;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-14.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-14.js
index 865f68d77..b63c01866 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-14.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-14.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a number (value is NaN)

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; NaN;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a number (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; NaN;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-15.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-15.js
index 8f85811f3..0ec3102da 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-15.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-15.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-15.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a number (value is +0)

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; +0;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a number (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; +0;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-16.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-16.js
index 20d03326e..128b13e8a 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-16.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-16.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-16.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a number (value is -0)

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; -0;) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a number (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; -0;) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-17.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-17.js
index faca41566..5f10dda2d 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-17.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-17.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-17.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a number (value is a positive)

- */

-

-

-function testcase() {

-        var accessed = false;

-        for (var i = 0; 2;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a number (value is a positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        for (var i = 0; 2;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-18.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-18.js
index 8fc6251de..abb993f83 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-18.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-18.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a string (value is empty string)

- */

-

-

-function testcase() {

-        var count = 0;

-        for (var i = 0; "";) {

-            count++;

-        }

-        return count === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a string (value is empty string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var count = 0;
+        for (var i = 0; "";) {
+            count++;
+        }
+        return count === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-19.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-19.js
index 19dc79e05..f6d780366 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-19.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-19.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-19.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a string (value is 'undefined')

- */

-

-

-function testcase() {

-        var accessed = false;

-        for (var i = 0; "undefined";) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a string (value is 'undefined')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        for (var i = 0; "undefined";) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-2.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-2.js
index eaf600c6e..4808a731d 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-2.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-2.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a Boolean object

- */

-

-

-function testcase() {

-        var accessed = false;

-        var boolObj = new Boolean(false);

-        for (var i = 0; boolObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var boolObj = new Boolean(false);
+        for (var i = 0; boolObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-20.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-20.js
index 6c8e61c59..d415b1ab0 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-20.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-20.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-20.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a string (value is 'null')

- */

-

-

-function testcase() {

-        var accessed = false;

-        for (var i = 0; "null";) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a string (value is 'null')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        for (var i = 0; "null";) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-21.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-21.js
index d83bd0b18..3d67a3267 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-21.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-21.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-21.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a string (value is '1')

- */

-

-

-function testcase() {

-        var accessed = false;

-        for (var i = 0; "1";) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a string (value is '1')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        for (var i = 0; "1";) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-3.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-3.js
index 76f27f8bd..4ee23b491 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-3.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-3.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a Number object (value is NaN)

- */

-

-

-function testcase() {

-        var accessed = false;

-        var numObj = new Number(NaN);

-        for (var i = 0; numObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a Number object (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var numObj = new Number(NaN);
+        for (var i = 0; numObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-4.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-4.js
index 81599d37b..159ba9cb7 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-4.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-4.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a Number object (value is +0)

- */

-

-

-function testcase() {

-        var accessed = false;

-        var numObj = new Number(+0);

-        for (var i = 0; numObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a Number object (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var numObj = new Number(+0);
+        for (var i = 0; numObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-5.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-5.js
index 5a3199947..a7cb8e415 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-5.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-5.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-5.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a Number object (value is -0)

- */

-

-

-function testcase() {

-        var accessed = false;

-        var numObj = new Number(-0);

-        for (var i = 0; numObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a Number object (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var numObj = new Number(-0);
+        for (var i = 0; numObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-6.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-6.js
index 6f8ed9cd3..ed45462a2 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-6.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-6.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a Number object (value is a positive)

- */

-

-

-function testcase() {

-        var accessed = false;

-        var numObj = new Number(12);

-        for (var i = 0; numObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a Number object (value is a positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var numObj = new Number(12);
+        for (var i = 0; numObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-7.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-7.js
index 920911c94..859432461 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-7.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-7.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a String object (value is empty string)

- */

-

-

-function testcase() {

-        var accessed = false;

-        var strObj = new String("");

-        for (var i = 0; strObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a String object (value is empty string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var strObj = new String("");
+        for (var i = 0; strObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-8.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-8.js
index f087aa207..72ef6d326 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-8.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-8.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-8.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a String object (value is 'undefined')

- */

-

-

-function testcase() {

-        var accessed = false;

-        var strObj = new String("undefined");

-        for (var i = 0; strObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a String object (value is 'undefined')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var strObj = new String("undefined");
+        for (var i = 0; strObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-9.js b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-9.js
index 45ed58923..9d3ce47c0 100644
--- a/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-9.js
+++ b/test/suite/ch12/12.6/12.6.3/12.6.3_2-3-a-ii-9.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 12.6.3; 

- * The production 

- *     IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement

- * is evaluated as follows:

- *

- * @path ch12/12.6/12.6.3/12.6.3_2-3-a-ii-9.js

- * @description The for Statement - (normal, V, empty) will be returned when first Expression is a String object (value is 'null')

- */

-

-

-function testcase() {

-        var accessed = false;

-        var strObj = new String("null");

-        for (var i = 0; strObj;) {

-            accessed = true;

-            break;

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 12.6.3; 
+    The production 
+    IterationStatement : for ( var VariableDeclarationListNoIn ; Expressionopt ; Expressionopt ) Statement
+    is evaluated as follows:
+description: >
+    The for Statement - (normal, V, empty) will be returned when first
+    Expression is a String object (value is 'null')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var strObj = new String("null");
+        for (var i = 0; strObj;) {
+            accessed = true;
+            break;
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A1.js
index dd200559c..6ab102582 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "for {;;}" for Statement with empty expressions is allowed and leads to performing an infinite loop
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A1.js
- * @description Breaking an infinite loop by throwing exception
- */
+/*---
+info: >
+    The "for {;;}" for Statement with empty expressions is allowed and leads
+    to performing an infinite loop
+description: Breaking an infinite loop by throwing exception
+---*/
 
 var __in__for = 0;
 
@@ -32,5 +32,3 @@ if (__in__for !== 101) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.1.js
index 13bfc59ff..478eaa052 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Nested "var-loops" nine blocks depth is evaluated properly
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A10.1.js
- * @description Checking if executing nested "var-loops" nine blocks depth is evaluated properly
- */
+/*---
+info: Nested "var-loops" nine blocks depth is evaluated properly
+description: >
+    Checking if executing nested "var-loops" nine blocks depth is
+    evaluated properly
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -108,4 +108,3 @@ if (__str!== "000000000\n100000000\n110000000\n110000001\n111000000\n111000001\n
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.js
index fb17b0b2c..a06592a1f 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Nested "var-loops" nine blocks depth is evaluated properly
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A10.js
- * @description Checking if executing nested "var-loops" nine blocks depth is evaluated properly
- */
+/*---
+info: Nested "var-loops" nine blocks depth is evaluated properly
+description: >
+    Checking if executing nested "var-loops" nine blocks depth is
+    evaluated properly
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -48,4 +48,3 @@ if (__str!== "000000000\n100000000\n110000000\n110000001\n111000000\n111000001\n
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T1.js
index d050b3dbc..4aa6f7540 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled "var-loop" breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11.1_T1.js
- * @description Using "continue" in order to continue a loop
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled
+    "var-loop" breaks
+description: Using "continue" in order to continue a loop
+---*/
 
 __str=""
 
@@ -18,4 +19,3 @@ for(var index=0; index<10; index+=1) {
 if (__str!=="56789") {
 	$ERROR('#1: __str === "56789". Actual:  __str ==='+ __str  );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T2.js
index cc0233d41..0d171277a 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled "var-loop" breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11.1_T2.js
- * @description Embedded loops
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled
+    "var-loop" breaks
+description: Embedded loops
+---*/
 
 __str="";
 
@@ -57,7 +58,3 @@ if (__str !== "001011202122303133") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T3.js
index d02abf292..f192f69c2 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11.1_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled "var-loop" breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11.1_T3.js
- * @description Trying to continue non-existent label
- * @negative
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled
+    "var-loop" breaks
+description: Trying to continue non-existent label
+flags: [negative]
+---*/
 
 __str="";
 
@@ -21,7 +22,3 @@ outer:for(var index=0;index<4;index+=1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T1.js
index 192f1ebd5..6657bed06 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled loop breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11_T1.js
- * @description Simple test of continue loop with using "continue"
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled loop
+    breaks
+description: Simple test of continue loop with using "continue"
+---*/
 
 __str=""
 
@@ -18,4 +19,3 @@ for(index=0; index<10; index+=1) {
 if (__str!=="56789") {
 	$ERROR('#1: __str === "56789". Actual:  __str ==='+ __str  );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T2.js
index cdc606b5c..daf2b1cd7 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled loop breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11_T2.js
- * @description Embedded loops
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled loop
+    breaks
+description: Embedded loops
+---*/
 
 __str="";
 
@@ -57,7 +58,3 @@ if (__str !== "001011202122303133") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T3.js
index 2807bc86f..7836fd5b8 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A11_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "continue" and (Evaluate Statement).target is in the current label set, iteration of labeled loop breaks
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A11_T3.js
- * @description Trying to continue non-existent label
- * @negative
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "continue" and (Evaluate
+    Statement).target is in the current label set, iteration of labeled loop
+    breaks
+description: Trying to continue non-existent label
+flags: [negative]
+---*/
 
 __str="";
 
@@ -21,7 +22,3 @@ outer:for(index=0;index<4;index+=1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T1.js
index 48fc3b30c..11b372496 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a "var-loop"
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12.1_T1.js
- * @description Breaking a loop with "break"
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a "var-loop"
+description: Breaking a loop with "break"
+---*/
 
 __str=""
 
@@ -18,4 +19,3 @@ for(var index=0; index<10; index+=1) {
 if (__str!=="012345") {
 	$ERROR('#1: __str === "012345". Actual:  __str ==='+ __str  );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T2.js
index 939fd991d..f50c262e3 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a "var-loop"
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12.1_T2.js
- * @description Embedded loops
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a "var-loop"
+description: Embedded loops
+---*/
 
 __str="";
 
@@ -58,7 +59,3 @@ if (__str !== "00101120213031") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T3.js
index 96a5accd9..bddfe803b 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12.1_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a "var-loop"
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12.1_T3.js
- * @description Trying to break non-existent label
- * @negative
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a "var-loop"
+description: Trying to break non-existent label
+flags: [negative]
+---*/
 
 __str="";
 
@@ -21,4 +22,3 @@ outer:for(var index=0;index<4;index+=1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T1.js
index 55031321d..9d13c8785 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a loop
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12_T1.js
- * @description Breaking a loop with "break"
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a loop
+description: Breaking a loop with "break"
+---*/
 
 __str=""
 
@@ -18,4 +19,3 @@ for(index=0; index<10; index+=1) {
 if (__str!=="012345") {
 	$ERROR('#1:__str === "012345". Actual: __str ==='+__str  );
 }
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T2.js
index e97dc7da3..bba72cd13 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a loop
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12_T2.js
- * @description Embedded loops
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a loop
+description: Embedded loops
+---*/
 
 __str="";
 
@@ -58,7 +59,3 @@ if (__str !== "00101120213031") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T3.js
index 67fd236cd..4e97d47fd 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A12_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If (Evaluate Statement).type is "break" and (Evaluate Statement).target is in the current label set, (normal, (Evaluate Statement), empty) is returned while evaluating a loop
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A12_T3.js
- * @description Trying to break non-existent label
- * @negative
- */
+/*---
+info: >
+    If (Evaluate Statement).type is "break" and (Evaluate Statement).target
+    is in the current label set, (normal, (Evaluate Statement), empty) is
+    returned while evaluating a loop
+description: Trying to break non-existent label
+flags: [negative]
+---*/
 
 __str="";
 
@@ -21,7 +22,3 @@ outer:for(index=0;index<4;index+=1){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A13.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A13.js
index 452902537..f7476724c 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A13.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * VariableDeclaration in "var VariableDeclarationListNoIn" of for IterationStatement is allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A13.js
- * @description Declaring variable in "for" ExpressionNoIn
- */
+/*---
+info: >
+    VariableDeclaration in "var VariableDeclarationListNoIn" of for
+    IterationStatement is allowed
+description: Declaring variable in "for" ExpressionNoIn
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -22,4 +22,3 @@ try {
 for(var index=0; index<6; index++) {
 	;
 }
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A14.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A14.js
index 182482dd9..01fa4ead5 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A14.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A14.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationListNoIn; Expression; Expression) Statement"
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A14.js
- * @description Using +,*,/, as the second Expression
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationListNoIn;
+    Expression; Expression) Statement"
+description: Using +,*,/, as the second Expression
+---*/
 
 //CHECK#1
 for(var i=0;i<10;i++){}
@@ -43,4 +43,3 @@ for(var i=2;i<10;i*=i){
 }
 if (i!==16)  $ERROR('#5.1: i === 16. Actual:  i ==='+ i  );
 if (j!==2)  $ERROR('#5.2: j === 2. Actual:  j ==='+ j  );
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A15.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A15.js
index 4ec6147b9..7f9ef917a 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A15.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationListNoIn; Expression; Expression) Statement"
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A15.js
- * @description Statement must be evaluated before second Expression is evaluated
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationListNoIn;
+    Expression; Expression) Statement"
+description: Statement must be evaluated before second Expression is evaluated
+---*/
 
 //CHECK#1
 for(var i=0;i<10;i++){
@@ -20,5 +20,3 @@ for(var i=0;i<10;i++){
   i*=2;
   if (i===3)  $ERROR('#2: i !== 3');
 }
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.1.js
index 78372a2d7..61328a35d 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "for (ExpressionNoIn ;  ; Expression) Statement", Statement is evaulated first
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A2.1.js
- * @description Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
- */
+/*---
+info: >
+    While evaluating "for (ExpressionNoIn ;  ; Expression) Statement",
+    Statement is evaulated first
+description: Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -22,4 +22,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.2.js
index f6391e2f7..897c9d3cc 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "for (ExpressionNoIn;;) Statement", Statement is evaulated first
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A2.2.js
- * @description Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
- */
+/*---
+info: >
+    While evaluating "for (ExpressionNoIn;;) Statement", Statement is
+    evaulated first
+description: Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -22,4 +22,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.js
index 86718d9d1..c6c145fff 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "for (ExpressionNoIn; Expression; Expression) Statement", ExpressionNoIn is evaulated first
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A2.js
- * @description Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
- */
+/*---
+info: >
+    While evaluating "for (ExpressionNoIn; Expression; Expression)
+    Statement", ExpressionNoIn is evaulated first
+description: Using "(function(){throw "NoInExpression"})()" as ExpressionNoIn
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -30,4 +30,3 @@ if (in_for !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A3.js
index 2c46dbfbb..67995c6c3 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "for (ExpressionNoIn; FirstExpression; SecondExpression) Statement", ExpressionNoIn is evaulated first, FirstExpressoin is evaluated second
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A3.js
- * @description Using "(function(){throw "FirstExpression"})()" as FirstExpression
- */
+/*---
+info: >
+    While evaluating "for (ExpressionNoIn; FirstExpression; SecondExpression)
+    Statement", ExpressionNoIn is evaulated first, FirstExpressoin is
+    evaluated second
+description: Using "(function(){throw "FirstExpression"})()" as FirstExpression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -38,4 +39,3 @@ if (typeof __in__for !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4.1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4.1.js
index a64935274..44244f323 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4.1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4.1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "in"-expression is not allowed as a ExpressionNoIn in "for (ExpressionNoIn; FirstExpression; SecondExpression) Statement" IterationStatement
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A4.1.js
- * @description Checking if execution of "for (var a in arr;1;){}" fails
- * @negative
- */
+/*---
+info: >
+    "in"-expression is not allowed as a ExpressionNoIn in "for
+    (ExpressionNoIn; FirstExpression; SecondExpression) Statement"
+    IterationStatement
+description: Checking if execution of "for (var a in arr;1;){}" fails
+flags: [negative]
+---*/
 
 arr = [1,2,3,4,5];
 
@@ -18,5 +19,3 @@ for (var a in arr;1;){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T1.js
index 48e56c4b1..bcfb8ff31 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "in"-expression is not allowed as a ExpressionNoIn in "for (ExpressionNoIn; FirstExpression; SecondExpression) Statement" IterationStatement
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A4_T1.js
- * @description Checking if execution of "for (a in arr;1;){}" fails
- * @negative
- */
+/*---
+info: >
+    "in"-expression is not allowed as a ExpressionNoIn in "for
+    (ExpressionNoIn; FirstExpression; SecondExpression) Statement"
+    IterationStatement
+description: Checking if execution of "for (a in arr;1;){}" fails
+flags: [negative]
+---*/
 
 arr = [1,2,3,4,5];
 
@@ -18,5 +19,3 @@ for (a in arr;1;){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T2.js
index 2a292a808..77b703792 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A4_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "in"-expression is not allowed as a ExpressionNoIn in "for (ExpressionNoIn; FirstExpression; SecondExpression) Statement" IterationStatement
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A4_T2.js
- * @description Checking if execution of "for (1 in arr;1;){}" fails
- * @negative
- */
+/*---
+info: >
+    "in"-expression is not allowed as a ExpressionNoIn in "for
+    (ExpressionNoIn; FirstExpression; SecondExpression) Statement"
+    IterationStatement
+description: Checking if execution of "for (1 in arr;1;){}" fails
+flags: [negative]
+---*/
 
 arr = [1,2,3,4,5];
 
@@ -18,5 +19,3 @@ for(1 in arr;1;) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A5.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A5.js
index 6cab0f017..78206c179 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A5.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "in"-expression wrapped into "eval" statement is allowed as a ExpressionNoIn in "for (ExpressionNoIn; FirstExpression; SecondExpression) Statement" IterationStatement
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A5.js
- * @description Using eval "for(eval("i in arr");1;)"
- */
+/*---
+info: >
+    "in"-expression wrapped into "eval" statement is allowed as a
+    ExpressionNoIn in "for (ExpressionNoIn; FirstExpression;
+    SecondExpression) Statement" IterationStatement
+description: Using eval "for(eval("i in arr");1;)"
+---*/
 
 arr = [1,2,3,4,5];
 i = 1;
@@ -39,4 +40,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A6.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A6.js
index 1dfd5b457..d00ae353f 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A6.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * While evaluating "for ( ;  ; Expression) Statement", Statement is evaluated first and then Expression is evaluated
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A6.js
- * @description Using "(function(){throw "SecondExpression";})()" as an Expression
- */
+/*---
+info: >
+    While evaluating "for ( ;  ; Expression) Statement", Statement is
+    evaluated first and then Expression is evaluated
+description: Using "(function(){throw "SecondExpression";})()" as an Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -30,4 +30,3 @@ if (__in__for !== "reached") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T1.js
index f8b2fdbd0..bf8c17313 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T1.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only three expressions and two semicolons in "for(with var)" braces are allowed.
- * Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A7.1_T1.js
- * @description Checking if execution of "for(var index=0; index<10; index++; index--)" fails
- * @negative
- */
+/*---
+info: >
+    Only three expressions and two semicolons in "for(with var)" braces are allowed.
+    Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
+description: >
+    Checking if execution of "for(var index=0; index<10; index++;
+    index--)" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 for(var index=0; index<10; index++; index--);
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T2.js
index 550b14b19..014bc2284 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7.1_T2.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only three expressions and two semicolons in "for(with var)" braces are allowed.
- * Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A7.1_T2.js
- * @description Checking if execution of "for(var index=0; index<10; index+=4; index++; index--)" fails
- * @negative
- */
+/*---
+info: >
+    Only three expressions and two semicolons in "for(with var)" braces are allowed.
+    Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
+description: >
+    Checking if execution of "for(var index=0; index<10; index+=4;
+    index++; index--)" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 for(var index=0; index<10; index+=4; index++; index--) ;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T1.js
index 39dcc1c6a..9cef2b12a 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T1.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only three expressions and two semicolons in "for" braces are allowed.
- * Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A7_T1.js
- * @description Checking if execution of "for(index=0; index<10; index++; index--)" fails
- * @negative
- */
+/*---
+info: >
+    Only three expressions and two semicolons in "for" braces are allowed.
+    Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
+description: >
+    Checking if execution of "for(index=0; index<10; index++;
+    index--)" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 for(index=0; index<10; index++; index--) ;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T2.js
index 2f22dbf3c..dbb1ab424 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A7_T2.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Only three expressions and two semicolons in "for" braces are allowed.
- * Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A7_T2.js
- * @description Checking if execution of "for(index=0; index<10; index+=4; index++; index--)" fails
- * @negative
- */
+/*---
+info: >
+    Only three expressions and two semicolons in "for" braces are allowed.
+    Appearing of for (ExpressionNoIn_opt ; Expression_opt ; Expression_opt; Expression_opt; Expression_opt;) statement leads to SyntaxError
+description: >
+    Checking if execution of "for(index=0; index<10; index+=4;
+    index++; index--)" fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 for(index=0; index<10; index+=4; index++; index--) ;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T1.js
index ddd3c30e4..9560278df 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for(with var)" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8.1_T1.js
- * @description Checking if execution of "for(var index=0; index<100; {index++; index*2;}) {  arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for(with var)" braces are not allowed
+description: >
+    Checking if execution of "for(var index=0; index<100; {index++;
+    index*2;}) {  arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,4 +16,3 @@ var arr = [];
 for(var index=0; index<100; {index++; index*2;}) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T2.js
index 81cbed22b..01d03c1e5 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for(with var)" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8.1_T2.js
- * @description Checking if execution of "for(var index=0; {index++;index<100;}; index*2;) {  arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for(with var)" braces are not allowed
+description: >
+    Checking if execution of "for(var index=0; {index++;index<100;};
+    index*2;) {  arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,7 +16,3 @@ var arr = [];
 for(var index=0; {index++;index<100;}; index*2;) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T3.js
index 8c26060e3..c41114522 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8.1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for(with var)" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8.1_T3.js
- * @description Checking if execution of "for({var index=0; index+=1;} index++<=10; index*2;) { arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for(with var)" braces are not allowed
+description: >
+    Checking if execution of "for({var index=0; index+=1;}
+    index++<=10; index*2;) { arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,7 +16,3 @@ var arr = [];
 for({var index=0; index+=1;} index++<=10; index*2;) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T1.js
index 8f9ce29d6..09fef90b0 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8_T1.js
- * @description Checking if execution of "for(index=0; index<100; {index++; index*2;}) {  arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for" braces are not allowed
+description: >
+    Checking if execution of "for(index=0; index<100; {index++;
+    index*2;}) {  arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,4 +16,3 @@ var arr = [];
 for(index=0; index<100; {index++; index*2;}) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T2.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T2.js
index 406d23bbb..3c114311c 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T2.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8_T2.js
- * @description Checking if execution of "for(index=0; {index++;index<100;}; index*2;) {  arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for" braces are not allowed
+description: >
+    Checking if execution of "for(index=0; {index++;index<100;};
+    index*2;) {  arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,4 +16,3 @@ var arr = [];
 for(index=0; {index++;index<100;}; index*2;) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T3.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T3.js
index 9843a3229..58e9c2d62 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T3.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A8_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Blocks within "for" braces are not allowed
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A8_T3.js
- * @description Checking if execution of "for({index=0; index+=1;} index++<=10; index*2;) { arr.add(""+index);}" fails
- * @negative
- */
+/*---
+info: Blocks within "for" braces are not allowed
+description: >
+    Checking if execution of "for({index=0; index+=1;} index++<=10;
+    index*2;) { arr.add(""+index);}" fails
+flags: [negative]
+---*/
 
 var arr = [];
 
@@ -16,7 +16,3 @@ var arr = [];
 for({index=0; index+=1;} index++<=10; index*2;) {	arr.add(""+index);};
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.1.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.1.js
index c2031c9ab..ec3417302 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.1.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of evaluating "for( ExpNoIn;Exp;Exp)" loop is returning (normal, evalValue, empty)
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A9.1.js
- * @description Using eval
- */
+/*---
+info: >
+    The result of evaluating "for( ExpNoIn;Exp;Exp)" loop is returning
+    (normal, evalValue, empty)
+description: Using eval
+---*/
 
 supreme=5;
 
@@ -22,4 +22,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.js b/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.js
index 11b88316f..0df1fdd0a 100644
--- a/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.js
+++ b/test/suite/ch12/12.6/12.6.3/S12.6.3_A9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of evaluating "for(var ExpNoIn;Exp;Exp)" loop is returning (normal, evalValue, empty)
- *
- * @path ch12/12.6/12.6.3/S12.6.3_A9.js
- * @description Using eval
- */
+/*---
+info: >
+    The result of evaluating "for(var ExpNoIn;Exp;Exp)" loop is returning
+    (normal, evalValue, empty)
+description: Using eval
+---*/
 
 supreme=5;
 
@@ -22,4 +22,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.4/12.6.4-1.js b/test/suite/ch12/12.6/12.6.4/12.6.4-1.js
index 3929b0a23..89037a23f 100644
--- a/test/suite/ch12/12.6/12.6.4/12.6.4-1.js
+++ b/test/suite/ch12/12.6/12.6.4/12.6.4-1.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.6/12.6.4/12.6.4-1.js

- * @description The for-in Statement - a property name must not be visited more than once in any enumeration.

- */

-

-

-function testcase() {

-        var obj = { prop1: "abc", prop2: "bbc", prop3: "cnn" };

-

-        var countProp1 = 0;

-        var countProp2 = 0;

-        var countProp3 = 0;

-

-        for (var p in obj) {

-            if (obj.hasOwnProperty(p)) {

-                if (p === "prop1") {

-                    countProp1++;

-                }

-                if (p === "prop2") {

-                    countProp2++;

-                }

-                if (p === "prop3") {

-                    countProp3++;

-                }

-            }

-        }

-        return countProp1 === 1 && countProp2 === 1 && countProp3 === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The for-in Statement - a property name must not be visited more
+    than once in any enumeration.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: "abc", prop2: "bbc", prop3: "cnn" };
+
+        var countProp1 = 0;
+        var countProp2 = 0;
+        var countProp3 = 0;
+
+        for (var p in obj) {
+            if (obj.hasOwnProperty(p)) {
+                if (p === "prop1") {
+                    countProp1++;
+                }
+                if (p === "prop2") {
+                    countProp2++;
+                }
+                if (p === "prop3") {
+                    countProp3++;
+                }
+            }
+        }
+        return countProp1 === 1 && countProp2 === 1 && countProp3 === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.4/12.6.4-2.js b/test/suite/ch12/12.6/12.6.4/12.6.4-2.js
index ffdd58cdf..36778a3dd 100644
--- a/test/suite/ch12/12.6/12.6.4/12.6.4-2.js
+++ b/test/suite/ch12/12.6/12.6.4/12.6.4-2.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.6/12.6.4/12.6.4-2.js

- * @description The for-in Statement - the values of [[Enumerable]] attributes are not considered when determining if a property of a prototype object is shadowed by a previous object on the prototype chain

- */

-

-

-function testcase() {

-        var proto = {

-            prop: "enumerableValue"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(child, "prop", {

-            value: "nonEnumerableValue",

-            enumerable: false

-        });

-

-        var accessedProp = false;

-

-        for (var p in child) {

-            if (p === "prop") {

-                accessedProp = true;

-            }

-        }

-        return !accessedProp;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The for-in Statement - the values of [[Enumerable]] attributes are
+    not considered when determining if a property of a prototype
+    object is shadowed by a previous object on the prototype chain
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {
+            prop: "enumerableValue"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(child, "prop", {
+            value: "nonEnumerableValue",
+            enumerable: false
+        });
+
+        var accessedProp = false;
+
+        for (var p in child) {
+            if (p === "prop") {
+                accessedProp = true;
+            }
+        }
+        return !accessedProp;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A1.js
index fd8c754bf..a82fb651a 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "for(key in undefined)" Statement is allowed
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A1.js
- * @description Checking if execution of "for(key in undefined)" passes
- */
+/*---
+info: "\"for(key in undefined)\" Statement is allowed"
+description: Checking if execution of "for(key in undefined)" passes
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -28,6 +26,3 @@ if (key!==undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A14_T2.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A14_T2.js
index b90e3e99b..be330ce38 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A14_T2.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A14_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpession within a "for-in" Expression is allowed
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A14_T2.js
- * @description Using "function __func(){return {a:1};}()" as Expession
- */
+/*---
+info: FunctionExpession within a "for-in" Expression is allowed
+description: "Using \"function __func(){return {a:1};}()\" as Expession"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -23,4 +21,3 @@ if (__reached !== "a") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A15.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A15.js
index c19908904..8ddc81613 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A15.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A15.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Block within a "for-in" Expression is not allowed
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A15.js
- * @description Using block within "for-in" Expression
- * @negative
- */
+/*---
+info: Block within a "for-in" Expression is not allowed
+description: Using block within "for-in" Expression
+flags: [negative]
+---*/
 
 var __arr=[1,2,3];
 
@@ -18,4 +16,3 @@ for(x in {__arr}){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A2.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A2.js
index e8db640c0..56d980789 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A2.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "for(key in null)" Expression is allowed
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A2.js
- * @description Checking if execution of "for(key in null)" passes
- */
+/*---
+info: "\"for(key in null)\" Expression is allowed"
+description: Checking if execution of "for(key in null)" passes
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#
@@ -27,7 +25,3 @@ if (key!==undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.1.js
index d232fe48d..39a41dbc0 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A3.1.js
- * @description Using an array as an Expression is appropriate. Here Expression is an array of numbers
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using an array as an Expression is appropriate. Here Expression is
+    an array of numbers
+---*/
 
 __str="";
 
@@ -27,7 +29,3 @@ if (!( (__str.indexOf("2")!==-1)&&(__str.indexOf("1")!==-1)&&(__str.indexOf("4")
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.js
index 2b34c38c7..be542b8bf 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A3.js
- * @description Using an array as an Expression is appropriate. Here Expression is an array of numbers. Eval is used
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using an array as an Expression is appropriate. Here Expression is
+    an array of numbers. Eval is used
+---*/
 
 __str="";
 
@@ -27,7 +29,3 @@ if (!( (__str.indexOf("2")!==-1)&&(__str.indexOf("1")!==-1)&&(__str.indexOf("4")
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.1.js
index a491b3f34..0fd3bb6de 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A4.1.js
- * @description Using Object as an Expression is appropriate. Eval is used
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: Using Object as an Expression is appropriate. Eval is used
+---*/
 
 __str="";
 
@@ -27,8 +27,3 @@ if (__str !== __evaluated) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.js
index 79f496b8c..2b197dc13 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A4.js
- * @description Using Object as an Expression is appropriate. Eval is used
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: Using Object as an Expression is appropriate. Eval is used
+---*/
 
 __str="";
 
@@ -27,8 +27,3 @@ if (__str !== __evaluated) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.1.js
index 37992e1dd..f38cf383f 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A5.1.js
- * @description Using hierarchical Object as an Expression is appropriate. The depth is two
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using hierarchical Object as an Expression is appropriate. The
+    depth is two
+---*/
 
 __hash__map={a:{aa:1,ab:2,ac:3,ad:4},b:{ba:1,bb:2,bc:3,bd:4},c:{ca:1,cb:2,cc:3,cd:4},d:{da:1,db:2,dc:3,dd:4}};
 
@@ -36,7 +38,3 @@ if(!(
 (__arr.indexOf("dc3")!==-1)&
 (__arr.indexOf("dd4")!==-1)
 )) $ERROR('#1: The nested for-in Statement applied to hierarchial object works properly as described in the Standard');
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.js
index 974659f10..65c7c71d5 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A5.js
- * @description Using hierarchical Object as an Expression is appropriate. The depth is two
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using hierarchical Object as an Expression is appropriate. The
+    depth is two
+---*/
 
 __hash__map={a:{aa:1,ab:2,ac:3,ad:4},b:{ba:1,bb:2,bc:3,bd:4},c:{ca:1,cb:2,cc:3,cd:4},d:{da:1,db:2,dc:3,dd:4}};
 
@@ -36,7 +38,3 @@ if(!(
 (__arr.indexOf("dc3")!==-1)&
 (__arr.indexOf("dd4")!==-1)
 )) $ERROR('#1: The nested for-in Statement applied to hierarchial object works properly as described in the Standard');
-
-
-
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.1.js
index 78cc2e842..69d0cdfbf 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A6.1.js
- * @description Using Object with custom prototype as an Expression is appropriate. The prototype is "{feat:2,hint:"protohint"}"
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using Object with custom prototype as an Expression is
+    appropriate. The prototype is "{feat:2,hint:"protohint"}"
+---*/
 
 function FACTORY(){this.prop=1;this.hint="hinted"};
 
@@ -35,4 +37,3 @@ if (__accum.indexOf("hintprotohint")!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.js
index 5a1f8d9c2..ffc7babfb 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production IterationStatement: "for (var VariableDeclarationNoIn in Expression) Statement"
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A6.js
- * @description Using Object with custom prototype as an Expression is appropriate. The prototype is "{feat:2,hint:"protohint"}"
- */
+/*---
+info: >
+    The production IterationStatement: "for (var VariableDeclarationNoIn in
+    Expression) Statement"
+description: >
+    Using Object with custom prototype as an Expression is
+    appropriate. The prototype is "{feat:2,hint:"protohint"}"
+---*/
 
 function FACTORY(){this.prop=1;this.hint="hinted"};
 
@@ -35,4 +37,3 @@ if (__accum.indexOf("hintprotohint")!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T1.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T1.js
index 1105b7ff2..734c0168c 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T1.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Properties of the object being enumerated may be deleted during enumeration
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A7_T1.js
- * @description Checking "for (LeftHandSideExpression in Expression) Statement" case
- */
+/*---
+info: >
+    Properties of the object being enumerated may be deleted during
+    enumeration
+description: >
+    Checking "for (LeftHandSideExpression in Expression) Statement"
+    case
+---*/
 
 __obj={aa:1,ba:2,ca:3};
 
@@ -46,4 +48,3 @@ function erasator_T_1000(hash_map, charactr){
 		};
 	}
 }
-
diff --git a/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T2.js b/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T2.js
index 48be196ab..0d80694f3 100644
--- a/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T2.js
+++ b/test/suite/ch12/12.6/12.6.4/S12.6.4_A7_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Properties of the object being enumerated may be deleted during enumeration
- *
- * @path ch12/12.6/12.6.4/S12.6.4_A7_T2.js
- * @description Checking "for (var VariableDeclarationNoIn in Expression) Statement" case
- */
+/*---
+info: >
+    Properties of the object being enumerated may be deleted during
+    enumeration
+description: >
+    Checking "for (var VariableDeclarationNoIn in Expression)
+    Statement" case
+---*/
 
 __obj={aa:1,ba:2,ca:3};
 
@@ -46,4 +48,3 @@ function erasator_T_1000(hash_map, charactr){
 		};
 	}
 }
-
diff --git a/test/suite/ch12/12.7/12.7-1.js b/test/suite/ch12/12.7/12.7-1.js
index a19060a82..8786b838c 100644
--- a/test/suite/ch12/12.7/12.7-1.js
+++ b/test/suite/ch12/12.7/12.7-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.7/12.7-1.js

- * @description The continue Statement - a continue statement without an identifier may have a LineTerminator before the semi-colon

- */

-

-

-function testcase() {

-        var sum = 0;

-        for (var i = 1; i <= 10; i++) {

-            continue

-            ;

-            sum += i;

-        }

-        return sum === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The continue Statement - a continue statement without an
+    identifier may have a LineTerminator before the semi-colon
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var sum = 0;
+        for (var i = 1; i <= 10; i++) {
+            continue
+            ;
+            sum += i;
+        }
+        return sum === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.7/S12.7_A1_T1.js b/test/suite/ch12/12.7/S12.7_A1_T1.js
index ec172729f..156523cd0 100644
--- a/test/suite/ch12/12.7/S12.7_A1_T1.js
+++ b/test/suite/ch12/12.7/S12.7_A1_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of continue without an IterationStatement leads to syntax error
- *
- * @path ch12/12.7/S12.7_A1_T1.js
- * @description Checking if execution of single "continue" without any IterationStatement fails
- * @negative
- */
+/*---
+info: Appearing of continue without an IterationStatement leads to syntax error
+description: >
+    Checking if execution of single "continue" without any
+    IterationStatement fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ continue;
 var y=2;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.7/S12.7_A1_T2.js b/test/suite/ch12/12.7/S12.7_A1_T2.js
index 2aa90f8b1..0b8495ffb 100644
--- a/test/suite/ch12/12.7/S12.7_A1_T2.js
+++ b/test/suite/ch12/12.7/S12.7_A1_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of continue without an IterationStatement leads to syntax error
- *
- * @path ch12/12.7/S12.7_A1_T2.js
- * @description Checking if single "continue" with Label but without any IterationStatement fails
- * @negative
- */
+/*---
+info: Appearing of continue without an IterationStatement leads to syntax error
+description: >
+    Checking if single "continue" with Label but without any
+    IterationStatement fails
+flags: [negative]
+---*/
 
 LABEL : x=3.14;
 
@@ -18,4 +18,3 @@ continue LABEL;
 var y=2;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.7/S12.7_A1_T3.js b/test/suite/ch12/12.7/S12.7_A1_T3.js
index 4652dc865..acd701c49 100644
--- a/test/suite/ch12/12.7/S12.7_A1_T3.js
+++ b/test/suite/ch12/12.7/S12.7_A1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of continue without an IterationStatement leads to syntax error
- *
- * @path ch12/12.7/S12.7_A1_T3.js
- * @description Checking if laballed "continue" with no IterationStatement, placed into a block, fails
- * @negative
- */
+/*---
+info: Appearing of continue without an IterationStatement leads to syntax error
+description: >
+    Checking if laballed "continue" with no IterationStatement, placed
+    into a block, fails
+flags: [negative]
+---*/
 
 LABEL : x=3.14;
 
@@ -20,4 +20,3 @@ LABEL : x=3.14;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.7/S12.7_A1_T4.js b/test/suite/ch12/12.7/S12.7_A1_T4.js
index ac34f2642..0d292d40f 100644
--- a/test/suite/ch12/12.7/S12.7_A1_T4.js
+++ b/test/suite/ch12/12.7/S12.7_A1_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of continue without an IterationStatement leads to syntax error
- *
- * @path ch12/12.7/S12.7_A1_T4.js
- * @description Checking if execution of "continue" with no IterationStatement, placed into a block, fails
- * @negative
- */
+/*---
+info: Appearing of continue without an IterationStatement leads to syntax error
+description: >
+    Checking if execution of "continue" with no IterationStatement,
+    placed into a block, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,5 +18,3 @@
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch12/12.7/S12.7_A2.js b/test/suite/ch12/12.7/S12.7_A2.js
index 3f76aa1a4..2c4690512 100644
--- a/test/suite/ch12/12.7/S12.7_A2.js
+++ b/test/suite/ch12/12.7/S12.7_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator between "continue" and Identifier is not allowed, "continue" is evaluated without label
- *
- * @path ch12/12.7/S12.7_A2.js
- * @description Checking by using eval, inserting LineTerminator between continue and Identifier
- */
+/*---
+info: >
+    Since LineTerminator between "continue" and Identifier is not allowed,
+    "continue" is evaluated without label
+description: >
+    Checking by using eval, inserting LineTerminator between continue
+    and Identifier
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -59,6 +61,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.7/S12.7_A5_T1.js b/test/suite/ch12/12.7/S12.7_A5_T1.js
index 14a8b5f7a..7c2545057 100644
--- a/test/suite/ch12/12.7/S12.7_A5_T1.js
+++ b/test/suite/ch12/12.7/S12.7_A5_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "continue Identifier" is evaluated Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.7/S12.7_A5_T1.js
- * @description Trying to continue another labeled loop
- * @negative
- */
+/*---
+info: >
+    When "continue Identifier" is evaluated Identifier must be label in the
+    label set of an enclosing (but not crossing function boundaries)
+    IterationStatement
+description: Trying to continue another labeled loop
+flags: [negative]
+---*/
 
 LABEL_OUT : var x=0, y=0;
 LABEL_DO_LOOP : do {
@@ -23,4 +24,3 @@ LABEL_ANOTHER_LOOP : do {
 } while(0);
 
 function OUT_FUNC(){}
-
diff --git a/test/suite/ch12/12.7/S12.7_A5_T2.js b/test/suite/ch12/12.7/S12.7_A5_T2.js
index 1d3f7e9c1..9c8c1346e 100644
--- a/test/suite/ch12/12.7/S12.7_A5_T2.js
+++ b/test/suite/ch12/12.7/S12.7_A5_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "continue Identifier" is evaluated Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.7/S12.7_A5_T2.js
- * @description Identifier is a function name
- * @negative
- */
+/*---
+info: >
+    When "continue Identifier" is evaluated Identifier must be label in the
+    label set of an enclosing (but not crossing function boundaries)
+    IterationStatement
+description: Identifier is a function name
+flags: [negative]
+---*/
 
 LABEL_OUT : var x=0, y=0;
 LABEL_DO_LOOP : do {
@@ -23,4 +24,3 @@ LABEL_ANOTHER_LOOP : do {
 } while(0);
 
 function OUT_FUNC(){};
-
diff --git a/test/suite/ch12/12.7/S12.7_A5_T3.js b/test/suite/ch12/12.7/S12.7_A5_T3.js
index 16babd629..ef3fefac8 100644
--- a/test/suite/ch12/12.7/S12.7_A5_T3.js
+++ b/test/suite/ch12/12.7/S12.7_A5_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "continue Identifier" is evaluated Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.7/S12.7_A5_T3.js
- * @description Identifier is within loop label
- * @negative
- */
+/*---
+info: >
+    When "continue Identifier" is evaluated Identifier must be label in the
+    label set of an enclosing (but not crossing function boundaries)
+    IterationStatement
+description: Identifier is within loop label
+flags: [negative]
+---*/
 
 LABEL_OUT : var x=0, y=0;
 
@@ -24,4 +25,3 @@ LABEL_ANOTHER_LOOP : do {
 } while(0);
 
 function OUT_FUNC(){}
-
diff --git a/test/suite/ch12/12.7/S12.7_A6.js b/test/suite/ch12/12.7/S12.7_A6.js
index 11bb439aa..ed3f4aa37 100644
--- a/test/suite/ch12/12.7/S12.7_A6.js
+++ b/test/suite/ch12/12.7/S12.7_A6.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "continue" within a function call that is within an IterationStatement yields SyntaxError
- *
- * @path ch12/12.7/S12.7_A6.js
- * @description Using labaled "continue Identifier" within a function body
- * @negative
- */
+/*---
+info: >
+    Appearing of "continue" within a function call that is within an
+    IterationStatement yields SyntaxError
+description: Using labaled "continue Identifier" within a function body
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -16,4 +16,3 @@ LABEL1 : do {
     (function(){continue LABEL1;})();
     y++;
 } while(0);
-
diff --git a/test/suite/ch12/12.7/S12.7_A7.js b/test/suite/ch12/12.7/S12.7_A7.js
index c43f701e1..32b11c012 100644
--- a/test/suite/ch12/12.7/S12.7_A7.js
+++ b/test/suite/ch12/12.7/S12.7_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of continue within eval statement that is within an IterationStatement yields SyntaxError
- *
- * @path ch12/12.7/S12.7_A7.js
- * @description Using eval "eval("continue LABEL1")"
- */
+/*---
+info: >
+    Appearing of continue within eval statement that is within an
+    IterationStatement yields SyntaxError
+description: Using eval "eval("continue LABEL1")"
+---*/
 
 var x=0,y=0;
 
@@ -26,4 +26,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.7/S12.7_A8_T1.js b/test/suite/ch12/12.7/S12.7_A8_T1.js
index 76f8538a8..8f87c10f0 100644
--- a/test/suite/ch12/12.7/S12.7_A8_T1.js
+++ b/test/suite/ch12/12.7/S12.7_A8_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "continue" within a "try/catch" Block yields SyntaxError
- *
- * @path ch12/12.7/S12.7_A8_T1.js
- * @description Checking if execution of "continue Identifier" within catch Block fails
- * @negative
- */
+/*---
+info: Appearing of "continue" within a "try/catch" Block yields SyntaxError
+description: >
+    Checking if execution of "continue Identifier" within catch Block
+    fails
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -25,4 +25,3 @@ try{
 		y++;
 	} while(0);
 };
-
diff --git a/test/suite/ch12/12.7/S12.7_A8_T2.js b/test/suite/ch12/12.7/S12.7_A8_T2.js
index 4d6f48e8b..f3dac3bb8 100644
--- a/test/suite/ch12/12.7/S12.7_A8_T2.js
+++ b/test/suite/ch12/12.7/S12.7_A8_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "continue" within a "try/catch" Block yields SyntaxError
- *
- * @path ch12/12.7/S12.7_A8_T2.js
- * @description Checking if execution of "continue" within catch Block fails
- * @negative
- */
+/*---
+info: Appearing of "continue" within a "try/catch" Block yields SyntaxError
+description: Checking if execution of "continue" within catch Block fails
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -25,4 +23,3 @@ try{
 		y++;
 	} while(0);
 };
-
diff --git a/test/suite/ch12/12.7/S12.7_A9_T1.js b/test/suite/ch12/12.7/S12.7_A9_T1.js
index e6ab1f542..c3a642463 100644
--- a/test/suite/ch12/12.7/S12.7_A9_T1.js
+++ b/test/suite/ch12/12.7/S12.7_A9_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Continue inside of try-catch nested in a loop is allowed
- *
- * @path ch12/12.7/S12.7_A9_T1.js
- * @description Using "continue Identifier" within catch Block that is within a loop
- */
+/*---
+info: Continue inside of try-catch nested in a loop is allowed
+description: >
+    Using "continue Identifier" within catch Block that is within a
+    loop
+---*/
 
 var x=0,y=0;
 
@@ -29,4 +29,3 @@ if (x!==10) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.7/S12.7_A9_T2.js b/test/suite/ch12/12.7/S12.7_A9_T2.js
index 8763414eb..9577a2e84 100644
--- a/test/suite/ch12/12.7/S12.7_A9_T2.js
+++ b/test/suite/ch12/12.7/S12.7_A9_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Continue inside of try-catch nested in a loop is allowed
- *
- * @path ch12/12.7/S12.7_A9_T2.js
- * @description Using "continue" within catch Block that is within a loop
- */
+/*---
+info: Continue inside of try-catch nested in a loop is allowed
+description: Using "continue" within catch Block that is within a loop
+---*/
 
 var x=0,y=0;
 
@@ -29,4 +27,3 @@ if (x!==10) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/12.8-1.js b/test/suite/ch12/12.8/12.8-1.js
index e32f54168..1355a137c 100644
--- a/test/suite/ch12/12.8/12.8-1.js
+++ b/test/suite/ch12/12.8/12.8-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.8/12.8-1.js

- * @description The break Statement - a break statement without an identifier may have a LineTerminator before the semi-colon

- */

-

-

-function testcase() {

-        var sum = 0;

-        for (var i = 1; i <= 10; i++) {

-            if (i === 6) {

-                break

-                ;

-            }

-            sum += i;

-        }

-        return sum === 15;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The break Statement - a break statement without an identifier may
+    have a LineTerminator before the semi-colon
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var sum = 0;
+        for (var i = 1; i <= 10; i++) {
+            if (i === 6) {
+                break
+                ;
+            }
+            sum += i;
+        }
+        return sum === 15;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.8/S12.8_A1_T1.js b/test/suite/ch12/12.8/S12.8_A1_T1.js
index 546e66780..98428a16e 100644
--- a/test/suite/ch12/12.8/S12.8_A1_T1.js
+++ b/test/suite/ch12/12.8/S12.8_A1_T1.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of break without an IterationStatement leads to syntax error
- *
- * @path ch12/12.8/S12.8_A1_T1.js
- * @description Checking if break statement with no loop fails
- * @negative
- */
+/*---
+info: Appearing of break without an IterationStatement leads to syntax error
+description: Checking if break statement with no loop fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ break;
 var y=2;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A1_T2.js b/test/suite/ch12/12.8/S12.8_A1_T2.js
index c141c7722..2002a9776 100644
--- a/test/suite/ch12/12.8/S12.8_A1_T2.js
+++ b/test/suite/ch12/12.8/S12.8_A1_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of break without an IterationStatement leads to syntax error
- *
- * @path ch12/12.8/S12.8_A1_T2.js
- * @description Checking if break Identifier with no loop fails
- * @negative
- */
+/*---
+info: Appearing of break without an IterationStatement leads to syntax error
+description: Checking if break Identifier with no loop fails
+flags: [negative]
+---*/
 
 LABEL : x=3.14;
 
@@ -18,4 +16,3 @@ break LABEL;
 var y=2;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A1_T3.js b/test/suite/ch12/12.8/S12.8_A1_T3.js
index 6627be368..da320f9d9 100644
--- a/test/suite/ch12/12.8/S12.8_A1_T3.js
+++ b/test/suite/ch12/12.8/S12.8_A1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of break without an IterationStatement leads to syntax error
- *
- * @path ch12/12.8/S12.8_A1_T3.js
- * @description Checking if break statement with no loop, placed into a block, fails
- * @negative
- */
+/*---
+info: Appearing of break without an IterationStatement leads to syntax error
+description: >
+    Checking if break statement with no loop, placed into a block,
+    fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A1_T4.js b/test/suite/ch12/12.8/S12.8_A1_T4.js
index 1663fc5f5..b30334750 100644
--- a/test/suite/ch12/12.8/S12.8_A1_T4.js
+++ b/test/suite/ch12/12.8/S12.8_A1_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of break without an IterationStatement leads to syntax error
- *
- * @path ch12/12.8/S12.8_A1_T4.js
- * @description Checking if break Identifier with no loop, placed into a  block, fails
- * @negative
- */
+/*---
+info: Appearing of break without an IterationStatement leads to syntax error
+description: >
+    Checking if break Identifier with no loop, placed into a  block,
+    fails
+flags: [negative]
+---*/
 
 LABEL : x=3.14;
 
@@ -20,4 +20,3 @@ LABEL : x=3.14;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A2.js b/test/suite/ch12/12.8/S12.8_A2.js
index a1154aeca..d85acb1ea 100644
--- a/test/suite/ch12/12.8/S12.8_A2.js
+++ b/test/suite/ch12/12.8/S12.8_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since LineTerminator between "break" and Identifier is not allowed, "break" is evaluated without label
- *
- * @path ch12/12.8/S12.8_A2.js
- * @description Checking by using eval, inserting LineTerminator between break and Identifier
- */
+/*---
+info: >
+    Since LineTerminator between "break" and Identifier is not allowed,
+    "break" is evaluated without label
+description: >
+    Checking by using eval, inserting LineTerminator between break and
+    Identifier
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -59,6 +61,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch12/12.8/S12.8_A3.js b/test/suite/ch12/12.8/S12.8_A3.js
index d2aaa5ad3..96ab224e3 100644
--- a/test/suite/ch12/12.8/S12.8_A3.js
+++ b/test/suite/ch12/12.8/S12.8_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "break" is evaluated, (break, empty, empty) is returned
- *
- * @path ch12/12.8/S12.8_A3.js
- * @description Using "break" without Identifier within labeled loop
- */
+/*---
+info: When "break" is evaluated, (break, empty, empty) is returned
+description: Using "break" without Identifier within labeled loop
+---*/
 
 LABEL_OUT : var x=0, y=0;
 
@@ -31,4 +29,3 @@ if ((x!==2)&&(y!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A4_T1.js b/test/suite/ch12/12.8/S12.8_A4_T1.js
index 86e258a4e..f72c32283 100644
--- a/test/suite/ch12/12.8/S12.8_A4_T1.js
+++ b/test/suite/ch12/12.8/S12.8_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "break Identifier" is evaluated, (break, empty, Identifier) is returned
- *
- * @path ch12/12.8/S12.8_A4_T1.js
- * @description Using "break Identifier" within labaeled loop
- */
+/*---
+info: >
+    When "break Identifier" is evaluated, (break, empty, Identifier) is
+    returned
+description: Using "break Identifier" within labaeled loop
+---*/
 
 LABEL_OUT : var x=0, y=0;
 (function(){
@@ -32,4 +32,3 @@ if ((x!==1)&&(y!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A4_T2.js b/test/suite/ch12/12.8/S12.8_A4_T2.js
index 8662cf829..5ba2bd0bf 100644
--- a/test/suite/ch12/12.8/S12.8_A4_T2.js
+++ b/test/suite/ch12/12.8/S12.8_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "break Identifier" is evaluated, (break, empty, Identifier) is returned
- *
- * @path ch12/12.8/S12.8_A4_T2.js
- * @description Using embedded and labeled loops, breaking to nested loop
- */
+/*---
+info: >
+    When "break Identifier" is evaluated, (break, empty, Identifier) is
+    returned
+description: Using embedded and labeled loops, breaking to nested loop
+---*/
 
 LABEL_OUT : var x=0, y=0, xx=0, yy=0;
 (function(){
@@ -38,4 +38,3 @@ if ((x!==1)&&(y!==1)&&(xx!==1)&(yy!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A4_T3.js b/test/suite/ch12/12.8/S12.8_A4_T3.js
index 7ca7fc2d6..10187c3ee 100644
--- a/test/suite/ch12/12.8/S12.8_A4_T3.js
+++ b/test/suite/ch12/12.8/S12.8_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "break Identifier" is evaluated, (break, empty, Identifier) is returned
- *
- * @path ch12/12.8/S12.8_A4_T3.js
- * @description Using embedded and labeled loops, breaking to outer loop
- */
+/*---
+info: >
+    When "break Identifier" is evaluated, (break, empty, Identifier) is
+    returned
+description: Using embedded and labeled loops, breaking to outer loop
+---*/
 
 LABEL_OUT : var x=0, y=0, xx=0, yy=0;
 (function(){
@@ -38,4 +38,3 @@ if ((x!==1)&&(y!==0)&&(xx!==1)&(yy!==0)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A5_T1.js b/test/suite/ch12/12.8/S12.8_A5_T1.js
index 34fbed938..2a53dd897 100644
--- a/test/suite/ch12/12.8/S12.8_A5_T1.js
+++ b/test/suite/ch12/12.8/S12.8_A5_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.8/S12.8_A5_T1.js
- * @description Checking if breaking another labeled loop fails
- * @negative
- */
+/*---
+info: >
+    Identifier must be label in the label set of an enclosing (but not
+    crossing function boundaries) IterationStatement
+description: Checking if breaking another labeled loop fails
+flags: [negative]
+---*/
 
 (function(){
     LABEL_OUT : var x=0, y=0;
@@ -26,4 +26,3 @@
     
     function OUT_FUNC(){}
 })();
-
diff --git a/test/suite/ch12/12.8/S12.8_A5_T2.js b/test/suite/ch12/12.8/S12.8_A5_T2.js
index f843c3bb1..fbb48a73f 100644
--- a/test/suite/ch12/12.8/S12.8_A5_T2.js
+++ b/test/suite/ch12/12.8/S12.8_A5_T2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.8/S12.8_A5_T2.js
- * @description Checking if using function name as an Identifier appears to be invalid
- * @negative
- */
+/*---
+info: >
+    Identifier must be label in the label set of an enclosing (but not
+    crossing function boundaries) IterationStatement
+description: >
+    Checking if using function name as an Identifier appears to be
+    invalid
+flags: [negative]
+---*/
 
 (function(){
     LABEL_OUT : var x=0, y=0;
@@ -26,4 +28,3 @@
     
     function OUT_FUNC(){}
 })();
-
diff --git a/test/suite/ch12/12.8/S12.8_A5_T3.js b/test/suite/ch12/12.8/S12.8_A5_T3.js
index d6f930705..49c854a9f 100644
--- a/test/suite/ch12/12.8/S12.8_A5_T3.js
+++ b/test/suite/ch12/12.8/S12.8_A5_T3.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Identifier must be label in the label set of an enclosing (but not crossing function boundaries) IterationStatement
- *
- * @path ch12/12.8/S12.8_A5_T3.js
- * @description Checking if using internal loop label as an Identifier appears to be invalid
- * @negative
- */
+/*---
+info: >
+    Identifier must be label in the label set of an enclosing (but not
+    crossing function boundaries) IterationStatement
+description: >
+    Checking if using internal loop label as an Identifier appears to
+    be invalid
+flags: [negative]
+---*/
 
 (function(){
     LABEL_OUT : var x=0, y=0;
@@ -29,4 +31,3 @@
     function OUT_FUNC(){}
     
 })();
-
diff --git a/test/suite/ch12/12.8/S12.8_A6.js b/test/suite/ch12/12.8/S12.8_A6.js
index 264f74d86..df1c99d12 100644
--- a/test/suite/ch12/12.8/S12.8_A6.js
+++ b/test/suite/ch12/12.8/S12.8_A6.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "break" within a function call that is nested in a IterationStatement yields SyntaxError
- *
- * @path ch12/12.8/S12.8_A6.js
- * @description Checking if using "break Identifier" within a function body appears to be invalid
- * @negative
- */
+/*---
+info: >
+    Appearing of "break" within a function call that is nested in a
+    IterationStatement yields SyntaxError
+description: >
+    Checking if using "break Identifier" within a function body
+    appears to be invalid
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -16,4 +18,3 @@ LABEL1 : do {
     (function(){break LABEL1;})();
     y++;
 } while(0);
-
diff --git a/test/suite/ch12/12.8/S12.8_A7.js b/test/suite/ch12/12.8/S12.8_A7.js
index a5f5bebaf..5e2b5445f 100644
--- a/test/suite/ch12/12.8/S12.8_A7.js
+++ b/test/suite/ch12/12.8/S12.8_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "break" within eval statement that is nested in an IterationStatement yields SyntaxError
- *
- * @path ch12/12.8/S12.8_A7.js
- * @description Using eval "eval("break LABEL1")"
- */
+/*---
+info: >
+    Appearing of "break" within eval statement that is nested in an
+    IterationStatement yields SyntaxError
+description: Using eval "eval("break LABEL1")"
+---*/
 
 var x=0,y=0;
 
@@ -26,4 +26,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A8_T1.js b/test/suite/ch12/12.8/S12.8_A8_T1.js
index cbcba7f69..9c79b22a4 100644
--- a/test/suite/ch12/12.8/S12.8_A8_T1.js
+++ b/test/suite/ch12/12.8/S12.8_A8_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "break" within "try/catch" Block yields SyntaxError
- *
- * @path ch12/12.8/S12.8_A8_T1.js
- * @description Checking if using "break Identifier" from within catch Block appears to be invalid
- * @negative
- */
+/*---
+info: Appearing of "break" within "try/catch" Block yields SyntaxError
+description: >
+    Checking if using "break Identifier" from within catch Block
+    appears to be invalid
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -25,5 +25,3 @@ try{
 		y++;
 	} while(0);
 }
-
-
diff --git a/test/suite/ch12/12.8/S12.8_A8_T2.js b/test/suite/ch12/12.8/S12.8_A8_T2.js
index 92771babf..414079717 100644
--- a/test/suite/ch12/12.8/S12.8_A8_T2.js
+++ b/test/suite/ch12/12.8/S12.8_A8_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "break" within "try/catch" Block yields SyntaxError
- *
- * @path ch12/12.8/S12.8_A8_T2.js
- * @description Checking if using "break Identifier" from within catch Block appears to be invalid
- * @negative
- */
+/*---
+info: Appearing of "break" within "try/catch" Block yields SyntaxError
+description: >
+    Checking if using "break Identifier" from within catch Block
+    appears to be invalid
+flags: [negative]
+---*/
 
 var x=0,y=0;
 
@@ -25,5 +25,3 @@ try{
 		y++;
 	} while(0);
 }
-
-
diff --git a/test/suite/ch12/12.8/S12.8_A9_T1.js b/test/suite/ch12/12.8/S12.8_A9_T1.js
index 60da11ef2..e3a919176 100644
--- a/test/suite/ch12/12.8/S12.8_A9_T1.js
+++ b/test/suite/ch12/12.8/S12.8_A9_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "break" within "try/catch" statement that is nested in a loop is allowed
- *
- * @path ch12/12.8/S12.8_A9_T1.js
- * @description Using "continue Identifier" within "catch" statement
- */
+/*---
+info: >
+    Using "break" within "try/catch" statement that is nested in a loop is
+    allowed
+description: Using "continue Identifier" within "catch" statement
+---*/
 
 var x=0,y=0;
 
@@ -29,4 +29,3 @@ if (x!==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.8/S12.8_A9_T2.js b/test/suite/ch12/12.8/S12.8_A9_T2.js
index 53dc3555c..1a4117e69 100644
--- a/test/suite/ch12/12.8/S12.8_A9_T2.js
+++ b/test/suite/ch12/12.8/S12.8_A9_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using "break" within "try/catch" statement that is nested in a loop is allowed
- *
- * @path ch12/12.8/S12.8_A9_T2.js
- * @description Using "continue Identifier" within "catch" statement
- */
+/*---
+info: >
+    Using "break" within "try/catch" statement that is nested in a loop is
+    allowed
+description: Using "continue Identifier" within "catch" statement
+---*/
 
 var x=0,y=0;
 
@@ -29,4 +29,3 @@ if (x!==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/12.9-1.js b/test/suite/ch12/12.9/12.9-1.js
index 098042e93..9042ea318 100644
--- a/test/suite/ch12/12.9/12.9-1.js
+++ b/test/suite/ch12/12.9/12.9-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch12/12.9/12.9-1.js

- * @description The return Statement - a return statement without an expression may have a LineTerminator before the semi-colon

- */

-

-

-function testcase() {

-        var sum = 0;

-        (function innerTest() {

-            for (var i = 1; i <= 10; i++) {

-                if (i === 6) {

-                    return

-                    ;

-                }

-                sum += i;

-            }

-        })();

-        return sum === 15;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The return Statement - a return statement without an expression
+    may have a LineTerminator before the semi-colon
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var sum = 0;
+        (function innerTest() {
+            for (var i = 1; i <= 10; i++) {
+                if (i === 6) {
+                    return
+                    ;
+                }
+                sum += i;
+            }
+        })();
+        return sum === 15;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch12/12.9/S12.9_A1_T1.js b/test/suite/ch12/12.9/S12.9_A1_T1.js
index a4115f7ec..1f5423b7c 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T1.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T1.js
- * @description Checking if execution of "return" with no function fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return" with no function fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x=1;
 return;
 var y=2;
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T10.js b/test/suite/ch12/12.9/S12.9_A1_T10.js
index 63bcd816c..2344b9d57 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T10.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T10.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T10.js
- * @description Checking if execution of "return (0)" with no function fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return (0)" with no function fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 return (0);
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T2.js b/test/suite/ch12/12.9/S12.9_A1_T2.js
index 74f657b60..ea7bd9d6e 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T2.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T2.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T2.js
- * @description Checking if execution of "return x" with no function fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return x" with no function fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ return x;
 var y=2;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T3.js b/test/suite/ch12/12.9/S12.9_A1_T3.js
index 8f22b8859..c8d869207 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T3.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T3.js
- * @description Checking if execution of "return" within "try" statement fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return" within "try" statement fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +16,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T4.js b/test/suite/ch12/12.9/S12.9_A1_T4.js
index 3add975cb..5edb9deca 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T4.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T4.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T4.js
- * @description Checking if execution of "return" with no function fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return" with no function fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 return;
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T5.js b/test/suite/ch12/12.9/S12.9_A1_T5.js
index a53d7c764..e5a7c89cf 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T5.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T5.js
- * @description Checking if execution of "return" with no function, placed into a Block, fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: >
+    Checking if execution of "return" with no function, placed into a
+    Block, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T6.js b/test/suite/ch12/12.9/S12.9_A1_T6.js
index aea6ec977..a732f0977 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T6.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T6.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T6.js
- * @description Checking if execution of "return" with no function, placed into a loop, fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: >
+    Checking if execution of "return" with no function, placed into a
+    loop, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ do {
 } while(0);
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T7.js b/test/suite/ch12/12.9/S12.9_A1_T7.js
index ad863d473..6a37ead7e 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T7.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T7.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T7.js
- * @description Checking if execution of "return x" with no function, placed inside Block, fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: >
+    Checking if execution of "return x" with no function, placed
+    inside Block, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T8.js b/test/suite/ch12/12.9/S12.9_A1_T8.js
index edfbd1660..d91304f43 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T8.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T8.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T8.js
- * @description Checking if execution of "return x" with no function, placed into a loop, fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: >
+    Checking if execution of "return x" with no function, placed into
+    a loop, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ do {
 } while(0);
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A1_T9.js b/test/suite/ch12/12.9/S12.9_A1_T9.js
index 57e39aee7..588919ba6 100644
--- a/test/suite/ch12/12.9/S12.9_A1_T9.js
+++ b/test/suite/ch12/12.9/S12.9_A1_T9.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Appearing of "return" without a function body leads to syntax error
- *
- * @path ch12/12.9/S12.9_A1_T9.js
- * @description Checking if execution of "return", placed into a catch Block, fails
- * @negative
- */
+/*---
+info: Appearing of "return" without a function body leads to syntax error
+description: Checking if execution of "return", placed into a catch Block, fails
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +16,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A2.js b/test/suite/ch12/12.9/S12.9_A2.js
index 177205dbb..5fbcc4411 100644
--- a/test/suite/ch12/12.9/S12.9_A2.js
+++ b/test/suite/ch12/12.9/S12.9_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * LineTerminator between return and Identifier_opt yields return without Identifier_opt
- *
- * @path ch12/12.9/S12.9_A2.js
- * @description Checking by using eval, inserting LineTerminator between return and Variable
- */
+/*---
+info: >
+    LineTerminator between return and Identifier_opt yields return without
+    Identifier_opt
+description: >
+    Checking by using eval, inserting LineTerminator between return
+    and Variable
+---*/
 
 //CHECK#1
 try{
@@ -52,4 +54,3 @@ try{
 } catch(e){
   $ERROR('#4: eval("(function(){var x =1;return\\u2029x;var y=2;})()") does not lead to throwing exception');
 }
-
diff --git a/test/suite/ch12/12.9/S12.9_A3.js b/test/suite/ch12/12.9/S12.9_A3.js
index 95b87c363..d77fb5cba 100644
--- a/test/suite/ch12/12.9/S12.9_A3.js
+++ b/test/suite/ch12/12.9/S12.9_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Expression is omitted, the return value is undefined
- *
- * @path ch12/12.9/S12.9_A3.js
- * @description Return without Expression
- */
+/*---
+info: If Expression is omitted, the return value is undefined
+description: Return without Expression
+---*/
 
 __evaluated = (function (){return;})();
 
@@ -17,4 +15,3 @@ if (__evaluated !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A4.js b/test/suite/ch12/12.9/S12.9_A4.js
index 97c923979..cde2ff182 100644
--- a/test/suite/ch12/12.9/S12.9_A4.js
+++ b/test/suite/ch12/12.9/S12.9_A4.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production ReturnStatement : return Expression; is evaluated as:
- * i)   Evaluate Expression.
- * ii)  Call GetValue(Result(2)).
- * iii) Return (return, Result(3), empty)
- *
- * @path ch12/12.9/S12.9_A4.js
- * @description Return very sophisticated expression and function
- */
+/*---
+info: >
+    The production ReturnStatement : return Expression; is evaluated as:
+    i)   Evaluate Expression.
+    ii)  Call GetValue(Result(2)).
+    iii) Return (return, Result(3), empty)
+description: Return very sophisticated expression and function
+---*/
 
 // second derivative 
 function DD_operator(f, delta){return function(x){return (f(x+delta)-2*f(x)+f(x-delta))/(delta*delta)};}
@@ -25,4 +24,3 @@ if (DDsin( Math.PI/2 ) + Math.sin( Math.PI/2 ) > 0.00001) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch12/12.9/S12.9_A5.js b/test/suite/ch12/12.9/S12.9_A5.js
index 3b0b98e43..6f846e31a 100644
--- a/test/suite/ch12/12.9/S12.9_A5.js
+++ b/test/suite/ch12/12.9/S12.9_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Code after ReturnStatement is not evaluated
- *
- * @path ch12/12.9/S12.9_A5.js
- * @description Using code after Return statement
- */
+/*---
+info: Code after ReturnStatement is not evaluated
+description: Using code after Return statement
+---*/
 
 //CHECK#1
 var x1=1;
@@ -37,4 +35,3 @@ function myfunc3(){
   x3*=2;
 }
 if (myfunc3()!==undefined) $ERROR('#3: myfunc3() === undefined. Actual:  myfunc3() ==='+ myfunc3()  );
-
diff --git a/test/suite/ch13/13.0/13.0-1.js b/test/suite/ch13/13.0/13.0-1.js
index 0873465b5..2a3de57cc 100644
--- a/test/suite/ch13/13.0/13.0-1.js
+++ b/test/suite/ch13/13.0/13.0-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.0/13.0-1.js

- * @description 13.0 - multiple names in one function declaration is not allowed, two function names

- */

-

-

-function testcase() {

-        try {

-            eval("function x, y() {}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    13.0 - multiple names in one function declaration is not allowed,
+    two function names
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("function x, y() {}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-10-s.js b/test/suite/ch13/13.0/13.0-10-s.js
index 71af1f4e4..208a0adad 100644
--- a/test/suite/ch13/13.0/13.0-10-s.js
+++ b/test/suite/ch13/13.0/13.0-10-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-10-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the code of this FunctionBody with an inner function contains a Use Strict Directive

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        function _13_0_10_fun() {

-            function _13_0_10_inner() {

-                "use strict";

-                eval("eval = 42;");

-            }

-            _13_0_10_inner();

-        };

-        try {

-            _13_0_10_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the code of this FunctionBody with an inner function contains a
+    Use Strict Directive
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function _13_0_10_fun() {
+            function _13_0_10_inner() {
+                "use strict";
+                eval("eval = 42;");
+            }
+            _13_0_10_inner();
+        };
+        try {
+            _13_0_10_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-11-s.js b/test/suite/ch13/13.0/13.0-11-s.js
index 5c623c054..26d23e51f 100644
--- a/test/suite/ch13/13.0/13.0-11-s.js
+++ b/test/suite/ch13/13.0/13.0-11-s.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-11-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the code of this FunctionBody with an inner function which is in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        function _13_0_11_fun() {

-            "use strict";

-            function _13_0_11_inner() {

-                eval("eval = 42;");

-            }

-            _13_0_11_inner();

-        };

-        try {

-            _13_0_11_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the code of this FunctionBody with an inner function which is in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function _13_0_11_fun() {
+            "use strict";
+            function _13_0_11_inner() {
+                eval("eval = 42;");
+            }
+            _13_0_11_inner();
+        };
+        try {
+            _13_0_11_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-12-s.js b/test/suite/ch13/13.0/13.0-12-s.js
index 17d593f1e..a28801421 100644
--- a/test/suite/ch13/13.0/13.0-12-s.js
+++ b/test/suite/ch13/13.0/13.0-12-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-12-s.js

- * @description Strict Mode - SourceElements is not evaluated as strict mode code when a Function constructor is contained in strict mode code and the function constructor body is not strict

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var _13_0_12_fun = new Function(" ","eval = 42;");

-        _13_0_12_fun();

-        return true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is not evaluated as strict mode code
+    when a Function constructor is contained in strict mode code and
+    the function constructor body is not strict
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var _13_0_12_fun = new Function(" ","eval = 42;");
+        _13_0_12_fun();
+        return true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-13-s.js b/test/suite/ch13/13.0/13.0-13-s.js
index 1e231e4aa..7ad6f2b63 100644
--- a/test/suite/ch13/13.0/13.0-13-s.js
+++ b/test/suite/ch13/13.0/13.0-13-s.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-13-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the function body of a Function constructor begins with a Strict Directive

- * @onlyStrict

- */

-

-

-function testcase() {

-       

-        try {

-            eval("var _13_0_13_fun = new Function(\" \", \"'use strict'; eval = 42;\"); _13_0_13_fun();");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the function body of a Function constructor begins with a Strict
+    Directive
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+       
+        try {
+            eval("var _13_0_13_fun = new Function(\" \", \"'use strict'; eval = 42;\"); _13_0_13_fun();");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-14-s.js b/test/suite/ch13/13.0/13.0-14-s.js
index 86ec4534d..a9838dca5 100644
--- a/test/suite/ch13/13.0/13.0-14-s.js
+++ b/test/suite/ch13/13.0/13.0-14-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-14-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the function body of a Function constructor contains a Strict Directive

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            var _13_0_14_fun = new Function(" ", "'use strict'; eval = 42; ");

-            _13_0_14_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the function body of a Function constructor contains a Strict
+    Directive
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            var _13_0_14_fun = new Function(" ", "'use strict'; eval = 42; ");
+            _13_0_14_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-15-s.js b/test/suite/ch13/13.0/13.0-15-s.js
index 7f86492f7..d4095ea13 100644
--- a/test/suite/ch13/13.0/13.0-15-s.js
+++ b/test/suite/ch13/13.0/13.0-15-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-15-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when a FunctionDeclaration is contained in strict mode code within eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function _13_0_15_fun() {eval = 42;};");

-            _13_0_15_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    a FunctionDeclaration is contained in strict mode code within eval
+    code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function _13_0_15_fun() {eval = 42;};");
+            _13_0_15_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-16-s.js b/test/suite/ch13/13.0/13.0-16-s.js
index 93c01c323..1a2e010e5 100644
--- a/test/suite/ch13/13.0/13.0-16-s.js
+++ b/test/suite/ch13/13.0/13.0-16-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-16-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when a FunctionExpression is contained in strict mode code within eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_0_16_fun = function () {eval = 42;};");

-            _13_0_16_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    a FunctionExpression is contained in strict mode code within eval
+    code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_0_16_fun = function () {eval = 42;};");
+            _13_0_16_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-17-s.js b/test/suite/ch13/13.0/13.0-17-s.js
index 283b3f7c3..a8b1f47c2 100644
--- a/test/suite/ch13/13.0/13.0-17-s.js
+++ b/test/suite/ch13/13.0/13.0-17-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-17-s.js

- * @description Strict Mode - SourceElements is not evaluated as strict mode code when a Function constructor is contained in strict mode code within eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        eval("'use strict'; var _13_0_17_fun = new Function('eval = 42;'); _13_0_17_fun();");

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is not evaluated as strict mode code
+    when a Function constructor is contained in strict mode code
+    within eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        eval("'use strict'; var _13_0_17_fun = new Function('eval = 42;'); _13_0_17_fun();");
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-2.js b/test/suite/ch13/13.0/13.0-2.js
index d30becfbf..8c1c20a09 100644
--- a/test/suite/ch13/13.0/13.0-2.js
+++ b/test/suite/ch13/13.0/13.0-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.0/13.0-2.js

- * @description 13.0 - multiple names in one function declaration is not allowed, three function names

- */

-

-

-function testcase() {

-        try {

-            eval("function x,y,z(){}");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    13.0 - multiple names in one function declaration is not allowed,
+    three function names
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            eval("function x,y,z(){}");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-3.js b/test/suite/ch13/13.0/13.0-3.js
index 780c2d2b9..f88e2239d 100644
--- a/test/suite/ch13/13.0/13.0-3.js
+++ b/test/suite/ch13/13.0/13.0-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.0/13.0-3.js

- * @description 13.0 - property names in function definition is not allowed, add a new property into object

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            eval("function obj.tt() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    13.0 - property names in function definition is not allowed, add a
+    new property into object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            eval("function obj.tt() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-4.js b/test/suite/ch13/13.0/13.0-4.js
index ce881f319..09e55d0a4 100644
--- a/test/suite/ch13/13.0/13.0-4.js
+++ b/test/suite/ch13/13.0/13.0-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.0/13.0-4.js

- * @description 13.0 - multiple names in one function declaration is not allowed, add a new property into a property which is a object

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.tt = { len: 10 };

-        try {

-            eval("function obj.tt.ss() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    13.0 - multiple names in one function declaration is not allowed,
+    add a new property into a property which is a object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.tt = { len: 10 };
+        try {
+            eval("function obj.tt.ss() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-7-s.js b/test/suite/ch13/13.0/13.0-7-s.js
index e73ed6548..2ebef3058 100644
--- a/test/suite/ch13/13.0/13.0-7-s.js
+++ b/test/suite/ch13/13.0/13.0-7-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-7-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the code of this FunctionDeclaration is contained in non-strict mode but the call to eval is a direct call in strict mode code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function _13_0_7_fun() {eval = 42;};");

-            _13_0_7_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the code of this FunctionDeclaration is contained in non-strict
+    mode but the call to eval is a direct call in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function _13_0_7_fun() {eval = 42;};");
+            _13_0_7_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-8-s.js b/test/suite/ch13/13.0/13.0-8-s.js
index a1b6e22a3..ad06ced9c 100644
--- a/test/suite/ch13/13.0/13.0-8-s.js
+++ b/test/suite/ch13/13.0/13.0-8-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-8-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when the code of this FunctionExpression is contained in non-strict mode but the call to eval is a direct call in strict mode code

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_0_8_fun = function () {eval = 42;};");

-            _13_0_8_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    the code of this FunctionExpression is contained in non-strict
+    mode but the call to eval is a direct call in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_0_8_fun = function () {eval = 42;};");
+            _13_0_8_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0-9-s.js b/test/suite/ch13/13.0/13.0-9-s.js
index a7f12ca4f..a7e68b554 100644
--- a/test/suite/ch13/13.0/13.0-9-s.js
+++ b/test/suite/ch13/13.0/13.0-9-s.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13; 

- * The production FunctionBody : SourceElementsopt is evaluated as follows:

- *

- * @path ch13/13.0/13.0-9-s.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when a FunctionDeclaration that is contained in strict mode code has an inner function

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var _13_0_9_fun = function () {

-            function _13_0_9_inner() { eval("eval = 42;"); }

-            _13_0_9_inner();

-        };

-        try {

-            _13_0_9_fun();

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13; 
+    The production FunctionBody : SourceElementsopt is evaluated as follows:
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    a FunctionDeclaration that is contained in strict mode code has an
+    inner function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var _13_0_9_fun = function () {
+            function _13_0_9_inner() { eval("eval = 42;"); }
+            _13_0_9_inner();
+        };
+        try {
+            _13_0_9_fun();
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.0/13.0_4-17gs.js b/test/suite/ch13/13.0/13.0_4-17gs.js
index c5eb74302..7575dabf5 100644
--- a/test/suite/ch13/13.0/13.0_4-17gs.js
+++ b/test/suite/ch13/13.0/13.0_4-17gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch13/13.0/13.0_4-17gs.js

- * @description Strict Mode - SourceElements is not evaluated as strict mode code when a Function constructor is contained in strict mode code

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-var _13_0_4_17_fun = new Function('eval = 42;');

-throw NotEarlyError;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SourceElements is not evaluated as strict mode code
+    when a Function constructor is contained in strict mode code
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var _13_0_4_17_fun = new Function('eval = 42;');
+throw NotEarlyError;
diff --git a/test/suite/ch13/13.0/13.0_4-5gs.js b/test/suite/ch13/13.0/13.0_4-5gs.js
index 4f9c01325..6d2ab4fdf 100644
--- a/test/suite/ch13/13.0/13.0_4-5gs.js
+++ b/test/suite/ch13/13.0/13.0_4-5gs.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch13/13.0/13.0_4-5gs.js

- * @description Strict Mode - SourceElements is evaluated as strict mode code when a FunctionDeclaration is contained in strict mode code

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-throw NotEarlyError;

-function _13_0_4_5_fun() { eval = 42; };

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SourceElements is evaluated as strict mode code when
+    a FunctionDeclaration is contained in strict mode code
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+function _13_0_4_5_fun() { eval = 42; };
diff --git a/test/suite/ch13/13.0/S13_A1.js b/test/suite/ch13/13.0/S13_A1.js
index 8d0a905af..73bf7fe20 100644
--- a/test/suite/ch13/13.0/S13_A1.js
+++ b/test/suite/ch13/13.0/S13_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "x=function y(){}" statement does not store a reference to the new function in the varaible y(Identifier)
- *
- * @path ch13/13.0/S13_A1.js
- * @description Checking the type of y
- */
+/*---
+info: >
+    "x=function y(){}" statement does not store a reference to the new
+    function in the varaible y(Identifier)
+description: Checking the type of y
+---*/
 
 var __func = function __exp__func(){return 0;};
 
@@ -28,4 +28,3 @@ if (typeof __exp__func !== "undefined"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A10.js b/test/suite/ch13/13.0/S13_A10.js
index dd85f242b..350a370a3 100644
--- a/test/suite/ch13/13.0/S13_A10.js
+++ b/test/suite/ch13/13.0/S13_A10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function is a data
- *
- * @path ch13/13.0/S13_A10.js
- * @description Using function as a property of an object
- */
+/*---
+info: Function is a data
+description: Using function as a property of an object
+---*/
 
 function __ziggy__func(){return "ziggy stardust"}
 
@@ -29,4 +27,3 @@ if (__music_box.ziggy() !== "ziggy stardust") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A11_T1.js b/test/suite/ch13/13.0/S13_A11_T1.js
index e9dc0e39a..18c0091c2 100644
--- a/test/suite/ch13/13.0/S13_A11_T1.js
+++ b/test/suite/ch13/13.0/S13_A11_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since arguments property has attribute { DontDelete }, only its elements can be deleted
- *
- * @path ch13/13.0/S13_A11_T1.js
- * @description Returning result of "delete arguments"
- */
+/*---
+info: >
+    Since arguments property has attribute { DontDelete }, only its elements
+    can be deleted
+description: Returning result of "delete arguments"
+---*/
 
 function __func(){ return delete arguments;}
 
@@ -17,4 +17,3 @@ if (__func("A","B",1,2)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A11_T2.js b/test/suite/ch13/13.0/S13_A11_T2.js
index 18886a307..be2845441 100644
--- a/test/suite/ch13/13.0/S13_A11_T2.js
+++ b/test/suite/ch13/13.0/S13_A11_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since arguments property has attribute { DontDelete }, only its elements can be deleted
- *
- * @path ch13/13.0/S13_A11_T2.js
- * @description Checking if deleting the arguments property fails and then returning it
- */
+/*---
+info: >
+    Since arguments property has attribute { DontDelete }, only its elements
+    can be deleted
+description: >
+    Checking if deleting the arguments property fails and then
+    returning it
+---*/
 
 function __func(){ 
     delete arguments;
@@ -20,4 +22,3 @@ if (typeof __func("A","B",1,2) !== "object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A11_T3.js b/test/suite/ch13/13.0/S13_A11_T3.js
index 94345da8f..03cb0ab3e 100644
--- a/test/suite/ch13/13.0/S13_A11_T3.js
+++ b/test/suite/ch13/13.0/S13_A11_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since arguments property has attribute { DontDelete }, only its elements can be deleted
- *
- * @path ch13/13.0/S13_A11_T3.js
- * @description Deleting arguments[i] and returning result of the operation
- */
+/*---
+info: >
+    Since arguments property has attribute { DontDelete }, only its elements
+    can be deleted
+description: Deleting arguments[i] and returning result of the operation
+---*/
 
 function __func(){
     was_del=false;
@@ -22,4 +22,3 @@ if (!__func("A","B",1,2)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A11_T4.js b/test/suite/ch13/13.0/S13_A11_T4.js
index c107879cd..63535c193 100644
--- a/test/suite/ch13/13.0/S13_A11_T4.js
+++ b/test/suite/ch13/13.0/S13_A11_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since arguments property has attribute { DontDelete }, only its elements can be deleted
- *
- * @path ch13/13.0/S13_A11_T4.js
- * @description Deleting arguments[i] and checking the type of arguments[i]
- */
+/*---
+info: >
+    Since arguments property has attribute { DontDelete }, only its elements
+    can be deleted
+description: Deleting arguments[i] and checking the type of arguments[i]
+---*/
 
 function __func(){
     is_undef=true;
@@ -25,4 +25,3 @@ if (!__func("A","B",1,2)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A12_T1.js b/test/suite/ch13/13.0/S13_A12_T1.js
index 278a46ac6..ab805b0e0 100644
--- a/test/suite/ch13/13.0/S13_A12_T1.js
+++ b/test/suite/ch13/13.0/S13_A12_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declarations in global or function scope are {DontDelete}
- *
- * @path ch13/13.0/S13_A12_T1.js
- * @description Checking if deleting a function that is declared in global scope fails
- */
+/*---
+info: Function declarations in global or function scope are {DontDelete}
+description: >
+    Checking if deleting a function that is declared in global scope
+    fails
+---*/
 
 ALIVE="Letov is alive"
 
@@ -29,4 +29,3 @@ if (__func() !== ALIVE) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A12_T2.js b/test/suite/ch13/13.0/S13_A12_T2.js
index 08ea18247..ced684e3f 100644
--- a/test/suite/ch13/13.0/S13_A12_T2.js
+++ b/test/suite/ch13/13.0/S13_A12_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declarations in global or function scope are {DontDelete}
- *
- * @path ch13/13.0/S13_A12_T2.js
- * @description Checking if deleting a function that is declared in function scope fails
- */
+/*---
+info: Function declarations in global or function scope are {DontDelete}
+description: >
+    Checking if deleting a function that is declared in function scope
+    fails
+---*/
 
 ALIVE="Letov is alive"
 
@@ -34,4 +34,3 @@ function __cont(){
 };
 
 __cont();
-
diff --git a/test/suite/ch13/13.0/S13_A13_T1.js b/test/suite/ch13/13.0/S13_A13_T1.js
index 072966196..05e76c1a1 100644
--- a/test/suite/ch13/13.0/S13_A13_T1.js
+++ b/test/suite/ch13/13.0/S13_A13_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting arguments[i] leads to breaking the connection to local reference
- *
- * @path ch13/13.0/S13_A13_T1.js
- * @description Deleting arguments[i]
- */
+/*---
+info: Deleting arguments[i] leads to breaking the connection to local reference
+description: Deleting arguments[i]
+---*/
 
 function __func(__arg){
   delete arguments[0];
@@ -23,4 +21,3 @@ if (__func(1) !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A13_T2.js b/test/suite/ch13/13.0/S13_A13_T2.js
index 49ba62ada..3c183a21e 100644
--- a/test/suite/ch13/13.0/S13_A13_T2.js
+++ b/test/suite/ch13/13.0/S13_A13_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting arguments[i] leads to breaking the connection to local reference
- *
- * @path ch13/13.0/S13_A13_T2.js
- * @description Changing arguments value and then deleting the argument
- */
+/*---
+info: Deleting arguments[i] leads to breaking the connection to local reference
+description: Changing arguments value and then deleting the argument
+---*/
 
 function __func(__arg){
   __arg = 2;
@@ -24,4 +22,3 @@ if (__func(1) !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A13_T3.js b/test/suite/ch13/13.0/S13_A13_T3.js
index 715150018..dbbb6ca00 100644
--- a/test/suite/ch13/13.0/S13_A13_T3.js
+++ b/test/suite/ch13/13.0/S13_A13_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Deleting arguments[i] leads to breaking the connection to local reference
- *
- * @path ch13/13.0/S13_A13_T3.js
- * @description Changing argument value, deleting the argument and then defining a new value for arguments[i]
- */
+/*---
+info: Deleting arguments[i] leads to breaking the connection to local reference
+description: >
+    Changing argument value, deleting the argument and then defining a
+    new value for arguments[i]
+---*/
 
 function __func(__arg){
   __arg = 2;
@@ -28,4 +28,3 @@ if (__func(1) !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A14.js b/test/suite/ch13/13.0/S13_A14.js
index 7d5bc732f..67c16cfb4 100644
--- a/test/suite/ch13/13.0/S13_A14.js
+++ b/test/suite/ch13/13.0/S13_A14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Unicode symbols in function name are allowed
- *
- * @path ch13/13.0/S13_A14.js
- * @description Defining function name with unicode symbols
- */
+/*---
+info: Unicode symbols in function name are allowed
+description: Defining function name with unicode symbols
+---*/
 
 eval("function __func\u0041(__arg){return __arg;};");
 
@@ -17,4 +15,3 @@ if (typeof __funcA !== "function") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A15_T1.js b/test/suite/ch13/13.0/S13_A15_T1.js
index 74531f8c5..70251b57e 100644
--- a/test/suite/ch13/13.0/S13_A15_T1.js
+++ b/test/suite/ch13/13.0/S13_A15_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ''arguments'' variable overrides ActivationObject.arguments
- *
- * @path ch13/13.0/S13_A15_T1.js
- * @description Declaring a function with "__func(arguments)"
- */
+/*---
+info: "''arguments'' variable overrides ActivationObject.arguments"
+description: Declaring a function with "__func(arguments)"
+---*/
 
 function __func(arguments){
     return arguments;
@@ -19,4 +17,3 @@ if (__func(42) !== 42) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A15_T2.js b/test/suite/ch13/13.0/S13_A15_T2.js
index 77e7c847b..3eacde6f2 100644
--- a/test/suite/ch13/13.0/S13_A15_T2.js
+++ b/test/suite/ch13/13.0/S13_A15_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ''arguments'' variable overrides ActivationObject.arguments
- *
- * @path ch13/13.0/S13_A15_T2.js
- * @description Overriding arguments within functions body
- */
+/*---
+info: "''arguments'' variable overrides ActivationObject.arguments"
+description: Overriding arguments within functions body
+---*/
 
 THE_ANSWER="Answer to Life, the Universe, and Everything";
 
@@ -22,4 +20,3 @@ if (__func(42,42,42) !== THE_ANSWER) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A15_T3.js b/test/suite/ch13/13.0/S13_A15_T3.js
index 4ba50e717..d8f941e69 100644
--- a/test/suite/ch13/13.0/S13_A15_T3.js
+++ b/test/suite/ch13/13.0/S13_A15_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ''arguments'' variable overrides ActivationObject.arguments
- *
- * @path ch13/13.0/S13_A15_T3.js
- * @description Declaring a variable named with "arguments" without a function
- */
+/*---
+info: "''arguments'' variable overrides ActivationObject.arguments"
+description: Declaring a variable named with "arguments" without a function
+---*/
 
 THE_ANSWER="Answer to Life, the Universe, and Everything";
 
@@ -32,4 +30,3 @@ if (__func("The Ultimate Question") !== "The Ultimate Question") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A15_T4.js b/test/suite/ch13/13.0/S13_A15_T4.js
index a71b34833..ef95469cc 100644
--- a/test/suite/ch13/13.0/S13_A15_T4.js
+++ b/test/suite/ch13/13.0/S13_A15_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ''arguments'' variable overrides ActivationObject.arguments
- *
- * @path ch13/13.0/S13_A15_T4.js
- * @description Declaring a variable named with "arguments" and following a "return" statement within a function body
- */
+/*---
+info: "''arguments'' variable overrides ActivationObject.arguments"
+description: >
+    Declaring a variable named with "arguments" and following a
+    "return" statement within a function body
+---*/
 
 THE_ANSWER="Answer to Life, the Universe, and Everything";
 
@@ -22,4 +22,3 @@ if (__func(42,42,42) !== "object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A15_T5.js b/test/suite/ch13/13.0/S13_A15_T5.js
index 4896a19c2..b9d07e883 100644
--- a/test/suite/ch13/13.0/S13_A15_T5.js
+++ b/test/suite/ch13/13.0/S13_A15_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * ''arguments'' variable overrides ActivationObject.arguments
- *
- * @path ch13/13.0/S13_A15_T5.js
- * @description Creating a variable named with "arguments" without a function
- */
+/*---
+info: "''arguments'' variable overrides ActivationObject.arguments"
+description: Creating a variable named with "arguments" without a function
+---*/
 
 THE_ANSWER="Answer to Life, the Universe, and Everything";
 
@@ -31,4 +29,3 @@ if (__func("The Ultimate Question") === "The Ultimate Question") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A16.js b/test/suite/ch13/13.0/S13_A16.js
index 8b8ee7080..00bca7e59 100644
--- a/test/suite/ch13/13.0/S13_A16.js
+++ b/test/suite/ch13/13.0/S13_A16.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Any separators are admitted between declaration chunks
- *
- * @path ch13/13.0/S13_A16.js
- * @description Inserting separators between declaration chunks
- */
+/*---
+info: Any separators are admitted between declaration chunks
+description: Inserting separators between declaration chunks
+---*/
 
 function
 x
@@ -41,4 +39,3 @@ z();
 eval("function\u0009\u2029w(\u000C)\u00A0{\u000D};");
 
 w();
-
diff --git a/test/suite/ch13/13.0/S13_A17_T1.js b/test/suite/ch13/13.0/S13_A17_T1.js
index 1ea6c287a..ae9165247 100644
--- a/test/suite/ch13/13.0/S13_A17_T1.js
+++ b/test/suite/ch13/13.0/S13_A17_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function call cannot appear in the program before the FunctionExpression appears
- *
- * @path ch13/13.0/S13_A17_T1.js
- * @description Trying to call a function before the FunctionExpression appears
- */
+/*---
+info: >
+    Function call cannot appear in the program before the FunctionExpression
+    appears
+description: Trying to call a function before the FunctionExpression appears
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -42,4 +43,3 @@ if (__result !== "TWO") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A17_T2.js b/test/suite/ch13/13.0/S13_A17_T2.js
index d502d3b46..094e50812 100644
--- a/test/suite/ch13/13.0/S13_A17_T2.js
+++ b/test/suite/ch13/13.0/S13_A17_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function call cannot appear in the program before the FunctionExpression appears
- *
- * @path ch13/13.0/S13_A17_T2.js
- * @description Trying to call a function before the FunctionExpression appears and then using the FunctionExpression one more time
- */
+/*---
+info: >
+    Function call cannot appear in the program before the FunctionExpression
+    appears
+description: >
+    Trying to call a function before the FunctionExpression appears
+    and then using the FunctionExpression one more time
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -43,4 +45,3 @@ if (__result !== "TWO") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A18.js b/test/suite/ch13/13.0/S13_A18.js
index 827db7547..7319efc56 100644
--- a/test/suite/ch13/13.0/S13_A18.js
+++ b/test/suite/ch13/13.0/S13_A18.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Closures are admitted
- *
- * @path ch13/13.0/S13_A18.js
- * @description Using a function declaration as a function parameter
- */
+/*---
+info: Closures are admitted
+description: Using a function declaration as a function parameter
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -29,4 +27,3 @@ if (typeof sinx !== 'undefined') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A19_T1.js b/test/suite/ch13/13.0/S13_A19_T1.js
index 9bcf1921f..9d5677444 100644
--- a/test/suite/ch13/13.0/S13_A19_T1.js
+++ b/test/suite/ch13/13.0/S13_A19_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "var" does not override function declaration
- *
- * @path ch13/13.0/S13_A19_T1.js
- * @description Creating a function and a variable with identical Identifiers in global scope
- */
+/*---
+info: "\"var\" does not override function declaration"
+description: >
+    Creating a function and a variable with identical Identifiers in
+    global scope
+---*/
 
 // since "var" does not override function declaration __decl is set to function
 //////////////////////////////////////////////////////////////////////////////
@@ -29,4 +29,3 @@ if (__decl !== 1) {
 //////////////////////////////////////////////////////////////////////////////
 
 function __decl(){return 1;}
-
diff --git a/test/suite/ch13/13.0/S13_A19_T2.js b/test/suite/ch13/13.0/S13_A19_T2.js
index 7757d8be6..06bac189b 100644
--- a/test/suite/ch13/13.0/S13_A19_T2.js
+++ b/test/suite/ch13/13.0/S13_A19_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "var" does not override function declaration
- *
- * @path ch13/13.0/S13_A19_T2.js
- * @description Creating a function and a variable with identical Identifiers within function scope
- */
+/*---
+info: "\"var\" does not override function declaration"
+description: >
+    Creating a function and a variable with identical Identifiers
+    within function scope
+---*/
 
 (function (){
 
@@ -31,5 +31,4 @@
     //////////////////////////////////////////////////////////////////////////////
 
     function __decl(){return 1;}
-})();    
-
+})();
diff --git a/test/suite/ch13/13.0/S13_A2_T1.js b/test/suite/ch13/13.0/S13_A2_T1.js
index b9307ac70..09b830e5a 100644
--- a/test/suite/ch13/13.0/S13_A2_T1.js
+++ b/test/suite/ch13/13.0/S13_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * function must be evaluated inside the expression
- *
- * @path ch13/13.0/S13_A2_T1.js
- * @description Defining function body with "return arg"
- */
+/*---
+info: function must be evaluated inside the expression
+description: Defining function body with "return arg"
+---*/
 
 var x = (function __func(arg){return arg})(1);
 
@@ -26,4 +24,3 @@ if (typeof __func !== 'undefined') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A2_T2.js b/test/suite/ch13/13.0/S13_A2_T2.js
index c43c58e79..62bfd6686 100644
--- a/test/suite/ch13/13.0/S13_A2_T2.js
+++ b/test/suite/ch13/13.0/S13_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * function must be evaluated inside the expression
- *
- * @path ch13/13.0/S13_A2_T2.js
- * @description Defining function body with "return arg + arguments[1]"
- */
+/*---
+info: function must be evaluated inside the expression
+description: Defining function body with "return arg + arguments[1]"
+---*/
 
 var x = (function __func(arg){return arg + arguments[1]})(1,"1");
 
@@ -26,4 +24,3 @@ if (typeof __func !== 'undefined') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A2_T3.js b/test/suite/ch13/13.0/S13_A2_T3.js
index 83d3f2463..7443d09af 100644
--- a/test/suite/ch13/13.0/S13_A2_T3.js
+++ b/test/suite/ch13/13.0/S13_A2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * function must be evaluated inside the expression
- *
- * @path ch13/13.0/S13_A2_T3.js
- * @description Defining function body with "return arguments[0] +"-"+ arguments[1]"
- */
+/*---
+info: function must be evaluated inside the expression
+description: >
+    Defining function body with "return arguments[0] +"-"+
+    arguments[1]"
+---*/
 
 var x = (function __func(){return arguments[0] +"-"+ arguments[1]})("Obi","Wan");
 
@@ -26,4 +26,3 @@ if (typeof __func !== 'undefined') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A3_T1.js b/test/suite/ch13/13.0/S13_A3_T1.js
index cac7e243d..03f19889d 100644
--- a/test/suite/ch13/13.0/S13_A3_T1.js
+++ b/test/suite/ch13/13.0/S13_A3_T1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Identifier in a FunctionExpression can be referenced from inside the FunctionExpression's FunctionBody to allow the function calling itself recursively
- *
- * @path ch13/13.0/S13_A3_T1.js
- * @description Creating a recursive function that calculates factorial, as a variable.
- * Function call itself by it`s name
- */
+/*---
+info: >
+    The Identifier in a FunctionExpression can be referenced from inside the
+    FunctionExpression's FunctionBody to allow the function calling itself
+    recursively
+description: >
+    Creating a recursive function that calculates factorial, as a
+    variable.  Function call itself by it`s name
+---*/
 
 var __func = function __exp__func(arg){
     if (arg === 1) {
@@ -26,4 +28,3 @@ if (fact_of_3 !== 6) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A3_T2.js b/test/suite/ch13/13.0/S13_A3_T2.js
index 2137666a7..cd3466f74 100644
--- a/test/suite/ch13/13.0/S13_A3_T2.js
+++ b/test/suite/ch13/13.0/S13_A3_T2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Identifier in a FunctionExpression can be referenced from inside the FunctionExpression's FunctionBody to allow the function calling itself recursively
- *
- * @path ch13/13.0/S13_A3_T2.js
- * @description Creating a recursive function that calculates factorial, as a variable.
- * Function calls itself by the name of the variable
- */
+/*---
+info: >
+    The Identifier in a FunctionExpression can be referenced from inside the
+    FunctionExpression's FunctionBody to allow the function calling itself
+    recursively
+description: >
+    Creating a recursive function that calculates factorial, as a
+    variable.  Function calls itself by the name of the variable
+---*/
 
 var __func = function (arg){
     if (arg === 1) {
@@ -26,4 +28,3 @@ if (fact_of_3 !== 6) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A3_T3.js b/test/suite/ch13/13.0/S13_A3_T3.js
index 467f3fea5..a05da537c 100644
--- a/test/suite/ch13/13.0/S13_A3_T3.js
+++ b/test/suite/ch13/13.0/S13_A3_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Identifier in a FunctionExpression can be referenced from inside the FunctionExpression's FunctionBody to allow the function calling itself recursively
- *
- * @path ch13/13.0/S13_A3_T3.js
- * @description Creating simple recursive function that calculates factorial
- */
+/*---
+info: >
+    The Identifier in a FunctionExpression can be referenced from inside the
+    FunctionExpression's FunctionBody to allow the function calling itself
+    recursively
+description: Creating simple recursive function that calculates factorial
+---*/
 
 function __func(arg){
     if (arg === 1) {
@@ -25,4 +26,3 @@ if (fact_of_3 !== 6) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A4_T1.js b/test/suite/ch13/13.0/S13_A4_T1.js
index 453207158..74f651395 100644
--- a/test/suite/ch13/13.0/S13_A4_T1.js
+++ b/test/suite/ch13/13.0/S13_A4_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production FunctionDeclaration: "function Identifier ( FormalParameterList_opt ) { FunctionBody }" is processed by function declarations
- *
- * @path ch13/13.0/S13_A4_T1.js
- * @description Declaring a function that returns string
- */
+/*---
+info: >
+    The production FunctionDeclaration: "function Identifier (
+    FormalParameterList_opt ) { FunctionBody }" is processed by function
+    declarations
+description: Declaring a function that returns string
+---*/
 
 function __func(){return "zig-zig-sputnik";};
 
@@ -25,4 +26,3 @@ if (__func() !== "zig-zig-sputnik") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A4_T2.js b/test/suite/ch13/13.0/S13_A4_T2.js
index d7b4a2788..c044b4f06 100644
--- a/test/suite/ch13/13.0/S13_A4_T2.js
+++ b/test/suite/ch13/13.0/S13_A4_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production FunctionDeclaration: "function Identifier ( FormalParameterList_opt ) { FunctionBody }" is processed by function declarations
- *
- * @path ch13/13.0/S13_A4_T2.js
- * @description Declaring a function that uses prefix increment operator within its "return" Expression
- */
+/*---
+info: >
+    The production FunctionDeclaration: "function Identifier (
+    FormalParameterList_opt ) { FunctionBody }" is processed by function
+    declarations
+description: >
+    Declaring a function that uses prefix increment operator within
+    its "return" Expression
+---*/
 
 function __func(arg){return ++arg;};
 
@@ -25,4 +28,3 @@ if (__func(1) !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A4_T3.js b/test/suite/ch13/13.0/S13_A4_T3.js
index 6595f4f77..1119079bf 100644
--- a/test/suite/ch13/13.0/S13_A4_T3.js
+++ b/test/suite/ch13/13.0/S13_A4_T3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production FunctionDeclaration: "function Identifier ( FormalParameterList_opt ) { FunctionBody }" is processed by function declarations
- *
- * @path ch13/13.0/S13_A4_T3.js
- * @description Declaring a function that uses arithmetical operators within its "return" Expression
- */
+/*---
+info: >
+    The production FunctionDeclaration: "function Identifier (
+    FormalParameterList_opt ) { FunctionBody }" is processed by function
+    declarations
+description: >
+    Declaring a function that uses arithmetical operators within its
+    "return" Expression
+---*/
 
 function __func(arg1, arg2, arg3){return arg1+=(arg2+=arg3);};
 
@@ -25,4 +28,3 @@ if (__func(10, 20, 30) !== 60) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A4_T4.js b/test/suite/ch13/13.0/S13_A4_T4.js
index 7330bd80f..a7a7f8328 100644
--- a/test/suite/ch13/13.0/S13_A4_T4.js
+++ b/test/suite/ch13/13.0/S13_A4_T4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production FunctionDeclaration: "function Identifier ( FormalParameterList_opt ) { FunctionBody }" is processed by function declarations
- *
- * @path ch13/13.0/S13_A4_T4.js
- * @description Declaring a function that uses strings concatenaion opeator within its "return" Expression
- */
+/*---
+info: >
+    The production FunctionDeclaration: "function Identifier (
+    FormalParameterList_opt ) { FunctionBody }" is processed by function
+    declarations
+description: >
+    Declaring a function that uses strings concatenaion opeator within
+    its "return" Expression
+---*/
 
 function __func(){return arguments[0].name + " " + arguments[0].surname;};
 
@@ -43,4 +46,3 @@ if (func__({name:'john', surname:'lennon'}) !== "john lennon") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A6_T1.js b/test/suite/ch13/13.0/S13_A6_T1.js
index 2cdd53709..b36c6747f 100644
--- a/test/suite/ch13/13.0/S13_A6_T1.js
+++ b/test/suite/ch13/13.0/S13_A6_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration can be overrided by other FunctionDeclaration with the same Identifier
- *
- * @path ch13/13.0/S13_A6_T1.js
- * @description Duplicating function declaration
- */
+/*---
+info: >
+    FunctionDeclaration can be overrided by other FunctionDeclaration with
+    the same Identifier
+description: Duplicating function declaration
+---*/
 
 function __func(){return 1};
  
@@ -33,4 +33,3 @@ if (__1 !== __A) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A6_T2.js b/test/suite/ch13/13.0/S13_A6_T2.js
index 6268e06e2..a702da31c 100644
--- a/test/suite/ch13/13.0/S13_A6_T2.js
+++ b/test/suite/ch13/13.0/S13_A6_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration can be overrided by other FunctionDeclaration with the same Identifier
- *
- * @path ch13/13.0/S13_A6_T2.js
- * @description Calling a function before it is declared one more time
- */
+/*---
+info: >
+    FunctionDeclaration can be overrided by other FunctionDeclaration with
+    the same Identifier
+description: Calling a function before it is declared one more time
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -33,4 +34,3 @@ if (__result !== "SECOND") {
 //////////////////////////////////////////////////////////////////////////////
 
 function __func(){return "SECOND";};
-
diff --git a/test/suite/ch13/13.0/S13_A7_T1.js b/test/suite/ch13/13.0/S13_A7_T1.js
index b83e6e140..6e755cbef 100644
--- a/test/suite/ch13/13.0/S13_A7_T1.js
+++ b/test/suite/ch13/13.0/S13_A7_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The FunctionBody must be SourceElements
- *
- * @path ch13/13.0/S13_A7_T1.js
- * @description Using only SourceElements within the FunctionBody
- */
+/*---
+info: The FunctionBody must be SourceElements
+description: Using only SourceElements within the FunctionBody
+---*/
 
 function __func(){'ground control to major tom'};
 //////////////////////////////////////////////////////////////////////////////
@@ -70,4 +68,3 @@ if (typeof __func__6 !== "function") {
 //}
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A7_T2.js b/test/suite/ch13/13.0/S13_A7_T2.js
index 6b381b794..0cf815087 100644
--- a/test/suite/ch13/13.0/S13_A7_T2.js
+++ b/test/suite/ch13/13.0/S13_A7_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The FunctionBody must be SourceElements
- *
- * @path ch13/13.0/S13_A7_T2.js
- * @description Inserting elements that is different from SourceElements into the FunctionBody
- */
+/*---
+info: The FunctionBody must be SourceElements
+description: >
+    Inserting elements that is different from SourceElements into the
+    FunctionBody
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -46,4 +46,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A7_T3.js b/test/suite/ch13/13.0/S13_A7_T3.js
index e2b893b65..dfce83382 100644
--- a/test/suite/ch13/13.0/S13_A7_T3.js
+++ b/test/suite/ch13/13.0/S13_A7_T3.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The FunctionBody must be SourceElements
- *
- * @path ch13/13.0/S13_A7_T3.js
- * @description Checking if execution of "function __func(){\A\B\C}" fails
- * @negative
- */
+/*---
+info: The FunctionBody must be SourceElements
+description: Checking if execution of "function __func(){\A\B\C}" fails
+flags: [negative]
+---*/
 
 function __func(){\A\B\C};
-
diff --git a/test/suite/ch13/13.0/S13_A8_T1.js b/test/suite/ch13/13.0/S13_A8_T1.js
index d147259ce..74dd9948a 100644
--- a/test/suite/ch13/13.0/S13_A8_T1.js
+++ b/test/suite/ch13/13.0/S13_A8_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments property of activation object contains real params to be passed
- *
- * @path ch13/13.0/S13_A8_T1.js
- * @description Creating a function declared with "function __func(param1, param2, param3)" and using arguments.length property in order to perform the test
- */
+/*---
+info: Arguments property of activation object contains real params to be passed
+description: >
+    Creating a function declared with "function __func(param1, param2,
+    param3)" and using arguments.length property in order to perform
+    the test
+---*/
 
- function __func(param1, param2, param3) {
+function __func(param1, param2, param3) {
  	return arguments.length;
  }
  
@@ -27,7 +28,3 @@ if (__func('A', 'B', 1, 2,__func) !== 5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
- 
- 
- 
-
diff --git a/test/suite/ch13/13.0/S13_A8_T2.js b/test/suite/ch13/13.0/S13_A8_T2.js
index 6e4b3f05c..54dc2ecf4 100644
--- a/test/suite/ch13/13.0/S13_A8_T2.js
+++ b/test/suite/ch13/13.0/S13_A8_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Arguments property of activation object contains real params to be passed
- *
- * @path ch13/13.0/S13_A8_T2.js
- * @description Creating a function with no parameters and using arguments.length property in order to perform the test
- */
+/*---
+info: Arguments property of activation object contains real params to be passed
+description: >
+    Creating a function with no parameters and using arguments.length
+    property in order to perform the test
+---*/
 
- function __func() {
+function __func() {
  	return arguments.length;
  }
  
@@ -35,4 +35,3 @@ if (__func() !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.0/S13_A9.js b/test/suite/ch13/13.0/S13_A9.js
index c13119af9..18b575dd8 100644
--- a/test/suite/ch13/13.0/S13_A9.js
+++ b/test/suite/ch13/13.0/S13_A9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function can be passed as argument
- *
- * @path ch13/13.0/S13_A9.js
- * @description Using function as argument of another function
- */
+/*---
+info: Function can be passed as argument
+description: Using function as argument of another function
+---*/
 
 function __func__INC(arg){return arg + 1;};
 function __func__MULT(incrementator, arg, mult){ return incrementator(arg)*mult; };
@@ -18,5 +16,3 @@ if (__func__MULT(__func__INC, 2, 2) !== 6) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.1/13.1-1-1.js b/test/suite/ch13/13.1/13.1-1-1.js
index a30103edc..fbed98636 100644
--- a/test/suite/ch13/13.1/13.1-1-1.js
+++ b/test/suite/ch13/13.1/13.1-1-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-1-1.js

- * @description Duplicate identifier allowed in non-strict function declaration parameter list

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval('function foo(a,a){}');

-    return true;

-  }

-  catch (e) { return false }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate identifier allowed in non-strict function declaration
+    parameter list
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval('function foo(a,a){}');
+    return true;
+  }
+  catch (e) { return false }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-1-2.js b/test/suite/ch13/13.1/13.1-1-2.js
index dc6708fb4..ac47be73b 100644
--- a/test/suite/ch13/13.1/13.1-1-2.js
+++ b/test/suite/ch13/13.1/13.1-1-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-1-2.js

- * @description Duplicate identifier allowed in non-strict function expression parameter list

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval('(function foo(a,a){})');

-    return true;

-  }

-  catch (e) { return false }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate identifier allowed in non-strict function expression
+    parameter list
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval('(function foo(a,a){})');
+    return true;
+  }
+  catch (e) { return false }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-1-s.js b/test/suite/ch13/13.1/13.1-1-s.js
index 4768b2072..ca769e892 100644
--- a/test/suite/ch13/13.1/13.1-1-s.js
+++ b/test/suite/ch13/13.1/13.1-1-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-1-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionDeclaration

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function _13_1_1_fun(eval) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function _13_1_1_fun(eval) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-10-s.js b/test/suite/ch13/13.1/13.1-10-s.js
index 802c13ab4..39adef0ed 100644
--- a/test/suite/ch13/13.1/13.1-10-s.js
+++ b/test/suite/ch13/13.1/13.1-10-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-10-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created in 'strict mode' using a FunctionExpression and the function has three identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_1_10_fun = function (param, param, param) { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created in
+    'strict mode' using a FunctionExpression and the function has
+    three identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_1_10_fun = function (param, param, param) { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-11-s.js b/test/suite/ch13/13.1/13.1-11-s.js
index 5f63b5627..a4f29c148 100644
--- a/test/suite/ch13/13.1/13.1-11-s.js
+++ b/test/suite/ch13/13.1/13.1-11-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-11-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the function name of a FunctionDeclaration in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            eval("function eval() { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    function name of a FunctionDeclaration in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            eval("function eval() { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-12-s.js b/test/suite/ch13/13.1/13.1-12-s.js
index 8ebf40b26..37a54fce1 100644
--- a/test/suite/ch13/13.1/13.1-12-s.js
+++ b/test/suite/ch13/13.1/13.1-12-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-12-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the Identifier of a FunctionExpression in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _13_1_12_s = {};

-

-        try {

-            eval("_13_1_12_s.x = function eval() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    Identifier of a FunctionExpression in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _13_1_12_s = {};
+
+        try {
+            eval("_13_1_12_s.x = function eval() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-13-s.js b/test/suite/ch13/13.1/13.1-13-s.js
index b1eb17421..313cb653d 100644
--- a/test/suite/ch13/13.1/13.1-13-s.js
+++ b/test/suite/ch13/13.1/13.1-13-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-13-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the function name of a FunctionDeclaration in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function arguments() { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    function name of a FunctionDeclaration in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function arguments() { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-13gs.js b/test/suite/ch13/13.1/13.1-13gs.js
index 5287ab343..a79eeeff3 100644
--- a/test/suite/ch13/13.1/13.1-13gs.js
+++ b/test/suite/ch13/13.1/13.1-13gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-13gs.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the Identifier of a FunctionDeclaration

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-function arguments() { };

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    Identifier of a FunctionDeclaration
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+function arguments() { };
diff --git a/test/suite/ch13/13.1/13.1-14-s.js b/test/suite/ch13/13.1/13.1-14-s.js
index 4841cee18..b4b18d59d 100644
--- a/test/suite/ch13/13.1/13.1-14-s.js
+++ b/test/suite/ch13/13.1/13.1-14-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-14-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the Identifier of a FunctionExpression in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        var _13_1_14_s = {};

-

-        try {

-            eval("_13_1_14_s.x = function arguments() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    Identifier of a FunctionExpression in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var _13_1_14_s = {};
+
+        try {
+            eval("_13_1_14_s.x = function arguments() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-15-s.js b/test/suite/ch13/13.1/13.1-15-s.js
index 0f49d0b97..27fb42033 100644
--- a/test/suite/ch13/13.1/13.1-15-s.js
+++ b/test/suite/ch13/13.1/13.1-15-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-15-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionDeclaration in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict';function _13_1_15_fun(eval) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict';function _13_1_15_fun(eval) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-16-s.js b/test/suite/ch13/13.1/13.1-16-s.js
index 4dd74265a..8e2f77a92 100644
--- a/test/suite/ch13/13.1/13.1-16-s.js
+++ b/test/suite/ch13/13.1/13.1-16-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-16-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionDeclaration when FuctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function _13_1_16_fun(eval) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration when FuctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function _13_1_16_fun(eval) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-17-s.js b/test/suite/ch13/13.1/13.1-17-s.js
index e38ee27c6..c3a0be456 100644
--- a/test/suite/ch13/13.1/13.1-17-s.js
+++ b/test/suite/ch13/13.1/13.1-17-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-17-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionExpression in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_1_17_fun = function (eval) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_1_17_fun = function (eval) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-18-s.js b/test/suite/ch13/13.1/13.1-18-s.js
index 51668c621..f404d2ce0 100644
--- a/test/suite/ch13/13.1/13.1-18-s.js
+++ b/test/suite/ch13/13.1/13.1-18-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-18-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionExpression when FuctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var _13_1_18_fun = function (eval) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression when FuctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var _13_1_18_fun = function (eval) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-19-s.js b/test/suite/ch13/13.1/13.1-19-s.js
index a063fba9f..c48cddb30 100644
--- a/test/suite/ch13/13.1/13.1-19-s.js
+++ b/test/suite/ch13/13.1/13.1-19-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-19-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionDeclaration in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict';function _13_1_19_fun(arguments) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict';function _13_1_19_fun(arguments) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-1gs.js b/test/suite/ch13/13.1/13.1-1gs.js
index bc4971291..391552cfc 100644
--- a/test/suite/ch13/13.1/13.1-1gs.js
+++ b/test/suite/ch13/13.1/13.1-1gs.js
@@ -1,14 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-1gs.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionDeclaration

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-function _13_1_1_fun(eval) { }
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+function _13_1_1_fun(eval) { }
diff --git a/test/suite/ch13/13.1/13.1-2-1.js b/test/suite/ch13/13.1/13.1-2-1.js
index 8d4155037..85ebac8d5 100644
--- a/test/suite/ch13/13.1/13.1-2-1.js
+++ b/test/suite/ch13/13.1/13.1-2-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-2-1.js

- * @description eval allowed as formal parameter name of a non-strict function declaration

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("function foo(eval){};");

-    return true;

-  }

-  catch (e) {  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval allowed as formal parameter name of a non-strict function
+    declaration
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("function foo(eval){};");
+    return true;
+  }
+  catch (e) {  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-2-2.js b/test/suite/ch13/13.1/13.1-2-2.js
index 04e19c1a6..40758bdaa 100644
--- a/test/suite/ch13/13.1/13.1-2-2.js
+++ b/test/suite/ch13/13.1/13.1-2-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-2-2.js

- * @description eval allowed as formal parameter name of a non-strict function expression

- */

-

-

-function testcase()

-{

-    eval("(function foo(eval){});");

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval allowed as formal parameter name of a non-strict function
+    expression
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+    eval("(function foo(eval){});");
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-2-5.js b/test/suite/ch13/13.1/13.1-2-5.js
index e60842ff1..734b4eac2 100644
--- a/test/suite/ch13/13.1/13.1-2-5.js
+++ b/test/suite/ch13/13.1/13.1-2-5.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-2-5.js

- * @description arguments allowed as formal parameter name of a non-strict function declaration

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("function foo(arguments){};");

-    return true;

-  }

-  catch (e) {  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments allowed as formal parameter name of a non-strict
+    function declaration
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("function foo(arguments){};");
+    return true;
+  }
+  catch (e) {  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-2-6.js b/test/suite/ch13/13.1/13.1-2-6.js
index ce9b76b3c..d389424b4 100644
--- a/test/suite/ch13/13.1/13.1-2-6.js
+++ b/test/suite/ch13/13.1/13.1-2-6.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-2-6.js

- * @description arguments allowed as formal parameter name of a non-strict function expression

- */

-

-

-function testcase()

-{

-    eval("(function foo(arguments){});");

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments allowed as formal parameter name of a non-strict
+    function expression
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+    eval("(function foo(arguments){});");
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-2-s.js b/test/suite/ch13/13.1/13.1-2-s.js
index 0e3c4473a..ef7dd1b6c 100644
--- a/test/suite/ch13/13.1/13.1-2-s.js
+++ b/test/suite/ch13/13.1/13.1-2-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-2-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'eval' appears within a FormalParameterList of a strict mode FunctionExpression

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_1_2_fun = function (eval) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'eval'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_1_2_fun = function (eval) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-20-s.js b/test/suite/ch13/13.1/13.1-20-s.js
index 064bc4deb..602f1b0a2 100644
--- a/test/suite/ch13/13.1/13.1-20-s.js
+++ b/test/suite/ch13/13.1/13.1-20-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-20-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionDeclaration when FuctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function _13_1_20_fun(arguments) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration when FuctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function _13_1_20_fun(arguments) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-21-s.js b/test/suite/ch13/13.1/13.1-21-s.js
index 2bf127083..148c52a35 100644
--- a/test/suite/ch13/13.1/13.1-21-s.js
+++ b/test/suite/ch13/13.1/13.1-21-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-21-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionExpression in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_1_21_fun = function (arguments) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_1_21_fun = function (arguments) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-22-s.js b/test/suite/ch13/13.1/13.1-22-s.js
index 38e2e9726..1892529d0 100644
--- a/test/suite/ch13/13.1/13.1-22-s.js
+++ b/test/suite/ch13/13.1/13.1-22-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-22-s.js

- * @description StrictMode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionExpression when FuctionBody is strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var _13_1_22_fun = function (arguments) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    StrictMode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression when FuctionBody is strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var _13_1_22_fun = function (arguments) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-23-s.js b/test/suite/ch13/13.1/13.1-23-s.js
index 748044089..bbc1bb16a 100644
--- a/test/suite/ch13/13.1/13.1-23-s.js
+++ b/test/suite/ch13/13.1/13.1-23-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-23-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration that is contained in eval strict code and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function _13_1_23_fun(param, param) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration that is contained in eval strict code and
+    the function has two identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function _13_1_23_fun(param, param) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-24-s.js b/test/suite/ch13/13.1/13.1-24-s.js
index b39fc5c19..e22bda212 100644
--- a/test/suite/ch13/13.1/13.1-24-s.js
+++ b/test/suite/ch13/13.1/13.1-24-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-24-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration whose FunctionBody is contained in strict code and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function _13_1_24_fun(param, param) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration whose FunctionBody is contained in strict
+    code and the function has two identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function _13_1_24_fun(param, param) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-25-s.js b/test/suite/ch13/13.1/13.1-25-s.js
index 45b0026b5..02d434c6b 100644
--- a/test/suite/ch13/13.1/13.1-25-s.js
+++ b/test/suite/ch13/13.1/13.1-25-s.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-25-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration that is contained in eval strict code and the function has two identical parameters which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function _13_1_25_fun(param1, param2, param1) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration that is contained in eval strict code and
+    the function has two identical parameters which are separated by a
+    unique parameter name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function _13_1_25_fun(param1, param2, param1) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-26-s.js b/test/suite/ch13/13.1/13.1-26-s.js
index c9f9410fd..f668bf3c6 100644
--- a/test/suite/ch13/13.1/13.1-26-s.js
+++ b/test/suite/ch13/13.1/13.1-26-s.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-26-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration whose FunctionBody is contained in strict code and the function has two identical parameters which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function _13_1_26_fun(param1, param2, param1) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration whose FunctionBody is contained in strict
+    code and the function has two identical parameters which are
+    separated by a unique parameter name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function _13_1_26_fun(param1, param2, param1) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-27-s.js b/test/suite/ch13/13.1/13.1-27-s.js
index aa5084332..6ad08a4c1 100644
--- a/test/suite/ch13/13.1/13.1-27-s.js
+++ b/test/suite/ch13/13.1/13.1-27-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-27-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration that is contained in eval strict code and the function has three identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function _13_1_27_fun(param, param, param) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration that is contained in eval strict code and
+    the function has three identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function _13_1_27_fun(param, param, param) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-28-s.js b/test/suite/ch13/13.1/13.1-28-s.js
index 1dbda4fc5..c3dec00bb 100644
--- a/test/suite/ch13/13.1/13.1-28-s.js
+++ b/test/suite/ch13/13.1/13.1-28-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-28-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionDeclaration whose FunctionBody is contained in strict code and the function has three identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-        

-

-        try {

-            eval("function _13_1_28_fun(param, param, param) { 'use strict'; }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionDeclaration whose FunctionBody is contained in strict
+    code and the function has three identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+
+        try {
+            eval("function _13_1_28_fun(param, param, param) { 'use strict'; }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-29-s.js b/test/suite/ch13/13.1/13.1-29-s.js
index a7c74290d..b79bc8056 100644
--- a/test/suite/ch13/13.1/13.1-29-s.js
+++ b/test/suite/ch13/13.1/13.1-29-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-29-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionExpression that is contained in eval strict code and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_1_29_fun = function (param, param) { };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionExpression that is contained in eval strict code and the
+    function has two identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_1_29_fun = function (param, param) { };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-3-1.js b/test/suite/ch13/13.1/13.1-3-1.js
index 47598c165..2f092a7fa 100644
--- a/test/suite/ch13/13.1/13.1-3-1.js
+++ b/test/suite/ch13/13.1/13.1-3-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-3-1.js

- * @description eval allowed as function identifier in non-strict function declaration

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("function eval(){};");

-    return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval allowed as function identifier in non-strict function
+    declaration
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("function eval(){};");
+    return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-3-2.js b/test/suite/ch13/13.1/13.1-3-2.js
index 598e3faf6..59caf6997 100644
--- a/test/suite/ch13/13.1/13.1-3-2.js
+++ b/test/suite/ch13/13.1/13.1-3-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-3-2.js

- * @description eval allowed as function identifier in non-strict function expression

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("(function eval(){});");

-    return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    eval allowed as function identifier in non-strict function
+    expression
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("(function eval(){});");
+    return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-3-7.js b/test/suite/ch13/13.1/13.1-3-7.js
index c6bbd159c..efc12812a 100644
--- a/test/suite/ch13/13.1/13.1-3-7.js
+++ b/test/suite/ch13/13.1/13.1-3-7.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-3-7.js

- * @description arguments allowed as function identifier in non-strict function declaration

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("function arguments (){};");

-    return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments allowed as function identifier in non-strict function
+    declaration
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("function arguments (){};");
+    return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-3-8.js b/test/suite/ch13/13.1/13.1-3-8.js
index cd9ef9a2a..896b5a8a6 100644
--- a/test/suite/ch13/13.1/13.1-3-8.js
+++ b/test/suite/ch13/13.1/13.1-3-8.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-3-8.js

- * @description arguments allowed as function identifier in non-strict function expression

- */

-

-

-function testcase()

-{

-  try 

-  {

-    eval("(function arguments (){});");

-    return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    arguments allowed as function identifier in non-strict function
+    expression
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{
+  try 
+  {
+    eval("(function arguments (){});");
+    return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-3-s.js b/test/suite/ch13/13.1/13.1-3-s.js
index ecc0385ea..7f4fb8c0c 100644
--- a/test/suite/ch13/13.1/13.1-3-s.js
+++ b/test/suite/ch13/13.1/13.1-3-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-3-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionDeclaration

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function _13_1_3_fun(arguments) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionDeclaration
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function _13_1_3_fun(arguments) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-30-s.js b/test/suite/ch13/13.1/13.1-30-s.js
index b07291c1d..21ab7bbde 100644
--- a/test/suite/ch13/13.1/13.1-30-s.js
+++ b/test/suite/ch13/13.1/13.1-30-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-30-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionExpression whose FunctionBody is contained in strict code and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var _13_1_30_fun = function (param, param) { 'use strict'; };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionExpression whose FunctionBody is contained in strict
+    code and the function has two identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var _13_1_30_fun = function (param, param) { 'use strict'; };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-31-s.js b/test/suite/ch13/13.1/13.1-31-s.js
index 1e47d2acf..9d1ee2bef 100644
--- a/test/suite/ch13/13.1/13.1-31-s.js
+++ b/test/suite/ch13/13.1/13.1-31-s.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-31-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionExpression that is contained in eval strict code and the function has two identical parameters, which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_1_31_fun = function (param1, param2, param1) { };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionExpression that is contained in eval strict code and the
+    function has two identical parameters, which are separated by a
+    unique parameter name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_1_31_fun = function (param1, param2, param1) { };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-32-s.js b/test/suite/ch13/13.1/13.1-32-s.js
index b1a4ef8b1..79321c3cb 100644
--- a/test/suite/ch13/13.1/13.1-32-s.js
+++ b/test/suite/ch13/13.1/13.1-32-s.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-32-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using a FunctionExpression whose FunctionBody is strict and the function has two identical parameters, which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var _13_1_32_fun = function (param1, param2, param1) { 'use strict'; };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    a FunctionExpression whose FunctionBody is strict and the function
+    has two identical parameters, which are separated by a unique
+    parameter name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var _13_1_32_fun = function (param1, param2, param1) { 'use strict'; };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-33-s.js b/test/suite/ch13/13.1/13.1-33-s.js
index bcffbd023..66f241217 100644
--- a/test/suite/ch13/13.1/13.1-33-s.js
+++ b/test/suite/ch13/13.1/13.1-33-s.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-33-s.js

- * @description Strict Mode - SyntaxError is thrown if function is created using a FunctionExpression that is contained in eval strict code and the function has three identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; var _13_1_33_fun = function (param, param, param) { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if function is created using a
+    FunctionExpression that is contained in eval strict code and the
+    function has three identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; var _13_1_33_fun = function (param, param, param) { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-34-s.js b/test/suite/ch13/13.1/13.1-34-s.js
index aca13ea5d..f0c90a49d 100644
--- a/test/suite/ch13/13.1/13.1-34-s.js
+++ b/test/suite/ch13/13.1/13.1-34-s.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-34-s.js

- * @description Strict Mode - SyntaxError is thrown if a function declaration has three identical parameters with a strict mode body

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("var _13_1_34_fun = function (param, param, param) { 'use strict'; };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function declaration has
+    three identical parameters with a strict mode body
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("var _13_1_34_fun = function (param, param, param) { 'use strict'; };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-35-s.js b/test/suite/ch13/13.1/13.1-35-s.js
index ebe7e71f2..91add24bb 100644
--- a/test/suite/ch13/13.1/13.1-35-s.js
+++ b/test/suite/ch13/13.1/13.1-35-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-35-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the function name of a FunctionDeclaration in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function eval() { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    function name of a FunctionDeclaration in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function eval() { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-36-s.js b/test/suite/ch13/13.1/13.1-36-s.js
index 63d08a282..71f101b5a 100644
--- a/test/suite/ch13/13.1/13.1-36-s.js
+++ b/test/suite/ch13/13.1/13.1-36-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-36-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the function name of a FunctionDeclaration whose FunctionBody is in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function eval() { 'use strict'; };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    function name of a FunctionDeclaration whose FunctionBody is in
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function eval() { 'use strict'; };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-37-s.js b/test/suite/ch13/13.1/13.1-37-s.js
index c2f27c0f1..595172d15 100644
--- a/test/suite/ch13/13.1/13.1-37-s.js
+++ b/test/suite/ch13/13.1/13.1-37-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-37-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the Identifier of a FunctionExpression in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-        var _13_1_37_s = {};

-        try {

-            eval("'use strict'; _13_1_37_s.x = function eval() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    Identifier of a FunctionExpression in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var _13_1_37_s = {};
+        try {
+            eval("'use strict'; _13_1_37_s.x = function eval() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-38-s.js b/test/suite/ch13/13.1/13.1-38-s.js
index 5d73e72c3..953fde169 100644
--- a/test/suite/ch13/13.1/13.1-38-s.js
+++ b/test/suite/ch13/13.1/13.1-38-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-38-s.js

- * @description StrictMode - SyntaxError is thrown if 'eval' occurs as the Identifier of a FunctionExpression whose FunctionBody is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-        var _13_1_38_s = {};

-        try {

-            eval("_13_1_38_s.x = function eval() {'use strict'; };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'eval' occurs as the
+    Identifier of a FunctionExpression whose FunctionBody is contained
+    in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var _13_1_38_s = {};
+        try {
+            eval("_13_1_38_s.x = function eval() {'use strict'; };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-39-s.js b/test/suite/ch13/13.1/13.1-39-s.js
index 54eb5ee03..1951f015a 100644
--- a/test/suite/ch13/13.1/13.1-39-s.js
+++ b/test/suite/ch13/13.1/13.1-39-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-39-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the function name of a FunctionDeclaration in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("'use strict'; function arguments() { };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    function name of a FunctionDeclaration in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("'use strict'; function arguments() { };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-4-s.js b/test/suite/ch13/13.1/13.1-4-s.js
index ba0c1cee4..326d25482 100644
--- a/test/suite/ch13/13.1/13.1-4-s.js
+++ b/test/suite/ch13/13.1/13.1-4-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList

- * of a strict mode FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-4-s.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionExpression

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_1_4_fun = function (arguments) { };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs within a FormalParameterList
+    of a strict mode FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_1_4_fun = function (arguments) { };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-40-s.js b/test/suite/ch13/13.1/13.1-40-s.js
index 42d7bcbba..7824b2c3d 100644
--- a/test/suite/ch13/13.1/13.1-40-s.js
+++ b/test/suite/ch13/13.1/13.1-40-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-40-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the Identifier of a FunctionDeclaration whose FunctionBody is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        try {

-            eval("function arguments() { 'use strict'; };")

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    Identifier of a FunctionDeclaration whose FunctionBody is
+    contained in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            eval("function arguments() { 'use strict'; };")
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-41-s.js b/test/suite/ch13/13.1/13.1-41-s.js
index 9a9a3ca2b..e8ec6faa6 100644
--- a/test/suite/ch13/13.1/13.1-41-s.js
+++ b/test/suite/ch13/13.1/13.1-41-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-41-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the Identifier of a FunctionExpression in strict eval code

- * @onlyStrict

- */

-

-

-function testcase() {

-        var _13_1_41_s = {};

-        try {

-            eval("'use strict'; _13_1_41_s.x = function arguments() {};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    Identifier of a FunctionExpression in strict eval code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var _13_1_41_s = {};
+        try {
+            eval("'use strict'; _13_1_41_s.x = function arguments() {};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-42-s.js b/test/suite/ch13/13.1/13.1-42-s.js
index f19d56c98..483f35466 100644
--- a/test/suite/ch13/13.1/13.1-42-s.js
+++ b/test/suite/ch13/13.1/13.1-42-s.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-42-s.js

- * @description StrictMode - SyntaxError is thrown if 'arguments' occurs as the Identifier of a FunctionExpression whose FunctionBody is contained in strict code

- * @onlyStrict

- */

-

-

-function testcase() {

-        var _13_1_42_s = {};

-        try {

-            eval("_13_1_42_s.x = function arguments() {'use strict';};");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - SyntaxError is thrown if 'arguments' occurs as the
+    Identifier of a FunctionExpression whose FunctionBody is contained
+    in strict code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var _13_1_42_s = {};
+        try {
+            eval("_13_1_42_s.x = function arguments() {'use strict';};");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-4gs.js b/test/suite/ch13/13.1/13.1-4gs.js
index 0c501018a..a83c20aff 100644
--- a/test/suite/ch13/13.1/13.1-4gs.js
+++ b/test/suite/ch13/13.1/13.1-4gs.js
@@ -1,14 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-4gs.js

- * @description Strict Mode - SyntaxError is thrown if the identifier 'arguments' appears within a FormalParameterList of a strict mode FunctionExpression

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-var _13_1_4_fun = function (arguments) { };
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if the identifier 'arguments'
+    appears within a FormalParameterList of a strict mode
+    FunctionExpression
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var _13_1_4_fun = function (arguments) { };
diff --git a/test/suite/ch13/13.1/13.1-5-s.js b/test/suite/ch13/13.1/13.1-5-s.js
index 6d13ca135..7d3a47233 100644
--- a/test/suite/ch13/13.1/13.1-5-s.js
+++ b/test/suite/ch13/13.1/13.1-5-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-5-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is declared in 'strict mode' using a FunctionDeclaration and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function _13_1_5_fun(param, param) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is declared in
+    'strict mode' using a FunctionDeclaration and the function has two
+    identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function _13_1_5_fun(param, param) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-5gs.js b/test/suite/ch13/13.1/13.1-5gs.js
index 709deb1e9..192ede209 100644
--- a/test/suite/ch13/13.1/13.1-5gs.js
+++ b/test/suite/ch13/13.1/13.1-5gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-5gs.js

- * @description Strict Mode - SyntaxError is thrown if a FunctionDeclaration has two identical parameters

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-function _13_1_5_fun(param, param) { }
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a FunctionDeclaration has
+    two identical parameters
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+function _13_1_5_fun(param, param) { }
diff --git a/test/suite/ch13/13.1/13.1-6-s.js b/test/suite/ch13/13.1/13.1-6-s.js
index 10e6e7d9a..f8f9e1c82 100644
--- a/test/suite/ch13/13.1/13.1-6-s.js
+++ b/test/suite/ch13/13.1/13.1-6-s.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-6-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created in 'strict mode' using a FunctionDeclaration and the function has two identical parameters, which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function _13_1_6_fun(param1, param2, param1) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created in
+    'strict mode' using a FunctionDeclaration and the function has two
+    identical parameters, which are separated by a unique parameter
+    name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function _13_1_6_fun(param1, param2, param1) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-7-s.js b/test/suite/ch13/13.1/13.1-7-s.js
index 087a20f7e..4057e8851 100644
--- a/test/suite/ch13/13.1/13.1-7-s.js
+++ b/test/suite/ch13/13.1/13.1-7-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-7-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created in 'strict mode' using a FunctionDeclaration and the function has three identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("function _13_1_7_fun(param, param, param) { }");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created in
+    'strict mode' using a FunctionDeclaration and the function has
+    three identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("function _13_1_7_fun(param, param, param) { }");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-8-s.js b/test/suite/ch13/13.1/13.1-8-s.js
index eb9a3976b..083c7372b 100644
--- a/test/suite/ch13/13.1/13.1-8-s.js
+++ b/test/suite/ch13/13.1/13.1-8-s.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-8-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created in 'strict mode' using a FunctionExpression and the function has two identical parameters

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_1_8_fun = function (param, param) { };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created in
+    'strict mode' using a FunctionExpression and the function has two
+    identical parameters
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_1_8_fun = function (param, param) { };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.1/13.1-8gs.js b/test/suite/ch13/13.1/13.1-8gs.js
index f647656d9..57f9891da 100644
--- a/test/suite/ch13/13.1/13.1-8gs.js
+++ b/test/suite/ch13/13.1/13.1-8gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.1/13.1-8gs.js

- * @description Strict Mode - SyntaxError is thrown if a FunctionExpression has two identical parameters

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-var _13_1_8_fun = function (param, param) { };
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a FunctionExpression has
+    two identical parameters
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var _13_1_8_fun = function (param, param) { };
diff --git a/test/suite/ch13/13.1/13.1-9-s.js b/test/suite/ch13/13.1/13.1-9-s.js
index 11aba0ce2..09ae4eb28 100644
--- a/test/suite/ch13/13.1/13.1-9-s.js
+++ b/test/suite/ch13/13.1/13.1-9-s.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Refer 13.1; 

- * It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode

- * FunctionDeclaration or FunctionExpression.

- *

- * @path ch13/13.1/13.1-9-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created in 'strict mode' using a FunctionExpression and the function has two identical parameters, which are separated by a unique parameter name

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        try {

-            eval("var _13_1_9_fun = function (param1, param2, param1) { };");

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Refer 13.1; 
+    It is a SyntaxError if any Identifier value occurs more than once within a FormalParameterList of a strict mode
+    FunctionDeclaration or FunctionExpression.
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created in
+    'strict mode' using a FunctionExpression and the function has two
+    identical parameters, which are separated by a unique parameter
+    name
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            eval("var _13_1_9_fun = function (param1, param2, param1) { };");
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-1-s.js b/test/suite/ch13/13.2/13.2-1-s.js
index 9b3b7e1d7..b2ae3734f 100644
--- a/test/suite/ch13/13.2/13.2-1-s.js
+++ b/test/suite/ch13/13.2/13.2-1-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-1-s.js

- * @description StrictMode -  Writing or reading from a property named 'caller' of function objects is allowed under both strict and normal modes.

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = function () {

-            this.caller = 12;

-        }

-        var obj = new foo();

-        return obj.caller === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode -  Writing or reading from a property named 'caller' of
+    function objects is allowed under both strict and normal modes.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = function () {
+            this.caller = 12;
+        }
+        var obj = new foo();
+        return obj.caller === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-10-s.js b/test/suite/ch13/13.2/13.2-10-s.js
index 9ab52ea93..c132fffc5 100644
--- a/test/suite/ch13/13.2/13.2-10-s.js
+++ b/test/suite/ch13/13.2/13.2-10-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-10-s.js

- * @description StrictMode - writing a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        try {

-            foo.caller = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        try {
+            foo.caller = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-11-s.js b/test/suite/ch13/13.2/13.2-11-s.js
index f08680ceb..b2bdd9e64 100644
--- a/test/suite/ch13/13.2/13.2-11-s.js
+++ b/test/suite/ch13/13.2/13.2-11-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-11-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails outside of the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        

-        for (var tempIndex in foo) {

-            if (tempIndex === "caller") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        
+        for (var tempIndex in foo) {
+            if (tempIndex === "caller") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-12-s.js b/test/suite/ch13/13.2/13.2-12-s.js
index ecb9ae413..e81d0fda5 100644
--- a/test/suite/ch13/13.2/13.2-12-s.js
+++ b/test/suite/ch13/13.2/13.2-12-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-12-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails inside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-            var foo = Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"caller\") {return false;}}; return true;");

-            return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            var foo = Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"caller\") {return false;}}; return true;");
+            return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-13-s.js b/test/suite/ch13/13.2/13.2-13-s.js
index 2a087ddad..3a33028f1 100644
--- a/test/suite/ch13/13.2/13.2-13-s.js
+++ b/test/suite/ch13/13.2/13.2-13-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-13-s.js

- * @description StrictMode - reading a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        try {

-            var temp = foo.arguments;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        try {
+            var temp = foo.arguments;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-14-s.js b/test/suite/ch13/13.2/13.2-14-s.js
index 53b9bf021..27de01ea2 100644
--- a/test/suite/ch13/13.2/13.2-14-s.js
+++ b/test/suite/ch13/13.2/13.2-14-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-14-s.js

- * @description StrictMode - writing a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        try {

-            foo.arguments = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        try {
+            foo.arguments = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-15-1.js b/test/suite/ch13/13.2/13.2-15-1.js
index 7575c6037..3c1c6f974 100644
--- a/test/suite/ch13/13.2/13.2-15-1.js
+++ b/test/suite/ch13/13.2/13.2-15-1.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-15-1.js

- * @description Function Object has length as its own property and does not invoke the setter defined on Function.prototype.length (Step 15)

- */

-

-

-function testcase() {

-            var fun = function (x, y) { };

-

-            var verifyValue = false;

-            verifyValue = (fun.hasOwnProperty("length") && fun.length === 2);

-

-            var verifyWritable = false;

-            fun.length = 1001;

-            verifyWritable = (fun.length === 1001);

-

-            var verifyEnumerable = false;

-            for (var p in fun) {

-                if (p === "length") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete fun.length;

-            verifyConfigurable = fun.hasOwnProperty("length");

-

-            return verifyValue && !verifyWritable && !verifyEnumerable && verifyConfigurable;

-        }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function Object has length as its own property and does not invoke
+    the setter defined on Function.prototype.length (Step 15)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            var fun = function (x, y) { };
+
+            var verifyValue = false;
+            verifyValue = (fun.hasOwnProperty("length") && fun.length === 2);
+
+            var verifyWritable = false;
+            fun.length = 1001;
+            verifyWritable = (fun.length === 1001);
+
+            var verifyEnumerable = false;
+            for (var p in fun) {
+                if (p === "length") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete fun.length;
+            verifyConfigurable = fun.hasOwnProperty("length");
+
+            return verifyValue && !verifyWritable && !verifyEnumerable && verifyConfigurable;
+        }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-15-s.js b/test/suite/ch13/13.2/13.2-15-s.js
index b14dd3cad..2986330fb 100644
--- a/test/suite/ch13/13.2/13.2-15-s.js
+++ b/test/suite/ch13/13.2/13.2-15-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-15-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails outside of the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        

-        for (var tempIndex in foo) {

-            if (tempIndex === "arguments") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        
+        for (var tempIndex in foo) {
+            if (tempIndex === "arguments") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-16-s.js b/test/suite/ch13/13.2/13.2-16-s.js
index 154887e9a..bfb558f64 100644
--- a/test/suite/ch13/13.2/13.2-16-s.js
+++ b/test/suite/ch13/13.2/13.2-16-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-16-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails inside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-            var foo = new Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"arguments\") {return false;}}; return true;");

-            return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            var foo = new Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"arguments\") {return false;}}; return true;");
+            return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-17-1.js b/test/suite/ch13/13.2/13.2-17-1.js
index 654f2b5dd..ae408d8d6 100644
--- a/test/suite/ch13/13.2/13.2-17-1.js
+++ b/test/suite/ch13/13.2/13.2-17-1.js
@@ -1,55 +1,58 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-17-1.js

- * @description Function Object has 'constructor' as its own property, it is not enumerable and does not invoke the setter defined on Function.prototype.constructor (Step 17)

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object.prototype, "constructor");

-        try {

-            var getFunc = function () {

-                return 100;

-            };

-

-            var data = "data";

-            var setFunc = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(Object.prototype, "constructor", {

-                get: getFunc,

-                set: setFunc,

-                configurable: true

-            });

-

-            var fun = function () {};

-

-            var verifyValue = false;

-            verifyValue = typeof fun.prototype.constructor === "function";

-

-            var verifyEnumerable = false;

-            for (var p in fun.prototype) {

-                if (p === "constructor" && fun.prototype.hasOwnProperty("constructor")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyWritable = false;

-            fun.prototype.constructor = 12;

-            verifyWritable = (fun.prototype.constructor === 12);

-

-            var verifyConfigurable = false;

-            delete fun.prototype.constructor;

-            verifyConfigurable = fun.hasOwnProperty("constructor");

-

-            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable && data === "data";

-        } finally {

-            Object.defineProperty(Object.prototype, "constructor", desc);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function Object has 'constructor' as its own property, it is not
+    enumerable and does not invoke the setter defined on
+    Function.prototype.constructor (Step 17)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object.prototype, "constructor");
+        try {
+            var getFunc = function () {
+                return 100;
+            };
+
+            var data = "data";
+            var setFunc = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(Object.prototype, "constructor", {
+                get: getFunc,
+                set: setFunc,
+                configurable: true
+            });
+
+            var fun = function () {};
+
+            var verifyValue = false;
+            verifyValue = typeof fun.prototype.constructor === "function";
+
+            var verifyEnumerable = false;
+            for (var p in fun.prototype) {
+                if (p === "constructor" && fun.prototype.hasOwnProperty("constructor")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyWritable = false;
+            fun.prototype.constructor = 12;
+            verifyWritable = (fun.prototype.constructor === 12);
+
+            var verifyConfigurable = false;
+            delete fun.prototype.constructor;
+            verifyConfigurable = fun.hasOwnProperty("constructor");
+
+            return verifyValue && verifyWritable && !verifyEnumerable && !verifyConfigurable && data === "data";
+        } finally {
+            Object.defineProperty(Object.prototype, "constructor", desc);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-17-s.js b/test/suite/ch13/13.2/13.2-17-s.js
index 6ff1776b6..61012ecdb 100644
--- a/test/suite/ch13/13.2/13.2-17-s.js
+++ b/test/suite/ch13/13.2/13.2-17-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-17-s.js

- * @description StrictMode - reading a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        try {

-            var temp = foo.arguments;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        try {
+            var temp = foo.arguments;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-18-1.js b/test/suite/ch13/13.2/13.2-18-1.js
index d3614872c..acd203445 100644
--- a/test/suite/ch13/13.2/13.2-18-1.js
+++ b/test/suite/ch13/13.2/13.2-18-1.js
@@ -1,53 +1,56 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-18-1.js

- * @description Function Object has 'prototype' as its own property, it is not enumerable and does not invoke the setter defined on Function.prototype (Step 18)

- */

-

-

-function testcase() {

-        try {

-            var getFunc = function () {

-                return 100;

-            };

-

-            var data = "data";

-            var setFunc = function (value) {

-                data = value;

-            };

-            Object.defineProperty(Function.prototype, "prototype", {

-                get: getFunc,

-                set: setFunc,

-                configurable: true

-            });

-

-            var fun = function () { };

-

-            var verifyValue = false;

-            verifyValue = (fun.prototype !== 100 && fun.prototype.toString() === "[object Object]");

-

-            var verifyEnumerable = false;

-            for (var p in fun) {

-                if (p === "prototype" && fun.hasOwnProperty("prototype")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete fun.prototype;

-            verifyConfigurable = fun.hasOwnProperty("prototype");

-

-            var verifyWritable = false;

-            fun.prototype = 12

-            verifyWritable = (fun.prototype === 12);

-

-            return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable && data === "data";

-        } finally {

-            delete Function.prototype.prototype;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function Object has 'prototype' as its own property, it is not
+    enumerable and does not invoke the setter defined on
+    Function.prototype (Step 18)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var getFunc = function () {
+                return 100;
+            };
+
+            var data = "data";
+            var setFunc = function (value) {
+                data = value;
+            };
+            Object.defineProperty(Function.prototype, "prototype", {
+                get: getFunc,
+                set: setFunc,
+                configurable: true
+            });
+
+            var fun = function () { };
+
+            var verifyValue = false;
+            verifyValue = (fun.prototype !== 100 && fun.prototype.toString() === "[object Object]");
+
+            var verifyEnumerable = false;
+            for (var p in fun) {
+                if (p === "prototype" && fun.hasOwnProperty("prototype")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete fun.prototype;
+            verifyConfigurable = fun.hasOwnProperty("prototype");
+
+            var verifyWritable = false;
+            fun.prototype = 12
+            verifyWritable = (fun.prototype === 12);
+
+            return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable && data === "data";
+        } finally {
+            delete Function.prototype.prototype;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-18-s.js b/test/suite/ch13/13.2/13.2-18-s.js
index c0ac07cc9..2cc2a0e3b 100644
--- a/test/suite/ch13/13.2/13.2-18-s.js
+++ b/test/suite/ch13/13.2/13.2-18-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-18-s.js

- * @description StrictMode - writing a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        try {

-            foo.arguments = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        try {
+            foo.arguments = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-19-b-3gs.js b/test/suite/ch13/13.2/13.2-19-b-3gs.js
index cd356070d..78d9c1ee3 100644
--- a/test/suite/ch13/13.2/13.2-19-b-3gs.js
+++ b/test/suite/ch13/13.2/13.2-19-b-3gs.js
@@ -1,15 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-19-b-3gs.js

- * @description StrictMode - error is thrown when assign a value to the 'caller' property of a function object

- * @onlyStrict

- * @negative NotEarlyError

- */

-"use strict";

-throw NotEarlyError;

-function _13_2_19_b_3_gs() {}

-_13_2_19_b_3_gs.caller = 1;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - error is thrown when assign a value to the 'caller'
+    property of a function object
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+function _13_2_19_b_3_gs() {}
+_13_2_19_b_3_gs.caller = 1;
diff --git a/test/suite/ch13/13.2/13.2-19-s.js b/test/suite/ch13/13.2/13.2-19-s.js
index 5e8b67e6a..06e9a2e46 100644
--- a/test/suite/ch13/13.2/13.2-19-s.js
+++ b/test/suite/ch13/13.2/13.2-19-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-19-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails outside of the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        

-        for (var tempIndex in foo) {

-            if (tempIndex === "arguments") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        
+        for (var tempIndex in foo) {
+            if (tempIndex === "arguments") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-2-s.js b/test/suite/ch13/13.2/13.2-2-s.js
index f2bdf6898..800d5b45d 100644
--- a/test/suite/ch13/13.2/13.2-2-s.js
+++ b/test/suite/ch13/13.2/13.2-2-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-2-s.js

- * @description StrictMode - A TypeError is thrown when a strict mode code writes to properties named 'caller' of function instances.

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            var foo = function () {

-            }

-            foo.caller = 20;

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - A TypeError is thrown when a strict mode code writes
+    to properties named 'caller' of function instances.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            var foo = function () {
+            }
+            foo.caller = 20;
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-20-s.js b/test/suite/ch13/13.2/13.2-20-s.js
index 5eee4a321..f4ad42f65 100644
--- a/test/suite/ch13/13.2/13.2-20-s.js
+++ b/test/suite/ch13/13.2/13.2-20-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-20-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails inside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-            var foo = Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"arguments\") {return false;}}; return true;");

-            return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            var foo = Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"arguments\") {return false;}}; return true;");
+            return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-21-s.js b/test/suite/ch13/13.2/13.2-21-s.js
index 42ad83815..e27b478e0 100644
--- a/test/suite/ch13/13.2/13.2-21-s.js
+++ b/test/suite/ch13/13.2/13.2-21-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-21-s.js

- * @description StrictMode - reading a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        try {

-            var temp = foo.caller;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        try {
+            var temp = foo.caller;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-22-s.js b/test/suite/ch13/13.2/13.2-22-s.js
index ab901903c..094a8b118 100644
--- a/test/suite/ch13/13.2/13.2-22-s.js
+++ b/test/suite/ch13/13.2/13.2-22-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-22-s.js

- * @description StrictMode - writing a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        try {

-            foo.caller = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        try {
+            foo.caller = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-23-s.js b/test/suite/ch13/13.2/13.2-23-s.js
index 0e89b66ae..019770605 100644
--- a/test/suite/ch13/13.2/13.2-23-s.js
+++ b/test/suite/ch13/13.2/13.2-23-s.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-23-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails outside of the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        for (var tempIndex in foo) {

-            if (tempIndex === "caller") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        for (var tempIndex in foo) {
+            if (tempIndex === "caller") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-24-s.js b/test/suite/ch13/13.2/13.2-24-s.js
index f9008fc56..2ef269683 100644
--- a/test/suite/ch13/13.2/13.2-24-s.js
+++ b/test/suite/ch13/13.2/13.2-24-s.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-24-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails inside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-            function foo () {

-                "use strict"; 

-                for (var tempIndex in this) {

-                    if (tempIndex==="caller") {

-                        return false;

-                    }

-                } 

-                return true;

-            }

-            return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            function foo () {
+                "use strict"; 
+                for (var tempIndex in this) {
+                    if (tempIndex==="caller") {
+                        return false;
+                    }
+                } 
+                return true;
+            }
+            return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-25-s.js b/test/suite/ch13/13.2/13.2-25-s.js
index b4c650897..27d4b32ad 100644
--- a/test/suite/ch13/13.2/13.2-25-s.js
+++ b/test/suite/ch13/13.2/13.2-25-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-25-s.js

- * @description StrictMode - reading a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        try {

-            var temp = foo.arguments;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        try {
+            var temp = foo.arguments;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-26-s.js b/test/suite/ch13/13.2/13.2-26-s.js
index 68682ce31..0e4d0a8d6 100644
--- a/test/suite/ch13/13.2/13.2-26-s.js
+++ b/test/suite/ch13/13.2/13.2-26-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-26-s.js

- * @description StrictMode - writing a property named 'arguments' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        try {

-            foo.arguments = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'arguments' of function
+    objects is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        try {
+            foo.arguments = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-27-s.js b/test/suite/ch13/13.2/13.2-27-s.js
index d6177986a..c640ad673 100644
--- a/test/suite/ch13/13.2/13.2-27-s.js
+++ b/test/suite/ch13/13.2/13.2-27-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-27-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails outside of the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo () {"use strict";}

-        

-        for (var tempIndex in foo) {

-            if (tempIndex === "arguments") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo () {"use strict";}
+        
+        for (var tempIndex in foo) {
+            if (tempIndex === "arguments") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-28-s.js b/test/suite/ch13/13.2/13.2-28-s.js
index dd9dad3ee..955938503 100644
--- a/test/suite/ch13/13.2/13.2-28-s.js
+++ b/test/suite/ch13/13.2/13.2-28-s.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-28-s.js

- * @description StrictMode - enumerating over a function object looking for 'arguments' fails inside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-            function foo() {

-                "use strict"; 

-                for (var tempIndex in this) {

-                    if (tempIndex==="arguments") {

-                        return false;

-                    }

-                } 

-                return true;

-            }

-            return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'arguments' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            function foo() {
+                "use strict"; 
+                for (var tempIndex in this) {
+                    if (tempIndex==="arguments") {
+                        return false;
+                    }
+                } 
+                return true;
+            }
+            return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-29-s.js b/test/suite/ch13/13.2/13.2-29-s.js
index 8f2b59d39..7ddc4a82b 100644
--- a/test/suite/ch13/13.2/13.2-29-s.js
+++ b/test/suite/ch13/13.2/13.2-29-s.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-29-s.js

- * @description StrictMode - property named 'caller' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo() {"use strict";}

-        return ! Object.getOwnPropertyDescriptor(foo, 

-                                                  "caller").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'caller' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo() {"use strict";}
+        return ! Object.getOwnPropertyDescriptor(foo, 
+                                                  "caller").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-3-s.js b/test/suite/ch13/13.2/13.2-3-s.js
index 642f417c7..bd49fe9ad 100644
--- a/test/suite/ch13/13.2/13.2-3-s.js
+++ b/test/suite/ch13/13.2/13.2-3-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-3-s.js

- * @description StrictMode - Writing or reading from a property named 'arguments' of function objects is allowed under both strict and normal modes.

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = function () {

-            this.arguments = 12;

-        } 

-        var obj = new foo();

-        return obj.arguments === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - Writing or reading from a property named 'arguments'
+    of function objects is allowed under both strict and normal modes.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = function () {
+            this.arguments = 12;
+        } 
+        var obj = new foo();
+        return obj.arguments === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-30-s.js b/test/suite/ch13/13.2/13.2-30-s.js
index fd531f4c5..2103f5ec2 100644
--- a/test/suite/ch13/13.2/13.2-30-s.js
+++ b/test/suite/ch13/13.2/13.2-30-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-30-s.js

- * @description StrictMode - property named 'caller' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        return ! Object.getOwnPropertyDescriptor(Function("'use strict';"), 

-                                                  "caller").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'caller' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return ! Object.getOwnPropertyDescriptor(Function("'use strict';"), 
+                                                  "caller").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-31-s.js b/test/suite/ch13/13.2/13.2-31-s.js
index e5693beb9..48da5a92b 100644
--- a/test/suite/ch13/13.2/13.2-31-s.js
+++ b/test/suite/ch13/13.2/13.2-31-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-31-s.js

- * @description StrictMode - property named 'caller' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        return ! Object.getOwnPropertyDescriptor(new Function("'use strict';"), 

-                                                  "caller").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'caller' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return ! Object.getOwnPropertyDescriptor(new Function("'use strict';"), 
+                                                  "caller").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-32-s.js b/test/suite/ch13/13.2/13.2-32-s.js
index cc0c1f9ca..929d2bba3 100644
--- a/test/suite/ch13/13.2/13.2-32-s.js
+++ b/test/suite/ch13/13.2/13.2-32-s.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-32-s.js

- * @description StrictMode - property named 'caller' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var funcExpr = function () { "use strict";};

-        return ! Object.getOwnPropertyDescriptor(funcExpr, 

-                                                  "caller").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'caller' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funcExpr = function () { "use strict";};
+        return ! Object.getOwnPropertyDescriptor(funcExpr, 
+                                                  "caller").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-33-s.js b/test/suite/ch13/13.2/13.2-33-s.js
index 602a0d808..0bc11d980 100644
--- a/test/suite/ch13/13.2/13.2-33-s.js
+++ b/test/suite/ch13/13.2/13.2-33-s.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-33-s.js

- * @description StrictMode - property named 'arguments' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        function foo() {"use strict";}

-        return ! Object.getOwnPropertyDescriptor(foo, 

-                                                  "arguments").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'arguments' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function foo() {"use strict";}
+        return ! Object.getOwnPropertyDescriptor(foo, 
+                                                  "arguments").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-34-s.js b/test/suite/ch13/13.2/13.2-34-s.js
index 81f9fd0d7..23a9d2af2 100644
--- a/test/suite/ch13/13.2/13.2-34-s.js
+++ b/test/suite/ch13/13.2/13.2-34-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-34-s.js

- * @description StrictMode - property named 'arguments' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        return ! Object.getOwnPropertyDescriptor(Function("'use strict';"), 

-                                                  "arguments").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'arguments' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return ! Object.getOwnPropertyDescriptor(Function("'use strict';"), 
+                                                  "arguments").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-35-s.js b/test/suite/ch13/13.2/13.2-35-s.js
index e6031df2d..c1da63eaf 100644
--- a/test/suite/ch13/13.2/13.2-35-s.js
+++ b/test/suite/ch13/13.2/13.2-35-s.js
@@ -1,18 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-35-s.js

- * @description StrictMode - property named 'arguments' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        return ! Object.getOwnPropertyDescriptor(new Function("'use strict';"), 

-                                                  "arguments").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'arguments' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return ! Object.getOwnPropertyDescriptor(new Function("'use strict';"), 
+                                                  "arguments").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-36-s.js b/test/suite/ch13/13.2/13.2-36-s.js
index 4e958dee0..0b13df082 100644
--- a/test/suite/ch13/13.2/13.2-36-s.js
+++ b/test/suite/ch13/13.2/13.2-36-s.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-36-s.js

- * @description StrictMode - property named 'arguments' of function objects is not configurable

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var funcExpr = function () { "use strict";};

-        return ! Object.getOwnPropertyDescriptor(funcExpr, 

-                                                  "arguments").configurable;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - property named 'arguments' of function objects is not
+    configurable
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funcExpr = function () { "use strict";};
+        return ! Object.getOwnPropertyDescriptor(funcExpr, 
+                                                  "arguments").configurable;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-4-s.js b/test/suite/ch13/13.2/13.2-4-s.js
index 82981f467..ddc05e571 100644
--- a/test/suite/ch13/13.2/13.2-4-s.js
+++ b/test/suite/ch13/13.2/13.2-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-4-s.js

- * @description StrictMode - A TypeError is thrown when a code in strict mode tries to write to 'arguments' of function instances.

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        try {

-            var foo = function () {

-            }

-            foo.arguments = 20;

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - A TypeError is thrown when a code in strict mode
+    tries to write to 'arguments' of function instances.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            var foo = function () {
+            }
+            foo.arguments = 20;
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-5-s.js b/test/suite/ch13/13.2/13.2-5-s.js
index 2512e5ef0..8a705158a 100644
--- a/test/suite/ch13/13.2/13.2-5-s.js
+++ b/test/suite/ch13/13.2/13.2-5-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-5-s.js

- * @description StrictMode - reading a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        try {

-            var temp = foo.caller;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        try {
+            var temp = foo.caller;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-6-s.js b/test/suite/ch13/13.2/13.2-6-s.js
index 5b6de1de9..c5848058a 100644
--- a/test/suite/ch13/13.2/13.2-6-s.js
+++ b/test/suite/ch13/13.2/13.2-6-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-6-s.js

- * @description StrictMode - writing a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        try {

-            foo.caller = 41;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - writing a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        try {
+            foo.caller = 41;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-7-s.js b/test/suite/ch13/13.2/13.2-7-s.js
index 2b5fbb185..b50034aca 100644
--- a/test/suite/ch13/13.2/13.2-7-s.js
+++ b/test/suite/ch13/13.2/13.2-7-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-7-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails outside of the function

- * @onlyStrict

- */

-

-

-function testcase() {

-        var foo = new Function("'use strict';");

-        

-        for (var tempIndex in foo) {

-            if (tempIndex === "caller") {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails outside of the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = new Function("'use strict';");
+        
+        for (var tempIndex in foo) {
+            if (tempIndex === "caller") {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-8-s.js b/test/suite/ch13/13.2/13.2-8-s.js
index 42bcc07d9..62b560ce6 100644
--- a/test/suite/ch13/13.2/13.2-8-s.js
+++ b/test/suite/ch13/13.2/13.2-8-s.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-8-s.js

- * @description StrictMode - enumerating over a function object looking for 'caller' fails inside the function

- * @onlyStrict

- */

-

-

-function testcase() {

-            var foo = new Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"caller\") {return false;}}; return true;");

-            return foo();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - enumerating over a function object looking for
+    'caller' fails inside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            var foo = new Function("'use strict'; for (var tempIndex in this) {if (tempIndex===\"caller\") {return false;}}; return true;");
+            return foo();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/13.2-9-s.js b/test/suite/ch13/13.2/13.2-9-s.js
index fac6285e6..7ae060575 100644
--- a/test/suite/ch13/13.2/13.2-9-s.js
+++ b/test/suite/ch13/13.2/13.2-9-s.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch13/13.2/13.2-9-s.js

- * @description StrictMode - reading a property named 'caller' of function objects is not allowed outside the function

- * @onlyStrict

- */

-

-

-

-function testcase() {

-        var foo = Function("'use strict';");

-        try {

-            var temp = foo.caller;

-            return false;

-        }

-        catch (e) {

-            return e instanceof TypeError;

-        }

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - reading a property named 'caller' of function objects
+    is not allowed outside the function
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = Function("'use strict';");
+        try {
+            var temp = foo.caller;
+            return false;
+        }
+        catch (e) {
+            return e instanceof TypeError;
+        }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch13/13.2/S13.2.1_A1_T1.js b/test/suite/ch13/13.2/S13.2.1_A1_T1.js
index 1295b6a48..f11e55875 100644
--- a/test/suite/ch13/13.2/S13.2.1_A1_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The depth of nested function calls reaches 32
- *
- * @path ch13/13.2/S13.2.1_A1_T1.js
- * @description Creating function calls 32 elements depth
- */
+/*---
+info: The depth of nested function calls reaches 32
+description: Creating function calls 32 elements depth
+---*/
 
 (function(){
     (function(){
@@ -70,5 +68,4 @@
             })()
         })()
     })()
-})()                            
-
+})()
diff --git a/test/suite/ch13/13.2/S13.2.1_A4_T1.js b/test/suite/ch13/13.2/S13.2.1_A4_T1.js
index a2bce3580..2d4189ed5 100644
--- a/test/suite/ch13/13.2/S13.2.1_A4_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A4_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects as arguments are passed by reference
- *
- * @path ch13/13.2/S13.2.1_A4_T1.js
- * @description Adding new number property to a function argument within the function body,
- * where explicit argument is an object defined with "var __obj={}"
- */
+/*---
+info: Objects as arguments are passed by reference
+description: >
+    Adding new number property to a function argument within the
+    function body,  where explicit argument is an object defined with
+    "var __obj={}"
+---*/
 
 function __func(__arg){
     __arg.foo=7;
@@ -24,4 +24,3 @@ if (__obj.foo !== 7) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A4_T2.js b/test/suite/ch13/13.2/S13.2.1_A4_T2.js
index 682f57d08..8881c5311 100644
--- a/test/suite/ch13/13.2/S13.2.1_A4_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A4_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects as arguments are passed by reference
- *
- * @path ch13/13.2/S13.2.1_A4_T2.js
- * @description Adding new string property to a function argument within the function body,
- * where explicit argument is an object defined with "__obj={}"
- */
+/*---
+info: Objects as arguments are passed by reference
+description: >
+    Adding new string property to a function argument within the
+    function body,  where explicit argument is an object defined with
+    "__obj={}"
+---*/
 
 function __func(__arg){
     __arg.foo="whiskey gogo";
@@ -24,4 +24,3 @@ if (__obj.foo !== "whiskey gogo") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A4_T3.js b/test/suite/ch13/13.2/S13.2.1_A4_T3.js
index 00ee68b10..6cd4c12a4 100644
--- a/test/suite/ch13/13.2/S13.2.1_A4_T3.js
+++ b/test/suite/ch13/13.2/S13.2.1_A4_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects as arguments are passed by reference
- *
- * @path ch13/13.2/S13.2.1_A4_T3.js
- * @description Adding new number property to a function argument within the function body,
- * where array element "arguments[0]" is an object defined with "__obj={}"
- */
+/*---
+info: Objects as arguments are passed by reference
+description: >
+    Adding new number property to a function argument within the
+    function body,  where array element "arguments[0]" is an object
+    defined with "__obj={}"
+---*/
 
 function __func(){
     arguments[0]["PI"]=3.14;
@@ -24,4 +24,3 @@ if (__obj.PI !== 3.14) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A4_T4.js b/test/suite/ch13/13.2/S13.2.1_A4_T4.js
index a9a026121..16744343e 100644
--- a/test/suite/ch13/13.2/S13.2.1_A4_T4.js
+++ b/test/suite/ch13/13.2/S13.2.1_A4_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects as arguments are passed by reference
- *
- * @path ch13/13.2/S13.2.1_A4_T4.js
- * @description Adding new number property to a function argument within the function body,
- * where array element "arguments[0]" is an object defined with "var __obj={}"
- */
+/*---
+info: Objects as arguments are passed by reference
+description: >
+    Adding new number property to a function argument within the
+    function body,  where array element "arguments[0]" is an object
+    defined with "var __obj={}"
+---*/
 
 function __func(){
     arguments[0]["E"]=2.74;
@@ -24,4 +24,3 @@ if (__obj.E !== 2.74) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A5_T1.js b/test/suite/ch13/13.2/S13.2.1_A5_T1.js
index 81909da90..b0a1fac91 100644
--- a/test/suite/ch13/13.2/S13.2.1_A5_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Closures are admitted
- *
- * @path ch13/13.2/S13.2.1_A5_T1.js
- * @description Sorting with closure
- */
+/*---
+info: Closures are admitted
+description: Sorting with closure
+---*/
 
 var __arr = [4,3,2,1,4,3,2,1,4,3,2,1];
 //Sort uses closure
@@ -26,5 +24,4 @@ if (__arr.toString() !== [4,4,4,3,3,3,2,2,2,1,1,1].toString()) {
 }
 
 //
-//////////////////////////////////////////////////////////////////////////////  
-
+//////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/ch13/13.2/S13.2.1_A5_T2.js b/test/suite/ch13/13.2/S13.2.1_A5_T2.js
index e48402cd6..00d2907bd 100644
--- a/test/suite/ch13/13.2/S13.2.1_A5_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A5_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Closures are admitted
- *
- * @path ch13/13.2/S13.2.1_A5_T2.js
- * @description Returning a function that approximates the derivative of f
- * using an interval of dx, which should be appropriately small
- */
+/*---
+info: Closures are admitted
+description: >
+    Returning a function that approximates the derivative of f  using
+    an interval of dx, which should be appropriately small
+---*/
 
 // Return a function that approximates the derivative of f
 // using an interval of dx, which should be appropriately small.
@@ -24,4 +23,3 @@ if (Math.abs(derivative(Math.sin, 0.0001)(0) - derivative(Math.sin, 0.0001)(2*Ma
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A6_T1.js b/test/suite/ch13/13.2/S13.2.1_A6_T1.js
index a1d360b34..ba430f274 100644
--- a/test/suite/ch13/13.2/S13.2.1_A6_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Primitive types are passed by value
- *
- * @path ch13/13.2/S13.2.1_A6_T1.js
- * @description Declaring a function with "function __func(arg1, arg2)"
- */
+/*---
+info: Primitive types are passed by value
+description: Declaring a function with "function __func(arg1, arg2)"
+---*/
 
 function __func(arg1, arg2){
     arg1++;
@@ -28,4 +26,3 @@ if (x!==1 || y!==2 || a!=="AB" || b!=="SAM") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A6_T2.js b/test/suite/ch13/13.2/S13.2.1_A6_T2.js
index f92bafaf2..36248a729 100644
--- a/test/suite/ch13/13.2/S13.2.1_A6_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A6_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Primitive types are passed by value
- *
- * @path ch13/13.2/S13.2.1_A6_T2.js
- * @description Declaring a function with "__func = function(arg1, arg2)"
- */
+/*---
+info: Primitive types are passed by value
+description: Declaring a function with "__func = function(arg1, arg2)"
+---*/
 
 __func = function(arg1, arg2){
     arg1++;
@@ -28,4 +26,3 @@ if (x!==1 || y!==2 || a!=="AB" || b!=="SAM") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A7_T1.js b/test/suite/ch13/13.2/S13.2.1_A7_T1.js
index 4e46fcafe..db095b177 100644
--- a/test/suite/ch13/13.2/S13.2.1_A7_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A7_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is returned  then Result.value is returned too
- *
- * @path ch13/13.2/S13.2.1_A7_T1.js
- * @description Returning null. Declaring a function with "function __func()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is returned  then Result.value is returned too
+description: Returning null. Declaring a function with "function __func()"
+---*/
 
 function __func(){
     var x = null;
@@ -24,4 +23,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A7_T2.js b/test/suite/ch13/13.2/S13.2.1_A7_T2.js
index ae4fbb406..3328bc55b 100644
--- a/test/suite/ch13/13.2/S13.2.1_A7_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A7_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is returned  then Result.value is returned too
- *
- * @path ch13/13.2/S13.2.1_A7_T2.js
- * @description Returning null. Declaring a function with "var __func = function ()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is returned  then Result.value is returned too
+description: >
+    Returning null. Declaring a function with "var __func = function
+    ()"
+---*/
 
 var __func = function (){
     var x = null;
@@ -24,4 +25,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A7_T3.js b/test/suite/ch13/13.2/S13.2.1_A7_T3.js
index efbb8a04d..5cd67c4dc 100644
--- a/test/suite/ch13/13.2/S13.2.1_A7_T3.js
+++ b/test/suite/ch13/13.2/S13.2.1_A7_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is returned  then Result.value is returned too
- *
- * @path ch13/13.2/S13.2.1_A7_T3.js
- * @description Returning number. Declaring a function with "function __func()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is returned  then Result.value is returned too
+description: Returning number. Declaring a function with "function __func()"
+includes: [Test262Error.js]
+---*/
 
 function __func(){
     x = 1;
@@ -51,5 +51,3 @@ if (x !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A7_T4.js b/test/suite/ch13/13.2/S13.2.1_A7_T4.js
index 7461324ed..13632f0f3 100644
--- a/test/suite/ch13/13.2/S13.2.1_A7_T4.js
+++ b/test/suite/ch13/13.2/S13.2.1_A7_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is returned  then Result.value is returned too
- *
- * @path ch13/13.2/S13.2.1_A7_T4.js
- * @description Returning boolean. Declaring a function with "function __func()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is returned  then Result.value is returned too
+description: Returning boolean. Declaring a function with "function __func()"
+includes: [Test262Error.js]
+---*/
 
 function __func(){
     var x = true;
@@ -19,8 +19,8 @@ function __func(){
 //CHECK#
 try {
 	x=x;
-	$ERROR('#0: "x=x" lead to throwing exception');

-} catch (e) {

+	$ERROR('#0: "x=x" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
@@ -48,11 +48,9 @@ if (!(__x)) {
 //CHECK#3
 try {
 	x=x;
-	$ERROR('#3: "x=x" lead to throwing exception');

-} catch (e) {

+	$ERROR('#3: "x=x" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A8_T1.js b/test/suite/ch13/13.2/S13.2.1_A8_T1.js
index 2be9cb728..a6fb01b32 100644
--- a/test/suite/ch13/13.2/S13.2.1_A8_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A8_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is thrown then Result.value is thrown too
- *
- * @path ch13/13.2/S13.2.1_A8_T1.js
- * @description Throwing an exception within a function body. Declaring function with "function __func()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is thrown then Result.value is thrown too
+description: >
+    Throwing an exception within a function body. Declaring function
+    with "function __func()"
+---*/
 
 function __func(){
     var x = 1;
@@ -24,4 +25,3 @@ try{
     	$ERROR('#1: Exception === "Catch Me If You Can". Actual: exception ==='+e);
     }
 }
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A8_T2.js b/test/suite/ch13/13.2/S13.2.1_A8_T2.js
index c07582b28..831e678dc 100644
--- a/test/suite/ch13/13.2/S13.2.1_A8_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A8_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object F is called, the following steps are taken:
- * 2. Evaluate F's FunctionBody;
- * if Result.type is thrown then Result.value is thrown too
- *
- * @path ch13/13.2/S13.2.1_A8_T2.js
- * @description Throwing an exception within a function body. Declaring function with "var __func = function (message)"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object F is called, the following steps are taken:
+    2. Evaluate F's FunctionBody;
+    if Result.type is thrown then Result.value is thrown too
+description: >
+    Throwing an exception within a function body. Declaring function
+    with "var __func = function (message)"
+---*/
 
 var CATCH_ME_IF_YOU_CAN = true;
 
@@ -26,4 +27,3 @@ try{
     	$ERROR('#1: Exception === true. Actual: exception ==='+e);
     }
 }
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A9.1_T1.js b/test/suite/ch13/13.2/S13.2.1_A9.1_T1.js
index 9b1dd7382..11b0f0c45 100644
--- a/test/suite/ch13/13.2/S13.2.1_A9.1_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A9.1_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object is called,
- * the body is evaluated and if evaluation result has type "normal", then "undefined" is returned
- *
- * @path ch13/13.2/S13.2.1_A9.1_T1.js
- * @description Declaring a function with "function __func()" and no "return" in the function body
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object is called,
+    the body is evaluated and if evaluation result has type "normal", then "undefined" is returned
+description: >
+    Declaring a function with "function __func()" and no "return" in
+    the function body
+---*/
 
 var x;
 
@@ -30,4 +31,3 @@ if (!x) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A9.1_T2.js b/test/suite/ch13/13.2/S13.2.1_A9.1_T2.js
index 90057b04b..25cfbd5f0 100644
--- a/test/suite/ch13/13.2/S13.2.1_A9.1_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A9.1_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object is called,
- * the body is evaluated and if evaluation result has type "normal", then "undefined" is returned
- *
- * @path ch13/13.2/S13.2.1_A9.1_T2.js
- * @description Declaring a function with "var __func = function()" and no "return" in the function body
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object is called,
+    the body is evaluated and if evaluation result has type "normal", then "undefined" is returned
+description: >
+    Declaring a function with "var __func = function()" and no
+    "return" in the function body
+---*/
 
 var x;
 
@@ -30,4 +31,3 @@ if (!x) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A9_T1.js b/test/suite/ch13/13.2/S13.2.1_A9_T1.js
index 6332ef34e..1cecf4992 100644
--- a/test/suite/ch13/13.2/S13.2.1_A9_T1.js
+++ b/test/suite/ch13/13.2/S13.2.1_A9_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object is called,
- * the body is evaluated and if evaluation result has type "return" its value is not defined, then "undefined" is returned
- *
- * @path ch13/13.2/S13.2.1_A9_T1.js
- * @description Using "return" with no expression. Declaring a function with "function __func()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object is called,
+    the body is evaluated and if evaluation result has type "return" its value is not defined, then "undefined" is returned
+description: >
+    Using "return" with no expression. Declaring a function with
+    "function __func()"
+---*/
 
 var x; 
 
@@ -31,4 +32,3 @@ if (x!==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.1_A9_T2.js b/test/suite/ch13/13.2/S13.2.1_A9_T2.js
index 75be8a19a..f40a79dd6 100644
--- a/test/suite/ch13/13.2/S13.2.1_A9_T2.js
+++ b/test/suite/ch13/13.2/S13.2.1_A9_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Call]] property for a Function object is called,
- * the body is evaluated and if evaluation result has type "return" its value is not defined, then "undefined" is returned
- *
- * @path ch13/13.2/S13.2.1_A9_T2.js
- * @description Using "return" with no expression. Declaring a function with "var __func = function()"
- */
+/*---
+info: >
+    When the [[Call]] property for a Function object is called,
+    the body is evaluated and if evaluation result has type "return" its value is not defined, then "undefined" is returned
+description: >
+    Using "return" with no expression. Declaring a function with "var
+    __func = function()"
+---*/
 
 var x; 
 
@@ -31,4 +32,3 @@ if (x!==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A10.js b/test/suite/ch13/13.2/S13.2.2_A10.js
index 25ba9d58d..a4ea620d3 100644
--- a/test/suite/ch13/13.2/S13.2.2_A10.js
+++ b/test/suite/ch13/13.2/S13.2.2_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is possible as long as this.any_Function is declared
- *
- * @path ch13/13.2/S13.2.2_A10.js
- * @description Calling a function as a constructor after it has been declared
- */
+/*---
+info: >
+    Calling a function as a constructor is possible as long as
+    this.any_Function is declared
+description: Calling a function as a constructor after it has been declared
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -35,4 +35,3 @@ if (obj.id !== 5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A11.js b/test/suite/ch13/13.2/S13.2.2_A11.js
index 13f7f4e9b..d4c3d2b1d 100644
--- a/test/suite/ch13/13.2/S13.2.2_A11.js
+++ b/test/suite/ch13/13.2/S13.2.2_A11.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is possible as long as this.any_Function is declared and called
- *
- * @path ch13/13.2/S13.2.2_A11.js
- * @description Calling a function as a constructor after it has been declared with "function func()"
- */
+/*---
+info: >
+    Calling a function as a constructor is possible as long as
+    this.any_Function is declared and called
+description: >
+    Calling a function as a constructor after it has been declared
+    with "function func()"
+includes: [Test262Error.js]
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -22,11 +25,9 @@ function FACTORY(){
 //CHECK#1
 try {
 	var obj = new FACTORY();
-	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');

-} catch (e) {

+	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A12.js b/test/suite/ch13/13.2/S13.2.2_A12.js
index 52d4a95b6..d5570a200 100644
--- a/test/suite/ch13/13.2/S13.2.2_A12.js
+++ b/test/suite/ch13/13.2/S13.2.2_A12.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is possible as long as this.any_Function is declared and called
- *
- * @path ch13/13.2/S13.2.2_A12.js
- * @description Calling a function as a constructor after it has been declared with "function func()"
- */
+/*---
+info: >
+    Calling a function as a constructor is possible as long as
+    this.any_Function is declared and called
+description: >
+    Calling a function as a constructor after it has been declared
+    with "function func()"
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -35,4 +37,3 @@ if (obj.id !== "id_string") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A13.js b/test/suite/ch13/13.2/S13.2.2_A13.js
index 79801ac9e..18919e13e 100644
--- a/test/suite/ch13/13.2/S13.2.2_A13.js
+++ b/test/suite/ch13/13.2/S13.2.2_A13.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is inadmissible as long as this.any_Function is declared by eval and called
- *
- * @path ch13/13.2/S13.2.2_A13.js
- * @description Calling a function as a constructor after it has been declared by eval
- */
+/*---
+info: >
+    Calling a function as a constructor is inadmissible as long as
+    this.any_Function is declared by eval and called
+description: >
+    Calling a function as a constructor after it has been declared by
+    eval
+includes: [Test262Error.js]
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -20,10 +23,9 @@ function FACTORY(){
 //CHECK#1
 try {
 	var obj = new FACTORY();
-	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');

-} catch (e) {

+	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A14.js b/test/suite/ch13/13.2/S13.2.2_A14.js
index 2db1005bc..6b233d56d 100644
--- a/test/suite/ch13/13.2/S13.2.2_A14.js
+++ b/test/suite/ch13/13.2/S13.2.2_A14.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is inadmissible as long as this.any_Function is declared by eval and called
- *
- * @path ch13/13.2/S13.2.2_A14.js
- * @description Calling a function as a constructor after it has been declared by eval
- * @noStrict
- */
+/*---
+info: >
+    Calling a function as a constructor is inadmissible as long as
+    this.any_Function is declared by eval and called
+description: >
+    Calling a function as a constructor after it has been declared by
+    eval
+flags: [noStrict]
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -26,4 +28,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A15_T1.js b/test/suite/ch13/13.2/S13.2.2_A15_T1.js
index 6548618eb..958dd93e3 100644
--- a/test/suite/ch13/13.2/S13.2.2_A15_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A15_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called,
- * and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
- *
- * @path ch13/13.2/S13.2.2_A15_T1.js
- * @description Function declared at the end of the program and "obj" property is declared with "var obj = {}"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called,
+    and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
+description: >
+    Function declared at the end of the program and "obj" property is
+    declared with "var obj = {}"
+---*/
 
 var __obj = new __FACTORY();
 
@@ -42,4 +43,3 @@ function __FACTORY(){
     obj.slot = this;
     return obj;
 }
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A15_T2.js b/test/suite/ch13/13.2/S13.2.2_A15_T2.js
index 007474b4b..9c9cc7765 100644
--- a/test/suite/ch13/13.2/S13.2.2_A15_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A15_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called,
- * and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
- *
- * @path ch13/13.2/S13.2.2_A15_T2.js
- * @description Function declared at the end of the program and "obj" property is declared with "obj = {}"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called,
+    and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
+description: >
+    Function declared at the end of the program and "obj" property is
+    declared with "obj = {}"
+---*/
 
 var __obj = new __FACTORY();
 
@@ -42,4 +43,3 @@ function __FACTORY(){
     obj.slot = this;
     return obj;
 }
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A15_T3.js b/test/suite/ch13/13.2/S13.2.2_A15_T3.js
index c448df552..a4ada72b1 100644
--- a/test/suite/ch13/13.2/S13.2.2_A15_T3.js
+++ b/test/suite/ch13/13.2/S13.2.2_A15_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called,
- * and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
- *
- * @path ch13/13.2/S13.2.2_A15_T3.js
- * @description Function declared at the end of the program and "obj" property is declared with "var obj = {}"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called,
+    and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
+description: >
+    Function declared at the end of the program and "obj" property is
+    declared with "var obj = {}"
+---*/
 
 __FACTORY = function (){
     this.prop = 1;
@@ -42,4 +43,3 @@ if (__obj.slot.prop !==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A15_T4.js b/test/suite/ch13/13.2/S13.2.2_A15_T4.js
index 5667b9b52..9267fff05 100644
--- a/test/suite/ch13/13.2/S13.2.2_A15_T4.js
+++ b/test/suite/ch13/13.2/S13.2.2_A15_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called,
- * and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
- *
- * @path ch13/13.2/S13.2.2_A15_T4.js
- * @description Function declared at the end of the program and "obj" property is declared with "obj = {}"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called,
+    and the object created in the function is returned, the object (declared with "this" within a function) will be strong and healthy
+description: >
+    Function declared at the end of the program and "obj" property is
+    declared with "obj = {}"
+---*/
 
 __FACTORY = function(){
     this.prop = 1;
@@ -42,5 +43,3 @@ if (__obj.slot.prop !==1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A16_T1.js b/test/suite/ch13/13.2/S13.2.2_A16_T1.js
index ea40cfb09..c6c8ffef3 100644
--- a/test/suite/ch13/13.2/S13.2.2_A16_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A16_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a new statement is admitted
- *
- * @path ch13/13.2/S13.2.2_A16_T1.js
- * @description Using "is __obj = new function __func(){this.prop=1;}" as FunctionExpression
- */
+/*---
+info: FunctionExpression within a new statement is admitted
+description: >
+    Using "is __obj = new function __func(){this.prop=1;}" as
+    FunctionExpression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -33,4 +33,3 @@ if (typeof __func !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A16_T2.js b/test/suite/ch13/13.2/S13.2.2_A16_T2.js
index 2af36ba44..1716a1d4d 100644
--- a/test/suite/ch13/13.2/S13.2.2_A16_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A16_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a new statement is admitted
- *
- * @path ch13/13.2/S13.2.2_A16_T2.js
- * @description Using "var __obj = new function __func(arg){this.prop=arg;}(5)" as FunctionExpression
- */
+/*---
+info: FunctionExpression within a new statement is admitted
+description: >
+    Using "var __obj = new function __func(arg){this.prop=arg;}(5)" as
+    FunctionExpression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -33,4 +33,3 @@ if (typeof __func !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A16_T3.js b/test/suite/ch13/13.2/S13.2.2_A16_T3.js
index 8cff917f6..25c585bdb 100644
--- a/test/suite/ch13/13.2/S13.2.2_A16_T3.js
+++ b/test/suite/ch13/13.2/S13.2.2_A16_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression within a new statement is admitted
- *
- * @path ch13/13.2/S13.2.2_A16_T3.js
- * @description Using "is __obj = new function __func(arg){this.prop=arg; return {feat: ++arg}}(5)" as FunctionExpression
- */
+/*---
+info: FunctionExpression within a new statement is admitted
+description: >
+    Using "is __obj = new function __func(arg){this.prop=arg; return
+    {feat: ++arg}}(5)" as FunctionExpression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -41,4 +41,3 @@ if (typeof __func !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A17_T2.js b/test/suite/ch13/13.2/S13.2.2_A17_T2.js
index 105b762d7..a85e83daa 100644
--- a/test/suite/ch13/13.2/S13.2.2_A17_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A17_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression containing "with" statement is admitted
- *
- * @path ch13/13.2/S13.2.2_A17_T2.js
- * @description Throwing an exception within "with" statement
- */
+/*---
+info: FunctionExpression containing "with" statement is admitted
+description: Throwing an exception within "with" statement
+---*/
 
 this.p1="alert";
 
@@ -68,5 +66,3 @@ if (resukt !== "alert") {
 //////////////////////////////////////////////////////////////////////////////
 
 var resukt;
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A17_T3.js b/test/suite/ch13/13.2/S13.2.2_A17_T3.js
index 8d8eba5bd..b678fc4f0 100644
--- a/test/suite/ch13/13.2/S13.2.2_A17_T3.js
+++ b/test/suite/ch13/13.2/S13.2.2_A17_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression containing "with" statement is admitted
- *
- * @path ch13/13.2/S13.2.2_A17_T3.js
- * @description In the check 4 we populate field getRight in __obj object since var getRight declaration adds variable to function scope
- * but getRight in statement resolves within with(__obj) scope and searchs getRight in __obj first
- */
+/*---
+info: FunctionExpression containing "with" statement is admitted
+description: >
+    In the check 4 we populate field getRight in __obj object since
+    var getRight declaration adds variable to function scope  but
+    getRight in statement resolves within with(__obj) scope and
+    searchs getRight in __obj first
+---*/
 
 p1="alert";
 
@@ -64,5 +65,3 @@ if (resukt !== "w1") {
 //////////////////////////////////////////////////////////////////////////////
 
 var resukt;
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A18_T1.js b/test/suite/ch13/13.2/S13.2.2_A18_T1.js
index 327f816dd..f50c93178 100644
--- a/test/suite/ch13/13.2/S13.2.2_A18_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A18_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using arguments object within a "with" Expression that is nested in a function is admitted
- *
- * @path ch13/13.2/S13.2.2_A18_T1.js
- * @description Object is declared with "var __obj={callee:"a"}"
- */
+/*---
+info: >
+    Using arguments object within a "with" Expression that is nested in a
+    function is admitted
+description: "Object is declared with \"var __obj={callee:\"a\"}\""
+---*/
 
 var callee=0, b;
 
@@ -51,4 +51,3 @@ if (!(this.b)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A18_T2.js b/test/suite/ch13/13.2/S13.2.2_A18_T2.js
index d586ca5f9..f60a03b2d 100644
--- a/test/suite/ch13/13.2/S13.2.2_A18_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A18_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Using arguments object within a "with" Expression that is nested in a function is admitted
- *
- * @path ch13/13.2/S13.2.2_A18_T2.js
- * @description Object is declared with "__obj={callee:"a"}"
- */
+/*---
+info: >
+    Using arguments object within a "with" Expression that is nested in a
+    function is admitted
+description: "Object is declared with \"__obj={callee:\"a\"}\""
+---*/
 
 this.callee = 0;
 var b;
@@ -54,4 +54,3 @@ if (!(this.b)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T1.js b/test/suite/ch13/13.2/S13.2.2_A19_T1.js
index 5fdcaee5a..662ba891c 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T1.js
- * @description Function is declared in the global scope
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: Function is declared in the global scope
+---*/
 
 var a = 1;
 
@@ -26,4 +24,3 @@ if (result !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T2.js b/test/suite/ch13/13.2/S13.2.2_A19_T2.js
index b36f457b8..41898209b 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T2.js
- * @description Function is declared in the object scope. Using "with" statement
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: Function is declared in the object scope. Using "with" statement
+---*/
 
 var a = 1;
 
@@ -24,4 +22,3 @@ if (result !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T3.js b/test/suite/ch13/13.2/S13.2.2_A19_T3.js
index 3f6e11266..10eaf76ad 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T3.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T3.js
- * @description Function is declared in the object scope and then an exception is thrown
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: >
+    Function is declared in the object scope and then an exception is
+    thrown
+---*/
 
 var a = 1;
 
@@ -31,7 +31,3 @@ if (result !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T4.js b/test/suite/ch13/13.2/S13.2.2_A19_T4.js
index 65f6e765a..eaec3ad4f 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T4.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T4.js
- * @description Function is declared in the hierarchical object scope and then an exception is thrown
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: >
+    Function is declared in the hierarchical object scope and then an
+    exception is thrown
+---*/
 
 var a = 1;
 
@@ -33,7 +33,3 @@ if (result !== 3) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T5.js b/test/suite/ch13/13.2/S13.2.2_A19_T5.js
index f0614e175..db670c3c9 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T5.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T5.js
- * @description Function is declared in the object scope, then an exception is thrown and the object is deleted
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: >
+    Function is declared in the object scope, then an exception is
+    thrown and the object is deleted
+---*/
 
 var a = 1;
 
@@ -37,4 +37,3 @@ if (result !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T6.js b/test/suite/ch13/13.2/S13.2.2_A19_T6.js
index b9fafb1f5..9c83b8a93 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T6.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T6.js
- * @description Function is declared in the "object->do-while" scope, then the object is deleted and another object with the same name is declared
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: >
+    Function is declared in the "object->do-while" scope, then the
+    object is deleted and another object with the same name is declared
+---*/
 
 var a = 1;
 
@@ -38,9 +38,3 @@ if (result !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T7.js b/test/suite/ch13/13.2/S13.2.2_A19_T7.js
index c83232d66..b4901d7e1 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T7.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T7.js
- * @description Function is declared in the object scope as a variable
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: Function is declared in the object scope as a variable
+---*/
 
 var a = 1;
 
@@ -51,4 +49,3 @@ if (this.__func === undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A19_T8.js b/test/suite/ch13/13.2/S13.2.2_A19_T8.js
index 7db4affd8..dc98121bc 100644
--- a/test/suite/ch13/13.2/S13.2.2_A19_T8.js
+++ b/test/suite/ch13/13.2/S13.2.2_A19_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function's scope chain is started when it is declared
- *
- * @path ch13/13.2/S13.2.2_A19_T8.js
- * @description Function is declared multiply times
- */
+/*---
+info: Function's scope chain is started when it is declared
+description: Function is declared multiply times
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -71,4 +69,3 @@ with ({a:99,b:"c"})
     //
     //////////////////////////////////////////////////////////////////////////////
 }
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A1_T1.js b/test/suite/ch13/13.2/S13.2.2_A1_T1.js
index cb9a2dbd6..1fefa0900 100644
--- a/test/suite/ch13/13.2/S13.2.2_A1_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since a function is an object, it might be set to [[Prototype]] property of a new created object through [[Construct]] property
- *
- * @path ch13/13.2/S13.2.2_A1_T1.js
- * @description Declaring a function with "function __func()"
- */
+/*---
+info: >
+    Since a function is an object, it might be set to [[Prototype]] property
+    of a new created object through [[Construct]] property
+description: Declaring a function with "function __func()"
+---*/
 
 var __MONSTER="monster";
 var __PREDATOR="predator";
@@ -41,4 +41,3 @@ if (__monster.type !==__MONSTER) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A1_T2.js b/test/suite/ch13/13.2/S13.2.2_A1_T2.js
index dd907d790..ea9555646 100644
--- a/test/suite/ch13/13.2/S13.2.2_A1_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since a function is an object, it might be set to [[Prototype]] property of a new created object through [[Construct]] property
- *
- * @path ch13/13.2/S13.2.2_A1_T2.js
- * @description Declaring a function with "var __PROTO = function()"
- */
+/*---
+info: >
+    Since a function is an object, it might be set to [[Prototype]] property
+    of a new created object through [[Construct]] property
+description: Declaring a function with "var __PROTO = function()"
+includes: [$FAIL.js]
+---*/
 
 var __MONSTER="monster";
 var __PREDATOR="predator";
@@ -41,4 +42,3 @@ if (__monster.type !==__MONSTER) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A2.js b/test/suite/ch13/13.2/S13.2.2_A2.js
index 3389a36d1..06d40bd13 100644
--- a/test/suite/ch13/13.2/S13.2.2_A2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since a function is an object, it might be set to [[Prototype]] property of a new created object through [[Construct]] property,
- * but [[call]] property must fail with TypeError error
- *
- * @path ch13/13.2/S13.2.2_A2.js
- * @description Trying to [[call]] this function
- */
+/*---
+info: >
+    Since a function is an object, it might be set to [[Prototype]] property of a new created object through [[Construct]] property,
+    but [[call]] property must fail with TypeError error
+description: Trying to [[call]] this function
+---*/
 
 var __PLANT="flower";
 var __ROSE="rose";
@@ -39,4 +38,3 @@ try{
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A3_T1.js b/test/suite/ch13/13.2/S13.2.2_A3_T1.js
index a04721c81..0bb9923d9 100644
--- a/test/suite/ch13/13.2/S13.2.2_A3_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A3_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * It gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
- * If PROTO_VAL is not an object, sets the [[Prototype]] property of native ECMAScript object just created
- *  to the original Object prototype object as described in 15.2.3.1
- *
- * @path ch13/13.2/S13.2.2_A3_T1.js
- * @description Declaring a function with "function __FACTORY()"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    It gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
+    If PROTO_VAL is not an object, sets the [[Prototype]] property of native ECMAScript object just created
+    to the original Object prototype object as described in 15.2.3.1
+description: Declaring a function with "function __FACTORY()"
+---*/
 
 function __FACTORY(){};
 __FACTORY.prototype=1;
@@ -32,4 +31,3 @@ if (!(Object.prototype.isPrototypeOf(__device))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A3_T2.js b/test/suite/ch13/13.2/S13.2.2_A3_T2.js
index 613adbb9c..609135ad8 100644
--- a/test/suite/ch13/13.2/S13.2.2_A3_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A3_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * It gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
- * If PROTO_VAL is not an object, sets the [[Prototype]] property of native ECMAScript object just created
- *  to the original Object prototype object as described in 15.2.3.1
- *
- * @path ch13/13.2/S13.2.2_A3_T2.js
- * @description Declaring a function with "var __FACTORY = function()"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    It gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
+    If PROTO_VAL is not an object, sets the [[Prototype]] property of native ECMAScript object just created
+    to the original Object prototype object as described in 15.2.3.1
+description: Declaring a function with "var __FACTORY = function()"
+---*/
 
 var __FACTORY = function(){};
 __FACTORY.prototype=1;
@@ -32,4 +31,3 @@ if (!(Object.prototype.isPrototypeOf(__device))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A4_T1.js b/test/suite/ch13/13.2/S13.2.2_A4_T1.js
index 5804b6c29..8824e825c 100644
--- a/test/suite/ch13/13.2/S13.2.2_A4_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A4_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
- * If PROTO_VAL is an object, sets the [[Prototype]] property of native ECMAScript object just created
- * to the PROTO_VAL
- *
- * @path ch13/13.2/S13.2.2_A4_T1.js
- * @description Declaring a function with "function __FACTORY()"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
+    If PROTO_VAL is an object, sets the [[Prototype]] property of native ECMAScript object just created
+    to the PROTO_VAL
+description: Declaring a function with "function __FACTORY()"
+---*/
 
 var __CUBE="cube";
 
@@ -35,4 +34,3 @@ if (__device.printShape() !== __CUBE) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A4_T2.js b/test/suite/ch13/13.2/S13.2.2_A4_T2.js
index 3560e058b..a130caf38 100644
--- a/test/suite/ch13/13.2/S13.2.2_A4_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A4_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
- * If PROTO_VAL is an object, sets the [[Prototype]] property of native ECMAScript object just created
- * to the PROTO_VAL
- *
- * @path ch13/13.2/S13.2.2_A4_T2.js
- * @description Declaring a function with "__FACTORY = function()"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Gets the value of the [[Prototype]] property of the F(Denote it PROTO_VAL).
+    If PROTO_VAL is an object, sets the [[Prototype]] property of native ECMAScript object just created
+    to the PROTO_VAL
+description: Declaring a function with "__FACTORY = function()"
+---*/
 
 __CUBE="cube";
 
@@ -35,4 +34,3 @@ if (__device.printShape() !== __CUBE) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A5_T1.js b/test/suite/ch13/13.2/S13.2.2_A5_T1.js
index 03c552318..ac1a9757a 100644
--- a/test/suite/ch13/13.2/S13.2.2_A5_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A5_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing native ECMAScript object just created as the this value and
- * providing the argument list passed into [[Construct]] as the argument values
- *
- * @path ch13/13.2/S13.2.2_A5_T1.js
- * @description Declaring a function with "function __FACTORY(arg1, arg2)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing native ECMAScript object just created as the this value and
+    providing the argument list passed into [[Construct]] as the argument values
+description: Declaring a function with "function __FACTORY(arg1, arg2)"
+---*/
 
 __VOLUME=8;
 __RED="red";
@@ -77,4 +76,3 @@ if (__device.bottom !== __BOTTOM) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A5_T2.js b/test/suite/ch13/13.2/S13.2.2_A5_T2.js
index d3cd773ab..94f9475fd 100644
--- a/test/suite/ch13/13.2/S13.2.2_A5_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A5_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing native ECMAScript object just created as the this value and
- * providing the argument list passed into [[Construct]] as the argument values
- *
- * @path ch13/13.2/S13.2.2_A5_T2.js
- * @description Declaring a function with "__FACTORY = function(arg1, arg2)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing native ECMAScript object just created as the this value and
+    providing the argument list passed into [[Construct]] as the argument values
+description: Declaring a function with "__FACTORY = function(arg1, arg2)"
+---*/
 
 __VOLUME=8;
 __RED="red";
@@ -77,4 +76,3 @@ if (__device.bottom !== __BOTTOM) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A6_T1.js b/test/suite/ch13/13.2/S13.2.2_A6_T1.js
index 82ef96dce..6817c9c06 100644
--- a/test/suite/ch13/13.2/S13.2.2_A6_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A6_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is not Object then return passed as this into [[Call]] object
- *
- * @path ch13/13.2/S13.2.2_A6_T1.js
- * @description Declaring a function with "__func = function(arg)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is not Object then return passed as this into [[Call]] object
+description: Declaring a function with "__func = function(arg)"
+---*/
 
 __FOO="fooValue";
 __BAR="barValue";
@@ -38,4 +37,3 @@ if (__obj.bar!==undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A6_T2.js b/test/suite/ch13/13.2/S13.2.2_A6_T2.js
index f428bcb15..f4222ff90 100644
--- a/test/suite/ch13/13.2/S13.2.2_A6_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A6_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is not Object then return passed as this into [[Call]] object
- *
- * @path ch13/13.2/S13.2.2_A6_T2.js
- * @description Declaring a function with "function __func (arg)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is not Object then return passed as this into [[Call]] object
+description: Declaring a function with "function __func (arg)"
+---*/
 
 var __FOO="fooValue";
 var __BAR="barValue";
@@ -38,4 +37,3 @@ if (__obj.bar!==undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A7_T1.js b/test/suite/ch13/13.2/S13.2.2_A7_T1.js
index 02734e83e..7594e3754 100644
--- a/test/suite/ch13/13.2/S13.2.2_A7_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A7_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is an Object then return this just as obtained object
- *
- * @path ch13/13.2/S13.2.2_A7_T1.js
- * @description Declaring a function with "as __func = function(arg)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is an Object then return this just as obtained object
+description: Declaring a function with "as __func = function(arg)"
+---*/
 
 var __FRST="one";
 var __SCND="two";
@@ -39,4 +38,3 @@ if (__obj__.second !== __SCND) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A7_T2.js b/test/suite/ch13/13.2/S13.2.2_A7_T2.js
index 9fbebf72c..e453b725c 100644
--- a/test/suite/ch13/13.2/S13.2.2_A7_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A7_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is an Object then return this just as obtained object
- *
- * @path ch13/13.2/S13.2.2_A7_T2.js
- * @description Declaring a "function as function __func (arg)"
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is an Object then return this just as obtained object
+description: Declaring a "function as function __func (arg)"
+---*/
 
 __FRST="one";
 __SCND="two";
@@ -39,4 +38,3 @@ if (__obj__.second !== __SCND) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A8_T1.js b/test/suite/ch13/13.2/S13.2.2_A8_T1.js
index 640c120f8..7ff876f70 100644
--- a/test/suite/ch13/13.2/S13.2.2_A8_T1.js
+++ b/test/suite/ch13/13.2/S13.2.2_A8_T1.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is an Function then return this just as obtained function
- *
- * @path ch13/13.2/S13.2.2_A8_T1.js
- * @description Creating a function whose prototype contains "return" followed by declaration of another function
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is an Function then return this just as obtained function
+description: >
+    Creating a function whose prototype contains "return" followed by
+    declaration of another function
+---*/
 
 var __FRST="one";
 var __SCND="two";
@@ -50,5 +51,3 @@ if (__instance(1)!== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A8_T2.js b/test/suite/ch13/13.2/S13.2.2_A8_T2.js
index e7f454b8d..e0be6ad6d 100644
--- a/test/suite/ch13/13.2/S13.2.2_A8_T2.js
+++ b/test/suite/ch13/13.2/S13.2.2_A8_T2.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is an Function then return this just as obtained function
- *
- * @path ch13/13.2/S13.2.2_A8_T2.js
- * @description Creating a function whose prototype contains declaration of another function declared as a variable
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is an Function then return this just as obtained function
+description: >
+    Creating a function whose prototype contains declaration of
+    another function declared as a variable
+---*/
 
 var __FRST="one";
 var __SCND="two";
@@ -48,5 +49,3 @@ if (__instance("SAM")!== "SAMBA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A8_T3.js b/test/suite/ch13/13.2/S13.2.2_A8_T3.js
index e5e05f4bd..43c1569ae 100644
--- a/test/suite/ch13/13.2/S13.2.2_A8_T3.js
+++ b/test/suite/ch13/13.2/S13.2.2_A8_T3.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the [[Construct]] property for a Function object F is called:
- * A new native ECMAScript object is created.
- * Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
- * list passed into [[Construct]] as the argument values.
- * If Type( [[Call]] returned) is an Function then return this just as obtained function
- *
- * @path ch13/13.2/S13.2.2_A8_T3.js
- * @description Creating a function whose prototype contains declaration of another function defined by using Function.call method
- */
+/*---
+info: >
+    When the [[Construct]] property for a Function object F is called:
+    A new native ECMAScript object is created.
+    Invoke the [[Call]] property of F, providing just created native ECMAScript object as the this value and providing the argument
+    list passed into [[Construct]] as the argument values.
+    If Type( [[Call]] returned) is an Function then return this just as obtained function
+description: >
+    Creating a function whose prototype contains declaration of
+    another function defined by using Function.call method
+---*/
 
 var __FRST="one";
 var __SCND="two";
@@ -48,5 +49,3 @@ if (__instance(1)!== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2.2_A9.js b/test/suite/ch13/13.2/S13.2.2_A9.js
index 4e178109c..17950fd32 100644
--- a/test/suite/ch13/13.2/S13.2.2_A9.js
+++ b/test/suite/ch13/13.2/S13.2.2_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Calling a function as a constructor is inadmissible as long as this.any_Function is called before it is declared
- *
- * @path ch13/13.2/S13.2.2_A9.js
- * @description Calling a function as a constructor
- */
+/*---
+info: >
+    Calling a function as a constructor is inadmissible as long as
+    this.any_Function is called before it is declared
+description: Calling a function as a constructor
+includes: [Test262Error.js]
+---*/
 
 function FACTORY(){
    this.id = 0;
@@ -22,10 +23,9 @@ function FACTORY(){
 //CHECK#1
 try {
 	var obj = new FACTORY();
-	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');

-} catch (e) {

+	$ERROR('#1: var obj = new FACTORY() lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2.3_A1.js b/test/suite/ch13/13.2/S13.2.3_A1.js
index bc6d70b90..9720f44d0 100644
--- a/test/suite/ch13/13.2/S13.2.3_A1.js
+++ b/test/suite/ch13/13.2/S13.2.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2.3_A1.js
- * @description check that all poisoning use the [[ThrowTypeError]]
- * function object.
- * @onlyStrict
- */
+/*---
+description: >
+    check that all poisoning use the [[ThrowTypeError]]  function
+    object.
+flags: [onlyStrict]
+---*/
 
 "use strict";
 var poison = Object.getOwnPropertyDescriptor(function() {}, 'caller').get;
@@ -46,4 +46,3 @@ checkPoison((function() { return arguments; })(), 'caller');
 checkPoison((function() { return arguments; })(), 'callee');
 checkPoison((function() {}).bind(null), 'caller');
 checkPoison((function() {}).bind(null), 'arguments');
-
diff --git a/test/suite/ch13/13.2/S13.2_A1_T1.js b/test/suite/ch13/13.2/S13.2_A1_T1.js
index 5f7d1b15a..2de2d0e27 100644
--- a/test/suite/ch13/13.2/S13.2_A1_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A "prototype" property is automatically created for every function
- *
- * @path ch13/13.2/S13.2_A1_T1.js
- * @description Using "function __func(){}" as a FunctionDeclaration
- */
+/*---
+info: A "prototype" property is automatically created for every function
+description: Using "function __func(){}" as a FunctionDeclaration
+---*/
 
 function __func(){};
 
@@ -17,4 +15,3 @@ if (__func.prototype === undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2_A1_T2.js b/test/suite/ch13/13.2/S13.2_A1_T2.js
index b9d933a6d..afe08f124 100644
--- a/test/suite/ch13/13.2/S13.2_A1_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A "prototype" property is automatically created for every function
- *
- * @path ch13/13.2/S13.2_A1_T2.js
- * @description Using "var __func = function(){}" as a FunctionDeclaration
- */
+/*---
+info: A "prototype" property is automatically created for every function
+description: Using "var __func = function(){}" as a FunctionDeclaration
+---*/
 
 var __func = function(){};
 
@@ -17,4 +15,3 @@ if (__func.prototype === undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2_A2_T1.js b/test/suite/ch13/13.2/S13.2_A2_T1.js
index b49ba1973..e72e5bce5 100644
--- a/test/suite/ch13/13.2/S13.2_A2_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Nested function are admitted
- *
- * @path ch13/13.2/S13.2_A2_T1.js
- * @description Nesting level is two
- */
+/*---
+info: Nested function are admitted
+description: Nesting level is two
+---*/
 
 var __JEDI="jedi";
 
@@ -25,4 +23,3 @@ if (__FUNC()(__JEDI) !== __JEDI) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2_A2_T2.js b/test/suite/ch13/13.2/S13.2_A2_T2.js
index 024a624fa..d3c414349 100644
--- a/test/suite/ch13/13.2/S13.2_A2_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Nested function are admitted
- *
- * @path ch13/13.2/S13.2_A2_T2.js
- * @description Nesting level is three
- */
+/*---
+info: Nested function are admitted
+description: Nesting level is three
+---*/
 
 var __ROBOT="C3PO";
 
@@ -27,4 +25,3 @@ if (__FUNC()()(__ROBOT) !== __ROBOT) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch13/13.2/S13.2_A3.js b/test/suite/ch13/13.2/S13.2_A3.js
index 3cd3c7032..3ba2be772 100644
--- a/test/suite/ch13/13.2/S13.2_A3.js
+++ b/test/suite/ch13/13.2/S13.2_A3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Function object(F) is constructed the length property of F is set to the number of formal properties specified in FormalParameterList
- *
- * @path ch13/13.2/S13.2_A3.js
- * @description Creating functions with various FormalParameterList and checking their lengths
- */
+/*---
+info: >
+    When Function object(F) is constructed the length property of F is set to
+    the number of formal properties specified in FormalParameterList
+description: >
+    Creating functions with various FormalParameterList and checking
+    their lengths
+---*/
 
 function __func(){};
 
@@ -27,5 +29,3 @@ if (__gunc.length !== 3) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A4_T1.js b/test/suite/ch13/13.2/S13.2_A4_T1.js
index ef47b61a0..2368e418c 100644
--- a/test/suite/ch13/13.2/S13.2_A4_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A4_T1.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Function object(F) is constructed the following steps from 9 to 11 take place
- * 9.Create a new object as would be constructed by the expression new Object().
- * 10. Set the constructor property of Result(9) to F. This property is given attributes { DontEnum }.
- * 11. Set the "prototype" property of F to Result(9).
- *
- * @path ch13/13.2/S13.2_A4_T1.js
- * @description Checking prototype, prototype.constructor properties and {DontEnum} property of a constructor.
- * Using "function __func(){}" as a FunctionDeclaration
- */
+/*---
+info: >
+    When Function object(F) is constructed the following steps from 9 to 11 take place
+    9.Create a new object as would be constructed by the expression new Object().
+    10. Set the constructor property of Result(9) to F. This property is given attributes { DontEnum }.
+    11. Set the "prototype" property of F to Result(9).
+description: >
+    Checking prototype, prototype.constructor properties and
+    {DontEnum} property of a constructor.  Using "function __func(){}"
+    as a FunctionDeclaration
+---*/
 
 function __func(){};
 
@@ -44,9 +45,3 @@ if (__constructor_was__enumed) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A4_T2.js b/test/suite/ch13/13.2/S13.2_A4_T2.js
index 2da55b763..f18ade750 100644
--- a/test/suite/ch13/13.2/S13.2_A4_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A4_T2.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Function object(F) is constructed the following steps from 9 to 11 take place
- * 9.Create a new object as would be constructed by the expression new Object().
- * 10. Set the constructor property of Result(9) to F. This property is given attributes { DontEnum }.
- * 11. Set the "prototype" property of F to Result(9).
- *
- * @path ch13/13.2/S13.2_A4_T2.js
- * @description Checking prototype, prototype.constructor properties and {DontEnum} property of a constructor.
- * Using "var __gunc = function(){}" as a FunctionDeclaration
- */
+/*---
+info: >
+    When Function object(F) is constructed the following steps from 9 to 11 take place
+    9.Create a new object as would be constructed by the expression new Object().
+    10. Set the constructor property of Result(9) to F. This property is given attributes { DontEnum }.
+    11. Set the "prototype" property of F to Result(9).
+description: >
+    Checking prototype, prototype.constructor properties and
+    {DontEnum} property of a constructor.  Using "var __gunc =
+    function(){}" as a FunctionDeclaration
+---*/
 
 var __gunc = function(){};
 
@@ -44,9 +45,3 @@ if (__constructor_was__enumed) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A5.js b/test/suite/ch13/13.2/S13.2_A5.js
index 6d88fad8e..988148352 100644
--- a/test/suite/ch13/13.2/S13.2_A5.js
+++ b/test/suite/ch13/13.2/S13.2_A5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Function object(F) is constructed
- * the [[Prototype]] property of F is set to the original Function prototype object as specified in 15.3.3.1
- *
- * @path ch13/13.2/S13.2_A5.js
- * @description Function.prototype.isPrototypeOf() is used
- */
+/*---
+info: >
+    When Function object(F) is constructed
+    the [[Prototype]] property of F is set to the original Function prototype object as specified in 15.3.3.1
+description: Function.prototype.isPrototypeOf() is used
+---*/
 
 function __func(){};
 
@@ -29,6 +28,3 @@ if (!(Function.prototype.isPrototypeOf(__gunc))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A6_T1.js b/test/suite/ch13/13.2/S13.2_A6_T1.js
index 2fca01cc2..b1148301f 100644
--- a/test/suite/ch13/13.2/S13.2_A6_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A6_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A6_T1.js
- * @description check if "caller" poisoning poisons
- * getOwnPropertyDescriptor too
- * @onlyStrict
- */
+/*---
+description: check if "caller" poisoning poisons  getOwnPropertyDescriptor too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 Object.getOwnPropertyDescriptor(function(){}, 'caller');
-
diff --git a/test/suite/ch13/13.2/S13.2_A6_T2.js b/test/suite/ch13/13.2/S13.2_A6_T2.js
index e8a334462..e7088fa93 100644
--- a/test/suite/ch13/13.2/S13.2_A6_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A6_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A6_T2.js
- * @description check if "arguments" poisoning poisons
- * getOwnPropertyDescriptor too
- * @onlyStrict
- */
+/*---
+description: >
+    check if "arguments" poisoning poisons  getOwnPropertyDescriptor
+    too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 Object.getOwnPropertyDescriptor(function(){}, 'arguments');
-
diff --git a/test/suite/ch13/13.2/S13.2_A7_T1.js b/test/suite/ch13/13.2/S13.2_A7_T1.js
index d557bbd67..78198580b 100644
--- a/test/suite/ch13/13.2/S13.2_A7_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A7_T1.js
@@ -1,14 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A7_T1.js
- * @description check if "caller" poisoning poisons
- * hasOwnProperty too
- * @onlyStrict
- */
+/*---
+description: check if "caller" poisoning poisons  hasOwnProperty too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){}).hasOwnProperty('caller');
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A7_T2.js b/test/suite/ch13/13.2/S13.2_A7_T2.js
index 82c03938f..8c2212356 100644
--- a/test/suite/ch13/13.2/S13.2_A7_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A7_T2.js
@@ -1,14 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A7_T2.js
- * @description check if "arguments" poisoning poisons
- * hasOwnProperty too
- * @onlyStrict
- */
+/*---
+description: check if "arguments" poisoning poisons  hasOwnProperty too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 (function(){}).hasOwnProperty('arguments');
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A8_T1.js b/test/suite/ch13/13.2/S13.2_A8_T1.js
index a68553e82..9b5dcd4e2 100644
--- a/test/suite/ch13/13.2/S13.2_A8_T1.js
+++ b/test/suite/ch13/13.2/S13.2_A8_T1.js
@@ -1,14 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A8_T1.js
- * @description check if "caller" poisoning poisons
- * "in" too
- * @onlyStrict
- */
+/*---
+description: check if "caller" poisoning poisons  "in" too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 'caller' in function() {};
-
-
diff --git a/test/suite/ch13/13.2/S13.2_A8_T2.js b/test/suite/ch13/13.2/S13.2_A8_T2.js
index 0d9eec7c5..58c7c58b1 100644
--- a/test/suite/ch13/13.2/S13.2_A8_T2.js
+++ b/test/suite/ch13/13.2/S13.2_A8_T2.js
@@ -1,14 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch13/13.2/S13.2_A8_T2.js
- * @description check if "arguments" poisoning poisons
- * "in" too
- * @onlyStrict
- */
+/*---
+description: check if "arguments" poisoning poisons  "in" too
+flags: [onlyStrict]
+---*/
 
 "use strict";
 'arguments' in function() {};
-
-
diff --git a/test/suite/ch14/14.0/S14_A1.js b/test/suite/ch14/14.0/S14_A1.js
index 302db12dd..02bb13997 100644
--- a/test/suite/ch14/14.0/S14_A1.js
+++ b/test/suite/ch14/14.0/S14_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionExpression must be localed in a reacheable fragment of the program
- *
- * @path ch14/14.0/S14_A1.js
- * @description Declaring a function within an "if" Expression
- */
+/*---
+info: FunctionExpression must be localed in a reacheable fragment of the program
+description: Declaring a function within an "if" Expression
+---*/
 
 var THERE = "I'm there";
 var HERE = "I'm here";
@@ -32,4 +30,3 @@ if (__func() !== HERE) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch14/14.0/S14_A2.js b/test/suite/ch14/14.0/S14_A2.js
index 758e6daf5..be4514a41 100644
--- a/test/suite/ch14/14.0/S14_A2.js
+++ b/test/suite/ch14/14.0/S14_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * FunctionDeclaration cannot be localed inside an Expression
- *
- * @path ch14/14.0/S14_A2.js
- * @description Declaring a function within an "if" Expression
- */
+/*---
+info: FunctionDeclaration cannot be localed inside an Expression
+description: Declaring a function within an "if" Expression
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -28,4 +26,3 @@ if (function f(arg){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch14/14.0/S14_A3.js b/test/suite/ch14/14.0/S14_A3.js
index d7dff69a6..c7d464bd9 100644
--- a/test/suite/ch14/14.0/S14_A3.js
+++ b/test/suite/ch14/14.0/S14_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global FunctionDeclaration cannot be defined within the body of another FunctionDeclaration
- *
- * @path ch14/14.0/S14_A3.js
- * @description Declaring a function within the body of another function
- */
+/*---
+info: >
+    Global FunctionDeclaration cannot be defined within the body of another
+    FunctionDeclaration
+description: Declaring a function within the body of another function
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +27,3 @@ if (typeof __gunc !== "undefined") {
 function __func(){
     function __gunc(){return true};
 }
-
diff --git a/test/suite/ch14/14.0/S14_A5_T1.js b/test/suite/ch14/14.0/S14_A5_T1.js
index 499147150..5e455805b 100644
--- a/test/suite/ch14/14.0/S14_A5_T1.js
+++ b/test/suite/ch14/14.0/S14_A5_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Identifer within a FunctionDeclaration can be written in both letters and unicode
- *
- * @path ch14/14.0/S14_A5_T1.js
- * @description Declaring a function with "function __\u0066\u0075\u006e\u0063(){return "both"}"
- */
+/*---
+info: >
+    The Identifer within a FunctionDeclaration can be written in both letters
+    and unicode
+description: >
+    Declaring a function with "function
+    __\u0066\u0075\u006e\u0063(){return "both"}"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -19,4 +21,3 @@ if (__func() !== "both") {
 function __func(){return "ascii"};
 function \u005f\u005f\u0066\u0075\u006e\u0063(){return "unicode"};//__func in unicode
 function __\u0066\u0075\u006e\u0063(){return "both"};//__func in unicode
-
diff --git a/test/suite/ch14/14.0/S14_A5_T2.js b/test/suite/ch14/14.0/S14_A5_T2.js
index ee3c9d2a3..0f5e71c54 100644
--- a/test/suite/ch14/14.0/S14_A5_T2.js
+++ b/test/suite/ch14/14.0/S14_A5_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Identifer within a FunctionDeclaration can be written in both letters and unicode
- *
- * @path ch14/14.0/S14_A5_T2.js
- * @description Declaring a function with "function \u005f\u005f\u0066\u0075\u006e\u0063(){return "unicode"}"
- */
+/*---
+info: >
+    The Identifer within a FunctionDeclaration can be written in both letters
+    and unicode
+description: >
+    Declaring a function with "function
+    \u005f\u005f\u0066\u0075\u006e\u0063(){return "unicode"}"
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +20,3 @@ if (__func() !== "unicode") {
 
 function __func(){return "ascii"};
 function \u005f\u005f\u0066\u0075\u006e\u0063(){return "unicode"};//__func in unicode
-
diff --git a/test/suite/ch14/14.1/14.1-1-s.js b/test/suite/ch14/14.1/14.1-1-s.js
index 6b2b377b8..9a0d32368 100644
--- a/test/suite/ch14/14.1/14.1-1-s.js
+++ b/test/suite/ch14/14.1/14.1-1-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-1-s.js

- * @description 'use strict' directive - correct usage

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-     return(this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'use strict' directive - correct usage"
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+     return(this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-10-s.js b/test/suite/ch14/14.1/14.1-10-s.js
index 5badea52b..907a5cebb 100644
--- a/test/suite/ch14/14.1/14.1-10-s.js
+++ b/test/suite/ch14/14.1/14.1-10-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-10-s.js

- * @description other directives - may follow 'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-     "use strict";

-     "bogus directive";

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: other directives - may follow 'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+     "use strict";
+     "bogus directive";
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-11-s.js b/test/suite/ch14/14.1/14.1-11-s.js
index bb5cbf79c..055d7537a 100644
--- a/test/suite/ch14/14.1/14.1-11-s.js
+++ b/test/suite/ch14/14.1/14.1-11-s.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-11-s.js

- * @description comments may preceed 'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-     // comment

-     /* comment */ "use strict";

-

-   return(this === undefined);

-

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: comments may preceed 'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+     // comment
+     /* comment */ "use strict";
+
+   return(this === undefined);
+
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-12-s.js b/test/suite/ch14/14.1/14.1-12-s.js
index 4aa3fb115..27d1c4749 100644
--- a/test/suite/ch14/14.1/14.1-12-s.js
+++ b/test/suite/ch14/14.1/14.1-12-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-12-s.js

- * @description comments may follow 'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-     "use strict";    /* comment */   // comment

-

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: comments may follow 'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+     "use strict";    /* comment */   // comment
+
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-13-s.js b/test/suite/ch14/14.1/14.1-13-s.js
index ba3889681..2e363841f 100644
--- a/test/suite/ch14/14.1/14.1-13-s.js
+++ b/test/suite/ch14/14.1/14.1-13-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-13-s.js

- * @description semicolon insertion works for'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    "use strict"

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: semicolon insertion works for'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    "use strict"
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-14-s.js b/test/suite/ch14/14.1/14.1-14-s.js
index fd37bd4f8..9418e62d9 100644
--- a/test/suite/ch14/14.1/14.1-14-s.js
+++ b/test/suite/ch14/14.1/14.1-14-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-14-s.js

- * @description semicolon insertion may come before 'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    "another directive"

-    "use strict" ;

-    return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: semicolon insertion may come before 'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    "another directive"
+    "use strict" ;
+    return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-15-s.js b/test/suite/ch14/14.1/14.1-15-s.js
index 38325c4d4..aa52ca57b 100644
--- a/test/suite/ch14/14.1/14.1-15-s.js
+++ b/test/suite/ch14/14.1/14.1-15-s.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-15-s.js

- * @description blank lines may come before 'use strict' directive

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-

-

-

-

-

-

-    "use strict" ;

-    return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: blank lines may come before 'use strict' directive
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+
+
+
+
+
+
+    "use strict" ;
+    return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-16-s.js b/test/suite/ch14/14.1/14.1-16-s.js
index e63ef40d0..221d2b8db 100644
--- a/test/suite/ch14/14.1/14.1-16-s.js
+++ b/test/suite/ch14/14.1/14.1-16-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-16-s.js

- * @description 'use strict' directive - not recognized if it follow an empty statement

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    ; 'use strict';

-     return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if it follow an empty
+    statement
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    ; 'use strict';
+     return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-17-s.js b/test/suite/ch14/14.1/14.1-17-s.js
index cfc21ff21..6a556d2bd 100644
--- a/test/suite/ch14/14.1/14.1-17-s.js
+++ b/test/suite/ch14/14.1/14.1-17-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-17-s.js

- * @description 'use strict' directive - not recognized if it follow some other statment empty statement

- * @noStrict

- */

-

-function testcase() {

-

-  function foo()

-  {

-    var x;

-    'use strict';

-    return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if it follow some other
+    statment empty statement
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    var x;
+    'use strict';
+    return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-2-s.js b/test/suite/ch14/14.1/14.1-2-s.js
index 9701c4020..265603249 100644
--- a/test/suite/ch14/14.1/14.1-2-s.js
+++ b/test/suite/ch14/14.1/14.1-2-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-2-s.js

- * @description "use strict" directive - correct usage double quotes

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    "use strict";

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "\"use strict\" directive - correct usage double quotes"
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    "use strict";
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-3-s.js b/test/suite/ch14/14.1/14.1-3-s.js
index 90eb7767a..53fc31494 100644
--- a/test/suite/ch14/14.1/14.1-3-s.js
+++ b/test/suite/ch14/14.1/14.1-3-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-3-s.js

- * @description 'use strict' directive - not recognized if it contains extra whitespace

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    '  use    strict   ';

-     return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if it contains extra
+    whitespace
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    '  use    strict   ';
+     return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-4-s.js b/test/suite/ch14/14.1/14.1-4-s.js
index f53cd37fa..25a6b74fc 100644
--- a/test/suite/ch14/14.1/14.1-4-s.js
+++ b/test/suite/ch14/14.1/14.1-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-4-s.js

- * @description 'use strict' directive - not recognized if contains Line Continuation

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use str\

-ict';

-     return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if contains Line
+    Continuation
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use str\
+ict';
+     return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-4gs.js b/test/suite/ch14/14.1/14.1-4gs.js
index 67456de53..1f15d5b28 100644
--- a/test/suite/ch14/14.1/14.1-4gs.js
+++ b/test/suite/ch14/14.1/14.1-4gs.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-4gs.js

- * @description StrictMode - a Use Strict Directive followed by a strict mode violation

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"use strict";

-throw NotEarlyError;

-eval = 42;
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - a Use Strict Directive followed by a strict mode
+    violation
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+eval = 42;
diff --git a/test/suite/ch14/14.1/14.1-5-s.js b/test/suite/ch14/14.1/14.1-5-s.js
index f0b40a12c..cc3183aaf 100644
--- a/test/suite/ch14/14.1/14.1-5-s.js
+++ b/test/suite/ch14/14.1/14.1-5-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-5-s.js

- * @description 'use strict' directive - not recognized if contains a EscapeSequence

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use\u0020strict';

-     return(this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if contains a
+    EscapeSequence
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use\u0020strict';
+     return(this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-5gs.js b/test/suite/ch14/14.1/14.1-5gs.js
index 9ce043a67..051ad1671 100644
--- a/test/suite/ch14/14.1/14.1-5gs.js
+++ b/test/suite/ch14/14.1/14.1-5gs.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-5gs.js

- * @description StrictMode - a Use Strict Directive embedded in a directive prologue followed by a strict mode violation

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-"a";

-"use strict";

-"c";

-throw NotEarlyError;

-eval = 42;
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - a Use Strict Directive embedded in a directive
+    prologue followed by a strict mode violation
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"a";
+"use strict";
+"c";
+throw NotEarlyError;
+eval = 42;
diff --git a/test/suite/ch14/14.1/14.1-6-s.js b/test/suite/ch14/14.1/14.1-6-s.js
index c779da837..08e2fcacc 100644
--- a/test/suite/ch14/14.1/14.1-6-s.js
+++ b/test/suite/ch14/14.1/14.1-6-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-6-s.js

- * @description 'use strict' directive - not recognized if contains a <TAB> instead of a space

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use	strict';

-     return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'use strict' directive - not recognized if contains a <TAB>
+    instead of a space
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use	strict';
+     return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-7-s.js b/test/suite/ch14/14.1/14.1-7-s.js
index a54b90774..fa225e35a 100644
--- a/test/suite/ch14/14.1/14.1-7-s.js
+++ b/test/suite/ch14/14.1/14.1-7-s.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-7-s.js

- * @description 'use strict' directive - not recognized if upper case

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'Use Strict';

-     return (this !== undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'use strict' directive - not recognized if upper case"
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'Use Strict';
+     return (this !== undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-8-s.js b/test/suite/ch14/14.1/14.1-8-s.js
index 446ab3a74..9cc2b5336 100644
--- a/test/suite/ch14/14.1/14.1-8-s.js
+++ b/test/suite/ch14/14.1/14.1-8-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-8-s.js

- * @description 'use strict' directive - may follow other directives

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-     "bogus directive";

-     "use strict";

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'use strict' directive - may follow other directives"
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+     "bogus directive";
+     "use strict";
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch14/14.1/14.1-9-s.js b/test/suite/ch14/14.1/14.1-9-s.js
index 2efb4736a..91d70d174 100644
--- a/test/suite/ch14/14.1/14.1-9-s.js
+++ b/test/suite/ch14/14.1/14.1-9-s.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch14/14.1/14.1-9-s.js

- * @description 'use strict' directive - may occur multiple times

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-     'use strict';

-     "use strict";

-     return (this === undefined);

-  }

-

-  return foo.call(undefined);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "'use strict' directive - may occur multiple times"
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+     'use strict';
+     "use strict";
+     return (this === undefined);
+  }
+
+  return foo.call(undefined);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.1/15.1.1.1-0.js b/test/suite/ch15/15.1/15.1.1/15.1.1.1/15.1.1.1-0.js
index ecf045e3d..315fff27d 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.1/15.1.1.1-0.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.1/15.1.1.1-0.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.1/15.1.1.1-0.js

- * @description Global.NaN is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'NaN');

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Global.NaN is a data property with default attribute values (false)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'NaN');
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A1.js
index d09000a6e..5a8f50996 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of NaN is NaN
- *
- * @path ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A1.js
- * @description Use typeof, isNaN, isFinite
- */
+/*---
+info: The initial value of NaN is NaN
+description: Use typeof, isNaN, isFinite
+---*/
 
 // CHECK#1
 if (typeof(NaN) !== "number") {
@@ -22,5 +20,3 @@ if (isNaN(NaN) !== true) {
 if (isFinite(NaN) !== false) {
 	$ERROR('#3: NaN === Not-a-Finite. Actual: ' + (NaN)); 
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.1.js
index ee5fcdab9..af52b5ca3 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The NaN is DontDelete
- *
- * @path ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.1.js
- * @description Use delete
- * @noStrict
- */
+/*---
+info: The NaN is DontDelete
+description: Use delete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete NaN !== false) {
 	$ERROR('#1: delete NaN === false. Actual: ' + (delete NaN)); 	
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.2.js b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.2.js
index e48814864..662056dde 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.2.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The NaN is DontEnum
- *
- * @path ch15/15.1/15.1.1/15.1.1.1/S15.1.1.1_A3.2.js
- * @description Use for-in statement
- */
+/*---
+info: The NaN is DontEnum
+description: Use for-in statement
+---*/
 
 // CHECK#1
 for (var prop in this) {
@@ -14,4 +12,3 @@ for (var prop in this) {
 	$ERROR('#1: The NaN is DontEnum');
   }	 	
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.2/15.1.1.2-0.js b/test/suite/ch15/15.1/15.1.1/15.1.1.2/15.1.1.2-0.js
index 53642a7d4..5e3c3a621 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.2/15.1.1.2-0.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.2/15.1.1.2-0.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.2/15.1.1.2-0.js

- * @description Global.Infinity is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'Infinity');

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Global.Infinity is a data property with default attribute values
+    (false)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'Infinity');
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A1.js
index 96980d89a..34751aab8 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Infinity is Number.POSITIVE_INFINITY
- *
- * @path ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A1.js
- * @description Use typeof, isNaN, isFinite
- */
+/*---
+info: The initial value of Infinity is Number.POSITIVE_INFINITY
+description: Use typeof, isNaN, isFinite
+---*/
 
 // CHECK#1
 if (typeof(Infinity) !== "number") {
@@ -28,4 +26,3 @@ if (isNaN(Infinity) !== false) {
 if (Infinity !== Number.POSITIVE_INFINITY) {
 	$ERROR('#4: Infinity === Number.POSITIVE_INFINITY. Actual: ' + (Infinity)); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A2_T2.js b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A2_T2.js
index 2b38f5efa..a49990109 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A2_T2.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A2_T2.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Infinity is not ReadOnly
- *
- * @path ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A2_T2.js
- * @description Checking typeof Functions
- */
+/*---
+info: The Infinity is not ReadOnly
+description: Checking typeof Functions
+---*/
 
 // CHECK#1
 var Finite = true;
 if (typeof(Finite) !== "boolean") {
 	$ERROR('#1: Finite = true; typeof(NaN) === "boolean". Actual: ' + (typeof(NaN))); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.1.js
index f41034966..65d4ddb2d 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Infinity is DontDelete
- *
- * @path ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.1.js
- * @description Use delete
- * @noStrict
- */
+/*---
+info: The Infinity is DontDelete
+description: Use delete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Infinity !== false) {
 	$ERROR('#1: delete Infinity === false. Actual: ' + (delete Infinity)); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.2.js b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.2.js
index 87f7af3c8..0717642e6 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.2.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Infinity is DontEnum
- *
- * @path ch15/15.1/15.1.1/15.1.1.2/S15.1.1.2_A3.2.js
- * @description Use for-in statement
- */
+/*---
+info: The Infinity is DontEnum
+description: Use for-in statement
+---*/
 
 // CHECK#1
 for (var prop in this) {
@@ -14,4 +12,3 @@ for (var prop in this) {
 	$ERROR('#1: The Infinity is DontEnum');
   }	 	
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-0.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-0.js
index 83929645e..c9372cfd9 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-0.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-0.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-0.js

- * @description Global.undefined is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'undefined');

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Global.undefined is a data property with default attribute values
+    (false)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+    var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), 'undefined');
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-1.js
index b331589f0..3e818ded7 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-1.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-1.js

- * @description undefined is not writable, should not throw in non-strict mode

- * @noStrict

- */

-

-function testcase(){

-    undefined = 5;

-    if(typeof undefined !== "undefined") return false;

-

-    var nosuchproperty;

-    if(nosuchproperty !== undefined) return false;

-    

-    return true;

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: undefined is not writable, should not throw in non-strict mode
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+    undefined = 5;
+    if(typeof undefined !== "undefined") return false;
+
+    var nosuchproperty;
+    if(nosuchproperty !== undefined) return false;
+    
+    return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-2.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-2.js
index 9d7a614c4..67e1c8718 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-2.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-2.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-2.js

- * @description undefined is not writable, should throw TypeError in strict mode

- * @onlyStrict

- */

-

-function testcase(){

-  "use strict";

-  var global = fnGlobalObject();

-  try{

-    global["undefined"] = 5;  // Should throw a TypeError as per 8.12.5

-  } catch (ex) {

-    if(ex instanceof TypeError){

-      return true;

-    } else {

-      return false;

-    }

-  }

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: undefined is not writable, should throw TypeError in strict mode
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase(){
+  "use strict";
+  var global = fnGlobalObject();
+  try{
+    global["undefined"] = 5;  // Should throw a TypeError as per 8.12.5
+  } catch (ex) {
+    if(ex instanceof TypeError){
+      return true;
+    } else {
+      return false;
+    }
+  }
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-3.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-3.js
index b2dec459a..dc9f13f8a 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-3.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-3.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.1/15.1.1.3/15.1.1.3-3.js

- * @description undefined is not writable, simple assignment should return the rval value (11.13.1-6)

- */

-

-function testcase(){

-  var newProperty = undefined = 42;

-  return (newProperty === 42);

-}

-

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    undefined is not writable, simple assignment should return the
+    rval value (11.13.1-6)
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  var newProperty = undefined = 42;
+  return (newProperty === 42);
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A1.js
index e05a01784..8073ad054 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of undefined is undefined
- *
- * @path ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A1.js
- * @description Use typeof, isNaN, isFinite
- */
+/*---
+info: The initial value of undefined is undefined
+description: Use typeof, isNaN, isFinite
+---*/
 
 // CHECK#1
 if (typeof(undefined) !== "undefined") {
@@ -22,4 +20,3 @@ if (undefined !== void 0) {
 if (undefined !== eval("var x")) {
 	$ERROR('#3: undefined === eval("var x"). Actual: ' + (undefined)); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.1.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.1.js
index 7a1657651..3edec2247 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.1.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The undefined is DontDelete
- *
- * @path ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.1.js
- * @description Use delete
- * @noStrict
- */
+/*---
+info: The undefined is DontDelete
+description: Use delete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete undefined !== false) {
 	$ERROR('#1: delete undefined === false. Actual: ' + (delete undefined)); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.2.js b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.2.js
index f818b96db..1c91da862 100644
--- a/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.2.js
+++ b/test/suite/ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The undefined is DontEnum
- *
- * @path ch15/15.1/15.1.1/15.1.1.3/S15.1.1.3_A3.2.js
- * @description Use for-in statement
- */
+/*---
+info: The undefined is DontEnum
+description: Use for-in statement
+---*/
 
 // CHECK#1
 for (prop in this) {
@@ -14,4 +12,3 @@ for (prop in this) {
 	$ERROR('#1: The undefined is DontEnum');
   }	 	
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T1.js
index e335d2f73..ec980bb70 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is not a string value, return x
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T1.js
- * @description Checking all primitive
- */
+/*---
+info: If x is not a string value, return x
+description: Checking all primitive
+---*/
 
 //CHECK#1
 var x = 1;
@@ -32,5 +30,4 @@ if (eval(null) !== null) {
 //CHECK#5
 if (eval(undefined) !== undefined) {
   $ERROR('#5: eval(undefined) === undefined. Actual: ' + (eval(undefined)));
-}        
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T2.js
index 67dd83d3f..cdb80fa1b 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is not a string value, return x
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.1_T2.js
- * @description Checking all object
- */
+/*---
+info: If x is not a string value, return x
+description: Checking all object
+---*/
 
 //CHECK#1
 var x = {};
@@ -30,5 +28,4 @@ if (eval(x) !== x) {
 x = new String("1+1");
 if (eval(x) !== x) {
   $ERROR('#4: x = new String("1"); eval(x) === x. Actual: ' + (eval(x)));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.2_T1.js
index 616755cdb..0323d662b 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the eval function is called with some argument, then use a first argument
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A1.2_T1.js
- * @description eval("x = 1", "x = 2"), x equal 1, not 2
- */
+/*---
+info: >
+    If the eval function is called with some argument, then use a first
+    argument
+description: eval("x = 1", "x = 2"), x equal 1, not 2
+---*/
 
 //CHECK#1
 var x;
@@ -14,4 +14,3 @@ eval("x = 1", "x = 2");
 if (x !== 1) {
   $ERROR('#1: eval("x = 1", "x = 2"); x === 1. Actual: ' + (x));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T1.js
index b1a6a03d7..8b23d4f67 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the parse fails, throw a SyntaxError exception (but see also clause 16)
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T1.js
- * @description Checking if execution of "eval("x = 1; x\u000A++"), catch SyntaxError" passes
- */
+/*---
+info: If the parse fails, throw a SyntaxError exception (but see also clause 16)
+description: >
+    Checking if execution of "eval("x = 1; x\u000A++"), catch
+    SyntaxError" passes
+---*/
 
 //CHECK#1
 var x;
@@ -17,5 +17,4 @@ try {
   if ((e instanceof SyntaxError) !== true) {
     $ERROR('#1.2: eval("x = 1; x\\u000A++") must throw a SyntaxError. Actual: ' + (e));
   }  
-}   
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T2.js
index 176a93c26..1eb641af9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the parse fails, throw a SyntaxError exception (but see also clause 16)
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A2_T2.js
- * @description Checking if execution of "eval("x = 1; x\u000A++")" fails
- * @negative
- */
+/*---
+info: If the parse fails, throw a SyntaxError exception (but see also clause 16)
+description: Checking if execution of "eval("x = 1; x\u000A++")" fails
+flags: [negative]
+---*/
 
 //CHECK#1
 var x;
-eval("x = 1; x\u000A++"); 
-
+eval("x = 1; x\u000A++");
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T1.js
index 5341f7ff0..d030a40cd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is a value V,
- * then return the value V
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T1.js
- * @description Expression statement. Eval return primitive value
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is a value V,
+    then return the value V
+description: Expression statement. Eval return primitive value
+---*/
 
 var x;
 //CHECK#1
@@ -29,5 +28,4 @@ if (eval("'1'") !== '1') {
 x = 1;
 if (eval("++x") !== 2) {
   $ERROR('#4: x = 1; eval("++x") === 2. Actual: ' + (x));
-}        
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T2.js
index cf91aa578..5ba9bc545 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is a value V,
- * then return the value V
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.1_T2.js
- * @description Expression statement. Eval return object value
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is a value V,
+    then return the value V
+description: Expression statement. Eval return object value
+---*/
 
 //CHECK#1
 var x = {};
@@ -20,6 +19,4 @@ if (eval("y = x") !== x) {
 //CHECK#2
 if (eval("x") !== x) {
   $ERROR('#2: var x = {}; eval("x") === x. Actual: ' + (eval("x")));
-}    
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T1.js
index 61d9099c9..f38d53437 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T1.js
- * @description Block statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: Block statement
+---*/
 
 //CHECK#1
 if (eval("{}") !== undefined) {
   $ERROR('#1: eval("{}") === undefined. Actual: ' + (eval("{}")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T2.js
index c6893cefe..a65c85761 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T2.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T2.js
- * @description Var statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: Var statement
+---*/
 
 //CHECK#1
 if (eval("var x = 1") !== undefined) {
   $ERROR('#1: eval("var x = 1") === undefined. Actual: ' + (eval("var x = 1")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T3.js
index 63a00ef51..dbad3f36e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T3.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T3.js
- * @description Empty statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: Empty statement
+---*/
 
 //CHECK#1
 if (eval(";") !== undefined) {
   $ERROR('#1: eval(";") === undefined. Actual: ' + (eval(";")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T4.js
index 4c7143495..17698f19e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T4.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T4.js
- * @description If statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: If statement
+---*/
 
 //CHECK#1
 if (eval("if (false) ;") !== undefined) {
   $ERROR('#1: eval("if (false) ;") === undefined. Actual: ' + eval("if (false) ;"));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T5.js
index 1cbae09f2..d35da0b05 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T5.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T5.js
- * @description Switch statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: Switch statement
+---*/
 
 //CHECK#1
 if (eval("switch(1){}") !== undefined) {
   $ERROR('#1: eval("switch(1){}") === undefined. Actual: ' + (eval("switch(1){}")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T6.js
index 44843a8a5..e4d2cd6e2 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T6.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T6.js
- * @description do-while statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: do-while statement
+---*/
 
 //CHECK#1
 if (eval("do ; while(false)") !== undefined) {
   $ERROR('#1: eval("do ; while(false)") === undefined. Actual: ' + (eval("do ; while(false)")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T7.js
index 22da19f08..62844ebe9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T7.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T7.js
- * @description do-while statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: do-while statement
+---*/
 
 //CHECK#1
 if (eval("while(false);") !== undefined) {
   $ERROR('#1: eval("while(false);") === undefined. Actual: ' + (eval("while(false);")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T8.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T8.js
index 5f2acb2d7..4a08860ea 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T8.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T8.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is normal and its completion value is empty,
- * then return the value undefined
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.2_T8.js
- * @description for statement
- */
+/*---
+info: >
+    If Result(3).type is normal and its completion value is empty,
+    then return the value undefined
+description: for statement
+---*/
 
 //CHECK#1
 if (eval("for(false;false;false);") !== undefined) {
   $ERROR('#1: eval("for(false;false;false);") === undefined. Actual: ' + (eval("for(false;false;false);")));
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T1.js
index 04bf18be7..0171bf231 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is not normal, then Result(3).type must be throw.
- * Throw Result(3).value as an exception
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T1.js
- * @description Continue statement
- */
+/*---
+info: >
+    If Result(3).type is not normal, then Result(3).type must be throw.
+    Throw Result(3).value as an exception
+description: Continue statement
+---*/
 
 //CHECK#1
 try {
@@ -31,5 +30,4 @@ try {
   if ((e instanceof SyntaxError) !== true) {
     $ERROR('#2.2: continue must throw SyntaxError. Actual: ' + (e));
   }  
-}      
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T2.js
index 1c1df2173..ddb947436 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is not normal, then Result(3).type must be throw.
- * Throw Result(3).value as an exception
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T2.js
- * @description Break statement
- */
+/*---
+info: >
+    If Result(3).type is not normal, then Result(3).type must be throw.
+    Throw Result(3).value as an exception
+description: Break statement
+---*/
 
 //CHECK#1
 try {
@@ -31,5 +30,4 @@ try {
   if ((e instanceof SyntaxError) !== true) {   
     $ERROR('#2.2: break must throw SyntaxError. Actual: ' + (e));
   }  
-}      
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T3.js
index b8e740723..aefe38cde 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is not normal, then Result(3).type must be throw.
- * Throw Result(3).value as an exception
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T3.js
- * @description Return statement
- */
+/*---
+info: >
+    If Result(3).type is not normal, then Result(3).type must be throw.
+    Throw Result(3).value as an exception
+description: Return statement
+---*/
 
 //CHECK#1
 try {
@@ -30,5 +29,4 @@ try {
   if ((e instanceof SyntaxError) !== true) {
     $ERROR('#2.2: return must throw SyntaxError. Actual: ' + (e));
   }  
-}      
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T4.js
index 45037cfbb..129257f07 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Result(3).type is not normal, then Result(3).type must be throw.
- * Throw Result(3).value as an exception
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A3.3_T4.js
- * @description Throw statement
- */
+/*---
+info: >
+    If Result(3).type is not normal, then Result(3).type must be throw.
+    Throw Result(3).value as an exception
+description: Throw statement
+---*/
 
 //CHECK#1
 try {
@@ -18,4 +17,3 @@ try {
     $ERROR('#1.2: throw 1 must throw SyntaxError. Actual: ' + (e));
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.1.js
index 17ae46129..578bfd568 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of eval has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of eval has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (eval.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in eval){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in eval) { if (p === "length") result = false; };  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.2.js
index 3a79a7baa..43681ff6e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of eval has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of eval has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (eval.hasOwnProperty('length') !== true) {
@@ -24,7 +23,3 @@ if (eval.hasOwnProperty('length') !== true) {
 if (eval.length === undefined) {
   $ERROR('#3: delete eval.length; eval.length !== undefined');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.3.js
index 338a0982c..5834ec039 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of eval has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of eval has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = eval.length;
@@ -15,5 +13,3 @@ eval.length = Infinity;
 if (eval.length !== x) {
   $ERROR('#1: x = eval.length; eval.length = Infinity; eval.length === x. Actual: ' + (eval.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.4.js
index bcae0bab0..36945b565 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of eval is 1
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.4.js
- * @description eval.length === 1
- */
+/*---
+info: The length property of eval is 1
+description: eval.length === 1
+---*/
 
 //CHECK#1
 if (eval.length !== 1) {
   $ERROR('#1: eval.length === 1. Actual: ' + (eval.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.5.js
index b9fe428fc..a619e41b2 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The eval property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The eval property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('eval') !== false) {
@@ -24,4 +22,3 @@ for (var p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "eval") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.6.js
index 04e1ade0a..2f9230c0d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The eval property has not prototype property
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.6.js
- * @description Checking eval.prototype
- */
+/*---
+info: The eval property has not prototype property
+description: Checking eval.prototype
+---*/
 
 //CHECK#1
 if (eval.prototype !== undefined) {
   $ERROR('#1: eval.prototype === undefined. Actual: ' + (eval.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.7.js
index 0a1fa011f..2d1b84894 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The eval property can't be used as constructor
- *
- * @path ch15/15.1/15.1.2/15.1.2.1/S15.1.2.1_A4.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The eval property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new eval() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/15.1.2.2-2-1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/15.1.2.2-2-1.js
index cb072a69a..2822ce056 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/15.1.2.2-2-1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/15.1.2.2-2-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.2/15.1.2.2/15.1.2.2-2-1.js

- * @description pareseInt - 'S' is the empty string when inputString does not contain any such characters

- */

-

-

-function testcase() {

-        return isNaN(parseInt("")) && parseInt("") !== parseInt("");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    pareseInt - 'S' is the empty string when inputString does not
+    contain any such characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return isNaN(parseInt("")) && parseInt("") !== parseInt("");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T1.js
index 364172767..0e122283d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T1.js
- * @description Checking for boolean primitive
- */
+/*---
+info: Operator use ToString
+description: Checking for boolean primitive
+---*/
 
 //CHECK#1
 if (!(isNaN(parseInt(true)) && isNaN(parseInt("NaN")))) {
@@ -17,4 +15,3 @@ if (!(isNaN(parseInt(true)) && isNaN(parseInt("NaN")))) {
 if (String(parseInt(false)) !== "NaN") {
   $ERROR('#2: String(parseInt(false)) === "NaN". Actual: ' + (String(parseInt(false))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T2.js
index ff5199a07..51c930209 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T2.js
- * @description Checking for number primitive
- */
+/*---
+info: Operator use ToString
+description: Checking for number primitive
+---*/
 
 //CHECK#1
 if (parseInt(-1) !== parseInt("-1")) {
@@ -30,5 +28,4 @@ if (parseInt(-0) !== 0) {
   if (1 / parseInt(-0) !== Number.POSITIVE_INFINITY) {
     $ERROR('#4: parseInt(-0) === +0. Actual: ' + (parseInt(-0)));
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T3.js
index 8302d3919..89b633ba0 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T3.js
- * @description Checking for undefined and null
- */
+/*---
+info: Operator use ToString
+description: Checking for undefined and null
+---*/
 
 //CHECK#1
 if (!(isNaN(parseInt(undefined)) && isNaN(parseInt("NaN")))) {
@@ -27,4 +25,3 @@ if (String(parseInt(undefined)) !== "NaN") {
 if (String(parseInt(null)) !== "NaN") {
   $ERROR('#4: String(parseInt(null)) === "NaN". Actual: ' + (String(parseInt(null))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T4.js
index cb8513d08..9ee8a9be6 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T4.js
- * @description Checking for Boolean object
- */
+/*---
+info: Operator use ToString
+description: Checking for Boolean object
+---*/
 
 //CHECK#1
 if (!(isNaN(parseInt(new Boolean(true))) && isNaN(parseInt("NaN")))) {
@@ -17,4 +15,3 @@ if (!(isNaN(parseInt(new Boolean(true))) && isNaN(parseInt("NaN")))) {
 if (String(parseInt(new Boolean(false))) !== "NaN") {
   $ERROR('#2: String(parseInt(new Boolean(false))) === "NaN". Actual: ' + (String(parseInt(new Boolean(false)))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T5.js
index acf3ec140..0c71aebbd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T5.js
- * @description Checking for Number object
- */
+/*---
+info: Operator use ToString
+description: Checking for Number object
+---*/
 
 //CHECK#1
 if (parseInt(new Number(-1)) !== parseInt("-1")) {
@@ -22,4 +20,3 @@ if (String(parseInt(new Number(Infinity))) !== "NaN") {
 if (String(parseInt(new Number(NaN))) !== "NaN") {
   $ERROR('#3: String(parseInt(new Number(NaN))) === "NaN". Actual: ' + (String(parseInt(new Number(NaN)))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T6.js
index 459b40fe4..dd6f5555c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T6.js
- * @description Checking for String object
- */
+/*---
+info: Operator use ToString
+description: Checking for String object
+---*/
 
 //CHECK#1
 if (parseInt(new String("-1")) !== parseInt("-1")) {
@@ -27,4 +25,3 @@ if (String(parseInt(new String("NaN"))) !== "NaN") {
 if (String(parseInt(new String("false"))) !== "NaN") {
   $ERROR('#4: String(parseInt(new String("false"))) === "NaN". Actual: ' + (String(parseInt(new String("false")))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T7.js
index dee9254f2..dbb6ff7cf 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A1_T7.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; parseInt(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T1.js
index 94d69742c..30dc0a418 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T1.js
- * @description StrWhiteSpaceChar :: TAB (U+0009)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: TAB (U+0009)"
+---*/
 
 //CHECK#1
 if (parseInt("\u00091") !== parseInt("1")) {
@@ -37,4 +35,3 @@ if (parseInt("			\u0009			\u0009-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u0009")) !== true) {
   $ERROR('#6: parseInt("\\u0009") === Not-a-Number. Actual: ' + (parseInt("\u0009")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T10.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T10.js
index f67483443..279e4f12c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T10.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T10.js
- * @description StrWhiteSpaceChar :: USP
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: USP"
+---*/
 
 //CHECK#
 var count = 0;
@@ -37,4 +35,3 @@ for (var index = 0; index < uspU.length; index++) {
 if (errorCount > 0) {  
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T2.js
index b7fcfe4da..a6de122d1 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T2.js
- * @description StrWhiteSpaceChar :: SP (U+0020)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: SP (U+0020)"
+---*/
 
 //CHECK#1
 if (parseInt("\u00201") !== parseInt("1")) {
@@ -37,4 +35,3 @@ if (parseInt("       \u0020       \u0020-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u0020")) !== true) {
   $ERROR('#6: parseInt("\\u0020") === Not-a-Number. Actual: ' + (parseInt("\u0020")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T3.js
index 6cf28d093..ef8baba36 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T3.js
- * @description StrWhiteSpaceChar :: NBSB (U+00A0)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: NBSB (U+00A0)"
+---*/
 
 //CHECK#1
 if (parseInt("\u00A01") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u00A0\u00A0-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u00A0")) !== true) {
   $ERROR('#3: parseInt("\\u00A0") === Not-a-Number. Actual: ' + (parseInt("\u00A0")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T4.js
index af48d2f2d..d0169b090 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T4.js
- * @description StrWhiteSpaceChar :: FF (U+000C)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: FF (U+000C)"
+---*/
 
 //CHECK#1
 if (parseInt("\u000C1") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u000C\u000C-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u000C")) !== true) {
   $ERROR('#3: parseInt("\\u000C") === Not-a-Number. Actual: ' + (parseInt("\u000C")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T5.js
index cf937d469..291cb62e4 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T5.js
- * @description StrWhiteSpaceChar :: VT (U+000B)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: VT (U+000B)"
+---*/
 
 //CHECK#1
 if (parseInt("\u000B1") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u000B\u000B-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u000B")) !== true) {
   $ERROR('#3: parseInt("\\u000B") === Not-a-Number. Actual: ' + (parseInt("\u000B")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T6.js
index 459fe4cbc..1b4627855 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T6.js
- * @description StrWhiteSpaceChar :: CR (U+000D)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: CR (U+000D)"
+---*/
 
 //CHECK#1
 if (parseInt("\u000D1") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u000D\u000D-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u000D")) !== true) {
   $ERROR('#3: parseInt("\\u000D") === Not-a-Number. Actual: ' + (parseInt("\u000D")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T7.js
index fd49e2b86..6148d8138 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T7.js
- * @description StrWhiteSpaceChar :: LF (U+000A)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: LF (U+000A)"
+---*/
 
 //CHECK#1
 if (parseInt("\u000A1") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u000A\u000A-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u000A")) !== true) {
   $ERROR('#3: parseInt("\\u000A") === Not-a-Number. Actual: ' + (parseInt("\u000A")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T8.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T8.js
index 2ecc4d7b3..183727780 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T8.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T8.js
- * @description StrWhiteSpaceChar :: LS (U+2028)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: LS (U+2028)"
+---*/
 
 //CHECK#1
 if (parseInt("\u20281") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u2028\u2028-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u2028")) !== true) {
   $ERROR('#3: parseInt("\\u2028") === Not-a-Number. Actual: ' + (parseInt("\u2028")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T9.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T9.js
index c517c2e8b..5481cf038 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T9.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A2_T9.js
- * @description StrWhiteSpaceChar :: PS (U+2029)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: PS (U+2029)"
+---*/
 
 //CHECK#1
 if (parseInt("\u20291") !== parseInt("1")) {
@@ -22,4 +20,3 @@ if (parseInt("\u2029\u2029-1") !== parseInt("-1")) {
 if (isNaN(parseInt("\u2029")) !== true) {
   $ERROR('#3: parseInt("\\u2029") === Not-a-Number. Actual: ' + (parseInt("\u2029")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T1.js
index 91faff88d..7fb531f6e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T1.js
- * @description Checking for boolean primitive
- */
+/*---
+info: Operator use ToNumber
+description: Checking for boolean primitive
+---*/
 
 //CHECK#1
 if (parseInt("11", false) !== parseInt("11", 10)) {
@@ -17,4 +15,3 @@ if (parseInt("11", false) !== parseInt("11", 10)) {
 if (isNaN(parseInt("11", true)) !== true) {
   $ERROR('#2: parseInt("11", true) === Not-a-Number. Actual: ' + (parseInt("11", true)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T2.js
index 3c3d3b170..2e52a810d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T2.js
- * @description Checking for string primitive
- */
+/*---
+info: Operator use ToNumber
+description: Checking for string primitive
+---*/
 
 //CHECK#1
 if (parseInt("11", "2") !== parseInt("11", 2)) {
@@ -22,5 +20,3 @@ if (parseInt("11", "0") !== parseInt("11", 10)) {
 if (parseInt("11", "") !== parseInt("11", 10)) {
   $ERROR('#3: parseInt("11", "") === parseInt("11", 10). Actual: ' + (parseInt("11", "")));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T3.js
index ad0f45f11..3581225d5 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T3.js
- * @description Checking for undefined and null
- */
+/*---
+info: Operator use ToNumber
+description: Checking for undefined and null
+---*/
 
 //CHECK#1
 if (parseInt("11", undefined) !== parseInt("11", 10)) {
@@ -17,4 +15,3 @@ if (parseInt("11", undefined) !== parseInt("11", 10)) {
 if (parseInt("11", null) !== parseInt("11", 10)) {
   $ERROR('#2: parseInt("11", null) === parseInt("11", 10). Actual: ' + (parseInt("11", null)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T4.js
index 32520b29d..7c9ef1e4d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T4.js
- * @description Checking for Boolean object
- */
+/*---
+info: Operator use ToNumber
+description: Checking for Boolean object
+---*/
 
 //CHECK#1
 if (parseInt("11", new Boolean(false)) !== parseInt("11", false)) {
@@ -17,4 +15,3 @@ if (parseInt("11", new Boolean(false)) !== parseInt("11", false)) {
 if (isNaN(parseInt("11", new Boolean(true))) !== true) {
   $ERROR('#2: parseInt("11", new Boolean(true)) === Not-a-Number. Actual: ' + (parseInt("11", new Boolean(true))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T5.js
index cde9f4b12..dbc452b0c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T5.js
- * @description Checking for Number object
- */
+/*---
+info: Operator use ToNumber
+description: Checking for Number object
+---*/
 
 //CHECK#1
 if (parseInt("11", new Number(2)) !== parseInt("11", 2)) {
@@ -17,4 +15,3 @@ if (parseInt("11", new Number(2)) !== parseInt("11", 2)) {
 if (parseInt("11", new Number(Infinity)) !== parseInt("11", Infinity)) {
   $ERROR('#2: parseInt("11", new Number(Infinity)) === parseInt("11", Infinity). Actual: ' + (parseInt("11", new Number(Infinity))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T6.js
index e3d44183d..d975c4bf2 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T6.js
- * @description Checking for String object
- */
+/*---
+info: Operator use ToNumber
+description: Checking for String object
+---*/
 
 //CHECK#1
 if (parseInt("11", new String("2")) !== parseInt("11", 2)) {
@@ -17,4 +15,3 @@ if (parseInt("11", new String("2")) !== parseInt("11", 2)) {
 if (parseInt("11", new String("Infinity")) !== parseInt("11", Infinity)) {
   $ERROR('#2: parseInt("11", new String("Infinity")) === parseInt("11", Infinity). Actual: ' + (parseInt("11", new String("Infinity"))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T7.js
index 76ab6e050..2173331eb 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToNumber
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.1_T7.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: Operator use ToNumber
+description: If Type(value) is Object, evaluate ToPrimitive(value, Number)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 2}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; parseInt("11", object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T1.js
index 07b4b17e6..0943689a0 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInt32
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T1.js
- * @description If radix is NaN, +0, -0, +Infinity, -Infinity, return radix = +0
- */
+/*---
+info: Operator use ToInt32
+description: If radix is NaN, +0, -0, +Infinity, -Infinity, return radix = +0
+---*/
 
 //CHECK#1
 if (parseInt("11", NaN) !== parseInt("11", 10)) {
@@ -32,4 +30,3 @@ if (parseInt("11", Number.POSITIVE_INFINITY) !== parseInt("11", 10)) {
 if (parseInt("11", Number.NEGATIVE_INFINITY) !== parseInt("11", 10)) {
   $ERROR('#5: parseInt("11", Number.NEGATIVE_INFINITY) === parseInt("11", 10). Actual: ' + (parseInt("11", Number.NEGATIVE_INFINITY)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T2.js
index 9611147b2..29d78bbd6 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInt32
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T2.js
- * @description ToInt32 use floor
- */
+/*---
+info: Operator use ToInt32
+description: ToInt32 use floor
+---*/
 
 //CHECK#1
 if (parseInt("11", 2.1) !== parseInt("11", 2)) {
@@ -32,4 +30,3 @@ if (parseInt("11", 2.000000000001) !== parseInt("11", 2)) {
 if (parseInt("11", 2.999999999999) !== parseInt("11", 2)) {
   $ERROR('#5: parseInt("11", 2.999999999999) === parseInt("11", 2). Actual: ' + (parseInt("11", 2.999999999999)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T3.js
index d06fc795f..664dba779 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInt32
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A3.2_T3.js
- * @description ToInt32 use modulo
- */
+/*---
+info: Operator use ToInt32
+description: ToInt32 use modulo
+---*/
 
 //CHECK#1
 if (parseInt("11", 4294967298) !== parseInt("11", 2)) {
@@ -27,4 +25,3 @@ if (isNaN(parseInt("11", -2147483650)) !== true) {
 if (parseInt("11", -4294967294) !== parseInt("11", 2)) {
   $ERROR('#4: parseInt("11", -4294967294) === parseInt("11", 2). Actual: ' + (parseInt("11", -4294967294)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T1.js
index 859c1c178..55e756042 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If R = 0 or R = undefined, then R = 10
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T1.js
- * @description R = 0
- */
+/*---
+info: If R = 0 or R = undefined, then R = 10
+description: R = 0
+---*/
 
 //CHECK#0
 if (parseInt("0", 0) !== parseInt("0", 10)) {
@@ -71,5 +69,4 @@ if (parseInt("11", 0) !== parseInt("11", 10)) {
 //CHECK#12
 if (parseInt("9999", 0) !== parseInt("9999", 10)) {
   $ERROR('#12: parseInt("9999", 0) === parseInt("9999", 10). Actual: ' + (parseInt("9999", 0)));
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T2.js
index d7e82dcbc..353f53c38 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If R = 0 or R = undefined, then R = 10
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.1_T2.js
- * @description R = undefined
- */
+/*---
+info: If R = 0 or R = undefined, then R = 10
+description: R = undefined
+---*/
 
 //CHECK#0
 if (parseInt("0") !== parseInt("0", 10)) {
@@ -71,5 +69,4 @@ if (parseInt("11") !== parseInt("11", 10)) {
 //CHECK#12
 if (parseInt("9999") !== parseInt("9999", 10)) {
   $ERROR('#12: parseInt("9999") === parseInt("9999", 10). Actual: ' + (parseInt("9999")));
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T1.js
index c7b353e5b..310db989f 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If R < 2 or R > 36, then return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T1.js
- * @description R = 1
- */
+/*---
+info: If R < 2 or R > 36, then return NaN
+description: R = 1
+---*/
 
 //CHECK#0
 if (isNaN(parseInt("0", 1)) !== true) {
@@ -66,5 +64,4 @@ if (isNaN(parseInt("10", 1)) !== true) {
 //CHECK#11
 if (isNaN(parseInt("11", 1)) !== true) {
   $ERROR('#11: parseInt("11", 1) === Not-a-Number. Actual: ' + (parseInt("11", 1)));
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T2.js
index 55621e4b0..8c271567b 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If R < 2 or R > 36, then return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T2.js
- * @description R = 37
- */
+/*---
+info: If R < 2 or R > 36, then return NaN
+description: R = 37
+---*/
 
 //CHECK#0
 if (isNaN(parseInt("0", 37)) !== true) {
@@ -66,5 +64,4 @@ if (isNaN(parseInt("10", 37)) !== true) {
 //CHECK#11
 if (isNaN(parseInt("11", 37)) !== true) {
   $ERROR('#11: parseInt("11", 37) === Not-a-Number. Actual: ' + (parseInt("11", 37)));
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T3.js
index 16d554447..8a0a2b4bf 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If R < 2 or R > 36, then return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A4.2_T3.js
- * @description Complex test
- */
+/*---
+info: If R < 2 or R > 36, then return NaN
+description: Complex test
+---*/
 
 //CHECK#
 var pow = 2;
@@ -21,5 +19,4 @@ for (var i = 1; i < 32; i++) {
     }
   }
   pow = pow * 2;                        
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.1_T1.js
index 541fdd355..b464ee69e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.1_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * parseInt is no longer allowed to treat a leading zero as indicating
- * octal.  "If radix is undefined or 0, it is assumed to be 10 except
- * when the number begins with the character pairs 0x or 0X, in which
- * case a radix of 16 is assumed."
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.1_T1.js
- * @description Check if parseInt still accepts octal
- */
+/*---
+info: >
+    parseInt is no longer allowed to treat a leading zero as indicating
+    octal.  "If radix is undefined or 0, it is assumed to be 10 except
+    when the number begins with the character pairs 0x or 0X, in which
+    case a radix of 16 is assumed."
+description: Check if parseInt still accepts octal
+---*/
 
 if (parseInt('010') !== 10) {
   $ERROR("parseInt should no longer accept octal");
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T1.js
index 7d6576d71..02d790588 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length of S is at least 2 and the first two characters of S
- * are either 0x or 0X, then remove the first two characters from S and let R = 16
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T1.js
- * @description : 0x
- */
+/*---
+info: >
+    If the length of S is at least 2 and the first two characters of S
+    are either 0x or 0X, then remove the first two characters from S and let R = 16
+description: ": 0x"
+---*/
 
 //CHECK#0
 if (parseInt("0x0", 0)  !== parseInt("0", 16)) {
@@ -97,5 +96,4 @@ if (parseInt("0xE", 0)  !== parseInt("E", 16)) {
 //CHECK#ABCDEF
 if (parseInt("0xABCDEF", 0)  !== parseInt("ABCDEF", 16)) {
   $ERROR('#ABCDEF: parseInt("0xABCDEF", 0) === parseInt("ABCDEF", 16). Actual: ' + (parseInt("0xABCDEF", 0)));
-}     
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T2.js
index 9170b7796..eada11e06 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length of S is at least 2 and the first two characters of S
- * are either 0x or 0X, then remove the first two characters from S and let R = 16
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A5.2_T2.js
- * @description : 0X
- */
+/*---
+info: >
+    If the length of S is at least 2 and the first two characters of S
+    are either 0x or 0X, then remove the first two characters from S and let R = 16
+description: ": 0X"
+---*/
 
 //CHECK#0
 if (parseInt("0X0", 0)  !== parseInt("0", 16)) {
@@ -97,5 +96,4 @@ if (parseInt("0XE")  !== parseInt("E", 16)) {
 //CHECK#ABCDEF
 if (parseInt("0XABCDEF")  !== parseInt("ABCDEF", 16)) {
   $ERROR('#ABCDEF: parseInt("0XABCDEF") === parseInt("ABCDEF", 16). Actual: ' + (parseInt("0XABCDEF")));
-}     
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T1.js
index 2c2e96a5a..020769fcf 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T1.js
@@ -1,19 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T1.js
- * @description Complex test. R in [2, 36]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. R in [2, 36]
+---*/
 
 //CHECK#
 for (var i = 2; i <= 36; i++) {
   if (parseInt("10$1", i) !== i) {
     $ERROR('#' + i +': i = ' + i + 'parseInt("10$1", i) === i. Actual: ' + (parseInt("10$1", i)));
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T2.js
index 0fcdb6837..112e8b6ba 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T2.js
- * @description Complex test. Radix-R notation in [0..9, A-Z]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. Radix-R notation in [0..9, A-Z]
+---*/
 
 //CHECK#
 var R_digit = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
@@ -16,5 +15,4 @@ for (var i = 2; i <= 36; i++) {
   if (parseInt(R_digit[i - 2] + "$", i) !== i - 1) {
     $ERROR('#' + i + ': ');
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T3.js
index d559d0675..cdbe4e685 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T3.js
- * @description Complex test. Radix-R notation in [0..9, a-z]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. Radix-R notation in [0..9, a-z]
+---*/
 
 //CHECK#
 var R_digit = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
@@ -16,5 +15,4 @@ for (var i = 2; i <= 36; i++) {
   if (parseInt(R_digit[i - 2] + "$", i) !== i - 1) {
     $ERROR('#' + i + ': ');
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T4.js
index 3b4dc78fa..cf98fa0bc 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T4.js
- * @description Complex test. Radix-R notation in [0..9, A-Z]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. Radix-R notation in [0..9, A-Z]
+---*/
 
 //CHECK#
 var R_digit = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
@@ -16,5 +15,4 @@ for (var i = 2; i <= 35; i++) {
   if (parseInt(R_digit[i - 2] + R_digit[i - 1], i) !== i - 1) {
     $ERROR('#' + i + ': ');
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T5.js
index 86f1fa4c7..6fcb07d4f 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T5.js
- * @description Complex test. Radix-R notation in [0..9, a-z]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. Radix-R notation in [0..9, a-z]
+---*/
 
 //CHECK#
 var R_digit = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
@@ -16,5 +15,4 @@ for (var i = 2; i <= 35; i++) {
   if (parseInt(R_digit[i - 2] + R_digit[i - 1], i) !== i - 1) {
     $ERROR('#' + i + ': ');
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T6.js
index 228408b3b..822f5511c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If S contains any character that is not a radix-R digit,
- * then let Z be the substring of S consisting of all characters before
- * the first such character; otherwise, let Z be S
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A6.1_T6.js
- * @description Complex test. Radix-R notation in [0..9]
- */
+/*---
+info: >
+    If S contains any character that is not a radix-R digit,
+    then let Z be the substring of S consisting of all characters before
+    the first such character; otherwise, let Z be S
+description: Complex test. Radix-R notation in [0..9]
+---*/
 
 //CHECK#2
 if (parseInt("0123456789", 2) !== 1) {
@@ -53,5 +52,4 @@ if (parseInt("01234567890", 9) !== 6053444) {
 //CHECK#10
 if (parseInt("01234567890", 10) !== Number(1234567890)) {
   $ERROR('#10: parseInt("01234567890", 10) === Number(1234567890). Actual: ' + (parseInt("01234567890", 10)));
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T1.js
index f01d60582..11b141abd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Z is empty, return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T1.js
- * @description Complex test. R in [2, 36]
- */
+/*---
+info: If Z is empty, return NaN
+description: Complex test. R in [2, 36]
+---*/
 
 //CHECK#
 for (var i = 2; i <= 36; i++) {
   if (isNaN(parseInt("$string", i)) !== true) {
     $ERROR('#' + i + ': parseInt("$string", i) === Not-a-Number. Actual: ' + (parseInt("$string", i)));
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T2.js
index 459097ce4..f4cc16f0d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If Z is empty, return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.1_T2.js
- * @description x is not a radix-R digit
- */
+/*---
+info: If Z is empty, return NaN
+description: x is not a radix-R digit
+---*/
 
 //CHECK#1
 if (isNaN(parseInt("$0x")) !== true) {
@@ -31,5 +29,4 @@ if (isNaN(parseInt("")) !== true) {
 //CHECK#5
 if (isNaN(parseInt(" ")) !== true) {
   $ERROR('#5: parseInt(" ") === Not-a-Number. Actual: ' + (parseInt(" ")));
-}          
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T1.js
index 449f85a00..e5b673b53 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the mathematical integer value
- * that is represented by Z in radix-R notation, using the
- * letters A-Z and a-z for digits with values 10 through 35.
- * Compute the number value for Result(16)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T1.js
- * @description Complex test. Check algorithm
- */
+/*---
+info: >
+    Compute the mathematical integer value
+    that is represented by Z in radix-R notation, using the
+    letters A-Z and a-z for digits with values 10 through 35.
+    Compute the number value for Result(16)
+description: Complex test. Check algorithm
+---*/
 
 //CHECK#
 var R_digit1 = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
@@ -33,5 +32,4 @@ for (var i = 2; i <= 36; i++) {
       $ERROR('#' + i + '.' + j + ' : ');      
     }
   }  
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T2.js
index b11d44293..8dd7f623e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the mathematical integer value
- * that is represented by Z in radix-R notation, using the
- * letters A-Z and a-z for digits with values 10 through 35.
- * Compute the number value for Result(16)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T2.js
- * @description Checking algorithm for R = 2
- */
+/*---
+info: >
+    Compute the mathematical integer value
+    that is represented by Z in radix-R notation, using the
+    letters A-Z and a-z for digits with values 10 through 35.
+    Compute the number value for Result(16)
+description: Checking algorithm for R = 2
+---*/
 
 //CHECK#1
 if (parseInt("1", 2)  !== 1) {
@@ -110,4 +109,3 @@ if (parseInt("1111111111111111111", 2)  !== 524287) {
 if (parseInt("11111111111111111111", 2)  !== 1048575) {
   $ERROR('#20: parseInt("11111111111111111111", 2) === 1048575. Actual: ' + (parseInt("11111111111111111111", 2)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T3.js
index 77529e11f..643892c2c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T3.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the mathematical integer value
- * that is represented by Z in radix-R notation, using the
- * letters A-Z and a-z for digits with values 10 through 35.
- * Compute the number value for Result(16)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.2_T3.js
- * @description Checking algorithm for R = 16
- */
+/*---
+info: >
+    Compute the mathematical integer value
+    that is represented by Z in radix-R notation, using the
+    letters A-Z and a-z for digits with values 10 through 35.
+    Compute the number value for Result(16)
+description: Checking algorithm for R = 16
+---*/
 
 //CHECK#1
 if (parseInt("0x1", 16) !== 1) {
@@ -110,4 +109,3 @@ if (parseInt("0x1000000000000000000", 16) !== 4722366482869645213696) {
 if (parseInt("0x10000000000000000000", 16) !== 75557863725914323419136) {
   $ERROR('#20: parseInt("0x10000000000000000000", 16) === 75557863725914323419136. Actual: ' + (parseInt("0x10000000000000000000", 16)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T1.js
index c9b796095..89f2a77a0 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return sign * Result(17)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T1.js
- * @description Complex test. Check algorithm
- */
+/*---
+info: Return sign * Result(17)
+description: Complex test. Check algorithm
+---*/
 
 //CHECK#
 var R_digit1 = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
@@ -35,5 +33,4 @@ for (var i = 2; i <= 36; i++) {
       $ERROR('#' + i + '.' + j + ' : ');      
     }
   }  
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T2.js
index de2b297e8..576a16aa9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return sign * Result(17)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T2.js
- * @description Checking algorithm for R = 2
- */
+/*---
+info: Return sign * Result(17)
+description: Checking algorithm for R = 2
+---*/
 
 //CHECK#1
 if (parseInt("-1", 2)  !== -1) {
@@ -107,4 +105,3 @@ if (parseInt("-1111111111111111111", 2)  !== -524287) {
 if (parseInt("-11111111111111111111", 2)  !== -1048575) {
   $ERROR('#20: parseInt("-11111111111111111111", 2) === -1048575. Actual: ' + (parseInt("-11111111111111111111", 2)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T3.js
index aa4ee7ac3..3df1e1acb 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return sign * Result(17)
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A7.3_T3.js
- * @description Checking algorithm for R = 10
- */
+/*---
+info: Return sign * Result(17)
+description: Checking algorithm for R = 10
+---*/
 
 //CHECK#1
 if (parseInt("-1", 10) !== -1) {
@@ -107,4 +105,3 @@ if (parseInt("-1000000000000000000", 10) !== -1000000000000000000) {
 if (parseInt("-10000000000000000000", 10) !== -10000000000000000000) {
   $ERROR('#20: parseInt("-10000000000000000000", 10) === -10000000000000000000. Actual: ' + (parseInt("-10000000000000000000", 10)));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A8.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A8.js
index 4176800b2..2f38efbe9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A8.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * parseInt may interpret only a leading portion of the string as
- * a number value; it ignores any characters that cannot be interpreted as part
- * of the notation of an decimal literal, and no indication is given that any such
- * characters were ignored.
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A8.js
- * @description Complex test without eval
- */
+/*---
+info: >
+    parseInt may interpret only a leading portion of the string as
+    a number value; it ignores any characters that cannot be interpreted as part
+    of the notation of an decimal literal, and no indication is given that any such
+    characters were ignored.
+description: Complex test without eval
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -80,4 +79,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.1.js
index 6b8d9fde0..0918e4aa5 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseInt has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of parseInt has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (parseInt.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (var p in parseInt){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in parseInt) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.2.js
index 978e920b5..6b640a962 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseInt has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of parseInt has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (parseInt.hasOwnProperty('length') !== true) {
@@ -25,4 +24,3 @@ if (parseInt.hasOwnProperty('length') !== true) {
 if (parseInt.length === undefined) {
   $ERROR('#3: delete parseInt.length; parseInt.length !== undefined');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.3.js
index dc0a2c522..957670eb3 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseInt has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of parseInt has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 x = parseInt.length;
@@ -15,5 +13,3 @@ parseInt.length = Infinity;
 if (parseInt.length !== x) {
   $ERROR('#1: x = parseInt.length; parseInt.length = Infinity; parseInt.length === x. Actual: ' + (parseInt.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.4.js
index f92a64bdb..ead4e410d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseInt is 2
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.4.js
- * @description parseInt.length === 2
- */
+/*---
+info: The length property of parseInt is 2
+description: parseInt.length === 2
+---*/
 
 //CHECK#1
 if (parseInt.length !== 2) {
   $ERROR('#1: parseInt.length === 2. Actual: ' + (parseInt.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.5.js
index 18e6653a2..a01638d73 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseInt property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The parseInt property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('parseInt') !== false) {
@@ -24,4 +22,3 @@ for (var p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "parseInt") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.6.js
index 8fa118ec4..18b504c2a 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseInt property has not prototype property
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.6.js
- * @description Checking parseInt.prototype
- */
+/*---
+info: The parseInt property has not prototype property
+description: Checking parseInt.prototype
+---*/
 
 //CHECK#1
 if (parseInt.prototype !== undefined) {
   $ERROR('#1: parseInt.prototype === undefined. Actual: ' + (parseInt.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.7.js
index 992aa4e12..6585229ad 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseInt property can't be used as constructor
- *
- * @path ch15/15.1/15.1.2/15.1.2.2/S15.1.2.2_A9.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The parseInt property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new parseInt() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/15.1.2.3-2-1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/15.1.2.3-2-1.js
index 874d5c30f..27c4dac63 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/15.1.2.3-2-1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/15.1.2.3-2-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.1/15.1.2/15.1.2.3/15.1.2.3-2-1.js

- * @description pareseFloat - 'trimmedString' is the empty string when inputString does not contain any such characters

- */

-

-

-function testcase() {

-        return isNaN(parseFloat("")) && parseFloat("") !== parseFloat("");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    pareseFloat - 'trimmedString' is the empty string when inputString
+    does not contain any such characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return isNaN(parseFloat("")) && parseFloat("") !== parseFloat("");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T1.js
index fa0b4ae60..30b40922c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T1.js
- * @description Checking for boolean primitive
- */
+/*---
+info: Operator use ToString
+description: Checking for boolean primitive
+---*/
 
 //CHECK#1
 if (!(isNaN(parseFloat(true)) && isNaN(parseFloat("NaN")))) {
@@ -17,4 +15,3 @@ if (!(isNaN(parseFloat(true)) && isNaN(parseFloat("NaN")))) {
 if (String(parseFloat(false)) !== "NaN") {
   $ERROR('#2: String(parseFloat(false)) === "NaN". Actual: ' + (String(parseFloat(false))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T2.js
index 02c7b2c9e..3cb3be752 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T2.js
- * @description Checking for number primitive
- */
+/*---
+info: Operator use ToString
+description: Checking for number primitive
+---*/
 
 //CHECK#1
 if (parseFloat(-1.1) !== parseFloat("-1.1")) {
@@ -35,5 +33,4 @@ if (parseFloat(-0) !== 0) {
   if (1 / parseFloat(-0) !== Number.POSITIVE_INFINITY) {
     $ERROR('#5: parseFloat(-0) === +0. Actual: ' + (parseFloat(-0)));
   }
-}    
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T3.js
index ddbe26109..6dd5ff5f9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T3.js
- * @description Checking for undefined and null
- */
+/*---
+info: Operator use ToString
+description: Checking for undefined and null
+---*/
 
 //CHECK#1
 if (!(isNaN(parseFloat(undefined)) && isNaN(parseFloat("NaN")))) {
@@ -28,4 +26,3 @@ if (String(parseFloat(undefined)) !== "NaN") {
 if (String(parseFloat(null)) !== "NaN") {
   $ERROR('#4: String(parseFloat(null)) === "NaN". Actual: ' + (String(parseFloat(null))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T4.js
index cf769c03e..cbcd0ec17 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T4.js
- * @description Checking for Boolean object
- */
+/*---
+info: Operator use ToString
+description: Checking for Boolean object
+---*/
 
 //CHECK#1
 if (!(isNaN(parseFloat(new Boolean(true))) && isNaN(parseFloat("NaN")))) {
@@ -17,4 +15,3 @@ if (!(isNaN(parseFloat(new Boolean(true))) && isNaN(parseFloat("NaN")))) {
 if (String(parseFloat(new Boolean(false))) !== "NaN") {
   $ERROR('#2: String(parseFloat(new Boolean(false))) === "NaN". Actual: ' + (String(parseFloat(new Boolean(false)))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T5.js
index 36259b4fb..87f8f5bf5 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T5.js
- * @description Checking for Number object
- */
+/*---
+info: Operator use ToString
+description: Checking for Number object
+---*/
 
 //CHECK#1
 if (parseFloat(new Number(-1.1)) !== parseFloat("-1.1")) {
@@ -27,4 +25,3 @@ if (String(parseFloat(new Number(NaN))) !== "NaN") {
 if (parseFloat(new Number(.01e+2)) !== parseFloat(".01e+2")) {
   $ERROR('#4: parseFloat(new Number(.01e+2)) === parseFloat(".01e+2"). Actual: ' + (parseFloat(new Number(.01e+2))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T6.js
index f54bc62f1..1f0f70101 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T6.js
- * @description Checking for String object
- */
+/*---
+info: Operator use ToString
+description: Checking for String object
+---*/
 
 //CHECK#1
 if (parseFloat(new String("-1.1")) !== parseFloat("-1.1")) {
@@ -32,4 +30,3 @@ if (parseFloat(new String(".01e+2")) !== parseFloat(".01e+2")) {
 if (String(parseFloat(new String("false"))) !== "NaN") {
   $ERROR('#5: String(parseFloat(new String("false"))) === "NaN". Actual: ' + (String(parseFloat(new String("false")))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T7.js
index 8b383ea53..3fd4e2fb0 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A1_T7.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return 1}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; parseFloat(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T1.js
index fa5a600a9..f69a27731 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T1.js
- * @description StrWhiteSpaceChar :: TAB (U+0009)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: TAB (U+0009)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u00091.1") !== parseFloat("1.1")) {
@@ -37,4 +35,3 @@ if (parseFloat("			\u0009			\u0009-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u0009")) !== true) {
   $ERROR('#6: parseFloat("\\u0009") === Not-a-Number. Actual: ' + (parseFloat("\u0009")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T10.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T10.js
index 2cdb2a754..5d7c5d3c3 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T10.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T10.js
- * @description StrWhiteSpaceChar :: USP
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: USP"
+---*/
 
 //CHECK#
 var count = 0;
@@ -36,4 +34,3 @@ for (var index = 0; index < uspU.length; index++) {
 if (errorCount > 0) {  
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T2.js
index 711bb6e79..d4bb7b562 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T2.js
- * @description StrWhiteSpaceChar :: SP (U+0020)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: SP (U+0020)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u00201.1") !== parseFloat("1.1")) {
@@ -37,4 +35,3 @@ if (parseFloat("       \u0020       \u0020-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u0020")) !== true) {
   $ERROR('#6: parseFloat("\\u0020") === Not-a-Number. Actual: ' + (parseFloat("\u0020")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T3.js
index 5d5e41f92..4a530c85d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T3.js
- * @description StrWhiteSpaceChar :: NBSB (U+00A0)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: NBSB (U+00A0)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u00A01.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u00A0\u00A0-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u00A0")) !== true) {
   $ERROR('#3: parseFloat("\\u00A0") === Not-a-Number. Actual: ' + (parseFloat("\u00A0")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T4.js
index 1bf82ac84..ddc780f47 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T4.js
- * @description StrWhiteSpaceChar :: FF (U+000C)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: FF (U+000C)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u000C1.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u000C\u000C-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u000C")) !== true) {
   $ERROR('#3: parseFloat("\\u000C") === Not-a-Number. Actual: ' + (parseFloat("\u000C")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T5.js
index ad1bf7878..ff6771fd2 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T5.js
- * @description StrWhiteSpaceChar :: VT (U+000B)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: VT (U+000B)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u000B1.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u000B\u000B-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u000B")) !== true) {
   $ERROR('#3: parseFloat("\\u000B") === Not-a-Number. Actual: ' + (parseFloat("\u000B")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T6.js
index 6d2905d89..550e2a623 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T6.js
- * @description StrWhiteSpaceChar :: CR (U+000D)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: CR (U+000D)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u000D1.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u000D\u000D-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u000D")) !== true) {
   $ERROR('#3: parseFloat("\\u000D") === Not-a-Number. Actual: ' + (parseFloat("\u000D")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T7.js
index d114913eb..635bba4c7 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T7.js
- * @description StrWhiteSpaceChar :: LF (U+000A)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: LF (U+000A)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u000A1.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u000A\u000A-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u000A")) !== true) {
   $ERROR('#3: parseFloat("\\u000A") === Not-a-Number. Actual: ' + (parseFloat("\u000A")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T8.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T8.js
index f7f2576fe..494715e1f 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T8.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T8.js
- * @description StrWhiteSpaceChar :: LS (U+2028)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: LS (U+2028)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u20281.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u2028\u2028-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u2028")) !== true) {
   $ERROR('#3: parseFloat("\\u2028") === Not-a-Number. Actual: ' + (parseFloat("\u2028")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T9.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T9.js
index 0c0252069..96c459816 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T9.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator remove leading StrWhiteSpaceChar
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A2_T9.js
- * @description StrWhiteSpaceChar :: PS (U+2029)
- */
+/*---
+info: Operator remove leading StrWhiteSpaceChar
+description: "StrWhiteSpaceChar :: PS (U+2029)"
+---*/
 
 //CHECK#1
 if (parseFloat("\u20291.1") !== parseFloat("1.1")) {
@@ -22,4 +20,3 @@ if (parseFloat("\u2029\u2029-1.1") !== parseFloat("-1.1")) {
 if (isNaN(parseFloat("\u2029")) !== true) {
   $ERROR('#3: parseFloat("\\u2029") === Not-a-Number. Actual: ' + (parseFloat("\u2029")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T1.js
index 6d131659a..17dbde946 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
- * StrDecimalLiteral (see 9.3.1), return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T1.js
- * @description parseFloat("some string") return NaN
- */
+/*---
+info: >
+    If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
+    StrDecimalLiteral (see 9.3.1), return NaN
+description: parseFloat("some string") return NaN
+---*/
 
 //CHECK#1
 if (isNaN(parseFloat("str")) !== true) {
@@ -43,4 +42,3 @@ if (String(parseFloat("")) !== "NaN") {
 if (String(parseFloat("+")) !== "NaN") {
   $ERROR('#7: String(parseFloat("+")) === "NaN". Actual: ' + (String(parseFloat("+"))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T2.js
index 8e550a0a7..4bb9676fe 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
- * StrDecimalLiteral (see 9.3.1), return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T2.js
- * @description parseFloat("wrong number format with ExponentIndicator") return NaN
- */
+/*---
+info: >
+    If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
+    StrDecimalLiteral (see 9.3.1), return NaN
+description: parseFloat("wrong number format with ExponentIndicator") return NaN
+---*/
 
 //CHECK#1
 if (isNaN(parseFloat("e1")) !== true) {
@@ -58,4 +57,3 @@ if (isNaN(parseFloat("-.e-1")) !== true) {
 if (isNaN(parseFloat(".e1")) !== true) {
   $ERROR('#10: parseFloat(".e1") === Not-a-Number. Actual: ' + (parseFloat(".e1")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T3.js
index 51c7869f1..73c49ce5a 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
- * StrDecimalLiteral (see 9.3.1), return NaN
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A3_T3.js
- * @description parseFloat("wrong numbr format") return NaN
- */
+/*---
+info: >
+    If neither Result(2) nor any prefix of Result(2) satisfies the syntax of a
+    StrDecimalLiteral (see 9.3.1), return NaN
+description: parseFloat("wrong numbr format") return NaN
+---*/
 
 //CHECK#1
 if (isNaN(parseFloat(".x")) !== true) {
@@ -48,4 +47,3 @@ if (String(parseFloat("infinity")) !== "NaN") {
 if (String(parseFloat("A")) !== "NaN") {
   $ERROR('#8: String(parseFloat("A")) === "NaN". Actual: ' + (String(parseFloat("A"))));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T1.js
index ea696cec4..f679c9354 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T1.js
- * @description Some wrong number
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: Some wrong number
+---*/
 
 //CHECK#1
 if (parseFloat("0x") !== 0) {
@@ -53,4 +52,3 @@ if (parseFloat("0.1.1") !== 0.1) {
 if (parseFloat("0. 1") !== 0) {
   $ERROR('#9: parseFloat("0. 1") === 0. Actual: ' + (parseFloat("0. 1")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T2.js
index 40c18ff86..0f2754035 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T2.js
- * @description With ExponentIndicator
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: With ExponentIndicator
+---*/
 
 //CHECK#1
 if (parseFloat("1ex") !== 1) {
@@ -33,4 +32,3 @@ if (parseFloat("1e-1x") !== 0.1) {
 if (parseFloat("0.1e-1x") !== 0.01) {
   $ERROR('#5: parseFloat("0.1e-1x") === 0.01. Actual: ' + (parseFloat("0.1e-1x")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T3.js
index 76da0e47d..496802cdd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T3.js
- * @description StrDecimalLiteral not contain HexIntegerLiteral
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: StrDecimalLiteral not contain HexIntegerLiteral
+---*/
 
 //CHECK#0
 if (parseFloat("0x0") !== 0) {
@@ -88,4 +87,3 @@ if (parseFloat("0xE") !== 0) {
 if (parseFloat("0xF") !== 0) {
   $ERROR('#F: parseFloat("0xF") === 0. Actual: ' + (parseFloat("0xF")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T4.js
index 4fef9fc07..caf6f3197 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T4.js
- * @description "Infinity"+"some string"
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: "\"Infinity\"+\"some string\""
+---*/
 
 //CHECK#1
 if (parseFloat("Infinity1") !== Number.POSITIVE_INFINITY) {
@@ -23,4 +22,3 @@ if (parseFloat("Infinityx") !== Number.POSITIVE_INFINITY) {
 if (parseFloat("Infinity+1") !== Number.POSITIVE_INFINITY) {
   $ERROR('#3: parseFloat("Infinity+1") === Number.POSITIVE_INFINITY. Actual: ' + (parseFloat("Infinity+1")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T5.js
index ecbddb449..31a92fff3 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T5.js
- * @description Checking DecimalDigits . DecimalDigits_opt ExponentPart_opt
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: Checking DecimalDigits . DecimalDigits_opt ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("-11.string") !== -11) {
@@ -58,4 +57,3 @@ if (parseFloat("001.string") !== 1) {
 if (parseFloat("010.string") !== 10) {
   $ERROR('#10: parseFloat("010.string") === 10. Actual: ' + (parseFloat("010.string")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T6.js
index 5272a62fb..077d5c53f 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T6.js
- * @description Checking . DecimalDigits ExponentPart_opt
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: Checking . DecimalDigits ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("+.1string") !== 0.1) {
@@ -23,4 +22,3 @@ if (parseFloat(".01string") !== 0.01) {
 if (parseFloat("+.22e-1string") !== 0.022) {
   $ERROR('#3: parseFloat("+.22e-1string") === 0.022. Actual: ' + (parseFloat("+.22e-1string")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T7.js
index 0f77778f9..5fe1b9358 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Compute the longest prefix of Result(2), which might be Result(2) itself,
- * which satisfies the syntax of a StrDecimalLiteral
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A4_T7.js
- * @description Checking DecimalDigits ExponentPart_opt
- */
+/*---
+info: >
+    Compute the longest prefix of Result(2), which might be Result(2) itself,
+    which satisfies the syntax of a StrDecimalLiteral
+description: Checking DecimalDigits ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("-11string") !== -11) {
@@ -43,4 +42,3 @@ if (parseFloat("1e001string") !== 10) {
 if (parseFloat("010string") !== 10) {
   $ERROR('#7: parseFloat("010string") === 10. Actual: ' + (parseFloat("010string")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T1.js
index 6ed8521aa..38ef3b79d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the number value for the MV of Result(4)
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T1.js
- * @description Checking Infinity
- */
+/*---
+info: Return the number value for the MV of Result(4)
+description: Checking Infinity
+---*/
 
 //CHECK#1
 if (parseFloat("Infinity") !== Number.POSITIVE_INFINITY) {
@@ -22,4 +20,3 @@ if (parseFloat("+Infinity") !== Number.POSITIVE_INFINITY) {
 if (parseFloat("-Infinity") !== Number.NEGATIVE_INFINITY) {
   $ERROR('#3: parseFloat("-Infinity") === Number.NEGATIVE_INFINITY. Actual: ' + (parseFloat("-Infinity")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T2.js
index b59fb7900..9288e4764 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the number value for the MV of Result(4)
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T2.js
- * @description Checking DecimalDigits . DecimalDigits_opt ExponentPart_opt
- */
+/*---
+info: Return the number value for the MV of Result(4)
+description: Checking DecimalDigits . DecimalDigits_opt ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("-11.") !== -11) {
@@ -57,4 +55,3 @@ if (parseFloat("001.") !== 1) {
 if (parseFloat("010.") !== 10) {
   $ERROR('#10: parseFloat("010.") === 10. Actual: ' + (parseFloat("010.")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T3.js
index b2a2097e9..848df6ecc 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the number value for the MV of Result(4)
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T3.js
- * @description Checking . DecimalDigits ExponentPart_opt
- */
+/*---
+info: Return the number value for the MV of Result(4)
+description: Checking . DecimalDigits ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("+.1") !== 0.1) {
@@ -22,4 +20,3 @@ if (parseFloat(".01") !== 0.01) {
 if (parseFloat("+.22e-1") !== 0.022) {
   $ERROR('#3: parseFloat("+.22e-1") === 0.022. Actual: ' + (parseFloat("+.22e-1")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T4.js
index d92e3bcb0..a4215b489 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Return the number value for the MV of Result(4)
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A5_T4.js
- * @description Checking DecimalDigits ExponentPart_opt
- */
+/*---
+info: Return the number value for the MV of Result(4)
+description: Checking DecimalDigits ExponentPart_opt
+---*/
 
 //CHECK#1
 if (parseFloat("-11") !== -11) {
@@ -42,4 +40,3 @@ if (parseFloat("1e001") !== 10) {
 if (parseFloat("010") !== 10) {
   $ERROR('#7: parseFloat("010") === 10. Actual: ' + (parseFloat("010")));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A6.js
index 8c626a855..3663299c9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * parseFloat may interpret only a leading portion of the string as
- * a number value; it ignores any characters that cannot be interpreted as part
- * of the notation of an decimal literal, and no indication is given that any such
- * characters were ignored.
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A6.js
- * @description Complex test without eval
- */
+/*---
+info: >
+    parseFloat may interpret only a leading portion of the string as
+    a number value; it ignores any characters that cannot be interpreted as part
+    of the notation of an decimal literal, and no indication is given that any such
+    characters were ignored.
+description: Complex test without eval
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -78,4 +77,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.1.js
index a63830dd2..5761be4f4 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseFloat has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of parseFloat has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (parseFloat.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (var p in parseFloat){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in parseFloat) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.2.js
index 84fa178c0..3b5d7a32a 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseFloat has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of parseFloat has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (parseFloat.hasOwnProperty('length') !== true) {
@@ -25,4 +24,3 @@ if (parseFloat.hasOwnProperty('length') !== true) {
 if (parseFloat.length === undefined) {
   $ERROR('#3: delete parseFloat.length; parseFloat.length !== undefined');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.3.js
index 28d1839ed..c7861cce0 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseFloat has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of parseFloat has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = parseFloat.length;
@@ -15,5 +13,3 @@ parseFloat.length = Infinity;
 if (parseFloat.length !== x) {
   $ERROR('#1: x = parseFloat.length; parseFloat.length = Infinity; parseFloat.length === x. Actual: ' + (parseFloat.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.4.js
index 085fac1a3..61c1306ec 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of parseFloat is 1
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.4.js
- * @description parseFloat.length === 1
- */
+/*---
+info: The length property of parseFloat is 1
+description: parseFloat.length === 1
+---*/
 
 //CHECK#1
 if (parseFloat.length !== 1) {
   $ERROR('#1: parseFloat.length === 1. Actual: ' + (parseFloat.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.5.js
index abf91c709..8c966d23c 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseFloat property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The parseFloat property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('parseFloat') !== false) {
@@ -24,4 +22,3 @@ for (var p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "parseFloat") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.6.js
index 773ea4dfa..7b5b93cdd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseFloat property has not prototype property
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.6.js
- * @description Checking parseFloat.prototype
- */
+/*---
+info: The parseFloat property has not prototype property
+description: Checking parseFloat.prototype
+---*/
 
 //CHECK#1
 if (parseFloat.prototype !== undefined) {
   $ERROR('#1: parseFloat.prototype === undefined. Actual: ' + (parseFloat.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.7.js
index ffa1934e7..1da8b0932 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The parseFloat property can't be used as constructor
- *
- * @path ch15/15.1/15.1.2/15.1.2.3/S15.1.2.3_A7.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The parseFloat property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new parseFloat() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T1.js
index 59cf248bc..201ba067d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * isNaN applies ToNumber to its argument, then return true if the result is NaN, and otherwise return false
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T1.js
- * @description Checking all primitive
- */
+/*---
+info: >
+    isNaN applies ToNumber to its argument, then return true if the result is
+    NaN, and otherwise return false
+description: Checking all primitive
+---*/
 
 // CHECK#1
 if (!(isNaN(NaN) === true)) {
@@ -67,8 +67,3 @@ if (isNaN(true) === true) {
 if (isNaN("1") === true) {
   $ERROR('#12: "1" !== Not-a-Number'); 
 }
-
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T2.js
index c9e957fe0..6920f06f9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * isNaN applies ToNumber to its argument, then return true if the result is NaN, and otherwise return false
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A1_T2.js
- * @description Checking all object
- */
+/*---
+info: >
+    isNaN applies ToNumber to its argument, then return true if the result is
+    NaN, and otherwise return false
+description: Checking all object
+---*/
 
 // CHECK#1
 if (!(isNaN({}) === true)) {
@@ -37,8 +37,3 @@ if (!(isNaN(new Number(NaN)) === true)) {
 if (isNaN(new Boolean(true)) === true) {
   $ERROR('#6: new Boolean(true) !== Not-a-Number'); 
 }
-
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.1.js
index 6b6099334..07493fe5d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isNaN has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of isNaN has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (isNaN.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in isNaN){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in isNaN) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.2.js
index a2539fb9b..2df18a2c6 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isNaN has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of isNaN has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (isNaN.hasOwnProperty('length') !== true) {
@@ -25,4 +24,3 @@ if (isNaN.hasOwnProperty('length') !== true) {
 if (isNaN.length === undefined) {
   $ERROR('#3: delete isNaN.length; isNaN.length !== undefined');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.3.js
index 8daaa8964..fa138562d 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isNaN has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of isNaN has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 x = isNaN.length;
@@ -15,5 +13,3 @@ isNaN.length = Infinity;
 if (isNaN.length !== x) {
   $ERROR('#1: x = isNaN.length; isNaN.length = Infinity; isNaN.length === x. Actual: ' + (isNaN.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.4.js
index b8f6aedcf..a58427f6f 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isNaN is 1
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.4.js
- * @description isNaN.length === 1
- */
+/*---
+info: The length property of isNaN is 1
+description: isNaN.length === 1
+---*/
 
 //CHECK#1
 if (isNaN.length !== 1) {
   $ERROR('#1: isNaN.length === 1. Actual: ' + (isNaN.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.5.js
index bf9ae3937..67fdd1964 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isNaN property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The isNaN property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('isNaN') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "isNaN") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.6.js
index cad9bed13..85d457aad 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isNaN property has not prototype property
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.6.js
- * @description Checking isNaN.prototype
- */
+/*---
+info: The isNaN property has not prototype property
+description: Checking isNaN.prototype
+---*/
 
 //CHECK#1
 if (isNaN.prototype !== undefined) {
   $ERROR('#1: isNaN.prototype === undefined. Actual: ' + (isNaN.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.7.js
index e6725cd02..624ad23ca 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isNaN property can't be used as constructor
- *
- * @path ch15/15.1/15.1.2/15.1.2.4/S15.1.2.4_A2.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The isNaN property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new isNaN() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T1.js
index 1e952b218..a6f0d7141 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * isFinite applies ToNumber to its argument, then return false if the result is NaN, +Infinity, -Infinity, and otherwise return true
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T1.js
- * @description Checking all primitive
- */
+/*---
+info: >
+    isFinite applies ToNumber to its argument, then return false if the
+    result is NaN, +Infinity, -Infinity, and otherwise return true
+description: Checking all primitive
+---*/
 
 // CHECK#1
 if (!(isFinite(NaN) === false)) {
@@ -67,4 +67,3 @@ if (isFinite(false) === false) {
 if (isFinite("1") === false) {
   $ERROR('#12: "1" !== Not-a-Finite'); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T2.js
index 86ea9a37d..776007ef9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * isFinite applies ToNumber to its argument, then return false if the result is NaN, +Infinity, -Infinity, and otherwise return true
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A1_T2.js
- * @description Checking all object
- */
+/*---
+info: >
+    isFinite applies ToNumber to its argument, then return false if the
+    result is NaN, +Infinity, -Infinity, and otherwise return true
+description: Checking all object
+---*/
 
 // CHECK#1
 if (!(isFinite({}) === false)) {
@@ -37,4 +37,3 @@ if (!(isFinite(new Number(NaN)) === false)) {
 if (isFinite(new Boolean(true)) === false) {
   $ERROR('#6: new Boolean(true) !== Not-a-Finite'); 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.1.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.1.js
index 0e1970eaa..0a3d91ed7 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.1.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isFinite has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of isFinite has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (isFinite.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in isFinite){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in isFinite) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.2.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.2.js
index 56d2c637a..7dc204afb 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.2.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isFinite has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of isFinite has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (isFinite.hasOwnProperty('length') !== true) {
@@ -25,4 +24,3 @@ if (isFinite.hasOwnProperty('length') !== true) {
 if (isFinite.length === undefined) {
   $ERROR('#3: delete isFinite.length; isFinite.length !== undefined');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.3.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.3.js
index af8441a36..3c91fa3d2 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.3.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isFinite has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of isFinite has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 x = isFinite.length;
@@ -15,5 +13,3 @@ isFinite.length = Infinity;
 if (isFinite.length !== x) {
   $ERROR('#1: x = isFinite.length; isFinite.length = Infinity; isFinite.length === x. Actual: ' + (isFinite.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.4.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.4.js
index cba913c9a..b287e5be9 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.4.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of isFinite is 1
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.4.js
- * @description isFinite.length === 1
- */
+/*---
+info: The length property of isFinite is 1
+description: isFinite.length === 1
+---*/
 
 //CHECK#1
 if (isFinite.length !== 1) {
   $ERROR('#1: isFinite.length === 1. Actual: ' + (isFinite.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.5.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.5.js
index b8599f2c3..58ca98274 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.5.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isFinite property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The isFinite property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('isFinite') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "isFinite") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.6.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.6.js
index e9f6e408b..e029d103e 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.6.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isFinite property has not prototype property
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.6.js
- * @description Checking isFinit.prototype
- */
+/*---
+info: The isFinite property has not prototype property
+description: Checking isFinit.prototype
+---*/
 
 //CHECK#1
 if (isFinite.prototype !== undefined) {
   $ERROR('#1: isFinite.prototype === undefined. Actual: ' + (isFinite.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.7.js b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.7.js
index b388cd30f..5ff35ecbd 100644
--- a/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.7.js
+++ b/test/suite/ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The isFinite property can't be used as constructor
- *
- * @path ch15/15.1/15.1.2/15.1.2.5/S15.1.2.5_A2.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The isFinite property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new isFinite() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.10_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.10_T1.js
index 98a7aa518..f69e05b8c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.10_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.10_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and string.charAt(k + 4) and
- * string.charAt(k + 5) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.10_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and string.charAt(k + 4) and
+    string.charAt(k + 5) do not represent hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 var result = true;
@@ -28,4 +27,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 110xxxxx (n = 2) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T1.js
index cbf112db8..a82b642a5 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T1.js
- * @description Complex tests, string.charAt(k + 4) and string.charAt(k + 5)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 var result = true;
@@ -30,4 +30,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T2.js
index 7fe1df5a9..d4a02a443 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.11_T2.js
- * @description Complex tests, string.charAt(k + 7) and string.charAt(k + 8)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 7) and string.charAt(k + 8)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 var result = true;
@@ -30,4 +30,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 7) and  string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T1.js
index a0ee74e2c..84124888d 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T1.js
- * @description Complex tests, string.charAt(k + 4) and string.charAt(k + 5)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 var result = true;
@@ -31,4 +31,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T2.js
index d75ba1898..752090dcc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T2.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T2.js
- * @description Complex tests, string.charAt(k + 7) and string.charAt(k + 7)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 7) and string.charAt(k + 7)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 var result = true;
@@ -31,4 +31,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T3.js
index 82dbe0b6e..f54c3c0dd 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T3.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.12_T3.js
- * @description Complex tests, string.charAt(k + 10) and string.charAt(k + 11)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 10) and string.charAt(k + 11)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 var result = true;
@@ -31,4 +31,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T1.js
index ecb081845..b4e5a4619 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T2.js
index aa8cb610f..bcdae2438 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.13_T2.js
- * @description Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T1.js
index 968237727..0512f83bc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T2.js
index 3539281f3..cd475e6f2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T2.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T3.js
index 34c5f120b..478bd7ccc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T3.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T4.js
index ebdf11c26..70d6d5ade 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.14_T4.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T1.js
index 089fe910a..979434cb9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T1.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T2.js
index 63e2f4eed..6ee669c83 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T2.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T3.js
index 4abf777d9..ca36e1c30 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T3.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T4.js
index 433d324ef..e101ce517 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T4.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T5.js
index 8c78da11d..b05c23deb 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T5.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T6.js
index 26672df4f..973be724a 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.15_T6.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.1_T1.js
index e178a708d..38bed2a1c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError
+description: Complex tests
+---*/
 
 var result = true;
 
@@ -53,7 +51,3 @@ try {
 if (result !== true) {
   $ERROR('#1: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T1.js
index 4ede22c6a..70cbca924 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = string.charAt(k+1) + string.charAt(k+2) do not represent
- * hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = string.charAt(k+1) + string.charAt(k+2) do not represent
+    hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 var result = true;
@@ -28,4 +27,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If string.charAt(k+1) does not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T2.js
index 44f16f68c..25e768e9d 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = string.charAt(k+1) + string.charAt(k+2) do not represent
- * hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.2_T2.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = string.charAt(k+1) + string.charAt(k+2) do not represent
+    hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 var result = true;
@@ -28,4 +27,3 @@ for (var indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If string.charAt(k+2) does not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T1.js
index e441d4b93..bacda8916 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 10xxxxxx or B = 11111xxx, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T1.js
- * @description Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
- */
+/*---
+info: If B = 10xxxxxx or B = 11111xxx, throw URIError
+description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T2.js
index 468df214f..d3a05b4ea 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 10xxxxxx or B = 11111xxx, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.3_T2.js
- * @description Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
- */
+/*---
+info: If B = 10xxxxxx or B = 11111xxx, throw URIError
+description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.4_T1.js
index 5a2ca51c2..5fb745e03 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.4_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF]
- */
+/*---
+info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
+description: Complex tests. B = [0xC0 - 0xDF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.5_T1.js
index e78388282..86e0771e2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.5_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF]
- */
+/*---
+info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
+description: Complex tests. B = [0xE0 - 0xEF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.6_T1.js
index 44f3ca8a8..b0d67b742 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.6_T1.js
- * @description Complex tests. B = [0xF0 - 0xF7]
- */
+/*---
+info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
+description: Complex tests. B = [0xF0 - 0xF7]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.7_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.7_T1.js
index 7d97e3992..7e61a04dc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.7_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.7_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.7_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw
+    URIError
+description: Complex tests. B = [0xC0 - 0xDF]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T1.js
index 87fb7101e..8c80cebc2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and string.charAt(k + 3),
- * string.charAt(k + 6) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF],
- * string.charAt(k + 3) not equal "%"
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and string.charAt(k + 3),
+    string.charAt(k + 6) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal
+    "%"
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T2.js
index 77f166a99..e645ab739 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and string.charAt(k + 3),
- * string.charAt(k + 6) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.8_T2.js
- * @description Complex tests. B = [0xE0 - 0xEF],
- * string.charAt(k + 6) not equal "%"
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and string.charAt(k + 3),
+    string.charAt(k + 6) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal
+    "%"
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T1.js
index 65935775f..b87a7015e 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T1.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 3) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal
+    "%"
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T2.js
index b63a049d6..9b1b83226 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T2.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 6) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal
+    "%"
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T3.js
index f353758c6..0fca8fe15 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A1.9_T3.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 9) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal
+    "%"
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.1_T1.js
index 4c853985d..ef1076fc9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) not equal "%", return this char
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) not equal "%", return this char
+description: Complex tests
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -55,4 +53,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.2_T1.js
index b9a08ea9e..8d108b8ca 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.2_T1.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 0xxxxxxxx ([0x00 - 0x7F]), without [uriReserved, #], return B1
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.2_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), without [uriReserved, #], return B1
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -83,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.3_T1.js
index 980a06175..070bd524f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without B1 = [0xC0, 0xC1], return UTF8(B1, B2)
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.3_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without
+    B1 = [0xC0, 0xC1], return UTF8(B1, B2)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -20,8 +21,8 @@ for (var indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {
     var hexB2 = decimalToHexString(indexB2);
     var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
     try {
-      if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;

-  } catch (e) {

+      if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
+  } catch (e) {
       if (e instanceof Test262Error) throw e;
     }   
     if (indexO === 0) { 
@@ -80,4 +81,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.4_T1.js
index d544f41f3..161bf8223 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.4_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 1110xxxx ([0xE0 - 0xEF]), B2, B3 = 10xxxxxxx ([0x80 - 0xBF]), without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 - 0xDFFF), return UTF8(B1, B2, B3)
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.4_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 1110xxxx ([0xE0 - 0xEF]), B2, B3 = 10xxxxxxx ([0x80 - 0xBF]),
+    without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 -
+    0xDFFF), return UTF8(B1, B2, B3)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -24,8 +26,8 @@ for (var indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {
       var hexB3 = decimalToHexString(indexB3);
       var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
       try {
-        if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;

-      } catch (e) {

+        if (decodeURI("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;
+      } catch (e) {
         if (e instanceof Test262Error) throw e;
       }   
       if (indexO === 0) { 
@@ -85,4 +87,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js
index 0e1017501..75e35cdaf 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 11110xxx ([0xF0 - 0x0F4]), B2, B3, B4 = 10xxxxxxx ([0x80 - 0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF], return UTF8(B1, B2, B3, B4)
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A2.5_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 11110xxx ([0xF0 - 0x0F4]), B2, B3, B4 = 10xxxxxxx ([0x80 -
+    0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF],
+    return UTF8(B1, B2, B3, B4)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 var errorCount = 0;
 var count = 0;
@@ -28,8 +30,8 @@ for (var indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
         var L = ((index - 0x10000) & 0x03FF) + 0xDC00;
         var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800;  
         try {
-          if (decodeURI("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;

-        } catch (e) {

+          if (decodeURI("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;
+        } catch (e) {
           if (e instanceof Test262Error) throw e;
         }   
         if (indexO === 0) { 
@@ -90,4 +92,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T1.js
index d16f6dc45..4c7327ae6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURISet be a string containing one instance of each character valid
- * in uriReserved plus "#"
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T1.js
- * @description Checking all character in reservedURISet. HexDigit in [0..9, A..F]
- */
+/*---
+info: >
+    Let reservedURISet be a string containing one instance of each character valid
+    in uriReserved plus "#"
+description: Checking all character in reservedURISet. HexDigit in [0..9, A..F]
+---*/
 
 //CHECK#1
 if (decodeURI("%3B") !== "%3B") {
@@ -63,4 +62,3 @@ if (decodeURI("%2C") !== "%2C") {
 if (decodeURI("%23") !== "%23") {
   $ERROR('#11: decodeURI("%23") equal "%23", not "#"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T2.js
index d5f67c410..8aaeaf2b0 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURISet be a string containing one instance of each character valid
- * in uriReserved plus "#"
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T2.js
- * @description Checking all character in reservedURISet. HexDigit in [0..9, a..f]
- */
+/*---
+info: >
+    Let reservedURISet be a string containing one instance of each character valid
+    in uriReserved plus "#"
+description: Checking all character in reservedURISet. HexDigit in [0..9, a..f]
+---*/
 
 //CHECK#1
 if (decodeURI("%3b") !== "%3b") {
@@ -63,4 +62,3 @@ if (decodeURI("%2c") !== "%2c") {
 if (decodeURI("%23") !== "%23") {
   $ERROR('#11: decodeURI("%23") equal "%23", not "#"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T3.js
index 56b135e9c..422074a67 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURISet be a string containing one instance of each character valid
- * in uriReserved plus "#"
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A3_T3.js
- * @description Complex test
- */
+/*---
+info: >
+    Let reservedURISet be a string containing one instance of each character valid
+    in uriReserved plus "#"
+description: Complex test
+---*/
 
 //CHECK#1
 if (decodeURI("%3B%2F%3F%3A%40%26%3D%2B%24%2C%23") !== "%3B%2F%3F%3A%40%26%3D%2B%24%2C%23") {
@@ -18,4 +17,3 @@ if (decodeURI("%3B%2F%3F%3A%40%26%3D%2B%24%2C%23") !== "%3B%2F%3F%3A%40%26%3D%2B
 if (decodeURI("%3b%2f%3f%3a%40%26%3d%2b%24%2c%23") !== "%3b%2f%3f%3a%40%26%3d%2b%24%2c%23") {
   $ERROR('#2: decodeURI("%3b%2f%3f%3a%40%26%3d%2b%24%2c%23") equal "%3b%2f%3f%3a%40%26%3d%2b%24%2c%23", not ";/?:@&=+$,#" or "%3B%2F%3F%3A%40%26%3D%2B%24%2C%23"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T1.js
index bca314ec1..e22a94395 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: URI tests
+description: Checking ENGLISH ALPHABET
+---*/
 
 //CHECK#1
 if (decodeURI("http://unipro.ru/0123456789") !== "http://unipro.ru/0123456789") {
@@ -22,4 +20,3 @@ if (decodeURI("%41%42%43%44%45%46%47%48%49%4A%4B%4C%4D%4E%4F%50%51%52%53%54%55%5
 if (decodeURI("%61%62%63%64%65%66%67%68%69%6A%6B%6C%6D%6E%6F%70%71%72%73%74%75%76%77%78%79%7A") !== "abcdefghijklmnopqrstuvwxyz") {
   $ERROR('#3: abcdefghijklmnopqrstuvwxyz');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T2.js
index 657bffd1e..e6541019b 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: URI tests
+description: Checking RUSSIAN ALPHABET
+---*/
 
 //CHECK#1
 if (decodeURI("http://ru.wikipedia.org/wiki/%d0%ae%D0%bd%D0%B8%D0%BA%D0%BE%D0%B4") !== "http://ru.wikipedia.org/wiki/Юникод") {
@@ -22,4 +20,3 @@ if (decodeURI("http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4
 if (decodeURI("http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%23%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0") !== "http://ru.wikipedia.org/wiki/Юникод%23Версии Юникода") {
   $ERROR('#3: http://ru.wikipedia.org/wiki/Юникод%23Версии Юникода');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T3.js
index f49675baa..baf93f5cf 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T3.js
- * @description Checking URL with Line Terminator
- */
+/*---
+info: URI tests
+description: Checking URL with Line Terminator
+---*/
 
 //CHECK#1
 if (decodeURI("http://unipro.ru/%0Aabout") !== "http://unipro.ru/\nabout") {
@@ -27,4 +25,3 @@ if (decodeURI("http://unipro.ru/%0Cabout") !== "http://unipro.ru/\fabout") {
 if (decodeURI("http://unipro.ru/%0Dabout") !== "http://unipro.ru/\rabout") {
   $ERROR('#4: http://unipro.ru/%0Dabout');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T4.js
index a518358a2..c4903d5f7 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A4_T4.js
- * @description Test some url
- */
+/*---
+info: URI tests
+description: Test some url
+---*/
 
 //CHECK#1
 if (decodeURI("") !== "") {
@@ -27,4 +25,3 @@ if (decodeURI("http://www.google.ru/support/jobs/bin/static.py%3Fpage%3dwhy-ru.h
 if (decodeURI("http://en.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8%23Description") {
   $ERROR('%234: http://en.wikipedia.org/wiki/UTF-8%23Description');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.1.js
index b338d7d7b..64b17ed23 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURI has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of decodeURI has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (decodeURI.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in decodeURI){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in decodeURI) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.2.js
index d8d1a5003..6a5ce7a75 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURI has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of decodeURI has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (decodeURI.hasOwnProperty('length') !== true) {
@@ -25,7 +24,3 @@ if (decodeURI.hasOwnProperty('length') !== true) {
 if (decodeURI.length === undefined) {
   $ERROR('#3: delete decodeURI.length; decodeURI.length !== undefined');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.3.js
index 02b7bf221..eed7c57d8 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURI has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of decodeURI has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = decodeURI.length;
@@ -15,5 +13,3 @@ decodeURI.length = Infinity;
 if (decodeURI.length !== x) {
   $ERROR('#1: x = decodeURI.length; decodeURI.length = Infinity; decodeURI.length === x. Actual: ' + (decodeURI.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.4.js
index 4b41d621e..f58e41bac 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURI is 1
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.4.js
- * @description decodeURI.length === 1
- */
+/*---
+info: The length property of decodeURI is 1
+description: decodeURI.length === 1
+---*/
 
 //CHECK#1
 if (decodeURI.length !== 1) {
   $ERROR('#1: decodeURI.length === 1. Actual: ' + (decodeURI.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.5.js
index 3a6125937..78e803aa5 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURI property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The decodeURI property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('decodeURI') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "decodeURI") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.6.js
index acab6ebdd..02fb38fac 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURI property has not prototype property
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.6.js
- * @description Checking decodeURI.prototype
- */
+/*---
+info: The decodeURI property has not prototype property
+description: Checking decodeURI.prototype
+---*/
 
 //CHECK#1
 if (decodeURI.prototype !== undefined) {
   $ERROR('#1: decodeURI.prototype === undefined. Actual: ' + (decodeURI.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.7.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.7.js
index 59827e332..7f02df82f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.7.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURI property can't be used as constructor
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The decodeURI property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new decodeURI() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A6_T1.js
index 8dbb7f65f..778fafeb0 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.3/15.1.3.1/S15.1.3.1_A6_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "%5E"}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURI(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.10_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.10_T1.js
index 6d280887a..c8fd8fe57 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.10_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.10_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and string.charAt(k + 4) and
- * string.charAt(k + 5) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.10_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and string.charAt(k + 4) and
+    string.charAt(k + 5) do not represent hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 result = true;
@@ -28,4 +27,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 110xxxxx (n = 2) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T1.js
index 8844b2ac0..59729a7a6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T1.js
- * @description Complex tests, string.charAt(k + 4) and string.charAt(k + 5)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 result = true;
@@ -30,4 +30,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and  string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T2.js
index 51dcd4477..3b528b270 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.11_T2.js
- * @description Complex tests, string.charAt(k + 7) and string.charAt(k + 8)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 7) and string.charAt(k + 8)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 result = true;
@@ -30,4 +30,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 1110xxxx (n = 3) and (string.charAt(k + 7) and  string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T1.js
index 59fe4f990..43b95cfd9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T1.js
- * @description Complex tests, string.charAt(k + 4) and string.charAt(k + 5)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 4) and string.charAt(k + 5)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 result = true;
@@ -31,4 +31,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 4) and string.charAt(k + 5)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T2.js
index 43b55955b..8854cb83d 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T2.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T2.js
- * @description Complex tests, string.charAt(k + 7) and string.charAt(k + 7)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 7) and string.charAt(k + 7)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 result = true;
@@ -31,4 +31,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 7) and string.charAt(k + 8)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T3.js
index daa1c2266..61f91a2d1 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T3.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
- * string.charAt(k + 5)) or (string.charAt(k + 7) and
- * string.charAt(k + 8)) or (string.charAt(k + 10) and
- * string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.12_T3.js
- * @description Complex tests, string.charAt(k + 10) and string.charAt(k + 11)
- * do not represent hexadecimal digits
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and (string.charAt(k + 4) and
+    string.charAt(k + 5)) or (string.charAt(k + 7) and
+    string.charAt(k + 8)) or (string.charAt(k + 10) and
+    string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError
+description: >
+    Complex tests, string.charAt(k + 10) and string.charAt(k + 11)  do
+    not represent hexadecimal digits
+---*/
 
 //CHECK
 result = true;
@@ -31,4 +31,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If B = 11110xxx (n = 4) and (string.charAt(k + 10) and string.charAt(k + 11)) do not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T1.js
index b3f0ed088..d2749d7e3 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xC0 - 0xDF], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T2.js
index 9f3158f67..6711deb8f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.13_T2.js
- * @description Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xC0 - 0xDF], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T1.js
index 72d11dd8a..13b8c1f20 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T2.js
index d0b0d1ead..b79738c59 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T2.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T3.js
index 66c09ebe8..1f8dc0010 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T3.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T4.js
index 06fd0b785..2338a6233 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.14_T4.js
- * @description Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xE0 - 0xEF], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T1.js
index e3b3722cb..1400a9de9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T1.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T2.js
index a40f69892..ad3d79f5a 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T2.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T3.js
index 3c36c07ee..4d76549ec 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T3.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0x00, 0x7F]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T4.js
index c6943fa06..dff9c4ee6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T4.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T5.js
index 5a1a8a9f1..b18d02847 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T5.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T6.js
index 230bc010b..d89c0b3a6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B), throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.15_T6.js
- * @description Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and C != 10xxxxxx (C - first of octets after B),
+    throw URIError
+description: Complex tests. B = [0xF0 - 0x0F7], C = [0xC0, 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -83,4 +83,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.1_T1.js
index 1f6eb5851..96fcf8f14 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError
+description: Complex tests
+---*/
 
 result = true;
 
@@ -53,7 +51,3 @@ try {
 if (result !== true) {
   $ERROR('#1: If string.charAt(k) equal "%" and k + 2 >= string.length, throw URIError');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T1.js
index 4348982ac..0b5a69a5f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = string.charAt(k+1) + string.charAt(k+2) do not represent
- * hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = string.charAt(k+1) + string.charAt(k+2) do not represent
+    hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 result = true;
@@ -28,4 +27,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If string.charAt(k+1) does not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T2.js
index d71d3eff6..7335d77c3 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = string.charAt(k+1) + string.charAt(k+2) do not represent
- * hexadecimal digits, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.2_T2.js
- * @description Complex tests
- */
+/*---
+info: >
+    If B = string.charAt(k+1) + string.charAt(k+2) do not represent
+    hexadecimal digits, throw URIError
+description: Complex tests
+---*/
 
 //CHECK
 result = true;
@@ -28,4 +27,3 @@ for (indexI = 0; indexI < interval.length; indexI++) {
 if (result !== true) {    
   $ERROR('#1: If string.charAt(k+2) does not represent hexadecimal digits, throw URIError');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T1.js
index a6c192e67..25edc1daa 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 10xxxxxx or B = 11111xxx, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T1.js
- * @description Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
- */
+/*---
+info: If B = 10xxxxxx or B = 11111xxx, throw URIError
+description: Complex tests. B = 10xxxxxx -> B in [0x80 - 0xBF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T2.js
index d76ba4ff9..f96dcba05 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 10xxxxxx or B = 11111xxx, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.3_T2.js
- * @description Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
- */
+/*---
+info: If B = 10xxxxxx or B = 11111xxx, throw URIError
+description: Complex tests. B = 11111xxx -> B in [0xF8 - 0xFF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.4_T1.js
index 43807fb32..5199b6c61 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.4_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF]
- */
+/*---
+info: If B = 110xxxxx (n = 2) and (k + 2) + 3 >= length, throw URIError
+description: Complex tests. B = [0xC0 - 0xDF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.5_T1.js
index eb9e66c9f..83bcdf858 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.5_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF]
- */
+/*---
+info: If B = 1110xxxx (n = 3) and (k + 2) + 6 >= length, throw URIError
+description: Complex tests. B = [0xE0 - 0xEF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.6_T1.js
index 4fa82f01d..1a39da4d4 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.6_T1.js
- * @description Complex tests. B = [0xF0 - 0xF7]
- */
+/*---
+info: If B = 11110xxx (n = 4) and (k + 2) + 9 >= length, throw URIError
+description: Complex tests. B = [0xF0 - 0xF7]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -84,4 +82,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.7_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.7_T1.js
index 6bdc6474d..8ccd10dcf 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.7_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.7_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.7_T1.js
- * @description Complex tests. B = [0xC0 - 0xDF]
- */
+/*---
+info: >
+    If B = 110xxxxx (n = 2) and string.charAt(k + 3) not equal "%", throw
+    URIError
+description: Complex tests. B = [0xC0 - 0xDF]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T1.js
index 894e2c203..4a3ba5e23 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and string.charAt(k + 3),
- * string.charAt(k + 6) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T1.js
- * @description Complex tests. B = [0xE0 - 0xEF],
- * string.charAt(k + 3) not equal "%"
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and string.charAt(k + 3),
+    string.charAt(k + 6) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 3) not equal
+    "%"
+---*/
 
 errorCount = 0;
 count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T2.js
index 25c00f8bf..c9c551b7e 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 1110xxxx (n = 3) and string.charAt(k + 3),
- * string.charAt(k + 6) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.8_T2.js
- * @description Complex tests. B = [0xE0 - 0xEF],
- * string.charAt(k + 6) not equal "%"
- */
+/*---
+info: >
+    If B = 1110xxxx (n = 3) and string.charAt(k + 3),
+    string.charAt(k + 6) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xE0 - 0xEF],  string.charAt(k + 6) not equal
+    "%"
+---*/
 
 errorCount = 0;
 count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T1.js
index 6ca5accff..bcf6df647 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T1.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 3) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 3) not equal
+    "%"
+---*/
 
 errorCount = 0;
 count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T2.js
index 8e81de3e5..4bf695b2e 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T2.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 6) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 6) not equal
+    "%"
+---*/
 
 errorCount = 0;
 count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T3.js
index 7904af5b1..32665cbfc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B = 11110xxx (n = 4) and string.charAt(k + 3),
- * string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A1.9_T3.js
- * @description Complex tests. B = [0xF0 - 0x0F7],
- * string.charAt(k + 9) not equal "%"
- */
+/*---
+info: >
+    If B = 11110xxx (n = 4) and string.charAt(k + 3),
+    string.charAt(k + 6), string.charAt(k + 9) not equal "%", throw URIError
+description: >
+    Complex tests. B = [0xF0 - 0x0F7],  string.charAt(k + 9) not equal
+    "%"
+---*/
 
 errorCount = 0;
 count = 0;
@@ -78,4 +78,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.1_T1.js
index e2b5f31f8..7e8783e30 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) not equal "%", return this char
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) not equal "%", return this char
+description: Complex tests
+---*/
 
 //CHECK
 errorCount = 0;
@@ -55,4 +53,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
index 8e7293f0b..42a5e83f4 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 0xxxxxxxx ([0x00 - 0x7F]), return B1
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: If B1 = 0xxxxxxxx ([0x00 - 0x7F]), return B1
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -18,8 +17,8 @@ for (indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
   var index = indexB1;  
   try {
     hex = String.fromCharCode(index);
-    if (decodeURIComponent("%" + hexB1.substring(2)) === hex) continue;

-  } catch (e) {

+    if (decodeURIComponent("%" + hexB1.substring(2)) === hex) continue;
+  } catch (e) {
     if (e instanceof Test262Error) throw e;
   }   
   if (indexO === 0) { 
@@ -77,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
index b42a9eab6..4e4bfbca9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without B1 = [0xC0, 0xC1], return UTF8(B1, B2)
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 110xxxxx ([0xC0 - 0xDF]), B2 = 10xxxxxx ([0x80 - 0xBF), without
+    B1 = [0xC0, 0xC1], return UTF8(B1, B2)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -20,8 +21,8 @@ for (indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {
     var hexB2 = decimalToHexString(indexB2);
     var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
     try {
-      if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;

-    } catch (e) {

+      if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
+    } catch (e) {
       if (e instanceof Test262Error) throw e;
     }   
     if (indexO === 0) { 
@@ -80,4 +81,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
index 6ca3dcf74..cee32c15d 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 1110xxxx ([0xE0 - 0xEF]), B2, B3 = 10xxxxxxx ([0x80 - 0xBF]), without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 - 0xDFFF), return UTF8(B1, B2, B3)
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 1110xxxx ([0xE0 - 0xEF]), B2, B3 = 10xxxxxxx ([0x80 - 0xBF]),
+    without [B1, B2] = [0xE0, 0x80 - 0x9F], [0xED, 0xA0 - 0xBF] (0xD800 -
+    0xDFFF), return UTF8(B1, B2, B3)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -24,8 +26,8 @@ for (indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {
       var hexB3 = decimalToHexString(indexB3);
       var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
       try {
-        if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;

-      } catch (e) {

+        if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;
+      } catch (e) {
         if (e instanceof Test262Error) throw e;
       }
       if (indexO === 0) { 
@@ -85,4 +87,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
index 49f4a6c81..d50d6bf3b 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If B1 = 11110xxx ([0xF0 - 0x0F4]), B2, B3, B4 = 10xxxxxxx ([0x80 - 0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF], return UTF8(B1, B2, B3, B4)
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If B1 = 11110xxx ([0xF0 - 0x0F4]), B2, B3, B4 = 10xxxxxxx ([0x80 -
+    0xBF]), without [B1, B2] = [0xF0, 0x80 - 0x9F], [0xF4, 0x90 - 0xBF],
+    return UTF8(B1, B2, B3, B4)
+description: Complex tests, use RFC 3629
+includes: [Test262Error.js]
+---*/
 
 errorCount = 0;
 count = 0;
@@ -28,8 +30,8 @@ for (indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
         var L = ((index - 0x10000) & 0x03FF) + 0xDC00;
         var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800;  
         try {
-          if (decodeURIComponent("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;

-        } catch (e) {

+          if (decodeURIComponent("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;
+        } catch (e) {
           if (e instanceof Test262Error) throw e;
         }   
         if (indexO === 0) { 
@@ -90,4 +92,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T1.js
index d0650ae6f..3e07d7e4e 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURIComponentSet be the empty string
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T1.js
- * @description uriReserved and "#" not in reservedURIComponentSet. HexDigit in [0..9, A..F]
- */
+/*---
+info: Let reservedURIComponentSet be the empty string
+description: >
+    uriReserved and "#" not in reservedURIComponentSet. HexDigit in
+    [0..9, A..F]
+---*/
 
 //CHECK#1
 if (decodeURIComponent("%3B") !== ";") {
@@ -62,4 +62,3 @@ if (decodeURIComponent("%2C") !== ",") {
 if (decodeURIComponent("%23") !== "#") {
   $ERROR('#11: decodeURIComponent("%23") equal "#", not "%23"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T2.js
index 7afc7ffef..fa77c1b85 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURIComponentSet be the empty string
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T2.js
- * @description uriReserved and "#" not in reservedURIComponentSet. HexDigit in [0..9, a..f]
- */
+/*---
+info: Let reservedURIComponentSet be the empty string
+description: >
+    uriReserved and "#" not in reservedURIComponentSet. HexDigit in
+    [0..9, a..f]
+---*/
 
 //CHECK#1
 if (decodeURIComponent("%3b") !== ";") {
@@ -62,4 +62,3 @@ if (decodeURIComponent("%2c") !== ",") {
 if (decodeURIComponent("%23") !== "#") {
   $ERROR('#11: decodeURIComponent("%23") equal "#", not "%23"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T3.js
index ec0017497..094c21549 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let reservedURIComponentSet be the empty string
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A3_T3.js
- * @description Complex test
- */
+/*---
+info: Let reservedURIComponentSet be the empty string
+description: Complex test
+---*/
 
 //CHECK#1
 if (decodeURIComponent("%3B%2F%3F%3A%40%26%3D%2B%24%2C%23") !== ";/?:@&=+$,#") {
@@ -17,4 +15,3 @@ if (decodeURIComponent("%3B%2F%3F%3A%40%26%3D%2B%24%2C%23") !== ";/?:@&=+$,#") {
 if (decodeURIComponent("%3b%2f%3f%3a%40%26%3d%2b%24%2c%23") !== ";/?:@&=+$,#") {
   $ERROR('#2: decodeURIComponent("%3b%2f%3f%3a%40%26%3d%2b%24%2c%23") equal ";/?:@&=+$,#" or "%3B%2F%3F%3A%40%26%3D%2B%24%2C%23", not "%3b%2f%3f%3a%40%26%3d%2b%24%2c%23"');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T1.js
index 5ac99a218..5ad2d8d9f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: URI tests
+description: Checking ENGLISH ALPHABET
+---*/
 
 //CHECK#1
 if (decodeURIComponent("http://unipro.ru/0123456789") !== "http://unipro.ru/0123456789") {
@@ -22,4 +20,3 @@ if (decodeURIComponent("%41%42%43%44%45%46%47%48%49%4A%4B%4C%4D%4E%4F%50%51%52%5
 if (decodeURIComponent("%61%62%63%64%65%66%67%68%69%6A%6B%6C%6D%6E%6F%70%71%72%73%74%75%76%77%78%79%7A") !== "abcdefghijklmnopqrstuvwxyz") {
   $ERROR('#3: abcdefghijklmnopqrstuvwxyz');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T2.js
index 369ad2beb..b041e38cc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: URI tests
+description: Checking RUSSIAN ALPHABET
+---*/
 
 //CHECK#1
 if (decodeURIComponent("http://ru.wikipedia.org/wiki/%d0%ae%D0%bd%D0%B8%D0%BA%D0%BE%D0%B4") !== "http://ru.wikipedia.org/wiki/Юникод") {
@@ -22,4 +20,3 @@ if (decodeURIComponent("http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0
 if (decodeURIComponent("http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%23%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0") !== "http://ru.wikipedia.org/wiki/Юникод#Версии Юникода") {
   $ERROR('#3: http://ru.wikipedia.org/wiki/Юникод%23Версии Юникода');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T3.js
index 70498e119..668f22a8c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T3.js
- * @description Checking URL with Line Terminator
- */
+/*---
+info: URI tests
+description: Checking URL with Line Terminator
+---*/
 
 //CHECK#1
 if (decodeURIComponent("http://unipro.ru/%0Aabout") !== "http://unipro.ru/\nabout") {
@@ -27,4 +25,3 @@ if (decodeURIComponent("http://unipro.ru/%0Cabout") !== "http://unipro.ru/\fabou
 if (decodeURIComponent("http://unipro.ru/%0Dabout") !== "http://unipro.ru/\rabout") {
   $ERROR('#4: http://unipro.ru/%0Dabout');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T4.js
index 913036529..27ce4f89f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A4_T4.js
- * @description Test some url
- */
+/*---
+info: URI tests
+description: Test some url
+---*/
 
 //CHECK#1
 if (decodeURIComponent("") !== "") {
@@ -27,4 +25,3 @@ if (decodeURIComponent("http:%2f%2Fwww.google.ru/support/jobs/bin/static.py%3Fpa
 if (decodeURIComponent("http:%2F%2Fen.wikipedia.org/wiki/UTF-8%23Description") !== "http://en.wikipedia.org/wiki/UTF-8#Description") {
   $ERROR('#4: http:%2F%2Fen.wikipedia.org/wiki/UTF-8%23Description');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.1.js
index d69893777..ea089aaab 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURIComponent has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of decodeURIComponent has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (decodeURIComponent.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in decodeURIComponent){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in decodeURIComponent) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.2.js
index 4f38892d1..8a24582db 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURIComponent has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of decodeURIComponent has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (decodeURIComponent.hasOwnProperty('length') !== true) {
@@ -24,7 +23,3 @@ if (decodeURIComponent.hasOwnProperty('length') !== true) {
 if (decodeURIComponent.length === undefined) {
   $ERROR('#3: delete decodeURIComponent.length; decodeURIComponent.length !== undefined');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.3.js
index 67b689a96..3410037a7 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURIComponent has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.3.js
- * @description Checking if varying the length property fails
- */
+/*---
+info: The length property of decodeURIComponent has the attribute ReadOnly
+description: Checking if varying the length property fails
+---*/
 
 //CHECK#1
 x = decodeURIComponent.length;
@@ -14,5 +12,3 @@ decodeURIComponent.length = Infinity;
 if (decodeURIComponent.length !== x) {
   $ERROR('#1: x = decodeURIComponent.length; decodeURIComponent.length = Infinity; decodeURIComponent.length === x. Actual: ' + (decodeURIComponent.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.4.js
index 8cb62227c..1a9dc80f9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of decodeURIComponent is 1
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.4.js
- * @description decodeURIComponent.length === 1
- */
+/*---
+info: The length property of decodeURIComponent is 1
+description: decodeURIComponent.length === 1
+---*/
 
 //CHECK#1
 if (decodeURIComponent.length !== 1) {
   $ERROR('#1: decodeURIComponent.length === 1. Actual: ' + (decodeURIComponent.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.5.js
index f8ae598e8..7c90e355a 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURIComponent property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The decodeURIComponent property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('decodeURIComponent') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "decodeURIComponent") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.6.js
index f5c9a3697..672747786 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURIComponent property has not prototype property
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.6.js
- * @description Checking decodeURIComponent.prototype
- */
+/*---
+info: The decodeURIComponent property has not prototype property
+description: Checking decodeURIComponent.prototype
+---*/
 
 //CHECK#1
 if (decodeURIComponent.prototype !== undefined) {
   $ERROR('#1: decodeURIComponent.prototype === undefined. Actual: ' + (decodeURIComponent.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.7.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.7.js
index 6078f8a50..056054c95 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.7.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The decodeURIComponent property can't be used as constructor
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The decodeURIComponent property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new decodeURIComponent() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A6_T1.js
index 0919bc526..148eb8ee2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A6_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "%5E"}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; decodeURIComponent(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T1.js
index af8b2324b..7ad860e97 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T2.js
index 44409b215..77c384bc7 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.1_T2.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T1.js
index 3bede687f..62badd825 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
+    URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T2.js
index 3fd55dd3e..d9b595b03 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.2_T2.js
- * @description Complex tests
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
+    URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.3_T1.js
index bddb360d3..42f21001c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.3_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) not in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A1.3_T1.js
- * @description Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) not in
+    [0xDC00 - 0xDFFF], throw URIError
+description: >
+    Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800,
+    0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
+---*/
 
 chars = [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF];
 errorCount = 0;
@@ -83,4 +85,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.1_T1.js
index 756d1be4d..c27a1c97e 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0000 - 0x007F]\[uriReserved, uriUnescaped, #], return 1 octet (00000000 0zzzzzzz -> 0zzzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.1_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0000 - 0x007F]\[uriReserved, uriUnescaped, #],
+    return 1 octet (00000000 0zzzzzzz -> 0zzzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
 uriUnescaped = ["-", "_", ".", "!", "~", "*", "'", "(", ")", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]; 
@@ -84,4 +84,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.2_T1.js
index e303747f9..9ff89802a 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0080 - 0x07FF], return 2 octets (00000yyy yyzzzzzz -> 110yyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.2_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0080 - 0x07FF], return 2 octets (00000yyy
+    yyzzzzzz -> 110yyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.3_T1.js
index a09d04518..43a7f07d6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0800 - 0xD7FF], return 3 octets (xxxxyyyy yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.3_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0800 - 0xD7FF], return 3 octets (xxxxyyyy
+    yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T1.js
index caf571502..9b0fdcd63 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz -> 11110www 10xxxxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T1.js
- * @description Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00, 0xDDFF, 0xDFFF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in
+    [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
+    11110www 10xxxxxx 10yyyyyy 10zzzzzz)
+description: >
+    Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00,
+    0xDDFF, 0xDFFF]
+---*/
 
 chars = [0xDC00, 0xDDFF, 0xDFFF]; 
 errorCount = 0;
@@ -86,4 +89,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T2.js
index b5203cfbd..976c48257 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz -> 11110www 10xxxxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.4_T2.js
- * @description Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF, 0xD9FF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in
+    [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
+    11110www 10xxxxxx 10yyyyyy 10zzzzzz)
+description: >
+    Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF,
+    0xD9FF]
+---*/
 
 chars = [0xD800, 0xDBFF, 0xD9FF]; 
 errorCount = 0;
@@ -86,4 +89,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.5_T1.js
index 1fa4ebe3c..889ec4027 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xE000 - 0xFFFF], return 3 octets (xxxxyyyy yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A2.5_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0xE000 - 0xFFFF], return 3 octets (xxxxyyyy
+    yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.1_T1.js
index 9ad30c050..98a5c2d63 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURISet containing one instance of each character valid in uriReserved
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.1_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    unescapedURISet containing one instance of each character valid in
+    uriReserved
+description: Complex tests
+---*/
 
 uriReserved = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];
 for (indexC = 0; indexC < uriReserved.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < uriReserved.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T1.js
index 10c22e012..dd795449c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURISet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T1.js
- * @description Complex tests, uriUnescaped :: uriAlpha
- */
+/*---
+info: >
+    unescapedURISet containing one instance of each character valid in
+    uriUnescaped
+description: "Complex tests, uriUnescaped :: uriAlpha"
+---*/
 
 uriAlpha = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
 for (indexC = 0; indexC < uriAlpha.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < uriAlpha.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing ' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T2.js
index a89aed7fb..3f30e1f77 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURISet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T2.js
- * @description Complex tests, uriUnescaped :: DecimalDigit
- */
+/*---
+info: >
+    unescapedURISet containing one instance of each character valid in
+    uriUnescaped
+description: "Complex tests, uriUnescaped :: DecimalDigit"
+---*/
 
 DecimalDigit = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
 for (indexC = 0; indexC < DecimalDigit.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < DecimalDigit.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T3.js
index a7c370ac1..fc4120c00 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURISet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.2_T3.js
- * @description Complex tests, uriUnescaped :: uriMark
- */
+/*---
+info: >
+    unescapedURISet containing one instance of each character valid in
+    uriUnescaped
+description: "Complex tests, uriUnescaped :: uriMark"
+---*/
 
 uriMark = ["-", "_", ".", "!", "~", "*", "'", "(", ")"];
 for (indexC = 0; indexC < uriMark.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < uriMark.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.3_T1.js
index 37cda639f..98226c4df 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.3_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURISet containing "#"
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A3.3_T1.js
- * @description encodeURI("#") === "#"
- */
+/*---
+info: unescapedURISet containing "#"
+description: encodeURI("#") === "#"
+---*/
 
 if (encodeURI("#") !== "#") {
   $ERROR('#1: unescapedURISet containing "#"');
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T1.js
index c14c2a303..0193869be 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: URI tests
+description: Checking ENGLISH ALPHABET
+---*/
 
 //CHECK#1
 if (encodeURI("http://unipro.ru/0123456789") !== "http://unipro.ru/0123456789") {
@@ -22,4 +20,3 @@ if (encodeURI("aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ") !== "aAbBc
 if (encodeURI("aA_bB-cC.dD!eE~fF*gG'hH(iI)jJ;kK/lL?mM:nN@oO&pP=qQ+rR$sS,tT9uU8vV7wW6xX5yY4zZ") !== "aA_bB-cC.dD!eE~fF*gG'hH(iI)jJ;kK/lL?mM:nN@oO&pP=qQ+rR$sS,tT9uU8vV7wW6xX5yY4zZ") {
   $ERROR('#3: ');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T2.js
index ef5696f25..26f47edb8 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: URI tests
+description: Checking RUSSIAN ALPHABET
+---*/
 
 //CHECK#1
 if ((encodeURI("http://ru.wikipedia.org/wiki/Юникод") !== "http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4") && (encodeURI("http://ru.wikipedia.org/wiki/Юникод") !== "http://ru.wikipedia.org/wiki/" + "%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4".toLowerCase())) {
@@ -22,4 +20,3 @@ if ((encodeURI("http://ru.wikipedia.org/wiki/Юникод#Ссылки") !== "ht
 if ((encodeURI("http://ru.wikipedia.org/wiki/Юникод#Версии Юникода") !== "http://ru.wikipedia.org/wiki/%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4#%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0") && ((encodeURI("http://ru.wikipedia.org/wiki/Юникод#Версии Юникода") !== "http://ru.wikipedia.org/wiki/" + "%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4#%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0".toLowerCase()))) {
   $ERROR('#3: http://ru.wikipedia.org/wiki/Юникод#Версии Юникода');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T3.js
index 606df82f2..a1aadfc8c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T3.js
- * @description Checking URL with Line Terminator
- */
+/*---
+info: URI tests
+description: Checking URL with Line Terminator
+---*/
 
 //CHECK#1
 if ((encodeURI("http://unipro.ru/\nabout") !== "http://unipro.ru/%0Aabout") && encodeURI("http://unipro.ru/\nabout") !== "http://unipro.ru/%0aabout") {
@@ -27,4 +25,3 @@ if ((encodeURI("http://unipro.ru/\fabout") !== "http://unipro.ru/%0Cabout") && e
 if ((encodeURI("http://unipro.ru/\rabout") !== "http://unipro.ru/%0Dabout") && encodeURI("http://unipro.ru/\rabout") !== "http://unipro.ru/%0dabout") {
   $ERROR('#4: http://unipro.ru/\\rabout');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T4.js
index bafaa396b..3ba7a48d1 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A4_T4.js
- * @description Test some url
- */
+/*---
+info: URI tests
+description: Test some url
+---*/
 
 //CHECK#1
 if (encodeURI("") !== "") {
@@ -27,4 +25,3 @@ if (encodeURI("http://www.google.ru/support/jobs/bin/static.py?page=why-ru.html&
 if (encodeURI("http://en.wikipedia.org/wiki/UTF-8#Description") !== "http://en.wikipedia.org/wiki/UTF-8#Description") {
   $ERROR('#4: http://en.wikipedia.org/wiki/UTF-8#Description');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.1.js
index f089aac01..6132a02fb 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURI has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of encodeURI has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (encodeURI.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in encodeURI){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in encodeURI) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.2.js
index ffbe0f37f..cfe065292 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURI has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of encodeURI has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (encodeURI.hasOwnProperty('length') !== true) {
@@ -24,7 +23,3 @@ if (encodeURI.hasOwnProperty('length') !== true) {
 if (encodeURI.length === undefined) {
   $ERROR('#3: delete encodeURI.length; encodeURI.length !== undefined');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.3.js
index 4aa01aaa4..913fc97d2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURI has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.3.js
- * @description Checking if varying the length property fails
- */
+/*---
+info: The length property of encodeURI has the attribute ReadOnly
+description: Checking if varying the length property fails
+---*/
 
 //CHECK#1
 x = encodeURI.length;
@@ -14,5 +12,3 @@ encodeURI.length = Infinity;
 if (encodeURI.length !== x) {
   $ERROR('#1: x = encodeURI.length; encodeURI.length = Infinity; encodeURI.length === x. Actual: ' + (encodeURI.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.4.js
index 3a016ebf2..0588edcb3 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURI is 1
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.4.js
- * @description encodeURI.length === 1
- */
+/*---
+info: The length property of encodeURI is 1
+description: encodeURI.length === 1
+---*/
 
 //CHECK#1
 if (encodeURI.length !== 1) {
   $ERROR('#1: encodeURI.length === 1. Actual: ' + (encodeURI.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.5.js
index 0bc0cf4d5..c1e0c4146 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURI property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The encodeURI property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('encodeURI') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "encodeURI") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.6.js
index a7f5f2800..56fb56ffc 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURI property has not prototype property
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.6.js
- * @description Checking encodeURI.prototype
- */
+/*---
+info: The encodeURI property has not prototype property
+description: Checking encodeURI.prototype
+---*/
 
 //CHECK#1
 if (encodeURI.prototype !== undefined) {
   $ERROR('#1: encodeURI.prototype === undefined. Actual: ' + (encodeURI.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.7.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.7.js
index 3509f476f..da13c5a10 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.7.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURI property can't be used as constructor
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The encodeURI property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new encodeURI() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A6_T1.js
index 1293d4df4..89d072af2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.3/15.1.3.3/S15.1.3.3_A6_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "^"}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; encodeURI(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T1.js
index 796172808..2cde4eca9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T1.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T2.js
index e2e3deed9..4c35b9fd2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.1_T2.js
- * @description Complex tests
- */
+/*---
+info: If string.charAt(k) in [0xDC00 - 0xDFFF], throw URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +74,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T1.js
index 91271fa2c..8c93b2136 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T1.js
- * @description Complex tests
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
+    URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T2.js
index 5f363bcca..e9f983332 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.2_T2.js
- * @description Complex tests
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.length = k + 1, throw
+    URIError
+description: Complex tests
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.3_T1.js
index 0a929379d..3ae0347e4 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.3_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) not in [0xDC00 - 0xDFFF], throw URIError
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A1.3_T1.js
- * @description Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) not in
+    [0xDC00 - 0xDFFF], throw URIError
+description: >
+    Complex tests, string.charAt(k+1) in [0x0000, 0xD7FF, 0xD800,
+    0xDBFE, 0xDBFF, 0xE000, 0xFFFF]
+---*/
 
 chars = [0x0000, 0xD7FF, 0xD800, 0xDBFE, 0xDBFF, 0xE000, 0xFFFF];
 errorCount = 0;
@@ -83,4 +85,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.1_T1.js
index 1920dd5f9..1ae173692 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0000 - 0x007F]\[uriUnescaped], return 1 octet (00000000 0zzzzzzz -> 0zzzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.1_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0000 - 0x007F]\[uriUnescaped], return 1 octet
+    (00000000 0zzzzzzz -> 0zzzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 uriUnescaped = ["-", "_", ".", "!", "~", "*", "'", "(", ")", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]; 
 errorCount = 0;
@@ -79,4 +79,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.2_T1.js
index ea19909ea..850184713 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0080 - 0x07FF], return 2 octets (00000yyy yyzzzzzz -> 110yyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.2_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0080 - 0x07FF], return 2 octets (00000yyy
+    yyzzzzzz -> 110yyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.3_T1.js
index b8fa4b3ea..fc42931e7 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0x0800 - 0xD7FF], return 3 octets (xxxxyyyy yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.3_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0x0800 - 0xD7FF], return 3 octets (xxxxyyyy
+    yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T1.js
index 418d227a3..b07cf1c45 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz -> 11110www 10xxxxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T1.js
- * @description Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00, 0xDDFF, 0xDFFF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in
+    [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
+    11110www 10xxxxxx 10yyyyyy 10zzzzzz)
+description: >
+    Complex tests, use RFC 3629, string.charAt(k+1) in [0xDC00,
+    0xDDFF, 0xDFFF]
+---*/
 
 chars = [0xDC00, 0xDDFF, 0xDFFF]; 
 errorCount = 0;
@@ -86,4 +89,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T2.js
index 672437cec..f1373402d 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz -> 11110www 10xxxxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.4_T2.js
- * @description Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF, 0xD9FF]
- */
+/*---
+info: >
+    If string.charAt(k) in [0xD800 - 0xDBFF] and string.charAt(k+1) in
+    [0xDC00 � 0xDFFF], return 4 octets (000wwwxx xxxxyyyy yyzzzzzz ->
+    11110www 10xxxxxx 10yyyyyy 10zzzzzz)
+description: >
+    Complex tests, use RFC 3629, string.charAt(k) in [0xD800, 0xDBFF,
+    0xD9FF]
+---*/
 
 chars = [0xD800, 0xDBFF, 0xD9FF]; 
 errorCount = 0;
@@ -86,4 +89,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.5_T1.js
index 7a616a2ea..365dac9bf 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If string.charAt(k) in [0xE000 - 0xFFFF], return 3 octets (xxxxyyyy yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A2.5_T1.js
- * @description Complex tests, use RFC 3629
- */
+/*---
+info: >
+    If string.charAt(k) in [0xE000 - 0xFFFF], return 3 octets (xxxxyyyy
+    yyzzzzzz -> 1110xxxx 10yyyyyy 10zzzzzz)
+description: Complex tests, use RFC 3629
+---*/
 
 errorCount = 0;
 count = 0;
@@ -76,4 +76,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.1_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.1_T1.js
index c6fbba03a..b12dda028 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.1_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURIComponentSet not containing uriReserved
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.1_T1.js
- * @description Complex tests
- */
+/*---
+info: unescapedURIComponentSet not containing uriReserved
+description: Complex tests
+---*/
 
 uriReserved = ["%3B", "%2F", "%3F", "%3A", "%40", "%26", "%3D", "%2B", "%24", "%2C"];
 uriReserved_ = [";", "/", "?", ":", "@", "&", "=", "+", "$", ","];                  
@@ -16,4 +14,3 @@ for (indexC = 0; indexC < 10; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURIComponentSet not containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T1.js
index 5b9771bbe..532ba2769 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURIComponentSet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T1.js
- * @description Complex tests, uriUnescaped :: uriAlpha
- */
+/*---
+info: >
+    unescapedURIComponentSet containing one instance of each character valid
+    in uriUnescaped
+description: "Complex tests, uriUnescaped :: uriAlpha"
+---*/
 
 uriAlpha = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
 for (indexC = 0; indexC < uriAlpha.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < uriAlpha.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing ' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T2.js
index 7181c2229..a8cfcba6b 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURIComponentSet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T2.js
- * @description Complex tests, uriUnescaped :: DecimalDigit
- */
+/*---
+info: >
+    unescapedURIComponentSet containing one instance of each character valid
+    in uriUnescaped
+description: "Complex tests, uriUnescaped :: DecimalDigit"
+---*/
 
 DecimalDigit = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
 for (indexC = 0; indexC < DecimalDigit.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < DecimalDigit.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T3.js
index 627812016..230a5cbf4 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURIComponentSet containing one instance of each character valid in uriUnescaped
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.2_T3.js
- * @description Complex tests, uriUnescaped :: uriMark
- */
+/*---
+info: >
+    unescapedURIComponentSet containing one instance of each character valid
+    in uriUnescaped
+description: "Complex tests, uriUnescaped :: uriMark"
+---*/
 
 uriMark = ["-", "_", ".", "!", "~", "*", "'", "(", ")"];
 for (indexC = 0; indexC < uriMark.length; indexC++) {
@@ -15,4 +15,3 @@ for (indexC = 0; indexC < uriMark.length; indexC++) {
     $ERROR('#' + (indexC + 1) + ': unescapedURISet containing' + str);
   }  
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.3_T1.js
index 77511d262..2070f629f 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.3_T1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * unescapedURIComponentSet not containing "#"
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A3.3_T1.js
- * @description encodeURIComponent("#") === "%23"
- */
+/*---
+info: unescapedURIComponentSet not containing "#"
+description: encodeURIComponent("#") === "%23"
+---*/
 
 if (encodeURIComponent("#") !== "%23") {
   $ERROR('#1: unescapedURIComponentSet not containing "%23"');
-}  
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T1.js
index 84e7e5b24..70c983960 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: URI tests
+description: Checking ENGLISH ALPHABET
+---*/
 
 //CHECK#1
 if (encodeURIComponent("http://unipro.ru/0123456789") !== "http%3A%2F%2Funipro.ru%2F0123456789") {
@@ -22,4 +20,3 @@ if (encodeURIComponent("aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ") !
 if (encodeURIComponent(";/?:@&=+$,") !== "%3B%2F%3F%3A%40%26%3D%2B%24%2C") {
   $ERROR('#3: ');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T2.js
index 10c6e40b7..50cfff8d9 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: URI tests
+description: Checking RUSSIAN ALPHABET
+---*/
 
 //CHECK#1
 if ((encodeURIComponent("http://ru.wikipedia.org/wiki/Юникод") !== "http%3A%2F%2Fru.wikipedia.org%2Fwiki%2F%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4") && (encodeURIComponent("http://ru.wikipedia.org/wiki/Юникод") !== "http%3A%2F%2Fru.wikipedia.org%2Fwiki%2F" + "%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4".toLowerCase())) {
@@ -22,4 +20,3 @@ if ((encodeURIComponent("http://ru.wikipedia.org/wiki/Юникод#Ссылки"
 if ((encodeURIComponent("http://ru.wikipedia.org/wiki/Юникод#Версии Юникода") !== "http%3A%2F%2Fru.wikipedia.org%2Fwiki%2F%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%23%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0") && ((encodeURIComponent("http://ru.wikipedia.org/wiki/Юникод%23Версии Юникода") !== "http%3A%2F%2Fru.wikipedia.org%2Fwiki%2F" + "%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4#%D0%92%D0%B5%D1%80%D1%81%D0%B8%D0%B8%20%D0%AE%D0%BD%D0%B8%D0%BA%D0%BE%D0%B4%D0%B0".toLowerCase()))) {
   $ERROR('#3: http://ru.wikipedia.org/wiki/Юникод#Версии Юникода');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T3.js
index b89db588e..ffb9a1e13 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T3.js
- * @description Checking URL with Line Terminator
- */
+/*---
+info: URI tests
+description: Checking URL with Line Terminator
+---*/
 
 //CHECK#1
 if ((encodeURIComponent("http://unipro.ru/\nabout") !== "http%3A%2F%2Funipro.ru%2F%0Aabout") && encodeURIComponent("http://unipro.ru/\nabout") !== "http%3A%2F%2Funipro.ru%2F%0aabout") {
@@ -27,4 +25,3 @@ if ((encodeURIComponent("http://unipro.ru/\fabout") !== "http%3A%2F%2Funipro.ru%
 if ((encodeURIComponent("http://unipro.ru/\rabout") !== "http%3A%2F%2Funipro.ru%2F%0Dabout") && encodeURIComponent("http://unipro.ru/\rabout") !== "http%3A%2F%2Funipro.ru%2F%0dabout") {
   $ERROR('#4: http://unipro.ru/\\rabout');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T4.js
index 3cbb21683..b7bc8b119 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * URI tests
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A4_T4.js
- * @description Test some url
- */
+/*---
+info: URI tests
+description: Test some url
+---*/
 
 //CHECK#1
 if (encodeURIComponent("") !== "") {
@@ -27,4 +25,3 @@ if (encodeURIComponent("http://www.google.ru/support/jobs/bin/static.py?page=why
 if (encodeURIComponent("http://en.wikipedia.org/wiki/UTF-8#Description") !== "http%3A%2F%2Fen.wikipedia.org%2Fwiki%2FUTF-8%23Description") {
   $ERROR('#4: http://en.wikipedia.org/wiki/UTF-8#Description');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.1.js
index 91efcb2bb..c9fcad4f3 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURIComponent has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of encodeURIComponent has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (encodeURIComponent.propertyIsEnumerable('length') !== false) {
@@ -24,4 +22,3 @@ for (p in encodeURIComponent){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in encodeURIComponent) { if (p === "length") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.2.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.2.js
index e90231832..1b19f3dec 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.2.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURIComponent has the attribute DontDelete
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of encodeURIComponent has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (encodeURIComponent.hasOwnProperty('length') !== true) {
@@ -24,7 +23,3 @@ if (encodeURIComponent.hasOwnProperty('length') !== true) {
 if (encodeURIComponent.length === undefined) {
   $ERROR('#3: delete encodeURIComponent.length; encodeURIComponent.length !== undefined');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.3.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.3.js
index be17a57f9..057f5ba90 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.3.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURIComponent has the attribute ReadOnly
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.3.js
- * @description Checking if varying the length property fails
- */
+/*---
+info: The length property of encodeURIComponent has the attribute ReadOnly
+description: Checking if varying the length property fails
+---*/
 
 //CHECK#1
 x = encodeURIComponent.length;
@@ -14,5 +12,3 @@ encodeURIComponent.length = Infinity;
 if (encodeURIComponent.length !== x) {
   $ERROR('#1: x = encodeURIComponent.length; encodeURIComponent.length = Infinity; encodeURIComponent.length === x. Actual: ' + (encodeURIComponent.length));
 }
-
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.4.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.4.js
index bebeadbb5..f8ba01ec2 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.4.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of encodeURIComponent is 1
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.4.js
- * @description encodeURIComponent.length === 1
- */
+/*---
+info: The length property of encodeURIComponent is 1
+description: encodeURIComponent.length === 1
+---*/
 
 //CHECK#1
 if (encodeURIComponent.length !== 1) {
   $ERROR('#1: encodeURIComponent.length === 1. Actual: ' + (encodeURIComponent.length));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.5.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.5.js
index 67358f35b..ba33abd70 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.5.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURIComponent property has the attribute DontEnum
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The encodeURIComponent property has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (this.propertyIsEnumerable('encodeURIComponent') !== false) {
@@ -24,4 +22,3 @@ for (p in this){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in this) { if (p === "encodeURIComponent") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.6.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.6.js
index 8d5bce7c4..26d53603b 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.6.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURIComponent property has not prototype property
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.6.js
- * @description Checking encodeURIComponent.prototype
- */
+/*---
+info: The encodeURIComponent property has not prototype property
+description: Checking encodeURIComponent.prototype
+---*/
 
 //CHECK#1
 if (encodeURIComponent.prototype !== undefined) {
   $ERROR('#1: encodeURIComponent.prototype === undefined. Actual: ' + (encodeURIComponent.prototype));
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.7.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.7.js
index b762aae2d..0ba245ab6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.7.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The encodeURIComponent property can't be used as constructor
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The encodeURIComponent property can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new encodeURIComponent() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A6_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A6_T1.js
index 695883985..d9b18aa0c 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A6_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString
- *
- * @path ch15/15.1/15.1.3/15.1.3.4/S15.1.3.4_A6_T1.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: Operator use ToString
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "^"}};
@@ -76,4 +74,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}}; encodeURIComponent(object) throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.1/S15.1_A1_T1.js b/test/suite/ch15/15.1/S15.1_A1_T1.js
index 366d28367..11817a079 100644
--- a/test/suite/ch15/15.1/S15.1_A1_T1.js
+++ b/test/suite/ch15/15.1/S15.1_A1_T1.js
@@ -1,14 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The global object does not have a [[Construct]] property
- *
- * @path ch15/15.1/S15.1_A1_T1.js
- * @description It is not possible to use the global object as a constructor
- * with the new operator
- * @negative
- */
+/*---
+info: The global object does not have a [[Construct]] property
+description: >
+    It is not possible to use the global object as a constructor  with
+    the new operator
+flags: [negative]
+---*/
 
 new this;
-
diff --git a/test/suite/ch15/15.1/S15.1_A1_T2.js b/test/suite/ch15/15.1/S15.1_A1_T2.js
index 2dd500041..50d786aac 100644
--- a/test/suite/ch15/15.1/S15.1_A1_T2.js
+++ b/test/suite/ch15/15.1/S15.1_A1_T2.js
@@ -1,14 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The global object does not have a [[Construct]] property
- *
- * @path ch15/15.1/S15.1_A1_T2.js
- * @description It is not possible to use the global object as a constructor
- * with the new operator
- * @negative
- */
+/*---
+info: The global object does not have a [[Construct]] property
+description: >
+    It is not possible to use the global object as a constructor  with
+    the new operator
+flags: [negative]
+---*/
 
 new this();
-
diff --git a/test/suite/ch15/15.1/S15.1_A2_T1.js b/test/suite/ch15/15.1/S15.1_A2_T1.js
index 308085a50..ba98afc34 100644
--- a/test/suite/ch15/15.1/S15.1_A2_T1.js
+++ b/test/suite/ch15/15.1/S15.1_A2_T1.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The global object does not have a [[Call]] property
- *
- * @path ch15/15.1/S15.1_A2_T1.js
- * @description It is not possible to invoke the global object as a function
- * @negative
- */
+/*---
+info: The global object does not have a [[Call]] property
+description: It is not possible to invoke the global object as a function
+flags: [negative]
+---*/
 
 this();
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T1.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T1.js
index c629126d8..bd19ef584 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T1.js
- * @description Tested RegExp is "a**"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a**"
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a**") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T10.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T10.js
index 858f95ad4..8f0bb25e4 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T10.js
- * @description Tested RegExp is "++a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "++a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("++a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T11.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T11.js
index e3ebc5c11..6e8e7cdaa 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T11.js
- * @description Tested RegExp is "?a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "?a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("?a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T12.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T12.js
index 02f80d692..9683d5e74 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T12.js
- * @description Tested RegExp is "??a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "??a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("??a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T13.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T13.js
index e6c0f5f37..01b701ddf 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T13.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T13.js
- * @description Tested RegExp is "x{1}{1,}"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "x{1}{1,}"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("x{1}{1,}") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T14.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T14.js
index d1bc8b0b2..f886ed0dc 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T14.js
- * @description Tested RegExp is "x{1,2}{1}"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "x{1,2}{1}"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("x{1,2}{1}") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T15.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T15.js
index 1912f4606..34d581b3f 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T15.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T15.js
- * @description Tested RegExp is "x{1,}{1}"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "x{1,}{1}"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("x{1,}{1}") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T16.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T16.js
index 70aea659d..e6f2e62e2 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T16.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T16.js
- * @description Tested RegExp is "x{0,1}{1,}"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "x{0,1}{1,}"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("x{0,1}{1,}") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T2.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T2.js
index 85d12c192..bc5e212a1 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T2.js
- * @description Tested RegExp is "a***"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a***"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a***") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T3.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T3.js
index eb39dde82..5dde15f86 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T3.js
- * @description Tested RegExp is "a++"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a++"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a++") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T4.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T4.js
index b057a5a46..f7dd3b5d5 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T4.js
- * @description Tested RegExp is "a+++"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a+++"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a+++") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T5.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T5.js
index 1954fc136..f56c8e287 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T5.js
- * @description Tested RegExp is "a???"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a???"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a???") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T6.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T6.js
index 83ae8f1c4..b17f7b1e0 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T6.js
- * @description Tested RegExp is "a????"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "a????"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("a????") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T7.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T7.js
index affed4c57..ee3041b11 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T7.js
- * @description Tested RegExp is "*a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "*a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("*a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T8.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T8.js
index e2dc4af80..0f45dc6d3 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T8.js
- * @description Tested RegExp is "**a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "**a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("**a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T9.js b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T9.js
index 561c2a5e7..9d27d4268 100644
--- a/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.1/S15.10.1_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp syntax errors must be caught when matcher(s) compiles
- *
- * @path ch15/15.10/15.10.1/S15.10.1_A1_T9.js
- * @description Tested RegExp is "+a"
- */
+/*---
+info: RegExp syntax errors must be caught when matcher(s) compiles
+description: Tested RegExp is "+a"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: new RegExp("+a") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.1_T1.js
index d4cfc054d..1e0e8e8de 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterEscape :: t evaluates by returning
- * the character \u0009
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.1_T1.js
- * @description Use \t in RegExp and \u0009 in tested string
- */
+/*---
+info: >
+    The production CharacterEscape :: t evaluates by returning
+    the character \u0009
+description: Use \t in RegExp and \u0009 in tested string
+---*/
 
 //CHECK#1
 var arr = /\t/.exec("\u0009");
@@ -19,5 +18,4 @@ if ((arr === null) || (arr[0] !== "\u0009")) {
 var arr = /\t\t/.exec("a\u0009\u0009b");
 if ((arr === null) || (arr[0] !== "\u0009\u0009")) {
   $ERROR('#2: var arr = /\\t\\t/.exec("a\\u0009\\u0009b"); arr[0] === "\\u0009\\u0009". Actual. ' + (arr && arr[0]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.2_T1.js
index c0294ae78..d2471d637 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterEscape :: n evaluates by returning
- * the character \u000A
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.2_T1.js
- * @description Use \n in RegExp and \u000A in tested string
- */
+/*---
+info: >
+    The production CharacterEscape :: n evaluates by returning
+    the character \u000A
+description: Use \n in RegExp and \u000A in tested string
+---*/
 
 //CHECK#1
 var arr = /\n/.exec("\u000A");
@@ -19,5 +18,4 @@ if ((arr === null) || (arr[0] !== "\u000A")) {
 var arr = /\n\n/.exec("a\u000A\u000Ab");
 if ((arr === null) || (arr[0] !== "\u000A\u000A")) {
   $ERROR('#2: var arr = /\\n\\n/.exec("a\\u000A\\u000Ab"); arr[0] === "\\u000A\\u000A". Actual. ' + (arr && arr[0]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.3_T1.js
index c1d26f44d..1e6f55005 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterEscape :: v evaluates by returning
- * the character \u000B
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.3_T1.js
- * @description Use \v in RegExp and \u000B in tested string
- */
+/*---
+info: >
+    The production CharacterEscape :: v evaluates by returning
+    the character \u000B
+description: Use \v in RegExp and \u000B in tested string
+---*/
 
 //CHECK#1
 var arr = /\v/.exec("\u000B");
@@ -19,5 +18,4 @@ if ((arr === null) || (arr[0] !== "\u000B")) {
 var arr = /\v\v/.exec("a\u000B\u000Bb");
 if ((arr === null) || (arr[0] !== "\u000B\u000B")) {
   $ERROR('#2: var arr = /\\v\\v/.exec("a\\u000B\\u000Bb"); arr[0] === "\\u000B\\u000B". Actual. ' + (arr && arr[0]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.4_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.4_T1.js
index 4b3b0f1b2..4ca86c97f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.4_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterEscape :: f evaluates by returning
- * the character \u000C
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.4_T1.js
- * @description Use \f in RegExp and \u000C in tested string
- */
+/*---
+info: >
+    The production CharacterEscape :: f evaluates by returning
+    the character \u000C
+description: Use \f in RegExp and \u000C in tested string
+---*/
 
 //CHECK#1
 var arr = /\f/.exec("\u000C");
@@ -19,5 +18,4 @@ if ((arr === null) || (arr[0] !== "\u000C")) {
 var arr = /\f\f/.exec("a\u000C\u000Cb");
 if ((arr === null) || (arr[0] !== "\u000C\u000C")) {
   $ERROR('#2: var arr = /\\f\\f/.exec("a\\u000C\\u000Cb"); arr[0] === "\\u000C\\u000C". Actual. ' + (arr && arr[0]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.5_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.5_T1.js
index d69e42496..e05599dbd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.5_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.5_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterEscape :: r evaluates by returning
- * the character \u000D
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A1.5_T1.js
- * @description Use \r in RegExp and \u000D in tested string
- */
+/*---
+info: >
+    The production CharacterEscape :: r evaluates by returning
+    the character \u000D
+description: Use \r in RegExp and \u000D in tested string
+---*/
 
 //CHECK#1
 var arr = /\r/.exec("\u000D");
@@ -19,5 +18,4 @@ if ((arr === null) || (arr[0] !== "\u000D")) {
 var arr = /\r\r/.exec("a\u000D\u000Db");
 if ((arr === null) || (arr[0] !== "\u000D\u000D")) {
   $ERROR('#2: var arr = /\\r\\r/.exec("a\\u000D\\u000Db"); arr[0] === "\\u000D\\u000D". Actual. ' + (arr && arr[0]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T1.js
index 623c912ea..e620e4840 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: c ControlLetter
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T1.js
- * @description ControlLetter :: A - Z
- */
+/*---
+info: "CharacterEscape :: c ControlLetter"
+description: "ControlLetter :: A - Z"
+---*/
 
 //CHECK#0041-005A
 var result = true; 
@@ -20,5 +18,4 @@ for (alpha = 0x0041; alpha <= 0x005A; alpha++) {
 
 if (result !== true) {
   $ERROR('#1: CharacterEscape :: c A - Z');
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T2.js
index 2b6a3937b..6b02edd06 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: c ControlLetter
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T2.js
- * @description ControlLetter :: a - z
- */
+/*---
+info: "CharacterEscape :: c ControlLetter"
+description: "ControlLetter :: a - z"
+---*/
 
 //CHECK#0061-007A
 var result = true; 
@@ -20,5 +18,4 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 
 if (result !== true) {
   $ERROR('#1: CharacterEscape :: c a - z');
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js
index bdf21e064..4da079671 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: c ControlLetter
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A2.1_T3.js
- * @description ControlLetter :: RUSSIAN ALPHABET is incorrect
- */
+/*---
+info: "CharacterEscape :: c ControlLetter"
+description: "ControlLetter :: RUSSIAN ALPHABET is incorrect"
+---*/
 
 //CHECK#0410-042F
 var result = true;  
@@ -34,5 +32,4 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 
 if (result !== true) {
   $ERROR('#2: russian small alphabet is incorrect');
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T1.js
index 2a431dc18..4d6e83325 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T1.js
- * @description Tested string include equal unicode symbols
- */
+/*---
+info: "CharacterEscape :: HexEscapeSequence :: x HexDigit HexDigit"
+description: Tested string include equal unicode symbols
+---*/
 
 //CHECK#0
 var arr = /\x00/.exec("\u0000"); 
@@ -31,4 +29,3 @@ var arr = /\xFF/.exec("\u00FF");
 if ((arr === null) || (arr[0] !== "\u00FF")) {
   $ERROR('#3: var arr = /\\xFF/.exec(\\u00FF); arr[0] === "\\u00FF". Actual. ' + (arr && arr[0]));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T2.js
index 789ee29c1..8b04ba3c3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: HexEscapeSequence :: x HexDigit HexDigit
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A3.1_T2.js
- * @description Checking ENGLISH CAPITAL ALPHABET and english small alphabet
- */
+/*---
+info: "CharacterEscape :: HexEscapeSequence :: x HexDigit HexDigit"
+description: Checking ENGLISH CAPITAL ALPHABET and english small alphabet
+---*/
 
 //CHECK#41-5A
 hex = ["\\x41", "\\x42", "\\x43", "\\x44", "\\x45", "\\x46", "\\x47", "\\x48", "\\x49", "\\x4A", "\\x4B", "\\x4C", "\\x4D", "\\x4E", "\\x4F", "\\x50", "\\x51", "\\x52", "\\x53", "\\x54", "\\x55", "\\x56", "\\x57", "\\x58", "\\x59", "\\x5A"];
@@ -36,5 +34,4 @@ for (index = 0; index < hex.length; index++) {
 
 if (result !== true) {
   $ERROR('#1: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T1.js
index 7da30da23..9598b6a6c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T1.js
- * @description RegExp and tested string include uncode symbols
- */
+/*---
+info: >
+    CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: RegExp and tested string include uncode symbols
+---*/
 
 //CHECK#0
 var arr = /\u0000/.exec("\u0000"); 
@@ -43,4 +43,3 @@ var arr = /\uFFFF/.exec("\uFFFF");
 if ((arr === null) || (arr[0] !== "\uFFFF")) {
   $ERROR('#5: var arr = /\\uFFFF/.exec(\\uFFFF); arr[0] === "\\uFFFF". Actual. ' + (arr && arr[0]));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T2.js
index 115b8d841..a7cf10413 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T2.js
- * @description Tested string include ENGLISH CAPITAL ALPHABET and english small alphabet
- */
+/*---
+info: >
+    CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: >
+    Tested string include ENGLISH CAPITAL ALPHABET and english small
+    alphabet
+---*/
 
 //CHECK#41-5A
 hex = ["\\u0041", "\\u0042", "\\u0043", "\\u0044", "\\u0045", "\\u0046", "\\u0047", "\\u0048", "\\u0049", "\\u004A", "\\u004B", "\\u004C", "\\u004D", "\\u004E", "\\u004F", "\\u0050", "\\u0051", "\\u0052", "\\u0053", "\\u0054", "\\u0055", "\\u0056", "\\u0057", "\\u0058", "\\u0059", "\\u005A"];
@@ -36,5 +38,4 @@ for (index = 0; index < hex.length; index++) {
 
 if (result !== true) {
   $ERROR('#1: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T3.js
index 9904a3482..408523c1d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit HexDigit
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A4.1_T3.js
- * @description Tested string include RUSSIAN CAPITAL ALPHABET and russian small alphabet in unicode notation
- */
+/*---
+info: >
+    CharacterEscape :: UnicodeEscapeSequence :: u HexDigit HexDigit HexDigit
+    HexDigit
+description: >
+    Tested string include RUSSIAN CAPITAL ALPHABET and russian small
+    alphabet in unicode notation
+---*/
 
 //CHECK#0410-042F, 0401 
 hex = ["\\u0410", "\\u0411", "\\u0412", "\\u0413", "\\u0414", "\\u0415", "\\u0416", "\\u0417", "\\u0418", "\\u0419", "\\u041A", "\\u041B", "\\u041C", "\\u041D", "\\u041E", "\\u041F", "\\u0420", "\\u0421", "\\u0422", "\\u0423", "\\u0424", "\\u0425", "\\u0426", "\\u0427", "\\u0428", "\\u0429", "\\u042A", "\\u042B", "\\u042C", "\\u042D", "\\u042E", "\\u042F", "\\u0401"];
@@ -37,4 +39,3 @@ for (index = 0; index < hex.length; index++) {
 if (result !== true) {
   $ERROR('#1: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A5.1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A5.1_T1.js
index 16517f4aa..dc010d63a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A5.1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A5.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * CharacterEscape :: IdentityEscapeSequence :: SourceCharacter but not IdentifierPart
- *
- * @path ch15/15.10/15.10.2/15.10.2.10/S15.10.2.10_A5.1_T1.js
- * @description Tested string is "~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"'
- */
+/*---
+info: >
+    CharacterEscape :: IdentityEscapeSequence :: SourceCharacter but not
+    IdentifierPart
+description: "Tested string is \"~`!@#$%^&*()-+={[}]|\\\\:;'<,>./?\" + '\"'"
+---*/
 
 //CHECK#1
 var non_ident = "~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"';
@@ -18,5 +18,4 @@ do {
 
 if (non_ident.length !== k) {
    $ERROR('#1: IdentityEscapeSequence :: SourceCharacter but not IdentifierPart');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T1.js
index 306eec084..1e6687534 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T1.js
- * @description DecimalEscape :: 0. If i is zero, return the EscapeValue consisting of a <NUL> character (Unicodevalue0000)
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: >
+    DecimalEscape :: 0. If i is zero, return the EscapeValue
+    consisting of a <NUL> character (Unicodevalue0000)
+---*/
 
 //CHECK#1
 var arr = /\0/.exec("\u0000"); 
@@ -19,4 +19,3 @@ var arr = (new RegExp("\\0")).exec("\u0000");
 if ((arr === null) || (arr[0] !== "\u0000")) {
   $ERROR('#2: var arr = (new RegExp("\\0")).exec(\\u0000); arr[0] === "\\u0000". Actual. ' + (arr && arr[0]));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T4.js
index fb1cb4676..7bedb8ff2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T4.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /(A)\1/.exec("AA");
 
@@ -18,5 +16,4 @@ if ((arr === null) || (arr[0] !== "AA")) {
 //CHECK#2
 if ((arr === null) || (arr[1] !== "A")) {
   $ERROR('#2: var arr = (/(A)\\1/.exec("AA")); arr[1] === "A". Actual. ' + (arr && arr[1]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T5.js
index d96e9f82b..502e778f8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T5.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /\1(A)/.exec("AA");
 
@@ -18,5 +16,4 @@ if ((arr === null) || (arr[0] !== "A")) {
 //CHECK#2
 if ((arr === null) || (arr[1] !== "A")) {
   $ERROR('#2: var arr = (/\\1(A)/.exec("AA")); arr[1] === "A". Actual. ' + (arr && arr[1]));
-}    
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T6.js
index 93fe35a09..2def73463 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T6.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /(A)\1(B)\2/.exec("AABB");
 
@@ -23,5 +21,4 @@ if ((arr === null) || (arr[1] !== "A")) {
 //CHECK#3
 if ((arr === null) || (arr[2] !== "B")) {
   $ERROR('#3: var arr = /(A)\\1(B)\\2/.exec("AABB"); arr[2] === "B". Actual. ' + (arr && arr[2]));
-}      
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T7.js
index 4adb97ead..10cd6f242 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T7.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /\1(A)(B)\2/.exec("ABB");
 
@@ -23,5 +21,4 @@ if ((arr === null) || (arr[1] !== "A")) {
 //CHECK#3
 if ((arr === null) || (arr[2] !== "B")) {
   $ERROR('#3: var arr = /\\1(A)(B)\\2/.exec("ABB"); arr[2] === "B". Actual. ' + (arr && arr[2]));
-}      
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T8.js
index d0915d52f..f79912acb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T8.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /((((((((((A))))))))))\1\2\3\4\5\6\7\8\9\10/.exec("AAAAAAAAAAA");
 
@@ -20,5 +18,4 @@ for (i = 1; i <= 10; i++) {
   if ((arr === null) || (arr[i] !== "A")) {
     $ERROR('#2: var arr = /((((((((((A))))))))))\\1\\2\\3\\4\\5\\6\\7\\8\\9\\10/.exec("AAAAAAAAAAA"); arr[' + i + '] === "A". Actual. ' + (arr && arr[i]));
   }
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T9.js
index b2dfb4ee3..943fd37bc 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path ch15/15.10/15.10.2/15.10.2.11/S15.10.2.11_A1_T9.js
- * @description DecimalIntegerLiteral is not 0
- */
+/*---
+info: "DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]"
+description: DecimalIntegerLiteral is not 0
+---*/
 
 var arr = /((((((((((A))))))))))\10\9\8\7\6\5\4\3\2\1/.exec("AAAAAAAAAAA");
 
@@ -20,5 +18,4 @@ for (i = 1; i <= 10; i++) {
   if ((arr === null) || (arr[i] !== "A")) {
     $ERROR('#2: var arr = /((((((((((A))))))))))\\10\\9\\8\\7\\6\\5\\4\\3\\2\\1/.exec("AAAAAAAAAAA"); arr[' + i + '] === "A". Actual. ' + (arr && arr[i]));
   }
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T1.js
index 482e089d5..2cbd8b4e1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: s evaluates by returning the set of characters
- * containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T1.js
- * @description WhiteSpace
- */
+/*---
+info: >
+    The production CharacterClassEscape :: s evaluates by returning the set of characters
+    containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
+description: WhiteSpace
+---*/
 
 var i0 = "";
 for (var j = 0; j < 1024; j++)
@@ -526,4 +525,4 @@ if (i63.replace(/\s+/g, "") !== o63) {
 var i64 = String.fromCharCode(65279);
 if (i64.replace(/\s/g, "") !== "") {
   $ERROR("#64: Error matching character class \s for BOM (feff)");
-}
\ No newline at end of file
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T2.js
index 52716fa8c..f497a9c60 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: s evaluates by returning the set of characters
- * containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T2.js
- * @description LineTerminator
- */
+/*---
+info: >
+    The production CharacterClassEscape :: s evaluates by returning the set of characters
+    containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
+description: LineTerminator
+---*/
 
 //CHECK#1
 var arr = /\s/.exec("\u000A");
@@ -31,5 +30,4 @@ if ((arr === null) || (arr[0] !== "\u2028")) {
 var arr = /\s/.exec("\u2029");
 if ((arr === null) || (arr[0] !== "\u2029")) {
   $ERROR('#4: var arr = /\\s/.exec("\\u2029"); arr[0] === "\\u2029". Actual. ' + (arr && arr[0]));
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T3.js
index a33d7dfbc..19a030b4e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: s evaluates by returning the set of characters
- * containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T3.js
- * @description ENGLISH ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: s evaluates by returning the set of characters
+    containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
+description: ENGLISH ALPHABET
+---*/
 
 var regexp_s = /\s/;
 
@@ -33,5 +32,4 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 
 if (result !== true) {
   $ERROR('#2: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T4.js
index 87c33c7c7..d95da91fc 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: s evaluates by returning the set of characters
- * containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T4.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: s evaluates by returning the set of characters
+    containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_s = /\s/;
 
@@ -34,4 +33,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T5.js
index 4e08b1f65..23fd19261 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T5.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: s evaluates by returning the set of characters
- * containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A1_T5.js
- * @description Tested string is "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"'
- */
+/*---
+info: >
+    The production CharacterClassEscape :: s evaluates by returning the set of characters
+    containing the characters that are on the right-hand side of the WhiteSpace (7.2) or LineTerminator (7.3) productions
+description: >
+    Tested string is
+    "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?"
+    + '"'
+---*/
 
 //CHECK#1
 var non_s = "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"';
@@ -25,5 +27,4 @@ while (regexp_s.exec(non_S) !== null) {
 
 if (non_S.length !== k) {
    $ERROR('#2: non-S');
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T1.js
index 36a45391b..061996200 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: S evaluates by returning
- * the set of all characters not included in the set returned by
- * CharacterClassEscape :: s
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T1.js
- * @description WhiteSpace
- */
+/*---
+info: >
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+description: WhiteSpace
+---*/
 
 var i0 = "";
 for (var j = 0; j < 1024; j++)
@@ -527,4 +526,4 @@ if (i63.replace(/\S+/g, "") !== o63) {
 var i64 = String.fromCharCode(65279);
 if (i64.replace(/\S/g, "") === "") {
   $ERROR("#64: Error matching character class \S for BOM (feff)");
-}
\ No newline at end of file
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T2.js
index 2cc29e04c..bb37b71d0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: S evaluates by returning
- * the set of all characters not included in the set returned by
- * CharacterClassEscape :: s
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T2.js
- * @description LineTerminator
- */
+/*---
+info: >
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+description: LineTerminator
+---*/
 
 //CHECK#1
 var arr = /\S/.exec("\u000A");
@@ -32,5 +31,4 @@ if (arr !== null) {
 var arr = /\S/.exec("\u2029");
 if (arr !== null) {
   $ERROR('#4: var arr = /\\S/.exec("\\u2029"); arr[0] === "\\u2029". Actual. ' + (arr && arr[0]));
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T3.js
index 66a831f10..301fd219a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: S evaluates by returning
- * the set of all characters not included in the set returned by
- * CharacterClassEscape :: s
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T3.js
- * @description ENGLISH ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+description: ENGLISH ALPHABET
+---*/
 
 var regexp_S = /\S/;
 
@@ -38,5 +37,4 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 
 if (result !== true) {
   $ERROR('#2: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T4.js
index 56d511ec6..93b3c35bc 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: S evaluates by returning
- * the set of all characters not included in the set returned by
- * CharacterClassEscape :: s
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T4.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_S = /\S/;
 
@@ -39,4 +38,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T5.js
index 7dbcfcb1a..9cbf5eb2f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T5.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: S evaluates by returning
- * the set of all characters not included in the set returned by
- * CharacterClassEscape :: s
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A2_T5.js
- * @description Tested string is "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"'
- */
+/*---
+info: >
+    The production CharacterClassEscape :: S evaluates by returning
+    the set of all characters not included in the set returned by
+    CharacterClassEscape :: s
+description: >
+    Tested string is
+    "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?"
+    + '"'
+---*/
 
 //CHECK#1
 var non_s = "0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ~`!@#$%^&*()-+={[}]|\\:;'<,>./?" + '"';
@@ -27,4 +29,3 @@ var non_S = '\f\n\r\t\v ';
 if (/\S/.exec(non_S) !== null) {
    $ERROR('#2: non-S');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T1.js
index df3a3e82a..a09ecced0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
- * a - z, A - Z, 0 - 9, _
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T1.js
- * @description A - Z
- */
+/*---
+info: >
+    The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
+    a - z, A - Z, 0 - 9, _
+description: A - Z
+---*/
 
 var i0 = "";
 for (var j = 0; j < 256; j++)
@@ -2056,4 +2055,3 @@ var o255 = i255;
 if (i255.replace(/\w+/g, "") !== o255) {
   $ERROR("#255: Error matching character class \w between character ff00 and ffff");
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T2.js
index 5a1f80a84..26ef9687c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
- * a - z, A - Z, 0 - 9, _
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T2.js
- * @description a - z
- */
+/*---
+info: >
+    The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
+    a - z, A - Z, 0 - 9, _
+description: a - z
+---*/
 
 var regexp_w = /\w/;
 
@@ -24,4 +23,3 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 if (result !== true) {
   $ERROR('#1: a - z');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T3.js
index 1b5833ff4..81209b5de 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
- * a - z, A - Z, 0 - 9, _
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T3.js
- * @description 0 - 9, _
- */
+/*---
+info: >
+    The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
+    a - z, A - Z, 0 - 9, _
+description: 0 - 9, _
+---*/
 
 var regexp_w = /\w/;
 
@@ -35,4 +34,3 @@ if ((arr === null) || (arr[0] !== "\u005F")) {
 if (regexp_w.exec(" ") !== null) {
   $ERROR('#3:  ');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T4.js
index cf2255903..140657af5 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
- * a - z, A - Z, 0 - 9, _
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T4.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
+    a - z, A - Z, 0 - 9, _
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_w = /\w/;
 
@@ -34,4 +33,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T5.js
index 3efca98cf..e5d7c9ee8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
- * a - z, A - Z, 0 - 9, _
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A3_T5.js
- * @description non-w
- */
+/*---
+info: >
+    The production CharacterClassEscape :: w evaluates by returning the set of characters containing the sixty-three characters:
+    a - z, A - Z, 0 - 9, _
+description: non-w
+---*/
 
 //CHECK#1
 var non_w = "\f\n\r\t\v~`!@#$%^&*()-+={[}]|\\:;'<,>./? " + '"';
@@ -25,5 +24,4 @@ while (regexp_w.exec(non_W) !== null) {
 
 if (non_W.length !== k) {
    $ERROR('#2: non-W');
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T1.js
index 97b79fe36..43fbbe0fd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: W evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: w
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T1.js
- * @description A - Z
- */
+/*---
+info: >
+    The production CharacterClassEscape :: W evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: w
+description: A - Z
+---*/
 
 var i0 = "";
 for (var j = 0; j < 1024; j++)
@@ -520,4 +519,3 @@ var o63 = "";
 if (i63.replace(/\W+/g, "") !== o63) {
   $ERROR("#63: Error matching character class \W between character fc00 and ffff");
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T2.js
index 7fc4278b6..fedeb321a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: W evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: w
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T2.js
- * @description a - z
- */
+/*---
+info: >
+    The production CharacterClassEscape :: W evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: w
+description: a - z
+---*/
 
 var regexp_W = /\W/;
 
@@ -22,4 +21,3 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 if (result !== true) {
   $ERROR('#1: a - z');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T3.js
index 22cbf5336..54560a093 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: W evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: w
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T3.js
- * @description 0 - 9
- */
+/*---
+info: >
+    The production CharacterClassEscape :: W evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: w
+description: 0 - 9
+---*/
 
 var regexp_W = /\W/;
 
@@ -33,4 +32,3 @@ var arr = regexp_W.exec(" ");
 if ((arr === null) || (arr[0] !== "\u0020")) {
   $ERROR('#2:  ');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T4.js
index e5657b968..2fde0c5cb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: W evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: w
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T4.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: W evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: w
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_W = /\W/;
 
@@ -38,4 +37,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T5.js
index 3e01ed72c..988dc7ec8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: W evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: w
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A4_T5.js
- * @description non-w
- */
+/*---
+info: >
+    The production CharacterClassEscape :: W evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: w
+description: non-w
+---*/
 
 //CHECK#1
 var non_w = "\f\n\r\t\v~`!@#$%^&*()-+={[}]|\\:;'<,>./? " + '"';
@@ -26,4 +25,3 @@ var non_W = "_0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 if (/\W/.exec(non_W) !== null) {
    $ERROR('#2: non-W');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T1.js
index e1602190e..b90b4d9f1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: d evaluates by returning the ten-element set of characters containing the characters 0 through 9 inclusive
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T1.js
- * @description 0 - 9
- */
+/*---
+info: >
+    The production CharacterClassEscape :: d evaluates by returning the
+    ten-element set of characters containing the characters 0 through 9
+    inclusive
+description: 0 - 9
+---*/
 
 var i0 = "";
 for (var j = 0; j < 1024; j++)
@@ -519,4 +520,3 @@ var o63 = i63;
 if (i63.replace(/\d+/g, "") !== o63) {
   $ERROR("#63: Error matching character class \d between character fc00 and ffff");
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T2.js
index 8aa5fd99b..fc9177fce 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: d evaluates by returning the ten-element set of characters containing the characters 0 through 9 inclusive
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T2.js
- * @description ENGLISH ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: d evaluates by returning the
+    ten-element set of characters containing the characters 0 through 9
+    inclusive
+description: ENGLISH ALPHABET
+---*/
 
 var regexp_d = /\d/;
 
@@ -32,5 +33,4 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 
 if (result !== true) {
   $ERROR('#2: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T3.js
index 922266793..f5cb51ff3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: d evaluates by returning the ten-element set of characters containing the characters 0 through 9 inclusive
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T3.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: d evaluates by returning the
+    ten-element set of characters containing the characters 0 through 9
+    inclusive
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_d = /\d/;
 
@@ -33,4 +34,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T4.js
index d8795cfb9..98b07881e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: d evaluates by returning the ten-element set of characters containing the characters 0 through 9 inclusive
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A5_T4.js
- * @description non-d
- */
+/*---
+info: >
+    The production CharacterClassEscape :: d evaluates by returning the
+    ten-element set of characters containing the characters 0 through 9
+    inclusive
+description: non-d
+---*/
 
 //CHECK#1
 var non_d = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\f\n\r\t\v~`!@#$%^&*()-+={[}]|\\:;'<,>./? " + '"';
@@ -24,5 +25,4 @@ while (regexp_d.exec(non_D) !== null) {
 
 if (non_D.length !== k) {
    $ERROR('#2: non-D');
-}  
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T1.js
index 0cf2a5a04..1753eaadb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: D evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: d
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T1.js
- * @description 0 - 9
- */
+/*---
+info: >
+    The production CharacterClassEscape :: D evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: d
+description: 0 - 9
+---*/
 
 var i0 = "";
 for (var j = 0; j < 1024; j++)
@@ -520,4 +519,3 @@ var o63 = "";
 if (i63.replace(/\D+/g, "") !== o63) {
   $ERROR("#63: Error matching character class \D between character fc00 and ffff");
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T2.js
index 320ec141f..60e32dc69 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: D evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: d
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T2.js
- * @description ENGLISH ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: D evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: d
+description: ENGLISH ALPHABET
+---*/
 
 var regexp_D = /\D/;
 
@@ -37,5 +36,4 @@ for (alpha = 0x0061; alpha <= 0x007A; alpha++) {
 
 if (result !== true) {
   $ERROR('#2: english small alphabet');
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T3.js
index 1edcdce38..075e86986 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: D evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: d
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T3.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: D evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: d
+description: RUSSIAN ALPHABET
+---*/
 
 var regexp_D = /\D/;
 
@@ -38,4 +37,3 @@ for (alpha = 0x0430; alpha <= 0x044F; alpha++) {
 if (result !== true) {
   $ERROR('#2: russian small alphabet');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T4.js
index 662ce119d..71181a447 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClassEscape :: D evaluates by returning the set of all characters not
- * included in the set returned by CharacterClassEscape :: d
- *
- * @path ch15/15.10/15.10.2/15.10.2.12/S15.10.2.12_A6_T4.js
- * @description RUSSIAN ALPHABET
- */
+/*---
+info: >
+    The production CharacterClassEscape :: D evaluates by returning the set of all characters not
+    included in the set returned by CharacterClassEscape :: d
+description: RUSSIAN ALPHABET
+---*/
 
 //CHECK#1
 var non_d = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\f\n\r\t\v~`!@#$%^&*()-+={[}]|\\:;'<,>./? " + '"';
@@ -26,4 +25,3 @@ var non_d = '0123456789';
 if (/\D/.exec(non_d) !== null) {
    $ERROR('#2: non-d');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T1.js
index a3f4f4457..c5b84baa1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T1.js
- * @description Execute /[]a/.test("\0a\0a") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[]a/.test("\0a\0a") and check results
+---*/
 
 __executed = /[]a/.test("\0a\0a");;
 
@@ -14,5 +15,3 @@ __executed = /[]a/.test("\0a\0a");;
  if (__executed) {
 	$ERROR('#1: /[]a/.test("\\0a\\0a") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T10.js
index 5e36a443b..c5d70150d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T10.js
- * @description Execute /[a-c\d]+/.exec("\n\n\abc324234\n") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[a-c\d]+/.exec("\n\n\abc324234\n") and check results
+---*/
 
 __executed = /[a-c\d]+/.exec("\n\n\abc324234\n");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-c\\d]+/.exec("\\n\\n\\abc324234\\n"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T11.js
index 70e8feac4..412443508 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T11.js
- * @description Execute /ab[.]?c/.exec("abc") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /ab[.]?c/.exec("abc") and check results
+---*/
 
 __executed = /ab[.]?c/.exec("abc");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /ab[.]?c/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T12.js
index 770542b6f..7e4e3f66b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T12.js
- * @description Execute /a[b]c/.exec("abc") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /a[b]c/.exec("abc") and check results
+---*/
 
 __executed = /a[b]c/.exec("abc");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[b]c/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T13.js
index 74ffd0d46..6103e1255 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T13.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T13.js
- * @description Execute /[a-z][^1-9][a-z]/.exec("a1b  b2c  c3d  def  f4g") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: >
+    Execute /[a-z][^1-9][a-z]/.exec("a1b  b2c  c3d  def  f4g") and
+    check results
+---*/
 
 __executed = /[a-z][^1-9][a-z]/.exec("a1b  b2c  c3d  def  f4g");
 
@@ -35,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-z][^1-9][a-z]/.exec("a1b  b2c  c3d  def  f4g"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T14.js
index 3fbf7affb..188bbe539 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T14.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T14.js
- * @description Execute /[*&$]{3}/.exec("123*&$abc") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[*&$]{3}/.exec("123*&$abc") and check results
+---*/
 
 __executed = /[*&$]{3}/.exec("123*&$abc");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[*&$]{3}/.exec("123*&$abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T15.js
index a80ce39bf..efb27f86d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T15.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T15.js
- * @description Execute /[\d][\n][^\d]/.exec("line1\nline2") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[\d][\n][^\d]/.exec("line1\nline2") and check results
+---*/
 
 __executed = /[\d][\n][^\d]/.exec("line1\nline2");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[\\d][\\n][^\\d]/.exec("line1\\nline2"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T16.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T16.js
index ea5be63be..23ca25faf 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T16.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T16.js
- * @description Execute /[\d][\12-\14]{1,}[^\d]/.exec("line1\n\n\n\n\nline2") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: >
+    Execute /[\d][\12-\14]{1,}[^\d]/.exec("line1\n\n\n\n\nline2") and
+    check results
+---*/
 
 __executed = /[\d][\12-\14]{1,}[^\d]/.exec("line1\n\n\n\n\nline2");
 
@@ -35,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[\\d][\\12-\\14]{1,}[^\\d]/.exec("line1\\n\\n\\n\\n\\nline2"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T17.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T17.js
index 28256c88b..8c7402c41 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T17.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T17.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T17.js
- * @description Execute /[]/.exec("a[b\n[]\tc]d") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[]/.exec("a[b\n[]\tc]d") and check results
+---*/
 
 __executed = /[]/.exec("a[b\n[]\tc]d");
 
@@ -14,5 +15,3 @@ __executed = /[]/.exec("a[b\n[]\tc]d");
 if (__executed !== null) {
 	$ERROR('#1: /[]/.exec("a[b\\n[]\\tc]d") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T2.js
index b02086b99..274ddd902 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T2.js
- * @description Execute /a[]/.test("\0a\0a") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /a[]/.test("\0a\0a") and check results
+---*/
 
 __executed = /a[]/.test("\0a\0a");;
 
@@ -14,5 +15,3 @@ __executed = /a[]/.test("\0a\0a");;
 if (__executed) {
 	$ERROR('#1: /a[]/.test("\\0a\\0a") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T3.js
index f1198a3a7..a5602a8d1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T3.js
- * @description Execute /q[ax-zb](?=\s+)/.exec("qYqy ") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /q[ax-zb](?=\s+)/.exec("qYqy ") and check results
+---*/
 
 __executed = /q[ax-zb](?=\s+)/.exec("qYqy ");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /q[ax-zb](?=\\s+)/.exec("qYqy "); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T4.js
index a4cb361f8..b24a0c63b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T4.js
- * @description Execute /q[ax-zb](?=\s+)/.exec("tqaqy ") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /q[ax-zb](?=\s+)/.exec("tqaqy ") and check results
+---*/
 
 __executed = /q[ax-zb](?=\s+)/.exec("tqaqy ");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /q[ax-zb](?=\\s+)/.exec("tqaqy "); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T5.js
index b8e2aa9a0..a4f6d39ca 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T5.js
- * @description Execute /q[ax-zb](?=\s+)/.exec("tqa\t  qy ") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /q[ax-zb](?=\s+)/.exec("tqa\t  qy ") and check results
+---*/
 
 __executed = /q[ax-zb](?=\s+)/.exec("tqa\t  qy ");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /q[ax-zb](?=\\s+)/.exec("tqa\\t  qy "); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T6.js
index d84a74b33..fd8542adb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T6.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T6.js
- * @description Execute /ab[ercst]de/.exec("abcde") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /ab[ercst]de/.exec("abcde") and check results
+---*/
 
 __executed = /ab[ercst]de/.exec("abcde");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /ab[ercst]de/.exec("abcde"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T7.js
index e6c7a5d7e..247014b8d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T7.js
- * @description Execute /ab[erst]de/.test("abcde") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /ab[erst]de/.test("abcde") and check results
+---*/
 
 __executed = /ab[erst]de/.test("abcde");
 
@@ -14,5 +15,3 @@ __executed = /ab[erst]de/.test("abcde");
 if (__executed) {
 	$ERROR('#1: /ab[erst]de/.test("abcde") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T8.js
index d69ffefb4..a209148d8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T8.js
- * @description Execute /[d-h]+/.exec("abcdefghijkl") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[d-h]+/.exec("abcdefghijkl") and check results
+---*/
 
 __executed = /[d-h]+/.exec("abcdefghijkl");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[d-h]+/.exec("abcdefghijkl"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T9.js
index d95321ce3..2c8135b3c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ] evaluates by evaluating ClassRanges to obtain a CharSet and returning that CharSet and the boolean false
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A1_T9.js
- * @description Execute /[1234567].{2}/.exec("abc6defghijkl") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ [lookahead \notin {^}] ClassRanges ]
+    evaluates by evaluating ClassRanges to obtain a CharSet and returning
+    that CharSet and the boolean false
+description: Execute /[1234567].{2}/.exec("abc6defghijkl") and check results
+---*/
 
 __executed = /[1234567].{2}/.exec("abc6defghijkl");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[1234567].{2}/.exec("abc6defghijkl"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T1.js
index 8410e4d46..1fe6194f0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T1.js
- * @description Execute /[^]a/m.exec("a\naba") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /[^]a/m.exec("a\naba") and check results
+---*/
 
 __executed = /[^]a/m.exec("a\naba");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^]a/m.exec("a\\naba"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T2.js
index 12c45c073..29897db63 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T2.js
- * @description Execute /a[^]/.exec("   a\t\n") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /a[^]/.exec("   a\t\n") and check results
+---*/
 
 __executed = /a[^]/.exec("   a\t\n");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[^]/.exec("   a\\t\\n"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T3.js
index 2b6bc76e4..b8c5bb3d8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T3.js
- * @description Execute /a[^b-z]\s+/.exec("ab an az aY n") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /a[^b-z]\s+/.exec("ab an az aY n") and check results
+---*/
 
 __executed = /a[^b-z]\s+/.exec("ab an az aY n");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[^b-z]\\s+/.exec("ab an az aY n"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T4.js
index c6690db5d..4b4a32432 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T4.js
- * @description Execute /[^\b]+/g.exec("easy\bto\u0008ride") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /[^\b]+/g.exec("easy\bto\u0008ride") and check results
+---*/
 
 __executed = /[^\b]+/g.exec("easy\bto\u0008ride");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^\\b]+/g.exec("easy\\bto\\u0008ride"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T5.js
index 97ba1ad32..76ce8284c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T5.js
- * @description Execute /a[^1-9]c/.exec("abc") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /a[^1-9]c/.exec("abc") and check results
+---*/
 
 __executed = /a[^1-9]c/.exec("abc");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[^1-9]c/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T6.js
index f964ffbf0..6bdb5d519 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T6.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T6.js
- * @description Execute /a[^b]c/.test("abc") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /a[^b]c/.test("abc") and check results
+---*/
 
 __executed = /a[^b]c/.test("abc");
 
@@ -14,5 +15,3 @@ __executed = /a[^b]c/.test("abc");
 if (__executed) {
 	$ERROR('#1: /a[^b]c/.test("abc") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T7.js
index 56cd92bd3..4a3eff316 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T7.js
- * @description Execute /[^a-z]{4}/.exec("abc#$%def%&*@ghi") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /[^a-z]{4}/.exec("abc#$%def%&*@ghi") and check results
+---*/
 
 __executed = /[^a-z]{4}/.exec("abc#$%def%&*@ghi");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^a-z]{4}/.exec("abc#$%def%&*@ghi"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T8.js
index 04e53653c..c5b5f459d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production CharacterClass :: [ ^ ClassRanges ] evaluates by evaluating ClassRanges to  obtain a CharSet and returning that CharSet and the boolean true
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A2_T8.js
- * @description Execute /[^]/.exec("abc#$%def%&*@ghi") and check results
- */
+/*---
+info: >
+    The production CharacterClass :: [ ^ ClassRanges ] evaluates by
+    evaluating ClassRanges to  obtain a CharSet and returning that CharSet
+    and the boolean true
+description: Execute /[^]/.exec("abc#$%def%&*@ghi") and check results
+---*/
 
 __executed = /[^]/.exec("abc#$%def%&*@ghi");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^]/.exec("abc#$%def%&*@ghi"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T1.js
index 392445023..2d772286f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Inside a CharacterClass, \b means the backspace character
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T1.js
- * @description Execute /.[\b]./.exec("abc\bdef") and check results
- */
+/*---
+info: Inside a CharacterClass, \b means the backspace character
+description: Execute /.[\b]./.exec("abc\bdef") and check results
+---*/
 
 __executed = /.[\b]./.exec("abc\bdef");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /.[\\b]./.exec("abc\\bdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T2.js
index f1bd6b63f..8e5cdb4b8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Inside a CharacterClass, \b means the backspace character
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T2.js
- * @description Execute /c[\b]{3}d/.exec("abc\b\b\bdef") and check results
- */
+/*---
+info: Inside a CharacterClass, \b means the backspace character
+description: Execute /c[\b]{3}d/.exec("abc\b\b\bdef") and check results
+---*/
 
 __executed = /c[\b]{3}d/.exec("abc\b\b\bdef");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /c[\\b]{3}d/.exec("abc\\b\\b\\bdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T3.js
index a4e4864c0..0f6903ebb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Inside a CharacterClass, \b means the backspace character
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T3.js
- * @description Execute /[^\[\b\]]+/.exec("abc\bdef") and check results
- */
+/*---
+info: Inside a CharacterClass, \b means the backspace character
+description: Execute /[^\[\b\]]+/.exec("abc\bdef") and check results
+---*/
 
 __executed = /[^\[\b\]]+/.exec("abc\bdef");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^\\[\\b\\]]+/.exec("abc\\bdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T4.js
index d97e00f46..a81e28cd9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Inside a CharacterClass, \b means the backspace character
- *
- * @path ch15/15.10/15.10.2/15.10.2.13/S15.10.2.13_A3_T4.js
- * @description Execute /[^\[\b\]]+/.exec("abcdef") and check results
- */
+/*---
+info: Inside a CharacterClass, \b means the backspace character
+description: Execute /[^\[\b\]]+/.exec("abcdef") and check results
+---*/
 
 __executed = /[^\[\b\]]+/.exec("abcdef");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^\\[\\b\\]]+/.exec("abcdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-1.js
index a026545e1..61099506e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.2/15.10.2.15-3-1.js

- * @description Pattern - SyntaxError was thrown when 'A' does not contain exactly one character (15.10.2.5 step 3)

- */

-

-

-function testcase() {

-        try {

-            var regExp = new RegExp("^[/w-c]$");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Pattern - SyntaxError was thrown when 'A' does not contain exactly
+    one character (15.10.2.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExp = new RegExp("^[/w-c]$");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-2.js
index 826529727..d0c84be35 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15-3-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.2/15.10.2.15-3-2.js

- * @description Pattern - SyntaxError was thrown when 'B' does not contain exactly one character (15.10.2.5 step 3)

- */

-

-

-function testcase() {

-        try {

-            var regExp = new RegExp("^[a-/w]$");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Pattern - SyntaxError was thrown when 'B' does not contain exactly
+    one character (15.10.2.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExp = new RegExp("^[a-/w]$");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15-6-1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15-6-1.js
index 67b1d1a3f..f46e9cb27 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15-6-1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15-6-1.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.2/15.10.2.15-6-1.js

- * @description Pattern - SyntaxError was thrown when one character in CharSet 'A' greater than one character in CharSet 'B' (15.10.2.15 CharacterRange step 6)

- */

-

-

-function testcase() {

-        try {

-            var regExp = new RegExp("^[z-a]$");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Pattern - SyntaxError was thrown when one character in CharSet 'A'
+    greater than one character in CharSet 'B' (15.10.2.15
+    CharacterRange step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExp = new RegExp("^[z-a]$");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T1.js
index 445093b5d..d04bdfdd9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T1.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T1.js
- * @description Checking if execution of "/[b-ac-e]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-ac-e]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-ac-e]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T10.js
index 020749a9f..4b119a479 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T10.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T10.js
- * @description Checking if execution of "/[\10b-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\10b-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\10b-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T11.js
index b88af78e7..84b03ae36 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T11.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T11.js
- * @description Checking if execution of "/[\bd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\bd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\bd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T12.js
index c81f72ad5..3e253a0a9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T12.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T12.js
- * @description Checking if execution of "/[\Bd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\Bd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\Bd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T13.js
index b0406f752..60a1a5d17 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T13.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T13.js
- * @description Checking if execution of "/[\td-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\td-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\td-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T14.js
index cfb4eadc7..b8d308b5f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T14.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T14.js
- * @description Checking if execution of "/[\nd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\nd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\nd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T15.js
index 17ff0ace0..a4b54668b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T15.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T15.js
- * @description Checking if execution of "/[\vd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\vd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\vd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T16.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T16.js
index 2cede536f..a4a6de44f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T16.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T16.js
- * @description Checking if execution of "/[\fd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\fd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\fd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T17.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T17.js
index d2e265c99..a09de6528 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T17.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T17.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T17.js
- * @description Checking if execution of "/[\rd-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\rd-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\rd-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T18.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T18.js
index f34067454..6fb7a2959 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T18.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T18.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T18.js
- * @description Checking if execution of "/[\c0001d-G]/.exec("1")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\c0001d-G]/.exec("1")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\c0001d-G]/.exec("1") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T19.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T19.js
index bd569e65b..dfdcef5a8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T19.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T19.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T19.js
- * @description Checking if execution of "/[\x0061d-G]/.exec("1")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\x0061d-G]/.exec("1")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\x0061d-G]/.exec("1") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T2.js
index 7047103bb..797d1be39 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T2.js
- * @description Checking if execution of "/[a-dc-b]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[a-dc-b]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[a-dc-b]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T20.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T20.js
index 74043d31b..d4f39a909 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T20.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T20.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T20.js
- * @description Checking if execution of "/[\u0061d-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\u0061d-G]/.exec("a")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\u0061d-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T21.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T21.js
index 848393484..bf0f169d5 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T21.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T21.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T21.js
- * @description Checking if execution of "/[\ad-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\ad-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\ad-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T22.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T22.js
index aabbacb17..f27a21ffd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T22.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T22.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T22.js
- * @description Checking if execution of "/[c-eb-a]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[c-eb-a]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[c-eb-a]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T23.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T23.js
index 0cd3f8f7e..76ceeb90b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T23.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T23.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T23.js
- * @description Checking if execution of "/[b-G\d]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\d]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\d]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T24.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T24.js
index d5744bab2..ee7b966b0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T24.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T24.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T24.js
- * @description Checking if execution of "/[b-G\D]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\D]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\D]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T25.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T25.js
index 2fc86dcbf..8bd38c081 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T25.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T25.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T25.js
- * @description Checking if execution of "/[b-G\s]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\s]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\s]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T26.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T26.js
index fecf0d82a..7f8f0fa3c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T26.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T26.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T26.js
- * @description Checking if execution of "/[b-G\S]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\S]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\S]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T27.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T27.js
index 961466cfb..02c9b13b3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T27.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T27.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T27.js
- * @description Checking if execution of "/[b-G\w]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\w]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\w]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T28.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T28.js
index c4227e1a0..4c499673b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T28.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T28.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T28.js
- * @description Checking if execution of "/[b-G\W]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\W]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\W]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T29.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T29.js
index 651f6eed3..d19209741 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T29.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T29.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T29.js
- * @description Checking if execution of "/[b-G\0]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\0]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\0]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T3.js
index be3e83de9..ca16cc9a2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T3.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T3.js
- * @description Checking if execution of "/[\db-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\db-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\db-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T30.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T30.js
index b70c335db..f83d351db 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T30.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T30.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T30.js
- * @description Checking if execution of "/[b-G\10]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[b-G\10]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[b-G\\10]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T31.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T31.js
index 4b6a85441..56bbf61db 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T31.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T31.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T31.js
- * @description Checking if execution of "/[d-G\b]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\b]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\b]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T32.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T32.js
index 35db57aac..7da8e42b1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T32.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T32.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T32.js
- * @description Checking if execution of "/[d-G\B]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\B]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\B]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T33.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T33.js
index 77f12e314..36e11a955 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T33.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T33.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T33.js
- * @description Checking if execution of "/[d-G\t]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\t]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\t]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T34.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T34.js
index 6f1bf0aa5..5d0f2589d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T34.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T34.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T34.js
- * @description Checking if execution of "/[d-G\n]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\n]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\n]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T35.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T35.js
index e4bcc9a9a..eb09d9434 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T35.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T35.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T35.js
- * @description Checking if execution of "/[d-G\v]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\v]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\v]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T36.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T36.js
index eaa9b66cd..78dd9fe4d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T36.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T36.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T36.js
- * @description Checking if execution of "/[d-G\f]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\f]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\f]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T37.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T37.js
index 49b37df66..9f3e0dc8a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T37.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T37.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T37.js
- * @description Checking if execution of "/[d-G\r]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\r]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\r]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T38.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T38.js
index 43f5dbf92..28bdc540c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T38.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T38.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T38.js
- * @description Checking if execution of "/[d-G\c0001]/.exec("1")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\c0001]/.exec("1")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\c0001]/.exec("1") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T39.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T39.js
index bbd17f8d6..028dd3ca3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T39.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T39.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T39.js
- * @description Checking if execution of "/[d-G\x0061]/.exec("1")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\x0061]/.exec("1")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\x0061]/.exec("1") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T4.js
index 5a9c458f4..4b593da7b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T4.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T4.js
- * @description Checking if execution of "/[\Db-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\Db-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\Db-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T40.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T40.js
index 061268c94..2c94710e1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T40.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T40.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T40.js
- * @description Checking if execution of "/[d-G\u0061]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\u0061]/.exec("a")" leads to
+    throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\u0061]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T41.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T41.js
index 3dc4f10c4..22e3b1df0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T41.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T41.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T41.js
- * @description Checking if execution of "/[d-G\a]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[d-G\a]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[d-G\\a]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T5.js
index a17b0abc8..c6fcb1403 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T5.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T5.js
- * @description Checking if execution of "/[\sb-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\sb-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\sb-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T6.js
index 6a20c51d6..84146bcd3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T6.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T6.js
- * @description Checking if execution of "/[\Sb-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\Sb-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\Sb-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T7.js
index cee8100a6..ded113ced 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T7.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T7.js
- * @description Checking if execution of "/[\wb-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\wb-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\wb-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T8.js
index 2f45104d6..7404ff3e3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T8.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T8.js
- * @description Checking if execution of "/[\Wb-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\Wb-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\Wb-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T9.js
index e4d64bfc8..4acfb1524 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T9.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
- * following:
- * If A does not contain exactly one character or B does not contain exactly one character then throw
- * a SyntaxError exception
- *
- * @path ch15/15.10/15.10.2/15.10.2.15/S15.10.2.15_A1_T9.js
- * @description Checking if execution of "/[\0b-G]/.exec("a")" leads to throwing the correct exception
- */
+/*---
+info: >
+    The internal helper function CharacterRange takes two CharSet parameters A and B and performs the
+    following:
+    If A does not contain exactly one character or B does not contain exactly one character then throw
+    a SyntaxError exception
+description: >
+    Checking if execution of "/[\0b-G]/.exec("a")" leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +20,3 @@ try {
     $ERROR('#1.2: /[\\0b-G]/.exec("a") throw SyntaxError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.2-1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.2-1.js
index c296eeace..89e92589d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.2-1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.2-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.2/15.10.2.2-1.js

- * @description Pattern - SyntaxError was thrown when compile a pattern

- */

-

-

-function testcase() {

-        try {

-            var regExp = new RegExp("\\");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Pattern - SyntaxError was thrown when compile a pattern
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExp = new RegExp("\\");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T1.js
index a40126f91..66327337c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T1.js
- * @description Execute /a|ab/.exec("abc") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /a|ab/.exec("abc") and check results
+---*/
 
 __executed = /a|ab/.exec("abc");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a|ab/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T10.js
index adec51a48..5d8eeeda6 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T10.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T10.js
- * @description Execute /(?:ab|cd)+|ef/i.exec("AEKeFCDab") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: "Execute /(?:ab|cd)+|ef/i.exec(\"AEKeFCDab\") and check results"
+---*/
 
 __executed = /(?:ab|cd)+|ef/i.exec("AEKeFCDab");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?:ab|cd)+|ef/i.exec("AEKeFCDab"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T11.js
index c1146e5c2..644d6aad1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T11.js
- * @description Execute /11111|111/.exec("1111111111111111") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /11111|111/.exec("1111111111111111") and check results
+---*/
 
 __executed = /11111|111/.exec("1111111111111111");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /11111|111/.exec("1111111111111111"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T12.js
index 6668f3683..acae651ab 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T12.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T12.js
- * @description Execute /xyz|.../.exec("abc") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /xyz|.../.exec("abc") and check results
+---*/
 
 __executed = /xyz|.../.exec("abc");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /xyz|.../.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T13.js
index 5b3c05183..764603cac 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T13.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T13.js
- * @description Execute /(.)..|abc/.exec("abc") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /(.)..|abc/.exec("abc") and check results
+---*/
 
 __executed = /(.)..|abc/.exec("abc");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(.)..|abc/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T14.js
index ea2cd7cd6..97e5872fa 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T14.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T14.js
- * @description Execute /.+: gr(a|e)y/.exec("color: grey") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: "Execute /.+: gr(a|e)y/.exec(\"color: grey\") and check results"
+---*/
 
 __executed = /.+: gr(a|e)y/.exec("color: grey");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /.+: gr(a|e)y/.exec("color: grey"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T15.js
index a0e4b8516..d8175aa0e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T15.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T15.js
- * @description Execute /(Rob)|(Bob)|(Robert)|(Bobby)/.exec("Hi Bob") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: >
+    Execute /(Rob)|(Bob)|(Robert)|(Bobby)/.exec("Hi Bob") and check
+    results
+---*/
 
 __executed = /(Rob)|(Bob)|(Robert)|(Bobby)/.exec("Hi Bob");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(Rob)|(Bob)|(Robert)|(Bobby)/.exec("Hi Bob"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T16.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T16.js
index 0f4cef5f0..e09cd16e0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T16.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T16.js
- * @description Execute /()|/.exec("") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /()|/.exec("") and check results
+---*/
 
 __executed = /()|/.exec("");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /()|/.exec(""); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T17.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T17.js
index bf6313a96..4814ed0b3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T17.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T17.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T17.js
- * @description Execute /|()/.exec("") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /|()/.exec("") and check results
+---*/
 
 __executed = /|()/.exec("");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /|()/.exec(""); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T2.js
index b07cdbab5..71a785a81 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T2.js
- * @description Execute /((a)|(ab))((c)|(bc))/.exec("abc") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /((a)|(ab))((c)|(bc))/.exec("abc") and check results
+---*/
 
 __executed = /((a)|(ab))((c)|(bc))/.exec("abc");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /((a)|(ab))((c)|(bc))/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T3.js
index a534fd392..4eabb53ee 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T3.js
- * @description Execute /\d{3}|[a-z]{4}/.exec("2, 12 and of course repeat 12") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: >
+    Execute /\d{3}|[a-z]{4}/.exec("2, 12 and of course repeat 12") and
+    check results
+---*/
 
 __executed = /\d{3}|[a-z]{4}/.exec("2, 12 and of course repeat 12");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{3}|[a-z]{4}/.exec("2, 12 and of course repeat 12"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T4.js
index 87579047d..7cdd50e4b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T4.js
- * @description Execute /\d{3}|[a-z]{4}/.exec("2, 12 and 234 AND of course repeat 12") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: >
+    Execute /\d{3}|[a-z]{4}/.exec("2, 12 and 234 AND of course repeat
+    12") and check results
+---*/
 
 __executed = /\d{3}|[a-z]{4}/.exec("2, 12 and 234 AND of course repeat 12");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{3}|[a-z]{4}/.exec("2, 12 and 234 AND of course repeat 12"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T5.js
index e9ffabc48..c4b51bfaf 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T5.js
- * @description Execute /\d{3}|[a-z]{4}/.test("2, 12 and 23 AND 0.00.1") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: >
+    Execute /\d{3}|[a-z]{4}/.test("2, 12 and 23 AND 0.00.1") and check
+    results
+---*/
 
 __executed = /\d{3}|[a-z]{4}/.test("2, 12 and 23 AND 0.00.1");
 
@@ -16,5 +17,3 @@ __executed = /\d{3}|[a-z]{4}/.test("2, 12 and 23 AND 0.00.1");
 if (__executed) {
 	$ERROR('#1: /\\d{3}|[a-z]{4}/.test("2, 12 and 23 AND 0.00.1") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T6.js
index d80ed9a97..d6c8b72c2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T6.js
- * @description Execute /ab|cd|ef/i.exec("AEKFCD") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /ab|cd|ef/i.exec("AEKFCD") and check results
+---*/
 
 __executed = /ab|cd|ef/i.exec("AEKFCD");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /ab|cd|ef/i.exec("AEKFCD"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T7.js
index e35fe0c43..67fd0eae3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T7.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T7.js
- * @description Execute /ab|cd|ef/.test("AEKFCD") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: Execute /ab|cd|ef/.test("AEKFCD") and check results
+---*/
 
 __executed = /ab|cd|ef/.test("AEKFCD");
 
@@ -16,5 +15,3 @@ __executed = /ab|cd|ef/.test("AEKFCD");
 if (__executed) {
 	$ERROR('#1: /ab|cd|ef/.test("AEKFCD") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T8.js
index 5f6374720..7c317d64c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T8.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T8.js
- * @description Execute /(?:ab|cd)+|ef/i.exec("AEKFCD") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: "Execute /(?:ab|cd)+|ef/i.exec(\"AEKFCD\") and check results"
+---*/
 
 __executed = /(?:ab|cd)+|ef/i.exec("AEKFCD");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?:ab|cd)+|ef/i.exec("AEKFCD"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T9.js
index 4226e80b5..866b490e4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T9.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The | regular expression operator separates two alternatives.
- * The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
- * If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
- *
- * @path ch15/15.10/15.10.2/15.10.2.3/S15.10.2.3_A1_T9.js
- * @description Execute /(?:ab|cd)+|ef/i.exec("AEKFCDab") and check results
- */
+/*---
+info: >
+    The | regular expression operator separates two alternatives.
+    The pattern first tries to match the left Alternative (followed by the sequel of the regular expression).
+    If it fails, it tries to match the right Disjunction (followed by the sequel of the regular expression)
+description: "Execute /(?:ab|cd)+|ef/i.exec(\"AEKFCDab\") and check results"
+---*/
 
 __executed = /(?:ab|cd)+|ef/i.exec("AEKFCDab");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?:ab|cd)+|ef/i.exec("AEKFCDab"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5-3-1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5-3-1.js
index a044aa874..0ba6bb68a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5-3-1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5-3-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.2/15.10.2.5-3-1.js

- * @description Term - SyntaxError was thrown when max is finite and less than min (15.10.2.5 step 3)

- */

-

-

-function testcase() {

-        try {

-            var regExp = new RegExp("0{2,1}");

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Term - SyntaxError was thrown when max is finite and less than min
+    (15.10.2.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExp = new RegExp("0{2,1}");
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T1.js
index d24918c11..100a64646 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Atom followed by a Quantifier is repeated the number of times specified by the Quantifier
- *
- * @path ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T1.js
- * @description Execute /a[a-z]{2,4}/.exec("abcdefghi") and check results
- */
+/*---
+info: >
+    An Atom followed by a Quantifier is repeated the number of times
+    specified by the Quantifier
+description: Execute /a[a-z]{2,4}/.exec("abcdefghi") and check results
+---*/
 
 __executed = /a[a-z]{2,4}/.exec("abcdefghi");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[a-z]{2,4}/.exec("abcdefghi"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T2.js
index dae4cdb50..6430fec7b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Atom followed by a Quantifier is repeated the number of times specified by the Quantifier
- *
- * @path ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T2.js
- * @description Execute /a[a-z]{2,4}?/.exec("abcdefghi") and check results
- */
+/*---
+info: >
+    An Atom followed by a Quantifier is repeated the number of times
+    specified by the Quantifier
+description: Execute /a[a-z]{2,4}?/.exec("abcdefghi") and check results
+---*/
 
 __executed = /a[a-z]{2,4}?/.exec("abcdefghi");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a[a-z]{2,4}?/.exec("abcdefghi"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T3.js
index 8a20e0dc5..137d5351a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Atom followed by a Quantifier is repeated the number of times specified by the Quantifier
- *
- * @path ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T3.js
- * @description Execute /(aa|aabaac|ba|b|c)* /.exec("aabaac") and check results
- */
+/*---
+info: >
+    An Atom followed by a Quantifier is repeated the number of times
+    specified by the Quantifier
+description: Execute /(aa|aabaac|ba|b|c)* /.exec("aabaac") and check results
+---*/
 
 __executed = /(aa|aabaac|ba|b|c)*/.exec("aabaac");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(aa|aabaac|ba|b|c)*/.exec("aabaac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T4.js
index 53587b712..1ab8cbb70 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Atom followed by a Quantifier is repeated the number of times specified by the Quantifier
- *
- * @path ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T4.js
- * @description Execute /(z)((a+)?(b+)?(c))* /.exec("zaacbbbcac") and check results
- */
+/*---
+info: >
+    An Atom followed by a Quantifier is repeated the number of times
+    specified by the Quantifier
+description: Execute /(z)((a+)?(b+)?(c))* /.exec("zaacbbbcac") and check results
+---*/
 
 __executed = /(z)((a+)?(b+)?(c))*/.exec("zaacbbbcac");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(z)((a+)?(b+)?(c))*/.exec("zaacbbbcac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T5.js
index ec2622b75..599dabbac 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An Atom followed by a Quantifier is repeated the number of times specified by the Quantifier
- *
- * @path ch15/15.10/15.10.2/15.10.2.5/S15.10.2.5_A1_T5.js
- * @description Execute /(a*)b\1+/.exec("baaaac") and check results
- */
+/*---
+info: >
+    An Atom followed by a Quantifier is repeated the number of times
+    specified by the Quantifier
+description: Execute /(a*)b\1+/.exec("baaaac") and check results
+---*/
 
 __executed = /(a*)b\1+/.exec("baaaac");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(a*)b\\1+/.exec("baaaac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T1.js
index a08a92547..6bc2cc571 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: $ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T1.js
- * @description Execute /s$/.test("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: $ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /s$/.test("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /s$/.test("pairs\nmakes\tdouble");
 
@@ -14,5 +14,3 @@ __executed = /s$/.test("pairs\nmakes\tdouble");
 if (__executed) {
 	$ERROR('#1: /s$/.test("pairs\\nmakes\\tdouble") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T2.js
index e45809bb7..40eed1188 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: $ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T2.js
- * @description Execute /e$/.exec("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: $ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /e$/.exec("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /e$/.exec("pairs\nmakes\tdouble");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /e$/.exec("pairs\\nmakes\\tdouble"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T3.js
index e5c73e365..f2d110bd4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: $ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T3.js
- * @description Execute /s$/m.exec("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: $ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /s$/m.exec("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /s$/m.exec("pairs\nmakes\tdouble");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /s$/m.exec("pairs\\nmakes\\tdouble"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T4.js
index dedbb27c1..bb8f20113 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: $ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T4.js
- * @description Execute /[^e]$/mg.exec("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: $ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /[^e]$/mg.exec("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /[^e]$/mg.exec("pairs\nmakes\tdouble");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^e]$/mg.exec("pairs\\nmakes\\tdouble"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T5.js
index bf38830cd..5427dffce 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: $ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A1_T5.js
- * @description Execute /es$/mg.exec("pairs\nmakes\tdoubl\u0065s") and check results
- */
+/*---
+info: >
+    The production Assertion :: $ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /es$/mg.exec("pairs\nmakes\tdoubl\u0065s") and check
+    results
+---*/
 
 __executed = /es$/mg.exec("pairs\nmakes\tdoubl\u0065s");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /es$/mg.exec("pairs\\nmakes\\tdoubl\\u0065s"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T1.js
index 918559b1c..9bdab41fb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T1.js
- * @description Execute /^m/.test("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^m/.test("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /^m/.test("pairs\nmakes\tdouble");
 
@@ -14,5 +14,3 @@ __executed = /^m/.test("pairs\nmakes\tdouble");
 if (__executed) {
 	$ERROR('#1: /^m/.test("pairs\\nmakes\\tdouble") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T10.js
index 298258b4a..dd8371995 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T10.js
- * @description Execute /^\d+/m.exec("abc\n123xyz") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^\d+/m.exec("abc\n123xyz") and check results
+---*/
 
 __executed = /^\d+/m.exec("abc\n123xyz");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^\\d+/m.exec("abc\\n123xyz"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T2.js
index 8fb843ec3..810cb74f4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T2.js
- * @description Execute /^m/m.exec("pairs\nmakes\tdouble") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^m/m.exec("pairs\nmakes\tdouble") and check results
+---*/
 
 __executed = /^m/m.exec("pairs\nmakes\tdouble");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^m/m.exec("pairs\\nmakes\\tdouble"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T3.js
index 144dd942a..399a87d2e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T3.js
- * @description Execute /^p[a-z]/.exec("pairs\nmakes\tdouble\npesos") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /^p[a-z]/.exec("pairs\nmakes\tdouble\npesos") and check
+    results
+---*/
 
 __executed = /^p[a-z]/.exec("pairs\nmakes\tdouble\npesos");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^p[a-z]/.exec("pairs\\nmakes\\tdouble\\npesos"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T4.js
index b1fd56e2a..968b481b4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T4.js
- * @description Execute /^p[a-z]/m.exec("pairs\nmakes\tdouble\npesos") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /^p[a-z]/m.exec("pairs\nmakes\tdouble\npesos") and check
+    results
+---*/
 
 __executed = /^p[b-z]/m.exec("pairs\nmakes\tdouble\npesos");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^p[b-z]/m.exec("pairs\\nmakes\\tdouble\\npesos"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T5.js
index 322a2dd54..1c6109c37 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T5.js
- * @description Execute /^[^p]/m.exec("pairs\nmakes\tdouble\npesos") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /^[^p]/m.exec("pairs\nmakes\tdouble\npesos") and check
+    results
+---*/
 
 __executed = /^[^p]/m.exec("pairs\nmakes\tdouble\npesos");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^[^p]/m.exec("pairs\\nmakes\\tdouble\\npesos"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T6.js
index 4c702c9f2..63a1ce467 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T6.js
- * @description Execute /^ab/.exec("abcde") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^ab/.exec("abcde") and check results
+---*/
 
 __executed = /^ab/.exec("abcde");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^ab/.exec("abcde"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T7.js
index aa76aaa6e..cc73a5c39 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T7.js
- * @description Execute /^..^e/.test("ab\ncde") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^..^e/.test("ab\ncde") and check results
+---*/
 
 __executed = /^..^e/.test("ab\ncde");
 
@@ -14,5 +14,3 @@ __executed = /^..^e/.test("ab\ncde");
 if (__executed) {
 	$ERROR('#1: /^..^e/.test("ab\\ncde") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T8.js
index 9017acdf6..7627becec 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T8.js
- * @description Execute /^xxx/.test("yyyyy") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^xxx/.test("yyyyy") and check results
+---*/
 
 __executed = /^xxx/.test("yyyyy");
 
@@ -14,5 +14,3 @@ __executed = /^xxx/.test("yyyyy");
 if (__executed) {
 	$ERROR('#1: /^xxx/.test("yyyyy") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T9.js
index f6d678ab9..bb889d710 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: ^ evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A2_T9.js
- * @description Execute /^\^+/.exec("^^^x") and check results
- */
+/*---
+info: >
+    The production Assertion :: ^ evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /^\^+/.exec("^^^x") and check results
+---*/
 
 __executed = /^\^+/.exec("^^^x");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^\\^+/.exec("^^^x"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T1.js
index 919287943..72511a0d5 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T1.js
- * @description Execute /\bp/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\bp/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /\bp/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\bp/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T10.js
index 9fd41c9cd..f9a3c7745 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T10.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T10.js
- * @description Execute /\brobot\b/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\brobot\b/.exec("pilot\nsoviet robot\topenoffice") and
+    check results
+---*/
 
 __executed = /\brobot\b/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\brobot\\b/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T11.js
index dac31e088..ad499ae74 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T11.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T11.js
- * @description Execute /\b\w{5}\b/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\b\w{5}\b/.exec("pilot\nsoviet robot\topenoffice") and
+    check results
+---*/
 
 __executed = /\b\w{5}\b/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\b\\w{5}\\b/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T12.js
index 5d37ef949..2fa5918d7 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T12.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T12.js
- * @description Execute /\bop/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\bop/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /\bop/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\bop/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T13.js
index 9efc67dbc..859301b73 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T13.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T13.js
- * @description Execute /op\b/.test("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /op\b/.test("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /op\b/.test("pilot\nsoviet robot\topenoffice");
 
@@ -14,5 +16,3 @@ __executed = /op\b/.test("pilot\nsoviet robot\topenoffice");
 if (__executed) {
 	$ERROR('#1: /op\\b/.test("pilot\\nsoviet robot\\topenoffice") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T14.js
index 78d5b00fd..34780421b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T14.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T14.js
- * @description Execute /e\b/.exec("pilot\nsoviet robot\topenoffic\u0065") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /e\b/.exec("pilot\nsoviet robot\topenoffic\u0065") and
+    check results
+---*/
 
 __executed = /e\b/.exec("pilot\nsoviet robot\topenoffic\u0065");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /e\\b/.exec("pilot\\nsoviet robot\\topenoffic\\u0065"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T15.js
index ffdbd71bc..d3f2cf115 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T15.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T15.js
- * @description Execute /\be/.test("pilot\nsoviet robot\topenoffic\u0065") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\be/.test("pilot\nsoviet robot\topenoffic\u0065") and
+    check results
+---*/
 
 __executed = /\be/.test("pilot\nsoviet robot\topenoffic\u0065");
 
@@ -14,5 +16,3 @@ __executed = /\be/.test("pilot\nsoviet robot\topenoffic\u0065");
 if (__executed) {
 	$ERROR('#1: /\\be/.test("pilot\\nsoviet robot\\topenoffic\\u0065") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T2.js
index 9e823cf24..954b5fa20 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T2.js
- * @description Execute /ot\b/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /ot\b/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /ot\b/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /ot\\b/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T3.js
index 97a2ba9d1..00199c4b8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T3.js
- * @description Execute /\bot/.test("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\bot/.test("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /\bot/.test("pilot\nsoviet robot\topenoffice");
 
@@ -14,5 +16,3 @@ __executed = /\bot/.test("pilot\nsoviet robot\topenoffice");
 if (__executed) {
 	$ERROR('#1: /\\bot/.test("pilot\\nsoviet robot\\topenoffice") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T4.js
index 7e45b6c68..194236a1d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T4.js
- * @description Execute /\bso/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\bso/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /\bso/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\bso/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T5.js
index 3ec5ab4e0..09587c6f4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T5.js
- * @description Execute /so\b/.test("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /so\b/.test("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /so\b/.test("pilot\nsoviet robot\topenoffice");
 
@@ -14,5 +16,3 @@ __executed = /so\b/.test("pilot\nsoviet robot\topenoffice");
 if (__executed) {
 	$ERROR('#1: /so\\b/.test("pilot\\nsoviet robot\\topenoffice") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T6.js
index e1e7ba3ab..ffc2c35bd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T6.js
- * @description Execute /[^o]t\b/.exec("pilOt\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /[^o]t\b/.exec("pilOt\nsoviet robot\topenoffice") and
+    check results
+---*/
 
 __executed = /[^o]t\b/.exec("pilOt\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^o]t\\b/.exec("pilOt\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T7.js
index 4c6970b3f..5dd338391 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T7.js
- * @description Execute /[^o]t\b/i.exec("pilOt\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /[^o]t\b/i.exec("pilOt\nsoviet robot\topenoffice") and
+    check results
+---*/
 
 __executed = /[^o]t\b/i.exec("pilOt\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^o]t\\b/i.exec("pilOt\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T8.js
index 679157757..5cb018184 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T8.js
- * @description Execute /\bro/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\bro/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /\bro/.exec("pilot\nsoviet robot\topenoffice");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\bro/.exec("pilot\\nsoviet robot\\topenoffice"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T9.js
index 191a42487..27165c968 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \b evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A3_T9.js
- * @description Execute /r\b/.exec("pilot\nsoviet robot\topenoffice") and check results
- */
+/*---
+info: >
+    The production Assertion :: \b evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /r\b/.exec("pilot\nsoviet robot\topenoffice") and check
+    results
+---*/
 
 __executed = /r\b/.test("pilot\nsoviet robot\topenoffice");
 
@@ -14,5 +16,3 @@ __executed = /r\b/.test("pilot\nsoviet robot\topenoffice");
 if (__executed) {
 	$ERROR('#1: /r\\b/.test("pilot\\nsoviet robot\\topenoffice") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T1.js
index b1d4a2325..8ec3c366c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T1.js
- * @description Execute /\Bevil\B/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\Bevil\B/.exec("devils arise\tfor\nevil") and check
+    results
+---*/
 
 __executed = /\Bevil\B/.exec("devils arise\tfor\nevil");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\Bevil\\B/.exec("devils arise\\tfor\\nevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T2.js
index d28b7cac4..472976dd6 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T2.js
- * @description Execute /[f-z]e\B/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /[f-z]e\B/.exec("devils arise\tfor\nevil") and check
+    results
+---*/
 
 __executed = /[f-z]e\B/.exec("devils arise\tfor\nrevil");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[f-z]e\\B/.exec("devils arise\\tfor\\nrevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T3.js
index 3bb63efe4..24e7bda7c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T3.js
- * @description Execute /\Bo\B/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /\Bo\B/.exec("devils arise\tfor\nevil") and check results
+---*/
 
 __executed = /\Bo\B/i.exec("devils arise\tfOr\nrevil");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\Bo\\B/i.exec("devils arise\\tfOr\\nrevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T4.js
index 60965fe6c..6dd4995a2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T4.js
- * @description Execute /\B\w\B/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /\B\w\B/.exec("devils arise\tfor\nevil") and check results
+---*/
 
 __executed = /\B\w\B/.exec("devils arise\tfor\nrevil");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\B\\w\\B/.exec("devils arise\\tfor\\nrevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T5.js
index 1e0863c4c..00d8ae25c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T5.js
- * @description Execute /\w\B/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /\w\B/.exec("devils arise\tfor\nevil") and check results
+---*/
 
 __executed = /\w\B/.exec("devils arise\tfor\nrevil");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\w\\B/.exec("devils arise\\tfor\\nrevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T6.js
index c6a63358a..5645d8033 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T6.js
- * @description Execute /\B\w/.exec("devils arise\tfor\nevil") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: Execute /\B\w/.exec("devils arise\tfor\nevil") and check results
+---*/
 
 __executed = /\B\w/.exec("devils arise\tfor\nrevil");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\B\\w/.exec("devils arise\\tfor\\nrevil"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T7.js
index b60057fbe..3e5d36761 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T7.js
- * @description Execute /\B\[^z]{4}\B/.test("devil arise\tforzzx\nevils") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\B\[^z]{4}\B/.test("devil arise\tforzzx\nevils") and
+    check results
+---*/
 
 __executed = /\B\[^z]{4}\B/.test("devil arise\tforzzx\nevils");
 
@@ -14,5 +16,3 @@ __executed = /\B\[^z]{4}\B/.test("devil arise\tforzzx\nevils");
 if (__executed) {
 	$ERROR('#1: /\\B\\[^z]{4}\\B/.test("devil arise\\tforzzx\\nevils") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T8.js
index c19aad65b..a3e4d9741 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Assertion :: \B evaluates by returning an internal AssertionTester closure that takes a State argument x and performs the ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A4_T8.js
- * @description Execute /\B\w{4}\B/.exec("devil arise\tforzzx\nevils") and check results
- */
+/*---
+info: >
+    The production Assertion :: \B evaluates by returning an internal
+    AssertionTester closure that takes a State argument x and performs the ...
+description: >
+    Execute /\B\w{4}\B/.exec("devil arise\tforzzx\nevils") and check
+    results
+---*/
 
 __executed = /\B\w{4}\B/.exec("devil arise\tforzzx\nevils");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\B\\w{4}\\B/.exec("devil arise\\tforzzx\\nevils"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T1.js
index f8fb83ed3..5090e8290 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since assertion evaluating do not change endIndex repetition of assertion does the same result
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T1.js
- * @description Execute /^^^^^^^robot$$$$/.exec("robot") and check results
- */
+/*---
+info: >
+    Since assertion evaluating do not change endIndex repetition of assertion
+    does the same result
+description: Execute /^^^^^^^robot$$$$/.exec("robot") and check results
+---*/
 
 __executed = /^^^^^^^robot$$$$/.exec("robot");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^^^^^^^robot$$$$/.exec("robot"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T2.js
index e63b1666f..adf34643b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since assertion evaluating do not change endIndex repetition of assertion does the same result
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A5_T2.js
- * @description Execute /\B\B\B\B\B\Bbot\b\b\b\b\b\b\b/.exec("robot wall-e") and check results
- */
+/*---
+info: >
+    Since assertion evaluating do not change endIndex repetition of assertion
+    does the same result
+description: >
+    Execute /\B\B\B\B\B\Bbot\b\b\b\b\b\b\b/.exec("robot wall-e") and
+    check results
+---*/
 
 __executed = /\B\B\B\B\B\Bbot\b\b\b\b\b\b\b/.exec("robot wall-e");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\B\\B\\B\\B\\B\\Bbot\\b\\b\\b\\b\\b\\b\\b/.exec("robot wall-e"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T1.js
index 688884379..0ac0db86b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assertions in combination
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T1.js
- * @description while asterix is non greedy it is run till the end because of dollar assertion
- */
+/*---
+info: Assertions in combination
+description: >
+    while asterix is non greedy it is run till the end because of
+    dollar assertion
+---*/
 
 __executed = /^.*?$/.exec("Hello World");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^.*?$/.exec("Hello World"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T2.js
index a1e4818c9..80836b6bf 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assertions in combination
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T2.js
- * @description Execute /^.*?/.exec("Hello World") and check results
- */
+/*---
+info: Assertions in combination
+description: Execute /^.*?/.exec("Hello World") and check results
+---*/
 
 __executed = /^.*?/.exec("Hello World");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^.*?/.exec("Hello World"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T3.js
index 8a1f3ad38..7aadca89c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assertions in combination
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T3.js
- * @description while asterix is non greedy it is run till matches end or colon
- */
+/*---
+info: Assertions in combination
+description: while asterix is non greedy it is run till matches end or colon
+---*/
 
 __executed = /^.*?(:|$)/.exec("Hello: World");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^.*?(:|$)/.exec("Hello: World"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T4.js
index 08cd42f78..73c0fcdb6 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assertions in combination
- *
- * @path ch15/15.10/15.10.2/15.10.2.6/S15.10.2.6_A6_T4.js
- * @description Execute /^.*(:|$)/.exec("Hello: World") and check results
- */
+/*---
+info: Assertions in combination
+description: "Execute /^.*(:|$)/.exec(\"Hello: World\") and check results"
+---*/
 
 __executed = /^.*(:|$)/.exec("Hello: World");
 
@@ -35,5 +33,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^.*(:|$)/.exec("Hello: World"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T1.js
index 2fefde618..cbc36eca3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T1.js
- * @description Execute /\d{2,4}/.exec("the answer is 42") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.exec("the answer is 42") and check results
+---*/
 
 __executed = /\d{2,4}/.exec("the answer is 42");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("the answer is 42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T10.js
index d141f3d65..d91669077 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T10.js
- * @description Execute /b{0,93}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /b{0,93}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{0,93}c/.exec("aaabbbbcccddeeeefffff");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b{0,93}c/.exec("aaabbbbcccddeeeefffff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T11.js
index 2470bcfc7..8d5f48972 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T11.js
- * @description Execute /bx{0,93}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /bx{0,93}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /bx{0,93}c/.exec("aaabbbbcccddeeeefffff");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /bx{0,93}c/.exec("aaabbbbcccddeeeefffff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T12.js
index c61c55d35..973154441 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T12.js
- * @description Execute /.{0,93}/.exec("weirwerdf") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /.{0,93}/.exec("weirwerdf") and check results
+---*/
 
 __executed = /.{0,93}/.exec("weirwerdf");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /.{0,93}/.exec("weirwerdf"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T2.js
index b61f802eb..b1afe736a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T2.js
- * @description Execute /\d{2,4}/.test("the 7 movie") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.test("the 7 movie") and check results
+---*/
 
 __executed = /\d{2,4}/.test("the 7 movie");
 
@@ -14,5 +14,3 @@ __executed = /\d{2,4}/.test("the 7 movie");
 if (__executed) {
 	$ERROR('#1: /\\d{2,4}/.test("the 7 movie") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T3.js
index 83ffab217..22f1543d7 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T3.js
- * @description Execute /\d{2,4}/.exec("the 20000 Leagues Under the Sea book") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: >
+    Execute /\d{2,4}/.exec("the 20000 Leagues Under the Sea book") and
+    check results
+---*/
 
 __executed = /\d{2,4}/.exec("the 20000 Leagues Under the Sea book");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("the 20000 Leagues Under the Sea book"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T4.js
index 8ae84c992..b1f703a1e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T4.js
- * @description Execute /\d{2,4}/.exec("the Fahrenheit 451 book") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.exec("the Fahrenheit 451 book") and check results
+---*/
 
 __executed = /\d{2,4}/.exec("the Fahrenheit 451 book");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("the Fahrenheit 451 book"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T5.js
index 25d5d368b..8976f65c4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T5.js
- * @description Execute /\d{2,4}/.exec("the 1984 novel") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.exec("the 1984 novel") and check results
+---*/
 
 __executed = /\d{2,4}/.exec("the 1984 novel");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("the 1984 novel"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T6.js
index bacc09142..ae3160895 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T6.js
- * @description Execute /\d{2,4}/.exec("0a0\u0031\u0031b") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.exec("0a0\u0031\u0031b") and check results
+---*/
 
 __executed = /\d{2,4}/.exec("0a0\u0031\u0031b");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("0a0\\u0031\\u0031b"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T7.js
index 239d624fa..3b927b5b0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T7.js
- * @description Execute /\d{2,4}/.exec("0a0\u0031\u003122b") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /\d{2,4}/.exec("0a0\u0031\u003122b") and check results
+---*/
 
 __executed = /\d{2,4}/.exec("0a0\u0031\u003122b");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{2,4}/.exec("0a0\\u0031\\u003122b"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T8.js
index 5b9d406e7..d7383b3ac 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T8.js
- * @description Execute /b{2,3}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /b{2,3}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{2,3}c/.exec("aaabbbbcccddeeeefffff");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b{2,3}c/.exec("aaabbbbcccddeeeefffff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T9.js
index 14a6bba24..cdd24bfe4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , DecimalDigits } evaluates as ...
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A1_T9.js
- * @description Execute /b{42,93}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , DecimalDigits }
+    evaluates as ...
+description: Execute /b{42,93}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{42,93}c/.test("aaabbbbcccddeeeefffff");
 
@@ -14,5 +14,3 @@ __executed = /b{42,93}c/.test("aaabbbbcccddeeeefffff");
 if (__executed) {
 	$ERROR('#1: /b{42,93}c/.test("aaabbbbcccddeeeefffff") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T1.js
index 0758297ca..236f08c92 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
- * ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T1.js
- * @description Execute /\w{3}\d?/.exec("CE\uFFFFL\uFFDDbox127") and check results
- */
+/*---
+info: >
+    i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
+    ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
+description: Execute /\w{3}\d?/.exec("CE\uFFFFL\uFFDDbox127") and check results
+---*/
 
 __executed = /\w{3}\d?/.exec("CE\uFFFFL\uFFDDbox127");
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\w{3}\\d?/.exec("CE\\uFFFFL\\uFFDDbox127"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T2.js
index 0bd93de40..ca34afd47 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
- * ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T2.js
- * @description Execute /\w{3}\d?/.exec("CELL\uFFDDbox127") and check results
- */
+/*---
+info: >
+    i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
+    ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
+description: Execute /\w{3}\d?/.exec("CELL\uFFDDbox127") and check results
+---*/
 
 __executed = /\w{3}\d?/.exec("CELL\uFFDDbox127");
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\w{3}\\d?/.exec("CELL\\uFFDDbox127"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T3.js
index ea5542af2..2e7d4a276 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
- * ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T3.js
- * @description Execute /b{2}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
+    ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
+description: Execute /b{2}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{2}c/.exec("aaabbbbcccddeeeefffff");
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b{2}c/.exec("aaabbbbcccddeeeefffff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T4.js
index 9f70d3573..75c4e2e25 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
- * ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A2_T4.js
- * @description Execute /b{8}c/.test("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    i) The production QuantifierPrefix :: { DecimalDigits } evaluates...
+    ii) The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
+description: Execute /b{8}c/.test("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{8}/.test("aaabbbbcccddeeeefffff");
 
@@ -15,5 +14,3 @@ __executed = /b{8}/.test("aaabbbbcccddeeeefffff");
 if (__executed) {
 	$ERROR('#1: /b{8}/.test("aaabbbbcccddeeeefffff") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T1.js
index 2b252a2c4..1fe7efa5b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T1.js
- * @description Execute /\s+java\s+/.exec("language  java\n") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /\s+java\s+/.exec("language  java\n") and check results
+---*/
 
 __executed = /\s+java\s+/.exec("language  java\n");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\s+java\\s+/.exec("language  java\\n"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T10.js
index 94d161b67..f7104a4a3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T10.js
- * @description Execute /o+/.test("abcdefg") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /o+/.test("abcdefg") and check results
+---*/
 
 __executed = /o+/.test("abcdefg");
 
@@ -14,5 +14,3 @@ __executed = /o+/.test("abcdefg");
 if (__executed) {
 	$ERROR('#1: /o+/.test("abcdefg") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T11.js
index 24eeaf962..43af933a1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T11.js
- * @description Execute /d+/.exec("abcdefg") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /d+/.exec("abcdefg") and check results
+---*/
 
 __executed = /d+/.exec("abcdefg");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /d+/.exec("abcdefg"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T12.js
index 761c49913..fda325b44 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T12.js
- * @description Execute /(b+)(b+)(b+)/.exec("abbbbbbbc") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /(b+)(b+)(b+)/.exec("abbbbbbbc") and check results
+---*/
 
 __executed = /(b+)(b+)(b+)/.exec("abbbbbbbc");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(b+)(b+)(b+)/.exec("abbbbbbbc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T13.js
index 70f8e1afa..72a1c59be 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T13.js
- * @description Execute /(b+)(b*)/.exec("abbbbbbbc") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /(b+)(b*)/.exec("abbbbbbbc") and check results
+---*/
 
 __executed = /(b+)(b*)/.exec("abbbbbbbc");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(b+)(b*)/.exec("abbbbbbbc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T14.js
index d1e713f9a..b291873ac 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T14.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T14.js
- * @description Execute /b*b+/.exec("abbbbbbbc") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /b*b+/.exec("abbbbbbbc") and check results
+---*/
 
 __executed = /b*b+/.exec("abbbbbbbc");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b*b+/.exec("abbbbbbbc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T2.js
index 648531c41..4cec3db5b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T2.js
- * @description Execute /\s+java\s+/.exec("\t java object") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /\s+java\s+/.exec("\t java object") and check results
+---*/
 
 __executed = /\s+java\s+/.exec("\t java object");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\s+java\\s+/.exec("\\t java object"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T3.js
index 149f3c98e..4ce40d5d2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T3.js
- * @description Execute /\s+java\s+/.test("\t javax package") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /\s+java\s+/.test("\t javax package") and check results
+---*/
 
 __executed = /\s+java\s+/.test("\t javax package");
 
@@ -14,5 +14,3 @@ __executed = /\s+java\s+/.test("\t javax package");
 if (__executed) {
 	$ERROR('#1: /\\s+java\\s+/.test("\\t javax package") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T4.js
index 1d566b277..40078e9fd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T4.js
- * @description Execute /\s+java\s+/.test("java\n\nobject") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /\s+java\s+/.test("java\n\nobject") and check results
+---*/
 
 __executed = /\s+java\s+/.test("java\n\nobject");
 
@@ -14,5 +14,3 @@ __executed = /\s+java\s+/.test("java\n\nobject");
 if (__executed) {
 	$ERROR('#1: /\\s+java\\s+/.test("java\\n\\nobject") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T5.js
index 0fb67ae6a..340fd3e54 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T5.js
- * @description Execute /[a-z]+\d+/.exec("x 2 ff 55 x2 as1 z12 abc12.0") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: >
+    Execute /[a-z]+\d+/.exec("x 2 ff 55 x2 as1 z12 abc12.0") and check
+    results
+---*/
 
 __executed = /[a-z]+\d+/.exec("x 2 ff 55 x2 as1 z12 abc12.0");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-z]+\\d+/.exec("x 2 ff 55 x2 as1 z12 abc12.0"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T6.js
index f7811bf4a..640517f18 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T6.js
- * @description Execute /[a-z]+\d+/.exec("__abc123.0") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /[a-z]+\d+/.exec("__abc123.0") and check results
+---*/
 
 __executed = /[a-z]+\d+/.exec("__abc123.0");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-z]+\\d+/.exec("__abc123.0"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T7.js
index 50df9d4c8..0e6d97f6b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T7.js
- * @description Execute /[a-z]+(\d+)/.exec("x 2 ff 55 x2 as1 z12 abc12.0") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: >
+    Execute /[a-z]+(\d+)/.exec("x 2 ff 55 x2 as1 z12 abc12.0") and
+    check results
+---*/
 
 __executed = /[a-z]+(\d+)/.exec("x 2 ff 55 x2 as1 z12 abc12.0");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-z]+(\\d+)/.exec("x 2 ff 55 x2 as1 z12 abc12.0"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T8.js
index f95837858..6dffb79a8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T8.js
- * @description Execute /[a-z]+(\d+)/.exec("__abc123.0") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /[a-z]+(\d+)/.exec("__abc123.0") and check results
+---*/
 
 __executed = /[a-z]+(\d+)/.exec("__abc123.0");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[a-z]+(\\d+)/.exec("__abc123.0"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T9.js
index 2c8311931..d90ab4840 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: + evaluates by returning the two results 1 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A3_T9.js
- * @description Execute /d+/.exec("abcdddddefg") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: + evaluates by returning the two
+    results 1 and \infty
+description: Execute /d+/.exec("abcdddddefg") and check results
+---*/
 
 __executed = /d+/.exec("abcdddddefg");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /d+/.exec("abcdddddefg"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T1.js
index a0d48de9a..bc4b81aff 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T1.js
- * @description Execute /[^"]* /.exec('"beast"-nickname') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /[^"]* /.exec('"beast"-nickname') and check results
+---*/
 
 __executed = /[^"]*/.exec('"beast"-nickname');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^"]*/.exec(\'"beast"-nickname\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T10.js
index c39a92513..66a741fc6 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T10.js
- * @description Execute /d* /.exec('abcddddefg') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /d* /.exec('abcddddefg') and check results
+---*/
 
 __executed = /d*/.exec('abcddddefg');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /d*/.exec(\'abcddddefg\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T11.js
index 3c17990db..3a671083b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T11.js
- * @description Execute /cd* /.exec('abcddddefg') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /cd* /.exec('abcddddefg') and check results
+---*/
 
 __executed = /cd*/.exec('abcddddefg');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /cd*/.exec(\'abcddddefg\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T12.js
index a8401083e..966e45908 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T12.js
- * @description Execute /cx*d/.exec('abcdefg') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /cx*d/.exec('abcdefg') and check results
+---*/
 
 __executed = /cx*d/.exec('abcdefg');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /cx*d/.exec(\'abcdefg\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T13.js
index b0d1f28e0..5aef77d74 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T13.js
- * @description Execute /(x*)(x+)/.exec('xxxxxxx') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /(x*)(x+)/.exec('xxxxxxx') and check results
+---*/
 
 __executed = /(x*)(x+)/.exec('xxxxxxx');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(x*)(x+)/.exec(\'xxxxxxx\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T14.js
index ad6b7d77e..473d00151 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T14.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T14.js
- * @description Execute /(\d*)(\d+)/.exec('1234567890') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /(\d*)(\d+)/.exec('1234567890') and check results
+---*/
 
 __executed = /(\d*)(\d+)/.exec('1234567890');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(\\d*)(\\d+)/.exec(\'1234567890\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T15.js
index 362003a82..34a7cce2f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T15.js
- * @description Execute /(\d*)\d(\d+)/.exec('1234567890') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /(\d*)\d(\d+)/.exec('1234567890') and check results
+---*/
 
 __executed = /(\d*)\d(\d+)/.exec('1234567890');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(\\d*)\\d(\\d+)/.exec(\'1234567890\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T16.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T16.js
index a2e4c965b..c0b07faaa 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T16.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T16.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T16.js
- * @description Execute /(x+)(x*)/.exec('xxxxxxx') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /(x+)(x*)/.exec('xxxxxxx') and check results
+---*/
 
 __executed = /(x+)(x*)/.exec('xxxxxxx');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(x+)(x*)/.exec(\'xxxxxxx\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T17.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T17.js
index 5e8861610..b645b2c92 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T17.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T17.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T17.js
- * @description Execute /x*y+$/.exec('xxxxxxyyyyyy') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /x*y+$/.exec('xxxxxxyyyyyy') and check results
+---*/
 
 __executed = /x*y+$/.exec('xxxxxxyyyyyy');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /x*y+$/.exec(\'xxxxxxyyyyyy\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T18.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T18.js
index 330315ad3..e155d7c81 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T18.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T18.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T18.js
- * @description Execute /[\d]*[\s]*bc./.exec('abcdef') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /[\d]*[\s]*bc./.exec('abcdef') and check results
+---*/
 
 __executed = /[\d]*[\s]*bc./.exec('abcdef');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[\\d]*[\\s]*bc./.exec(\'abcdef\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T19.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T19.js
index 0818eca6b..1c8d828a8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T19.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T19.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T19.js
- * @description Execute /bc..[\d]*[\s]* /.exec('abcdef') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /bc..[\d]*[\s]* /.exec('abcdef') and check results
+---*/
 
 __executed = /bc..[\d]*[\s]*/.exec('abcdef');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /bc..[\\d]*[\\s]*/.exec(\'abcdef\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T2.js
index 146fc23f9..44c854a3b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T2.js
- * @description Execute /[^"]* /.exec('alice said: "don\'t"') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: "Execute /[^\"]* /.exec('alice said: \"don\\'t\"') and check results"
+---*/
 
 __executed = /[^"]*/.exec('alice said: "don\'t"');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^"]*/.exec(\'alice said: "don\'t"\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T20.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T20.js
index 11b5462c7..0bb3cc26f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T20.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T20.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T20.js
- * @description Execute /.* /.exec('a1b2c3') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /.* /.exec('a1b2c3') and check results
+---*/
 
 __executed = /.*/.exec('a1b2c3');
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /.*/.exec(\'a1b2c3\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T21.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T21.js
index 84bf97034..8c33273a3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T21.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T21.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T21.js
- * @description Execute /[xyz]*1/.test('a0.b2.c3') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /[xyz]*1/.test('a0.b2.c3') and check results
+---*/
 
 __executed = /[xyz]*1/.test('a0.b2.c3');
 
@@ -14,5 +14,3 @@ __executed = /[xyz]*1/.test('a0.b2.c3');
 if (__executed) {
 	$ERROR('#1: /[xyz]*1/.test(\'a0.b2.c3\') === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T3.js
index 6d7ffaf71..f05de24ea 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T3.js
- * @description Execute /[^"]* /.exec("before\'i\'start") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: Execute /[^"]* /.exec("before\'i\'start") and check results
+---*/
 
 __executed = /[^"]*/.exec("before\'i\'start");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^"]*/.exec("before\'i\'start"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T4.js
index 4f4ca9ef5..b5d7ce23d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T4.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T4.js
- * @description Execute /[^"]* /.exec('alice \"sweep\": "don\'t"') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /[^"]* /.exec('alice \"sweep\": "don\'t"') and check
+    results
+---*/
 
 __executed = /[^"]*/.exec('alice \"sweep\": "don\'t"');
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^"]*/.exec(\'alice \\"sweep\\": "don\'t"\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T5.js
index 61420275b..b94b7e0ed 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T5.js
- * @description Execute /[^"]* /.exec('alice \u0022sweep\u0022: "don\'t"') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /[^"]* /.exec('alice \u0022sweep\u0022: "don\'t"') and
+    check results
+---*/
 
 __executed = /[^"]*/.exec('alice \u0022sweep\u0022: "don\'t"');
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[^"]*/.exec(\'alice \\u0022sweep\\u0022: "don\'t"\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T6.js
index 362dbdd62..81c60ecfa 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T6.js
- * @description Execute /["'][^"']*["']/.exec('alice \u0022sweep\u0022: "don\'t"') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /["'][^"']*["']/.exec('alice \u0022sweep\u0022: "don\'t"')
+    and check results
+---*/
 
 __executed = /["'][^"']*["']/.exec('alice \u0022sweep\u0022: "don\'t"');
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /["\'][^"\']*["\']/.exec(\'alice \\u0022sweep\\u0022: "don\'t"\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T7.js
index 8fc87a83f..73fd475ec 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T7.js
- * @description Execute /["'][^"']*["']/.exec('alice cries out: \'don\'t\'') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /["'][^"']*["']/.exec('alice cries out: \'don\'t\'') and
+    check results
+---*/
 
 __executed = /["'][^"']*["']/.exec('alice cries out: \'don\'t\'');
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /["\'][^"\']*["\']/.exec(\'alice cries out: \'don\'t\'\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T8.js
index 840c044e0..96ddb099c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T8.js
- * @description Execute /["'][^"']*["']/.test('alice cries out: don\'t') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /["'][^"']*["']/.test('alice cries out: don\'t') and check
+    results
+---*/
 
 __executed = /["'][^"']*["']/.test('alice cries out: don\'t');
 
@@ -14,5 +16,3 @@ __executed = /["'][^"']*["']/.test('alice cries out: don\'t');
 if (__executed) {
 	$ERROR('#1: /["\'][^"\']*["\']/.test(\'alice cries out: don\'t\') === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T9.js
index 836f76f8b..d433a485f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: * evaluates by returning the two results 0 and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A4_T9.js
- * @description Execute /["'][^"']*["']/.exec('alice cries out:\"\"') and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: * evaluates by returning the two
+    results 0 and \infty
+description: >
+    Execute /["'][^"']*["']/.exec('alice cries out:\"\"') and check
+    results
+---*/
 
 __executed = /["'][^"']*["']/.exec('alice cries out:\"\"');
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /["\'][^"\']*["\']/.exec(\'alice cries out:\\"\\"\'); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T1.js
index 035a62b27..8faf3df2d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T1.js
- * @description Execute /java(script)?/.exec("state: javascript is extension of ecma script") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: >
+    Execute /java(script)?/.exec("state: javascript is extension of
+    ecma script") and check results
+---*/
 
 __executed = /java(script)?/.exec("state: javascript is extension of ecma script");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /java(script)?/.exec("state: javascript is extension of ecma script"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T10.js
index 23224d09c..4f6254268 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T10.js
- * @description Execute /ab?c?d?x?y?z/.exec("123az789") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /ab?c?d?x?y?z/.exec("123az789") and check results
+---*/
 
 __executed = /ab?c?d?x?y?z/.exec("123az789");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /ab?c?d?x?y?z/.exec("123az789"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T11.js
index f9396a6a3..150cbb4d2 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T11.js
- * @description Execute /\??\??\??\??\??/.exec("?????") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /\??\??\??\??\??/.exec("?????") and check results
+---*/
 
 __executed = /\??\??\??\??\??/.exec("?????");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\??\\??\\??\\??\\??/.exec("?????"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T12.js
index db97a462f..19ba0b75e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T12.js
- * @description Execute /.?.?.?.?.?.?.?/.exec("test") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /.?.?.?.?.?.?.?/.exec("test") and check results
+---*/
 
 __executed = /.?.?.?.?.?.?.?/.exec("test");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /.?.?.?.?.?.?.?/.exec("test"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T2.js
index c30a69199..8068fb473 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T2.js
- * @description Execute /java(script)?/.exec("state: java and javascript are vastly different") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: >
+    Execute /java(script)?/.exec("state: java and javascript are
+    vastly different") and check results
+---*/
 
 __executed = /java(script)?/.exec("state: java and javascript are vastly different");
 
@@ -35,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /java(script)?/.exec("state: java and javascript are vastly different"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T3.js
index 3e84feb22..9f1fab046 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T3.js
- * @description Execute /java(script)?/.test("state: both Java and JavaScript used in web development") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: >
+    Execute /java(script)?/.test("state: both Java and JavaScript used
+    in web development") and check results
+---*/
 
 __executed = /java(script)?/.test("state: both Java and JavaScript used in web development");
 
@@ -14,5 +16,3 @@ __executed = /java(script)?/.test("state: both Java and JavaScript used in web d
 if (__executed) {
 	$ERROR('#1: /java(script)?/.test("state: both Java and JavaScript used in web development") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T4.js
index 0f418f37c..40dc6c2b9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T4.js
- * @description Execute /cd?e/.exec("abcdef") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /cd?e/.exec("abcdef") and check results
+---*/
 
 __executed = /cd?e/.exec("abcdef");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /cd?e/.exec("abcdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T5.js
index 78736fba7..0bde30d31 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T5.js
- * @description Execute /cdx?e/.exec("abcdef") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /cdx?e/.exec("abcdef") and check results
+---*/
 
 __executed = /cdx?e/.exec("abcdef");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /cdx?e/.exec("abcdef"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T6.js
index 5d50c362f..e6c8adbc9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T6.js
- * @description Execute /o?pqrst/.exec("pqrstuvw") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /o?pqrst/.exec("pqrstuvw") and check results
+---*/
 
 __executed = /o?pqrst/.exec("pqrstuvw");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /o?pqrst/.exec("pqrstuvw"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T7.js
index 5714b2e76..eb135023e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T7.js
- * @description Execute /x?y?z?/.exec("abcd") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /x?y?z?/.exec("abcd") and check results
+---*/
 
 __executed = /x?y?z?/.exec("abcd");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /x?y?z?/.exec("abcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T8.js
index e50dc6179..7cd33de67 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T8.js
- * @description Execute /x?ay?bz?c/.exec("abcd") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /x?ay?bz?c/.exec("abcd") and check results
+---*/
 
 __executed = /x?ay?bz?c/.exec("abcd");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /x?ay?bz?c/.exec("abcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T9.js
index 2f6b84ea8..15de307b0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: ? evaluates by returning the two results 0 and 1
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A5_T9.js
- * @description Execute /b?b?b?b/.exec("abbbbc") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: ? evaluates by returning the two
+    results 0 and 1
+description: Execute /b?b?b?b/.exec("abbbbc") and check results
+---*/
 
 __executed = /b?b?b?b/.exec("abbbbc");
 
@@ -35,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b?b?b?b/.exec("abbbbc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T1.js
index 02646ecaf..b277ea804 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T1.js
- * @description Execute /b{2,}c/.exec("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /b{2,}c/.exec("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{2,}c/.exec("aaabbbbcccddeeeefffff");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /b{2,}c/.exec("aaabbbbcccddeeeefffff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T2.js
index bf2d2e8de..7aecbd6cb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T2.js
- * @description Execute /b{8,}c/.test("aaabbbbcccddeeeefffff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /b{8,}c/.test("aaabbbbcccddeeeefffff") and check results
+---*/
 
 __executed = /b{8,}c/.test("aaabbbbcccddeeeefffff");
 
@@ -16,5 +15,3 @@ __executed = /b{8,}c/.test("aaabbbbcccddeeeefffff");
 if (__executed) {
 	$ERROR('#1: /b{8,}c/.test("aaabbbbcccddeeeefffff") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T3.js
index 99966c765..3db3803cf 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T3.js
- * @description Execute /\d{1,}/.exec("wqe456646dsff") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /\d{1,}/.exec("wqe456646dsff") and check results
+---*/
 
 __executed = /\d{1,}/.exec("wqe456646dsff");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\d{1,}/.exec("wqe456646dsff"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T4.js
index 0d8a9ae56..d06a2ccb0 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T4.js
- * @description Execute /(123){1,}/.exec("123123") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /(123){1,}/.exec("123123") and check results
+---*/
 
 __executed = /(123){1,}/.exec("123123");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(123){1,}/.exec("123123"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T5.js
index 514308943..b5b690201 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T5.js
- * @description Execute /(123){1,}x\1/.exec("123123x123") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /(123){1,}x\1/.exec("123123x123") and check results
+---*/
 
 __executed = /(123){1,}x\1/.exec("123123x123");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(123){1,}x\\1/.exec("123123x123"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T6.js
index cdc5ba6cd..3019a6c02 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
- * i) Let i be the MV of DecimalDigits
- * ii) Return the two results i and \infty
- *
- * @path ch15/15.10/15.10.2/15.10.2.7/S15.10.2.7_A6_T6.js
- * @description Execute /x{1,2}x{1,}/.exec("xxxxxxx") and check results
- */
+/*---
+info: >
+    The production QuantifierPrefix :: { DecimalDigits , }evaluates as follows:
+    i) Let i be the MV of DecimalDigits
+    ii) Return the two results i and \infty
+description: Execute /x{1,2}x{1,}/.exec("xxxxxxx") and check results
+---*/
 
 __executed = /x{1,2}x{1,}/.exec("xxxxxxx");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /x{1,2}x{1,}/.exec("xxxxxxx"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T1.js
index 8765743ce..19fe55c47 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?= Disjunction ) specifies a zero-width positive lookahead.
- * In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
- * If Disjunction can match at the current position in several ways, only the first one is tried
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T1.js
- * @description Execute /(?=(a+))/.exec("baaabac") and check results
- */
+/*---
+info: >
+    The form (?= Disjunction ) specifies a zero-width positive lookahead.
+    In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
+    If Disjunction can match at the current position in several ways, only the first one is tried
+description: Execute /(?=(a+))/.exec("baaabac") and check results
+---*/
 
 __executed = /(?=(a+))/.exec("baaabac");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?=(a+))/.exec("baaabac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T2.js
index f38bd2273..15da61ed9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?= Disjunction ) specifies a zero-width positive lookahead.
- * In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
- * If Disjunction can match at the current position in several ways, only the first one is tried
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T2.js
- * @description Execute /(?=(a+))a*b\1/.exec("baaabac") and check results
- */
+/*---
+info: >
+    The form (?= Disjunction ) specifies a zero-width positive lookahead.
+    In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
+    If Disjunction can match at the current position in several ways, only the first one is tried
+description: Execute /(?=(a+))a*b\1/.exec("baaabac") and check results
+---*/
 
 __executed = /(?=(a+))a*b\1/.exec("baaabac");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?=(a+))a*b\\1/.exec("baaabac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T3.js
index d37910429..84ada056a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?= Disjunction ) specifies a zero-width positive lookahead.
- * In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
- * If Disjunction can match at the current position in several ways, only the first one is tried
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T3.js
- * @description Execute /[Jj]ava([Ss]cript)?(?=\:)/.exec("just Javascript: the way af jedi") and check results
- */
+/*---
+info: >
+    The form (?= Disjunction ) specifies a zero-width positive lookahead.
+    In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
+    If Disjunction can match at the current position in several ways, only the first one is tried
+description: >
+    Execute /[Jj]ava([Ss]cript)?(?=\:)/.exec("just Javascript: the way
+    af jedi") and check results
+---*/
 
 __executed = /[Jj]ava([Ss]cript)?(?=\:)/.exec("just Javascript: the way af jedi");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[Jj]ava([Ss]cript)?(?=\\:)/.exec("just Javascript: the way af jedi"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T4.js
index 76f486db6..2339d6cd8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?= Disjunction ) specifies a zero-width positive lookahead.
- * In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
- * If Disjunction can match at the current position in several ways, only the first one is tried
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T4.js
- * @description Execute /[Jj]ava([Ss]cript)?(?=\:)/.exec("taste of java: the cookbook ") and check results
- */
+/*---
+info: >
+    The form (?= Disjunction ) specifies a zero-width positive lookahead.
+    In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
+    If Disjunction can match at the current position in several ways, only the first one is tried
+description: >
+    Execute /[Jj]ava([Ss]cript)?(?=\:)/.exec("taste of java: the
+    cookbook ") and check results
+---*/
 
 __executed = /[Jj]ava([Ss]cript)?(?=\:)/.exec("taste of java: the cookbook ");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /[Jj]ava([Ss]cript)?(?=\\:)/.exec("taste of java: the cookbook "); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T5.js
index b4608e6e0..005233922 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?= Disjunction ) specifies a zero-width positive lookahead.
- * In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
- * If Disjunction can match at the current position in several ways, only the first one is tried
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A1_T5.js
- * @description Execute /[Jj]ava([Ss]cript)?(?=\:)/.test("rhino is JavaScript engine") and check results
- */
+/*---
+info: >
+    The form (?= Disjunction ) specifies a zero-width positive lookahead.
+    In order for it to succeed, the pattern inside Disjunction must match at the current position, but the current position is not advanced before matching the sequel.
+    If Disjunction can match at the current position in several ways, only the first one is tried
+description: >
+    Execute /[Jj]ava([Ss]cript)?(?=\:)/.test("rhino is JavaScript
+    engine") and check results
+---*/
 
 __executed = /[Jj]ava([Ss]cript)?(?=\:)/.test("rhino is JavaScript engine");
 
@@ -16,5 +17,3 @@ __executed = /[Jj]ava([Ss]cript)?(?=\:)/.test("rhino is JavaScript engine");
 if (__executed) {
 	$ERROR('#1: /[Jj]ava([Ss]cript)?(?=\\:)/.test("rhino is JavaScript engine") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T1.js
index a080c0933..fc69bc0fb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T1.js
- * @description Execute /(.*?)a(?!(a+)b\2c)\2(.*)/.exec("baaabaac") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: >
+    Execute /(.*?)a(?!(a+)b\2c)\2(.*)/.exec("baaabaac") and check
+    results
+---*/
 
 __executed = /(.*?)a(?!(a+)b\2c)\2(.*)/.exec("baaabaac");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(.*?)a(?!(a+)b\\2c)\\2(.*)/.exec("baaabaac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T10.js
index 0929bb895..7fb5b54b4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T10.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T10.js
- * @description Execute /(?!a|b)|c/.exec("bc") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(?!a|b)|c/.exec("bc") and check results
+---*/
 
 __executed = /(?!a|b)|c/.exec("bc");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?!a|b)|c/.exec("bc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T11.js
index 636355d9a..f42810d89 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T11.js
- * @description Execute /(?!a|b)|c/.exec("d") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(?!a|b)|c/.exec("d") and check results
+---*/
 
 __executed = /(?!a|b)|c/.exec("d");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?!a|b)|c/.exec("d"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T2.js
index 887d7a999..55a9d6c89 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T2.js
- * @description Execute /Java(?!Script)([A-Z]\w*)/.exec("using of JavaBeans technology") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: >
+    Execute /Java(?!Script)([A-Z]\w*)/.exec("using of JavaBeans
+    technology") and check results
+---*/
 
 __executed = /Java(?!Script)([A-Z]\w*)/.exec("using of JavaBeans technology");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /Java(?!Script)([A-Z]\\w*)/.exec("using of JavaBeans technology"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T3.js
index 9e0624e31..1e3965544 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T3.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T3.js
- * @description Execute /Java(?!Script)([A-Z]\w*)/.test("using of Java language") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: >
+    Execute /Java(?!Script)([A-Z]\w*)/.test("using of Java language")
+    and check results
+---*/
 
 __executed = /Java(?!Script)([A-Z]\w*)/.test("using of Java language");
 
@@ -16,5 +17,3 @@ __executed = /Java(?!Script)([A-Z]\w*)/.test("using of Java language");
 if (__executed) {
 	$ERROR('#1: /Java(?!Script)([A-Z]\\w*)/.test("using of Java language") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T4.js
index 317169ec9..925de69fd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T4.js
- * @description Execute /Java(?!Script)([A-Z]\w*)/.test("i'm a JavaScripter ") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: >
+    Execute /Java(?!Script)([A-Z]\w*)/.test("i'm a JavaScripter ") and
+    check results
+---*/
 
 __executed = /Java(?!Script)([A-Z]\w*)/.test("i'm a JavaScripter ");
 
@@ -16,5 +17,3 @@ __executed = /Java(?!Script)([A-Z]\w*)/.test("i'm a JavaScripter ");
 if (__executed) {
 	$ERROR('#1: /Java(?!Script)([A-Z]\\w*)/.test("i\'m a JavaScripter ") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T5.js
index 39b842b00..c00b9348e 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T5.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T5.js
- * @description Execute /Java(?!Script)([A-Z]\w*)/.exec("JavaScr oops ipt ") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: >
+    Execute /Java(?!Script)([A-Z]\w*)/.exec("JavaScr oops ipt ") and
+    check results
+---*/
 
 __executed = /Java(?!Script)([A-Z]\w*)/.exec("JavaScr oops ipt ");
 
@@ -37,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /Java(?!Script)([A-Z]\\w*)/.exec("JavaScr oops ipt "); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T6.js
index ab3efd17d..a5c269028 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T6.js
- * @description Execute /(\.(?!com|org)|\/)/.exec("ah.info") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(\.(?!com|org)|\/)/.exec("ah.info") and check results
+---*/
 
 __executed = /(\.(?!com|org)|\/)/.exec("ah.info");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(\\.(?!com|org)|\\/)/.exec("ah.info"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T7.js
index 0e2766238..f1e439dca 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T7.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T7.js
- * @description Execute /(\.(?!com|org)|\/)/.exec("ah/info") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(\.(?!com|org)|\/)/.exec("ah/info") and check results
+---*/
 
 __executed = /(\.(?!com|org)|\/)/.exec("ah/info");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(\\.(?!com|org)|\\/)/.exec("ah/info"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T8.js
index 317da7d47..e315b6eef 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T8.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T8.js
- * @description Execute /(\.(?!com|org)|\/)/.test("ah.com") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(\.(?!com|org)|\/)/.test("ah.com") and check results
+---*/
 
 __executed = /(\.(?!com|org)|\/)/.test("ah.com");
 
@@ -16,5 +15,3 @@ __executed = /(\.(?!com|org)|\/)/.test("ah.com");
 if (__executed) {
 	$ERROR('#1: /(\\.(?!com|org)|\\/)/.test("ah.com") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T9.js
index 008d4ccbe..1d0e300b1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T9.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The form (?! Disjunction ) specifies a zero-width negative lookahead.
- * In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
- * The current position is not advanced before matching the sequel
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A2_T9.js
- * @description Execute /(?!a|b)|c/.exec("") and check results
- */
+/*---
+info: >
+    The form (?! Disjunction ) specifies a zero-width negative lookahead.
+    In order for it to succeed, the pattern inside Disjunction must fail to match at the current position.
+    The current position is not advanced before matching the sequel
+description: Execute /(?!a|b)|c/.exec("") and check results
+---*/
 
 __executed = /(?!a|b)|c/.exec("");
 
@@ -37,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(?!a|b)|c/.exec(""); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T1.js
index 9e6e4edd2..ca780da87 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T1.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T1.js
- * @description Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Learning javaScript is funny, really") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Learning
+    javaScript is funny, really") and check results
+---*/
 
 __executed = /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Learning javaScript is funny, really");
 
@@ -38,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /([Jj]ava([Ss]cript)?)\\sis\\s(fun\\w*)/.exec("Learning javaScript is funny, really"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T10.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T10.js
index b09dcdd4a..6b1a6f9c3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T10.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T10.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T10.js
- * @description Execute /(\d{3})(\d{3})\1\2/.exec("123456123456") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(\d{3})(\d{3})\1\2/.exec("123456123456") and check results
+---*/
 
 __executed = /(\d{3})(\d{3})\1\2/.exec("123456123456");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(\\d{3})(\\d{3})\\1\\2/.exec("123456123456"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T11.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T11.js
index 7aa61c013..0fb56023c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T11.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T11.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T11.js
- * @description Execute /a(..(..)..)/.exec("abcdefgh") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /a(..(..)..)/.exec("abcdefgh") and check results
+---*/
 
 __executed = /a(..(..)..)/.exec("abcdefgh");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a(..(..)..)/.exec("abcdefgh"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T12.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T12.js
index cf8b9fc1c..4ed17dbfe 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T12.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T12.js
- * @description Execute /(a(b(c)))(d(e(f)))/.exec("xabcdefg") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(a(b(c)))(d(e(f)))/.exec("xabcdefg") and check results
+---*/
 
 __executed = /(a(b(c)))(d(e(f)))/.exec("xabcdefg");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(a(b(c)))(d(e(f)))/.exec("xabcdefg"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T13.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T13.js
index a2ab53fbe..69ed05d81 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T13.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T13.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T13.js
- * @description Execute /(a(b(c)))(d(e(f)))\2\5/.exec("xabcdefbcefg") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /(a(b(c)))(d(e(f)))\2\5/.exec("xabcdefbcefg") and check
+    results
+---*/
 
 __executed = /(a(b(c)))(d(e(f)))\2\5/.exec("xabcdefbcefg");
 
@@ -38,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(a(b(c)))(d(e(f)))\\2\\5/.exec("xabcdefbcefg"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T14.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T14.js
index d6d74fa6f..092da15d9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T14.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T14.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T14.js
- * @description Execute /a(.?)b\1c\1d\1/.exec("abcd") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /a(.?)b\1c\1d\1/.exec("abcd") and check results
+---*/
 
 __executed = /a(.?)b\1c\1d\1/.exec("abcd");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a(.?)b\\1c\\1d\\1/.exec("abcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T15.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T15.js
index 93c454287..7e8bd205d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T15.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T15.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T15.js
- * @description see bug http:bugzilla.mozilla.org/show_bug.cgi?id=119909
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "see bug http:bugzilla.mozilla.org/show_bug.cgi?id=119909"
+---*/
 
 __strOriginal = "hello";
 __openParen = '(';
@@ -56,5 +55,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __re = new RegExp(__pattern); __executed = __re.exec(__strOriginal); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T16.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T16.js
index 750b6d151..77afefc51 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T16.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T16.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T16.js
- * @description see bug http:bugzilla.mozilla.org/show_bug.cgi?id=119909
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "see bug http:bugzilla.mozilla.org/show_bug.cgi?id=119909"
+---*/
 
 __strOriginal = "hello";
 __openParen = '(?:';
@@ -54,5 +53,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __re = new RegExp(__pattern); __executed = __re.exec(__strOriginal); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T17.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T17.js
index be4430121..8b64a41f4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T17.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T17.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T17.js
- * @description see bug http:bugzilla.mozilla.org/show_bug.cgi?id=169497
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "see bug http:bugzilla.mozilla.org/show_bug.cgi?id=169497"
+---*/
 
 __body="";
 __body += '<body onXXX="alert(event.type);">\n';
@@ -49,5 +48,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /<body.*>((.*\\n?)*?)<\\/body>/i.exec(__html); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T18.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T18.js
index 976bf0b86..9e658035a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T18.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T18.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T18.js
- * @description see bug  http:bugzilla.mozilla.org/show_bug.cgi?id=169534
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "see bug  http:bugzilla.mozilla.org/show_bug.cgi?id=169534"
+---*/
 
 __replaced = "To sign up click |here|https:www.xxxx.org/subscribe.htm|".replace(/(\|)([\w\x81-\xff ]*)(\|)([\/a-z][\w:\/\.]*\.[a-z]{3,4})(\|)/ig, '<a href="$4">$2</a>');
 
@@ -19,5 +18,3 @@ __expected = 'To sign up click <a href="https:www.xxxx.org/subscribe.htm">here</
 if (__replaced !== __expected) {
 	$ERROR('#1: __replaced = "To sign up click |here|https:www.xxxx.org/subscribe.htm|".replace(/(\\|)([\\w\\x81-\\xff ]*)(\\|)([\\/a-z][\\w:\\/\\.]*\\.[a-z]{3,4})(\\|)/ig, \'<a href="$4">$2</a>\'); __replaced === ' + __expected + '. Actual: ' + __replaced);
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T19.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T19.js
index 99502fcd3..1d8077f00 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T19.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T19.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T19.js
- * @description Execute /([\S]+([ \t]+[\S]+)*)[ \t]*=[ \t]*[\S]+/.exec("Course_Creator = Test") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /([\S]+([ \t]+[\S]+)*)[ \t]*=[
+    \t]*[\S]+/.exec("Course_Creator = Test") and check results
+---*/
 
 __executed = /([\S]+([ \t]+[\S]+)*)[ \t]*=[ \t]*[\S]+/.exec("Course_Creator = Test");
 
@@ -38,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /([\\S]+([ \\t]+[\\S]+)*)[ \\t]*=[ \\t]*[\\S]+/.exec("Course_Creator = Test"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T2.js
index 9583bbe34..9b175307d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T2.js
- * @description Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Developing with Java is fun, try it") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Developing
+    with Java is fun, try it") and check results
+---*/
 
 __executed = /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.exec("Developing with Java is fun, try it");
 
@@ -38,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /([Jj]ava([Ss]cript)?)\\sis\\s(fun\\w*)/.exec("Developing with Java is fun, try it"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T20.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T20.js
index 3a64abf76..5c64e795d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T20.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T20.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T20.js
- * @description Execute /^(A)?(A.*)$/.exec("AAA") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /^(A)?(A.*)$/.exec("AAA") and check results
+---*/
 
 __executed = /^(A)?(A.*)$/.exec("AAA");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^(A)?(A.*)$/.exec("AAA"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T21.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T21.js
index 08de79e15..2a3b783c7 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T21.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T21.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T21.js
- * @description Execute /^(A)?(A.*)$/.exec("AA") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /^(A)?(A.*)$/.exec("AA") and check results
+---*/
 
 __executed = /^(A)?(A.*)$/.exec("AA");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^(A)?(A.*)$/.exec("AA"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T22.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T22.js
index 2bfc065c0..bdb8fb431 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T22.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T22.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T22.js
- * @description Execute /^(A)?(A.*)$/.exec("A") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /^(A)?(A.*)$/.exec("A") and check results
+---*/
 
 __executed = /^(A)?(A.*)$/.exec("A");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /^(A)?(A.*)$/.exec("A"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T23.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T23.js
index bb8144f69..dd9875abd 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T23.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T23.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T23.js
- * @description Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AAAaaAAaaaf;lrlrzs") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AAAaaAAaaaf;lrlrzs") and
+    check results
+---*/
 
 __string = "zxcasd;fl\\\  ^AAAaaAAaaaf;lrlrzs";
 
@@ -40,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "zxcasd;fl\\\  ^AAAaaAAaaaf;lrlrzs"; __executed = /(A)?(A.*)/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T24.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T24.js
index 62ff1f2a2..53e9d7e08 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T24.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T24.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T24.js
- * @description Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AAaaAAaaaf;lrlrzs") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AAaaAAaaaf;lrlrzs") and
+    check results
+---*/
 
 __string = "zxcasd;fl\\\  ^AAaaAAaaaf;lrlrzs";
 
@@ -40,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "zxcasd;fl\\\  ^AAaaAAaaaf;lrlrzs"; __executed = /(A)?(A.*)/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T25.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T25.js
index f8883bc51..053a76c12 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T25.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T25.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T25.js
- * @description Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AaaAAaaaf;lrlrzs") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /(A)?(A.*)/.exec("zxcasd;fl\\\  ^AaaAAaaaf;lrlrzs") and
+    check results
+---*/
 
 __string = "zxcasd;fl\\\  ^AaaAAaaaf;lrlrzs";
 
@@ -40,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "zxcasd;fl\\\  ^AaaAAaaaf;lrlrzs"; __executed = /(A)?(A.*)/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T26.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T26.js
index 9f0953534..a1c0f0e4a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T26.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T26.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T26.js
- * @description Execute /(a)?a/.exec("a") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(a)?a/.exec("a") and check results
+---*/
 
 __string = "a";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "a"; __executed = /(a)?a/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T27.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T27.js
index 033d91721..9b5ecec18 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T27.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T27.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T27.js
- * @description Execute /a|(b)/.exec("a") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /a|(b)/.exec("a") and check results
+---*/
 
 __string = "a";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "a"; __executed = /a|(b)/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T28.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T28.js
index 304e053e3..f6fdaf1e1 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T28.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T28.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T28.js
- * @description Execute /(a)?(a)/.exec("a") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(a)?(a)/.exec("a") and check results
+---*/
 
 __string = "a";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "a"; __executed = /(a)?(a)/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T29.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T29.js
index a17dc6b8b..6e61b2288 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T29.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T29.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T29.js
- * @description See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353"
+---*/
 
 __string = "a";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "a"; __executed = /^([a-z]+)*[a-z]$/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T3.js
index 2ad172e72..a35887a75 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T3.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T3.js
- * @description Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.test("Developing with JavaScript is dangerous, do not try it without assistance") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: >
+    Execute /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.test("Developing
+    with JavaScript is dangerous, do not try it without assistance")
+    and check results
+---*/
 
 __executed = /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.test("Developing with JavaScript is dangerous, do not try it without assistance");
 
@@ -17,5 +19,3 @@ __executed = /([Jj]ava([Ss]cript)?)\sis\s(fun\w*)/.test("Developing with JavaScr
 if (__executed) {
 	$ERROR('#1: /([Jj]ava([Ss]cript)?)\\sis\\s(fun\\w*)/.test("Developing with JavaScript is dangerous, do not try it without assistance") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T30.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T30.js
index 1b0c17a0e..81bcaeda3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T30.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T30.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T30.js
- * @description See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353"
+---*/
 
 __string = "ab";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "ab"; __executed = /^([a-z]+)*[a-z]$/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T31.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T31.js
index f19455475..428c863f3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T31.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T31.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T31.js
- * @description See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353"
+---*/
 
 __string = "abc";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "abc"; __executed = /^([a-z]+)*[a-z]$/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T32.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T32.js
index 76d781afb..af6f50da4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T32.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T32.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T32.js
- * @description See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353"
+---*/
 
 __string = "www.netscape.com";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "www.netscape.com"; __executed = /^(([a-z]+)*[a-z]\\.)+[a-z]{2,}$/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T33.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T33.js
index bcbab6c9c..ce8ba51f4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T33.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T33.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T33.js
- * @description See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: "See bug http:bugzilla.mozilla.org/show_bug.cgi?id=165353"
+---*/
 
 __string = "www.netscape.com";
 
@@ -40,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "www.netscape.com"; __executed = /^(([a-z]+)*([a-z])\\.)+[a-z]{2,}$/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T4.js
index 88634c5e3..f5457e4e8 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T4.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T4.js
- * @description Execute /(abc)/.exec("abc") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(abc)/.exec("abc") and check results
+---*/
 
 __executed = /(abc)/.exec("abc");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(abc)/.exec("abc"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T5.js
index 4335f4287..4ea174536 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T5.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T5.js
- * @description Execute /a(bc)d(ef)g/.exec("abcdefg") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /a(bc)d(ef)g/.exec("abcdefg") and check results
+---*/
 
 __executed = /a(bc)d(ef)g/.exec("abcdefg");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /a(bc)d(ef)g/.exec("abcdefg"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T6.js
index 51554db84..6cc87113b 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T6.js
- * @description Execute /(.{3})(.{4})/.exec("abcdefgh") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(.{3})(.{4})/.exec("abcdefgh") and check results
+---*/
 
 __executed = /(.{3})(.{4})/.exec("abcdefgh");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(.{3})(.{4})/.exec("abcdefgh"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T7.js
index 9617ff958..5e257f818 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T7.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T7.js
- * @description Execute /(aa)bcd\1/.exec("aabcdaabcd") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(aa)bcd\1/.exec("aabcdaabcd") and check results
+---*/
 
 __executed = /(aa)bcd\1/.exec("aabcdaabcd");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(aa)bcd\\1/.exec("aabcdaabcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T8.js
index 5b3fa9050..0ac3c5480 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T8.js
- * @description Execute /(aa).+\1/.exec("aabcdaabcd") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(aa).+\1/.exec("aabcdaabcd") and check results
+---*/
 
 __executed = /(aa).+\1/.exec("aabcdaabcd");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(aa).+\\1/.exec("aabcdaabcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T9.js
index d8d5dbce6..4aed45a2c 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T9.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
- * The result can be used either in a backreference (\ followed by a nonzero decimal number),
- * referenced in a replace string,
- * or returned as part of an array from the regular expression matching function
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A3_T9.js
- * @description Execute /(.{2}).+\1/.exec("aabcdaabcd") and check results
- */
+/*---
+info: >
+    Parentheses of the form ( Disjunction ) serve both to group the components of the Disjunction pattern together and to save the result of the match.
+    The result can be used either in a backreference (\ followed by a nonzero decimal number),
+    referenced in a replace string,
+    or returned as part of an array from the regular expression matching function
+description: Execute /(.{2}).+\1/.exec("aabcdaabcd") and check results
+---*/
 
 __executed = /(.{2}).+\1/.exec("aabcdaabcd");
 
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(.{2}).+\\1/.exec("aabcdaabcd"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T1.js
index 7e3fd984c..9a84f786d 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T1.js
- * @description Execute /ab.de/.exec("abcde") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /ab.de/.exec("abcde") and check results
+---*/
 
 __string = "abcde";
 __executed = /ab.de/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "abcde"; __executed = /ab.de/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T2.js
index ccddfc344..29175a1cb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T2.js
- * @description Execute /.+/.exec("line 1\nline 2") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("line 1\nline 2") and check results
+---*/
 
 __string = "line 1\nline 2";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "line 1\nline 2"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T3.js
index cd72ad8da..aa9dc1e8f 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T3.js
- * @description Execute /.*a.* /.exec("this is a test") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.*a.* /.exec("this is a test") and check results
+---*/
 
 __string = "this is a test";
 __executed = /.*a.*/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "this is a test"; __executed = /.*a.*/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T4.js
index 63f02fd4a..ddfe10b63 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T4.js
- * @description Execute /.+/.exec("this is a *&^%$# test") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("this is a *&^%$# test") and check results
+---*/
 
 __string = "this is a *&^%$# test";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "this is a *&^%$# test"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T5.js
index eafdb66f6..4cdc937c4 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T5.js
- * @description Execute /.+/.exec("....") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("....") and check results
+---*/
 
 __string = "....";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "...."; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T6.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T6.js
index fac61d3a7..98246d729 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T6.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T6.js
- * @description Execute /.+/.exec("abcdefghijklmnopqrstuvwxyz") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("abcdefghijklmnopqrstuvwxyz") and check results
+---*/
 
 __string = "abcdefghijklmnopqrstuvwxyz";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "abcdefghijklmnopqrstuvwxyz"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T7.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T7.js
index 73c2343ba..af010c24a 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T7.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T7.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T7.js
- * @description Execute /.+/.exec("ABCDEFGHIJKLMNOPQRSTUVWXYZ") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("ABCDEFGHIJKLMNOPQRSTUVWXYZ") and check results
+---*/
 
 __string = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T8.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T8.js
index 5b1fec20d..c396ac293 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T8.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T8.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T8.js
- * @description Execute /.+/.exec("`1234567890-=~!@#$%^&*()_+") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: Execute /.+/.exec("`1234567890-=~!@#$%^&*()_+") and check results
+---*/
 
 __string = "`1234567890-=~!@#$%^&*()_+";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "`1234567890-=~!@#$%^&*()_+"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T9.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T9.js
index f34f43ad8..7b6e765d3 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T9.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T9.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The production Atom :: . evaluates as follows:
- * i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
- * ii) Call CharacterSetMatcher(A, false) and return its Matcher result
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A4_T9.js
- * @description Execute /.+/.exec("|\\[{]};:\"\',<>.?/") and check results
- */
+/*---
+info: >
+    The production Atom :: . evaluates as follows:
+    i) Let A be the set of all characters except the four line terminator characters <LF>, <CR>, <LS>, or <PS>
+    ii) Call CharacterSetMatcher(A, false) and return its Matcher result
+description: "Execute /.+/.exec(\"|\\\\[{]};:\\\"\\',<>.?/\") and check results"
+---*/
 
 __string = "|\\[{]};:\"\',<>.?/";
 __executed = /.+/.exec(__string);
@@ -38,5 +37,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "|\\[{]};:\"\',<>.?/"; __executed = /.+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T1.js
index e3ca1fdcd..a900620eb 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In case-insignificant matches all characters are implicitly converted to upper case immediately before they are compared
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T1.js
- * @description Execute /[a-z]+/ig.exec("ABC def ghi") and check results
- */
+/*---
+info: >
+    In case-insignificant matches all characters are implicitly converted to
+    upper case immediately before they are compared
+description: Execute /[a-z]+/ig.exec("ABC def ghi") and check results
+---*/
 
 __string = "ABC def ghi";
 __executed = /[a-z]+/ig.exec(__string);
@@ -36,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "ABC def ghi"; __executed = /[a-z]+/ig.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T2.js
index 383fc8476..e752eed29 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * In case-insignificant matches all characters are implicitly converted to upper case immediately before they are compared
- *
- * @path ch15/15.10/15.10.2/15.10.2.8/S15.10.2.8_A5_T2.js
- * @description Execute /[a-z]+/.exec("ABC def ghi") and check results
- */
+/*---
+info: >
+    In case-insignificant matches all characters are implicitly converted to
+    upper case immediately before they are compared
+description: Execute /[a-z]+/.exec("ABC def ghi") and check results
+---*/
 
 __string = "ABC def ghi";
 __executed = /[a-z]+/.exec(__string);
@@ -36,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __string = "ABC def ghi"; __executed = /[a-z]+/.exec(__string); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T1.js b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T1.js
index 688932566..0dbe91ec5 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An escape sequence of the form \ followed by a nonzero decimal number n matches the result of the nth set of capturing parentheses (see 15.10.2.11)
- *
- * @path ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T1.js
- * @description Execute /\b(\w+) \1\b/.exec("do you listen the the band") and check results
- */
+/*---
+info: >
+    An escape sequence of the form \ followed by a nonzero decimal number n
+    matches the result of the nth set of capturing parentheses (see
+    15.10.2.11)
+description: >
+    Execute /\b(\w+) \1\b/.exec("do you listen the the band") and
+    check results
+---*/
 
 __executed = /\b(\w+) \1\b/.exec("do you listen the the band");
 
@@ -35,5 +38,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /\\b(\\w+) \\1\\b/.exec("do you listen the the band"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T2.js b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T2.js
index 663096734..e7cc30759 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T2.js
@@ -1,12 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An escape sequence of the form \ followed by a nonzero decimal number n matches the result of the nth set of capturing parentheses (see 15.10.2.11)
- *
- * @path ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T2.js
- * @description Execute /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x01u00FFu00FFx04x04x23") and check results
- */
+/*---
+info: >
+    An escape sequence of the form \ followed by a nonzero decimal number n
+    matches the result of the nth set of capturing parentheses (see
+    15.10.2.11)
+description: >
+    Execute
+    /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x01u00FFu00FFx04x04x23")
+    and check results
+---*/
 
 __executed = /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x01u00FFu00FFx04x04x23");
 
@@ -35,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /([xu]\\d{2}([A-H]{2})?)\\1/.exec("x09x12x01x01u00FFu00FFx04x04x23"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T3.js b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T3.js
index 83349b41d..c6971dbfe 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T3.js
@@ -1,12 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An escape sequence of the form \ followed by a nonzero decimal number n matches the result of the nth set of capturing parentheses (see 15.10.2.11)
- *
- * @path ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T3.js
- * @description Execute /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x05u00FFu00FFx04x04x23") and check results
- */
+/*---
+info: >
+    An escape sequence of the form \ followed by a nonzero decimal number n
+    matches the result of the nth set of capturing parentheses (see
+    15.10.2.11)
+description: >
+    Execute
+    /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x05u00FFu00FFx04x04x23")
+    and check results
+---*/
 
 __executed = /([xu]\d{2}([A-H]{2})?)\1/.exec("x09x12x01x05u00FFu00FFx04x04x23");
 
@@ -35,5 +39,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /([xu]\\d{2}([A-H]{2})?)\\1/.exec("x09x12x01x05u00FFu00FFx04x04x23"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T4.js b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T4.js
index a0d5c8855..a1893e3e6 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An escape sequence of the form \ followed by a nonzero decimal number n matches the result of the nth set of capturing parentheses (see 15.10.2.11)
- *
- * @path ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T4.js
- * @description Execute /\b(\w+) \2\b/.test("do you listen the the band") and check results
- */
+/*---
+info: >
+    An escape sequence of the form \ followed by a nonzero decimal number n
+    matches the result of the nth set of capturing parentheses (see
+    15.10.2.11)
+description: >
+    Execute /\b(\w+) \2\b/.test("do you listen the the band") and
+    check results
+---*/
 
 __executed = /\b(\w+) \2\b/.test("do you listen the the band");
 
@@ -14,5 +17,3 @@ __executed = /\b(\w+) \2\b/.test("do you listen the the band");
 if (__executed) {
 	$ERROR('#1: /\\b(\\w+) \\2\\b/.test("do you listen the the band") === false');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T5.js b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T5.js
index 074fb95bb..a2b2c62c9 100644
--- a/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * An escape sequence of the form \ followed by a nonzero decimal number n matches the result of the nth set of capturing parentheses (see 15.10.2.11)
- *
- * @path ch15/15.10/15.10.2/15.10.2.9/S15.10.2.9_A1_T5.js
- * @description Execute /(a*)b\1+/.exec("baaac") and check results
- */
+/*---
+info: >
+    An escape sequence of the form \ followed by a nonzero decimal number n
+    matches the result of the nth set of capturing parentheses (see
+    15.10.2.11)
+description: Execute /(a*)b\1+/.exec("baaac") and check results
+---*/
 
 __executed = /(a*)b\1+/.exec("baaac");
 
@@ -35,5 +36,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#4: __executed = /(a*)b\\1+/.exec("baaac"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.2/S15.10.2_A1_T1.js b/test/suite/ch15/15.10/15.10.2/S15.10.2_A1_T1.js
index 9ba10e4b5..9e8e9e44b 100644
--- a/test/suite/ch15/15.10/15.10.2/S15.10.2_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.2/S15.10.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * XML Shallow Parsing with Regular Expressions
- *
- * @path ch15/15.10/15.10.2/S15.10.2_A1_T1.js
- * @description See bug http://bugzilla.mozilla.org/show_bug.cgi?id=103087
- */
+/*---
+info: XML Shallow Parsing with Regular Expressions
+description: "See bug http://bugzilla.mozilla.org/show_bug.cgi?id=103087"
+---*/
 
 // REX/Javascript 1.0 
 // Robert D. Cameron "REX: XML Shallow Parsing with Regular Expressions",
@@ -85,5 +83,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T1.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T1.js
index de92630d4..3909047de 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then return R unchanged
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A1_T1.js
- * @description R is /x/i and instance is RegExp(R)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is undefined, then return R unchanged
+description: R is /x/i and instance is RegExp(R)
+---*/
 
 __re = /x/i;
 __instance = RegExp(__re);
@@ -16,5 +16,3 @@ __re.indicator = 1;
 if (__instance.indicator !== 1) {
 	$ERROR('#1: __re = /x/i; __instance = RegExp(__re); __re.indicator = 1; __instance.indicator === 1. Actual: ' + (__instance.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T2.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T2.js
index 243ba2b5b..2cd3ca4e6 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then return R unchanged
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A1_T2.js
- * @description R is new RegExp and instance is RegExp(R, function(){}())
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is undefined, then return R unchanged
+description: R is new RegExp and instance is RegExp(R, function(){}())
+---*/
 
 __re = new RegExp;
 __instance = RegExp(__re, function(){}());
@@ -16,4 +16,3 @@ __re.indicator = 1;
 if (__instance.indicator !== 1) {
 	$ERROR('#1: __re = new RegExp; __instance = RegExp(__re, function(){}()); __re.indicator = 1; __instance.indicator === 1. Actual: ' + (__instance.indicator));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T3.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T3.js
index c61b7d466..c1c86e422 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then return R unchanged
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A1_T3.js
- * @description R is new RegExp() and instance is RegExp(R, x), where x is undefined variable
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is undefined, then return R unchanged
+description: >
+    R is new RegExp() and instance is RegExp(R, x), where x is
+    undefined variable
+---*/
 
 __re = new RegExp();
 __instance = RegExp(__re, x);
@@ -18,4 +20,3 @@ if (__instance.indicator !== 1) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T4.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T4.js
index 3e2ccd992..c55b91d86 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then return R unchanged
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A1_T4.js
- * @description R is new RegExp() and instance is RegExp(R, void 0)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is undefined, then return R unchanged
+description: R is new RegExp() and instance is RegExp(R, void 0)
+---*/
 
 __re = RegExp();
 __instance = RegExp(__re, void 0);
@@ -16,5 +16,3 @@ __re.indicator = 1;
 if (__instance.indicator !== 1) {
 	$ERROR('#1: __re = RegExp(); __instance = RegExp(__re, void 0); __re.indicator = 1; __instance.indicator === 1. Actual: ' + (__instance.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T5.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T5.js
index c22e2831a..e18775932 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then return R unchanged
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A1_T5.js
- * @description R is /\b/m and instance is RegExp(R, undefined)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is undefined, then return R unchanged
+description: R is /\b/m and instance is RegExp(R, undefined)
+---*/
 
 __re = /\b/m;
 __instance = RegExp(__re, undefined);
@@ -16,5 +16,3 @@ __re.indicator = 1;
 if (__instance.indicator !== 1) {
 	$ERROR('#1: __re = /\\b/m; __instance = RegExp(__re, undefined); __re.indicator = 1; __instance.indicator === 1. Actual: ' + (__instance.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T1.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T1.js
index 6178e6834..2928b41ca 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is defined, then
- * call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A2_T1.js
- * @description Checking if using "1" as flags leads to throwing the correct exception
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is defined, then
+    call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
+description: >
+    Checking if using "1" as flags leads to throwing the correct
+    exception
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +18,3 @@ try {
 		$ERROR('#1.2: RegExp(new RegExp("\\d"), "1")) throw TypeError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T2.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T2.js
index 6ff551124..cbd3a6a58 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A2_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is defined, then
- * call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A2_T2.js
- * @description Checking if using dafined variable "x = 1" as flags leads to throwing the correct exception
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is defined, then
+    call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
+description: >
+    Checking if using dafined variable "x = 1" as flags leads to
+    throwing the correct exception
+---*/
 
 var x = 1;
 
@@ -19,5 +20,3 @@ try {
 		$ERROR('#1.2: var x = 1; RegExp(/[a-b]?/, x) throw TypeError. Actual: ' + (e));
 	} 
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T1.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T1.js
index 6c40db075..ce193b129 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern and flags are defined, then
- * call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A3_T1.js
- * @description R is "d+" and instance is RegExp(R,"i")
- */
+/*---
+info: >
+    If pattern and flags are defined, then
+    call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
+description: R is "d+" and instance is RegExp(R,"i")
+---*/
 
 __re = "d+";
 __instance = RegExp(__re, "i");
@@ -21,5 +20,3 @@ if (__instance.constructor !== RegExp) {
 if (__instance.source !== __re) {
 	$ERROR('#2: __re = "d+"; __instance = RegExp(__re, "i"); __instance.source === __re. Actual: '+ (__instance.source));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T2.js b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T2.js
index 97330e7a6..5a7ca8646 100644
--- a/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.3/S15.10.3.1_A3_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern and flags are defined, then
- * call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
- *
- * @path ch15/15.10/15.10.3/S15.10.3.1_A3_T2.js
- * @description R is {toString:function(){return "[a-c]*";}} and instance is RegExp(R,"gm")
- */
+/*---
+info: >
+    If pattern and flags are defined, then
+    call the RegExp constructor (15.10.4.1), passing it the pattern and flags arguments and return the object constructed by that constructor
+description: >
+    R is {toString:function(){return "[a-c]*";}} and instance is
+    RegExp(R,"gm")
+---*/
 
 __instance = RegExp({toString:function(){return "[a-c]*";}}, "gm");
 
@@ -20,5 +21,3 @@ if (__instance.constructor !== RegExp) {
 if (__instance.source !== "[a-c]*") {
 	$ERROR('#2: __instance = RegExp({toString:function(){return "[a-c]*";}}, "gm"); __instance.source === "[a-c]*". Actual: '+ (__instance.source));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-1.js b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-1.js
index c032e39dd..acae7e073 100644
--- a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-1.js
+++ b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-1.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-1.js

- * @description RegExp - the thrown error is TypeError instead of RegExpError when pattern is an object whose [[Class]] property is 'RegExp' and flags is not undefined 

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-        try {

-            var regExpObj = new RegExp(regObj, true);

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp - the thrown error is TypeError instead of RegExpError when
+    pattern is an object whose [[Class]] property is 'RegExp' and
+    flags is not undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+        try {
+            var regExpObj = new RegExp(regObj, true);
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-2.js b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-2.js
index 679a37af1..422d82b46 100644
--- a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-2.js
+++ b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-2.js

- * @description RegExp - the thrown error is SyntaxError instead of RegExpError when the characters of 'P' do not have the syntactic form Pattern

- */

-

-

-function testcase() {

-        try {

-            var regExpObj = new RegExp('\\');

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp - the thrown error is SyntaxError instead of RegExpError
+    when the characters of 'P' do not have the syntactic form Pattern
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExpObj = new RegExp('\\');
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-3.js b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-3.js
index f300a4c6a..ecc4ab18f 100644
--- a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-3.js
+++ b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-3.js

- * @description RegExp - the thrown error is SyntaxError instead of RegExpError when 'F' contains any character other than 'g', 'i', or 'm' 

- */

-

-

-function testcase() {

-        try {

-            var regExpObj = new RegExp('abc', 'a');

-

-            return false;

-        } catch (e) {

-            return e instanceof SyntaxError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp - the thrown error is SyntaxError instead of RegExpError
+    when 'F' contains any character other than 'g', 'i', or 'm'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExpObj = new RegExp('abc', 'a');
+
+            return false;
+        } catch (e) {
+            return e instanceof SyntaxError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-4.js b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-4.js
index 3638bf46d..450027c56 100644
--- a/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-4.js
+++ b/test/suite/ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.4/15.10.4.1/15.10.4.1-4.js

- * @description RegExp - the SyntaxError is not thrown when flags is 'gim'

- */

-

-

-function testcase() {

-        try {

-            var regExpObj = new RegExp('abc', 'gim');

-

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp - the SyntaxError is not thrown when flags is 'gim'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var regExpObj = new RegExp('abc', 'gim');
+
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T1.js
index 27df5176d..5457cd556 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
- * the pattern used to construct R and let F be the flags used to construct R
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A1_T1.js
- * @description Pattern is /./i and RegExp is new RegExp(pattern)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
+    the pattern used to construct R and let F be the flags used to construct R
+description: Pattern is /./i and RegExp is new RegExp(pattern)
+---*/
 
 __pattern = /./i;
 __re = new RegExp(__pattern); 
@@ -31,4 +30,3 @@ if (__re.global !== __pattern.global) {
 if (__re.ignoreCase !== __pattern.ignoreCase) {
   $ERROR('#4: __pattern = /./i; __re = new RegExp(__pattern); __re.ignoreCase === __pattern.ignoreCase. Actual: ' + (__re.ignoreCase));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T2.js
index c884417e3..25f60323b 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
- * the pattern used to construct R and let F be the flags used to construct R
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A1_T2.js
- * @description Pattern is /\t/m and RegExp is new RegExp(pattern,x), where x is undefined variable
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
+    the pattern used to construct R and let F be the flags used to construct R
+description: >
+    Pattern is /\t/m and RegExp is new RegExp(pattern,x), where x is
+    undefined variable
+---*/
 
 __pattern = /\t/m;
 __re = new RegExp(__pattern, x);
@@ -33,4 +34,3 @@ if (__re.ignoreCase !== __pattern.ignoreCase) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T3.js
index 1152a2dc2..03ef13f75 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
- * the pattern used to construct R and let F be the flags used to construct R
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A1_T3.js
- * @description Pattern is /[a-b]/g and RegExp is new RegExp(pattern,void 0)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
+    the pattern used to construct R and let F be the flags used to construct R
+description: Pattern is /[a-b]/g and RegExp is new RegExp(pattern,void 0)
+---*/
 
 __pattern = /[a-b]/g;
 __re = new RegExp(__pattern, void 0);
@@ -31,6 +30,3 @@ if (__re.global !== __pattern.global) {
 if (__re.ignoreCase !== __pattern.ignoreCase) {
   $ERROR('#4: __pattern = /[a-b]/g; __re = new RegExp(__pattern, void 0); __re.ignoreCase === __pattern.ignoreCase. Actual: ' + (__re.ignoreCase));
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T4.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T4.js
index d65e854a2..a9ff58c70 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
- * the pattern used to construct R and let F be the flags used to construct R
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A1_T4.js
- * @description Pattern is new RegExp and RegExp is new RegExp(pattern,undefined)
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
+    the pattern used to construct R and let F be the flags used to construct R
+description: Pattern is new RegExp and RegExp is new RegExp(pattern,undefined)
+---*/
 
 __pattern = new RegExp;
 __re = new RegExp(__pattern, undefined);
@@ -31,5 +30,3 @@ if (__re.global !== __pattern.global) {
 if (__re.ignoreCase !== __pattern.ignoreCase) {
   $ERROR('#4: __pattern = new RegExp; __re = new RegExp(__pattern, undefined); __re.ignoreCase === __pattern.ignoreCase. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T5.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T5.js
index 22cf93f82..c8bec01ba 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A1_T5.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
- * the pattern used to construct R and let F be the flags used to construct R
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A1_T5.js
- * @description Pattern is RegExp("1?","mig") and RegExp is new RegExp(pattern,(function(){})())
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags is undefined, then let P be
+    the pattern used to construct R and let F be the flags used to construct R
+description: >
+    Pattern is RegExp("1?","mig") and RegExp is new
+    RegExp(pattern,(function(){})())
+---*/
 
 __pattern = RegExp("1?","mig");
 __re = new RegExp(__pattern, (function(){})());
@@ -31,6 +32,3 @@ if (__re.global !== __pattern.global) {
 if (__re.ignoreCase !== __pattern.ignoreCase) {
   $ERROR('#4: __pattern = RegExp("1?","mig"); __re = new RegExp(__pattern, (function(){})()); __re.ignoreCase === __pattern.ignoreCase. Actual: ' + (__re.ignoreCase));
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T1.js
index 8d1ccd51e..7cc67143d 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is not undefined, then throw a TypeError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A2_T1.js
- * @description Checking if execution of "new RegExp(pattern, "i")", where the pattern is "/\u0042/i", fails
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is not undefined, then throw a TypeError exception
+description: >
+    Checking if execution of "new RegExp(pattern, "i")", where the
+    pattern is "/\u0042/i", fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
 		$ERROR('#1.2: new RegExp(/\\u0042/i, "i") throw TypeError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T2.js
index d75b93711..a94c2f7dd 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A2_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pattern is an object R whose [[Class]] property is "RegExp" and flags is not undefined, then throw a TypeError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A2_T2.js
- * @description Checking if execution of "new RegExp(pattern, {})", where the pattern is "/1?1/mig", fails
- */
+/*---
+info: >
+    If pattern is an object R whose [[Class]] property is "RegExp" and flags
+    is not undefined, then throw a TypeError exception
+description: >
+    Checking if execution of "new RegExp(pattern, {})", where the
+    pattern is "/1?1/mig", fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
     $ERROR('#1.2: new RegExp(/1?1/mig, {}) throw TypeError. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T1.js
index ccdf9419a..7bed9d4e2 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be the empty string if pattern is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A3_T1.js
- * @description RegExp is new RegExp
- */
+/*---
+info: let P be the empty string if pattern is undefined
+description: RegExp is new RegExp
+---*/
 
 __re = new RegExp;
 
@@ -24,6 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp; __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T2.js
index 2a5825ee1..318d74c96 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be the empty string if pattern is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A3_T2.js
- * @description RegExp is new RegExp(void 0)
- */
+/*---
+info: let P be the empty string if pattern is undefined
+description: RegExp is new RegExp(void 0)
+---*/
 
 __re = new RegExp(void 0);
 
@@ -24,5 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp(void 0); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T3.js
index 73303a77e..c39852dec 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be the empty string if pattern is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A3_T3.js
- * @description RegExp is new RegExp(x), where x is undefined variable
- */
+/*---
+info: let P be the empty string if pattern is undefined
+description: RegExp is new RegExp(x), where x is undefined variable
+---*/
 
 __re = new RegExp(x);
 
@@ -26,5 +24,3 @@ if (__re.ignoreCase !== false) {
 }
 
 var x;
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T4.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T4.js
index b3fdb9569..c064ee09c 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be the empty string if pattern is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A3_T4.js
- * @description RegExp is new RegExp(undefined)
- */
+/*---
+info: let P be the empty string if pattern is undefined
+description: RegExp is new RegExp(undefined)
+---*/
 
 __re = new RegExp(undefined);
 
@@ -24,4 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp(undefined); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T5.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T5.js
index f8772d933..a048774a2 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A3_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be the empty string if pattern is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A3_T5.js
- * @description RegExp is new RegExp((function(){})())
- */
+/*---
+info: let P be the empty string if pattern is undefined
+description: RegExp is new RegExp((function(){})())
+---*/
 
 __re = new RegExp((function(){})());
 
@@ -24,5 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp((function(){})()); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T1.js
index 180f27914..f5aa597ba 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let F be the empty string if flags is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A4_T1.js
- * @description RegExp is new RegExp(undefined)
- */
+/*---
+info: let F be the empty string if flags is undefined
+description: RegExp is new RegExp(undefined)
+---*/
 
 __re = new RegExp(null, void 0);
 
@@ -29,6 +27,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp(null, void 0); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T2.js
index f12dd1f98..e86372d5e 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let F be the empty string if flags is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A4_T2.js
- * @description RegExp is new RegExp(undefined,undefined)
- */
+/*---
+info: let F be the empty string if flags is undefined
+description: RegExp is new RegExp(undefined,undefined)
+---*/
 
 __re = new RegExp(undefined, undefined);
 
@@ -24,5 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp(undefined, undefined); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T3.js
index 450b10aff..ea851d44d 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let F be the empty string if flags is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A4_T3.js
- * @description Use undefined properties of object as flags of RegExp
- */
+/*---
+info: let F be the empty string if flags is undefined
+description: Use undefined properties of object as flags of RegExp
+---*/
 
 __re = new RegExp({}.p, {}.q);
 
@@ -24,5 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp({}.p, {}.q); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T4.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T4.js
index 708757be5..9d2fe29c5 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let F be the empty string if flags is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A4_T4.js
- * @description RegExp is new RegExp(null,void 0)
- */
+/*---
+info: let F be the empty string if flags is undefined
+description: RegExp is new RegExp(null,void 0)
+---*/
 
 __re = new RegExp(null, void 0);
 
@@ -29,5 +27,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp(null, void 0); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T5.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T5.js
index ef04ca60e..4028b9f13 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A4_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let F be the empty string if flags is undefined
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A4_T5.js
- * @description RegExp is new RegExp("",(function(){})())
- */
+/*---
+info: let F be the empty string if flags is undefined
+description: RegExp is new RegExp("",(function(){})())
+---*/
 
 __re = new RegExp("", (function(){})());
 
@@ -24,4 +22,3 @@ if (__re.global !== false) {
 if (__re.ignoreCase !== false) {
   $ERROR('#4: __re = new RegExp("", (function(){})()); __re.ignoreCase === false. Actual: ' + (__re.ignoreCase));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T1.js
index 83601d375..c3fa16642 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T1.js
- * @description Checking if using "ii" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: Checking if using "ii" as F leads to throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp(undefined,"ii") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T2.js
index eadec7f4d..78322d4d0 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T2.js
- * @description Checking if using "migg" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: >
+    Checking if using "migg" as F leads to throwing the correct
+    exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
 		$ERROR('#1.2: new RegExp(null,"migg") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T3.js
index c32865440..5fc170a3f 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T3.js
- * @description Checking by using eval, try to use eval("\"migg\"") as F
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: Checking by using eval, try to use eval("\"migg\"") as F
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("",eval("\\"migr\\"")) throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T4.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T4.js
index 01176ab3a..7ca2a6b53 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T4.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T4.js
- * @description Checking if using "z" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: Checking if using "z" as F leads to throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("a|b","z") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T6.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T6.js
index 6d472996a..765ad2035 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T6.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T6.js
- * @description Checking if using "null" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: >
+    Checking if using "null" as F leads to throwing the correct
+    exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
 		$ERROR('#1.2: new RegExp(".",null) throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T7.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T7.js
index 2e1d7c66b..23ae5ec5b 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T7.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T7.js
- * @description Checking if using 1.0 as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: Checking if using 1.0 as F leads to throwing the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("^",1.0) throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T8.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T8.js
index 810e16806..7cb74c2cb 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T8.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T8.js
- * @description Checking if using "true" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: >
+    Checking if using "true" as F leads to throwing the correct
+    exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
 		$ERROR('#1.2: new RegExp("|",true) throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T9.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T9.js
index e9d9eb60d..47566c338 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T9.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A5_T9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If F contains any character other than 'g', 'i', or 'm', or if it contains the same one more than once, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A5_T9.js
- * @description Checking if using "{toString:function(){}}" as F leads to throwing the correct exception
- */
+/*---
+info: >
+    If F contains any character other than 'g', 'i', or 'm', or if it
+    contains the same one more than once, then throw a SyntaxError exception
+description: >
+    Checking if using "{toString:function(){}}" as F leads to throwing
+    the correct exception
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +18,3 @@ try {
 		$ERROR('#1.2: new RegExp("$sup",{toString:function(){}}) throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A6_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A6_T1.js
index be360d42f..bdbf43372 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A6_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A6_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "RegExp"
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A6_T1.js
- * @description Checking [[Class]] property of the newly constructed object
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "RegExp"
+description: Checking [[Class]] property of the newly constructed object
+---*/
 
 __re = new RegExp;
 __re.toString = Object.prototype.toString;
@@ -15,5 +13,3 @@ __re.toString = Object.prototype.toString;
 if (__re.toString() !== "[object "+"RegExp"+"]") {
 	$ERROR('#1: __re = new RegExp; __re.toString = Object.prototype.toString; __re.toString() === "[object "+"RegExp"+"]". Actual: ' + (__re.toString()));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T1.js
index efed4fdb9..275e6ef01 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original RegExp prototype object, the one that is the initial value of RegExp.prototype
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A7_T1.js
- * @description Add new property to [[Prototype]] of REgExp and check this property of the newly constructed object
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the
+    original RegExp prototype object, the one that is the initial value of
+    RegExp.prototype
+description: >
+    Add new property to [[Prototype]] of REgExp and check this
+    property of the newly constructed object
+---*/
 
 __re = new RegExp;
 RegExp.prototype.indicator = 1;
@@ -15,5 +18,3 @@ RegExp.prototype.indicator = 1;
 if (__re.indicator !== 1) {
 	$ERROR('#1: __re = new RegExp; RegExp.prototype.indicator = 1; __re.indicator === 1. Actual: ' + (__re.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T2.js
index d042a7b8e..39d3ea274 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A7_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original RegExp prototype object, the one that is the initial value of RegExp.prototype
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A7_T2.js
- * @description Checking [[Prototype]] property of the newly constructed object
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the
+    original RegExp prototype object, the one that is the initial value of
+    RegExp.prototype
+description: Checking [[Prototype]] property of the newly constructed object
+---*/
 
 __re = new RegExp();
 
@@ -14,5 +15,3 @@ __re = new RegExp();
 if (RegExp.prototype.isPrototypeOf(__re) !== true) {
 	$ERROR('#1: __re = new RegExp(); RegExp.prototype.isPrototypeOf(__re) === true. Actual: ' + (RegExp.prototype.isPrototypeOf(__re)));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T1.js
index f2fd70c42..3452f87e8 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T1.js
- * @description Pattern is "a|b" and flags is "i"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: Pattern is "a|b" and flags is "i"
+---*/
 
 __re = new RegExp("a|b","i");
 
@@ -34,5 +32,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp("a|b","i"); typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T10.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T10.js
index 62eeb2a6e..e08a71582 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T10.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T10.js
- * @description Pattern is true and flags is "m"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: Pattern is true and flags is "m"
+---*/
 
 __re = new RegExp(true,"m");
 
@@ -34,5 +32,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp(true,"m"); typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T11.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T11.js
index 7301cbc1d..be12222c5 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T11.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T11.js
- * @description Checking by using eval, pattern is Math and flags is eval("\"g\"")
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: Checking by using eval, pattern is Math and flags is eval("\"g\"")
+---*/
 
 __re = new RegExp(Math,eval("\"g\""));
 
@@ -34,5 +32,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp(Math,eval("\\"g\\"")); typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T12.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T12.js
index c07817787..90c6e6709 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T12.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T12.js
- * @description Pattern is "\u0042" and flags is {toString:void 0, valueOf:function(){throw "invalof";} }
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is "\u0042" and flags is {toString:void 0,
+    valueOf:function(){throw "invalof";} }
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("\\u0042", {toString:void 0, valueOf:function(){throw "invalof";}}) throw "invalof". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T13.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T13.js
index cf901852d..c05fa212f 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T13.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T13.js
- * @description Pattern is "1" and flags is {toString:function(){throw "intostr";} }
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is "1" and flags is {toString:function(){throw "intostr";}
+    }
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("1", {toString:function(){throw "intostr";}}) throw "intostr". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T2.js
index f6db4abd1..703b06033 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T2.js
- * @description Pattern is function(){return "a|b|[]";}() and flags is "ig"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: Pattern is function(){return "a|b|[]";}() and flags is "ig"
+---*/
 
 __re = new RegExp(function(){return "a|b|[]";}(),"ig");
 
@@ -34,5 +32,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp(function(){return "a|b|[]"; typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T3.js
index 722dfe59a..398afe9b7 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T3.js
- * @description Pattern is {toString:function(){return "[0-9]";}} and flags is (function(){return "m";})()
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is {toString:function(){return "[0-9]";}} and flags is
+    (function(){return "m";})()
+---*/
 
 __re = new RegExp({toString:function(){return "[0-9]";}}, (function(){return "m";})());
 
@@ -34,5 +34,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp({toString:function(){return "[0-9]"; typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T4.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T4.js
index 1b2e10891..08c1e692e 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T4.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T4.js
- * @description Pattern is {toString:void 0,valueOf:function(){return "[z-z]";}} and flags is {toString:void 0,valueOf:function(){return "mig";}}
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is {toString:void 0,valueOf:function(){return "[z-z]";}}
+    and flags is {toString:void 0,valueOf:function(){return "mig";}}
+---*/
 
 __re = new RegExp({toString:void 0,valueOf:function(){return "[z-z]";}}, {toString:void 0,valueOf:function(){return "mig";}});
 
@@ -34,5 +34,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp({toString:void 0,valueOf:function(){return "[z-z]"; typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T5.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T5.js
index 47e842590..607f11982 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T5.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T5.js
- * @description Pattern is new Object("abc{1}") and flags is {toString:function(){return "";}}
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is new Object("abc{1}") and flags is
+    {toString:function(){return "";}}
+---*/
 
 __re = new RegExp(new Object("abc{1}"), {toString:function(){return "";}});
 
@@ -34,5 +34,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp(new Object("abc{1}"), {toString:function(){return ""; typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T6.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T6.js
index 3cec72fbc..9a4d2c9ec 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T6.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T6.js
- * @description Pattern is {toString:function(){throw "intostr";} } and flags is "i"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is {toString:function(){throw "intostr";} } and flags is
+    "i"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp({toString:function(){throw "intostr";}}, "i") throw "intostr". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T7.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T7.js
index f68c0d54f..142e5c1bb 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T7.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T7.js
- * @description Pattern is {toString:void 0, valueOf:function(){throw "invalof";} } and flags is "i"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is {toString:void 0, valueOf:function(){throw "invalof";}
+    } and flags is "i"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp({toString:void 0, valueOf:function(){throw "invalof";}}) throw "invalof". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T8.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T8.js
index bddac87b6..8dff8645c 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T8.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T8.js
- * @description Pattern is {toString:function(){throw "intostr";} } and flags is "error"
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: >
+    Pattern is {toString:function(){throw "intostr";} } and flags is
+    "error"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp({toString:function(){throw "intostr";}}, "error") throw "intostr". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T9.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T9.js
index 991118a4a..aab722a09 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T9.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A8_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * let P be ToString(pattern) and let F be ToString(flags)
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A8_T9.js
- * @description Pattern is 1 and flags is new Object("gi")
- */
+/*---
+info: let P be ToString(pattern) and let F be ToString(flags)
+description: Pattern is 1 and flags is new Object("gi")
+---*/
 
 __re = new RegExp(1, new Object("gi"));
 
@@ -34,5 +32,3 @@ if (__re.lastIndex !== 0) {
 if (typeof __re.source === "undefined") {
 	$ERROR('#5: __re = new RegExp(1, new Object("gi")); typeof __re.source !== "undefined"');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T1.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T1.js
index 92f5f8115..2baf8bbf0 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T1.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If P's characters do not have the form Pattern, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A9_T1.js
- * @description Pattern is "??"
- */
+/*---
+info: >
+    If P's characters do not have the form Pattern, then throw a SyntaxError
+    exception
+description: Pattern is "??"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("??") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T2.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T2.js
index 978bfba3d..6033e83f6 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T2.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If P's characters do not have the form Pattern, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A9_T2.js
- * @description Pattern is "[{-z]"
- */
+/*---
+info: >
+    If P's characters do not have the form Pattern, then throw a SyntaxError
+    exception
+description: Pattern is "[{-z]"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("[{-z]") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T3.js b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T3.js
index 685c0639e..22520ab5a 100644
--- a/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T3.js
+++ b/test/suite/ch15/15.10/15.10.4/S15.10.4.1_A9_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If P's characters do not have the form Pattern, then throw a SyntaxError exception
- *
- * @path ch15/15.10/15.10.4/S15.10.4.1_A9_T3.js
- * @description Pattern is "[a--z]"
- */
+/*---
+info: >
+    If P's characters do not have the form Pattern, then throw a SyntaxError
+    exception
+description: Pattern is "[a--z]"
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: new RegExp("[a--z]") throw SyntaxError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A1.js b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A1.js
index f646a39c0..54f7891db 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A1.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A1.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp has property prototype
- *
- * @path ch15/15.10/15.10.5/S15.10.5.1_A1.js
- * @description Checking RegExp.prototype property
- */
+/*---
+info: The RegExp has property prototype
+description: Checking RegExp.prototype property
+---*/
 
 //CHECK#1
 if (RegExp.hasOwnProperty('prototype') !== true) {
 	$ERROR('#1: RegExp.hasOwnProperty(\'prototype\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A2.js b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A2.js
index 81df59391..d4525cfcf 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A2.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.5/S15.10.5.1_A2.js
- * @description Checking if enumerating the RegExp.prototype property fails
- */
+/*---
+info: The RegExp.prototype property has the attribute DontEnum
+description: Checking if enumerating the RegExp.prototype property fails
+---*/
 
 //CHECK#0
 if (RegExp.hasOwnProperty('prototype') !== true) {
@@ -27,5 +25,3 @@ for (p in RegExp){
 if (count !== 0) {
 	$ERROR('#2: count=0; for (p in RegExp){ if (p==="prototype") count++; } count === 0. Actual: ' + (count));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A3.js b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A3.js
index da1e32470..8af7af311 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A3.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A3.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.5/S15.10.5.1_A3.js
- * @description Checking if deleting the RegExp.prototype property fails
- */
+/*---
+info: The RegExp.prototype property has the attribute DontDelete
+description: Checking if deleting the RegExp.prototype property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (RegExp.hasOwnProperty('prototype') !== true) {
@@ -22,5 +21,3 @@ if (delete RegExp.prototype !== false) {
 if (RegExp.hasOwnProperty('prototype') !== true) {
 	$ERROR('#2: delete RegExp.prototype; RegExp.hasOwnProperty(\'prototype\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A4.js b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A4.js
index a1d9df93a..bc66d066b 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A4.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5.1_A4.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.5/S15.10.5.1_A4.js
- * @description Checking if varying the RegExp.prototype property fails
- */
+/*---
+info: The RegExp.prototype property has the attribute ReadOnly
+description: Checking if varying the RegExp.prototype property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.hasOwnProperty('prototype') !== true) {
@@ -21,5 +20,3 @@ RegExp.prototype = function(){return "shifted";};
 if (RegExp.prototype !== __obj) {
 	$ERROR('#2: __obj = RegExp.prototype; RegExp.prototype = function(){return "shifted";}; RegExp.prototype === __obj. Actual: ' + (RegExp.prototype));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5_A1.js b/test/suite/ch15/15.10/15.10.5/S15.10.5_A1.js
index 5e1baa28d..ca01a9da9 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5_A1.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5_A1.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp constructor has length property whose value is 2
- *
- * @path ch15/15.10/15.10.5/S15.10.5_A1.js
- * @description Checking RegExp.length property
- */
+/*---
+info: RegExp constructor has length property whose value is 2
+description: Checking RegExp.length property
+---*/
 
- //CHECK#1
+//CHECK#1
 if (RegExp.length !== 2) {
 	$ERROR('#1: RegExp.length === 2. Actual: ' + (RegExp.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T1.js b/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T1.js
index 78ffce644..0c42036ce 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the RegExp constructor is the Function prototype object
- *
- * @path ch15/15.10/15.10.5/S15.10.5_A2_T1.js
- * @description Checking Function.prototype.isPrototypeOf(RegExp)
- */
-
- //CHECK#1
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the RegExp
+    constructor is the Function prototype object
+description: Checking Function.prototype.isPrototypeOf(RegExp)
+---*/
+
+//CHECK#1
 if (Function.prototype.isPrototypeOf(RegExp) !== true) {
 	$ERROR('#1: Function.prototype.isPrototypeOf(RegExp) === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T2.js b/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T2.js
index f07b34b75..a31c29a08 100644
--- a/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.5/S15.10.5_A2_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the RegExp constructor is the Function prototype object
- *
- * @path ch15/15.10/15.10.5/S15.10.5_A2_T2.js
- * @description Add new property to Function.prototype and then check this property of RegExp
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the RegExp
+    constructor is the Function prototype object
+description: >
+    Add new property to Function.prototype and then check this
+    property of RegExp
+---*/
 
 Function.prototype.indicator = 1;
 
@@ -14,5 +16,3 @@ Function.prototype.indicator = 1;
 if (RegExp.indicator !== 1) {
 	$ERROR('#1: Function.prototype.indicator = 1; RegExp.indicator === 1. Actual: ' + (RegExp.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/15.10.6.2-9-e-1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/15.10.6.2-9-e-1.js
index 482748988..8a1a687bf 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/15.10.6.2-9-e-1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/15.10.6.2-9-e-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.6/15.10.6.2/15.10.6.2-9-e-1.js

- * @description RegExp.prototype.exec - the removed step 9.e won't affected current algorithm

- */

-

-

-function testcase() {

-        var str = "Hello World!";

-        var regObj = new RegExp("World");

-        var result = false;

-        result = regObj.exec(str).toString() === "World";

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.exec - the removed step 9.e won't affected
+    current algorithm
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = "Hello World!";
+        var regObj = new RegExp("World");
+        var result = false;
+        result = regObj.exec(str).toString() === "World";
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A10.js
index 622178b19..2fa8a88cb 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.exec.length property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A10.js
- * @description Checking if varying the RegExp.prototype.exec.length property fails
- */
+/*---
+info: The RegExp.prototype.exec.length property has the attribute ReadOnly
+description: Checking if varying the RegExp.prototype.exec.length property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.exec.hasOwnProperty('length') !== true) {
@@ -21,4 +20,3 @@ RegExp.prototype.exec.length = function(){return "shifted";};
 if (RegExp.prototype.exec.length !== __obj) {
   $ERROR('#2: __obj = RegExp.prototype.exec.length; RegExp.prototype.exec.length = function(){return "shifted";}; RegExp.prototype.exec.length === __obj. Actual: ' + (RegExp.prototype.exec.length));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A11.js
index cd7ac8ea6..883bd3217 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A11.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the exec method is 1
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A11.js
- * @description Checking RegExp.prototype.exec.length
- */
+/*---
+info: The length property of the exec method is 1
+description: Checking RegExp.prototype.exec.length
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.exec.hasOwnProperty("length") !== true) {
@@ -17,5 +16,3 @@ if (RegExp.prototype.exec.hasOwnProperty("length") !== true) {
 if (RegExp.prototype.exec.length !== 1) {
   $ERROR('#2: RegExp.prototype.exec.length === 1. Actual: ' + (RegExp.prototype.exec.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A12.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A12.js
index d4177de6a..2db3c0ec2 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A12.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A12.js
@@ -1,12 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * regExp exec() acts like regExp.exec('undefined') (step 2)
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A12.js
- * @description Checking RegExp.prototype.exec
- */
+/*---
+info: regExp exec() acts like regExp.exec('undefined') (step 2)
+description: Checking RegExp.prototype.exec
+includes: [$FAIL.js]
+---*/
 
 (/foo/).test('xfoox');
 var match = new RegExp('(.|\r|\n)*','').exec()[0];
@@ -16,4 +15,3 @@ if (match === 'xfoox') {
 if (match !== 'undefined') {
   $FAIL('#2: regExp.exec() must coerce absent first arg to "undefined"');
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T1.js
index 3820639df..e94054761 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T1.js
- * @description String is "123" and RegExp is /1|12/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is "123" and RegExp is /1|12/
+---*/
 
 __executed = /1|12/.exec("123");
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /1|12/.exec("123"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T10.js
index 9110c8a26..6ba70a801 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T10.js
- * @description String is 1.01 and RegExp is /1|12/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is 1.01 and RegExp is /1|12/
+---*/
 
 __executed = /1|12/.exec(1.01);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /1|12/.exec(1.01); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T11.js
index 312afbd52..8f9b7a2de 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T11.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T11.js
- * @description String is new Number(1.012) and RegExp is /2|12/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is new Number(1.012) and RegExp is /2|12/
+---*/
 
 __executed = /2|12/.exec(new Number(1.012));
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /2|12/.exec(new Number(1.012)); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T12.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T12.js
index fe8ec74b9..a442f232c 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T12.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T12.js
- * @description String is {toString:function(){return Math.PI;}} and RegExp is /\.14/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is {toString:function(){return Math.PI;}} and RegExp is
+    /\.14/
+---*/
 
 __executed = /\.14/.exec({toString:function(){return Math.PI}});
 
@@ -41,5 +42,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /\\.14/.exec({toString:function(){return Math.PI}}); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T13.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T13.js
index bb068edaa..8233105fe 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T13.js
- * @description String is true and RegExp is /t[a-b|q-s]/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is true and RegExp is /t[a-b|q-s]/
+---*/
 
 __executed = /t[a-b|q-s]/.exec(true);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /t[a-b|q-s]/.exec(true); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T14.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T14.js
index c631d5e40..f7e388f2a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T14.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T14.js
- * @description String is new Boolean and RegExp is /AL|se/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is new Boolean and RegExp is /AL|se/
+---*/
 
 __executed = /AL|se/.exec(new Boolean);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /AL|se/.exec(new Boolean); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T15.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T15.js
index 7bed7f106..e6668c929 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T15.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T15.js
- * @description String is {toString:function(){return false;}} and RegExp is /LS/i
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: "String is {toString:function(){return false;}} and RegExp is /LS/i"
+---*/
 
 __executed = /LS/i.exec({toString:function(){return false}});
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /LS/i.exec({toString:function(){return false}}); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T16.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T16.js
index 4431507ee..73c4bb47c 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T16.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T16.js
- * @description RegExp is /undefined/ and call exec() without arguments
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: RegExp is /undefined/ and call exec() without arguments
+---*/
 
 __re = /undefined/.exec()[0];
 if (__re !== "undefined") {
 	$ERROR('#1: /undefined/.exec()[0] === "undefined". Actual: ' + (__re));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T17.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T17.js
index b66df5954..54ea9ad04 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T17.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T17.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T17.js
- * @description String is null and RegExp is /ll|l/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is null and RegExp is /ll|l/
+---*/
 
 __executed = /ll|l/.exec(null);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /ll|l/.exec(null); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T18.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T18.js
index b1d5bdaf1..34ca221ce 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T18.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T18.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T18.js
- * @description String is undefined and RegExp is /nd|ne/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is undefined and RegExp is /nd|ne/
+---*/
 
 __executed = /nd|ne/.exec(undefined);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /nd|ne/.exec(undefined); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T19.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T19.js
index bf5851923..62fe9f440 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T19.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T19.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T19.js
- * @description String is void 0 and RegExp is /e{1}/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is void 0 and RegExp is /e{1}/
+---*/
 
 __executed = /e{1}/.exec(void 0);
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /e{1}/.exec(void 0); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T2.js
index d910dcfc8..724dc0961 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T2.js
- * @description String is new String("123") and RegExp is /((1)|(12))((3)|(23))/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is new String("123") and RegExp is /((1)|(12))((3)|(23))/
+---*/
 
 with(/((1)|(12))((3)|(23))/){
     __executed = exec(new String("123"));
@@ -43,5 +42,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: with(/((1)|(12))((3)|(23))/){__executed = exec(new String("123"));} __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T20.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T20.js
index c60a6b048..ab7655350 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T20.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T20.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T20.js
- * @description String is x and RegExp is /[a-f]d/, where x is undefined variable
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is x and RegExp is /[a-f]d/, where x is undefined variable
+---*/
 
 __executed = /[a-f]d/.exec(x);
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T21.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T21.js
index 2ce045593..f2a415e78 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T21.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T21.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T21.js
- * @description String is function(){}() and RegExp is /[a-z]n/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is function(){}() and RegExp is /[a-z]n/
+---*/
 
 __executed = /[a-z]n/.exec(function(){}());
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /[a-z]n/.exec(function(){}()); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T3.js
index c2a05cc09..b5ff40a2d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T3.js
- * @description String is new Object("abcdefghi") and RegExp is /a[a-z]{2,4}/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is new Object("abcdefghi") and RegExp is /a[a-z]{2,4}/
+---*/
 
 __executed = /a[a-z]{2,4}/.exec(new Object("abcdefghi"));
 
@@ -41,5 +40,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /a[a-z]{2,4}/.exec(new Object("abcdefghi")); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T4.js
index 07468985e..a8f39248d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T4.js
- * @description String is {toString:function(){return "abcdefghi";}} and RegExp is /a[a-z]{2,4}?/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is {toString:function(){return "abcdefghi";}} and RegExp is
+    /a[a-z]{2,4}?/
+---*/
 
 __executed = /a[a-z]{2,4}?/.exec({toString:function(){return "abcdefghi"}});
 
@@ -41,5 +42,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /a[a-z]{2,4}?/.exec({toString:function(){return "abcdefghi"}}); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T5.js
index 0efb7b256..6f9f046dd 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T5.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T5.js
- * @description String is {toString:function(){return {};}, valueOf:function(){return "aabaac";}} and RegExp is /(aa|aabaac|ba|b|c)* /
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is {toString:function(){return {};},
+    valueOf:function(){return "aabaac";}} and RegExp is
+    /(aa|aabaac|ba|b|c)* /
+---*/
 
 __executed = /(aa|aabaac|ba|b|c)*/.exec({toString:function(){return {};}, valueOf:function(){return "aabaac";}});
 
@@ -41,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /(aa|aabaac|ba|b|c)*/.exec({toString:function(){return {};}, valueOf:function(){return "aabaac";}}); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T6.js
index 2444d74bc..d44ad4be7 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T6.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T6.js
- * @description String is (function(){return "zaacbbbcac"})() and RegExp is /(z)((a+)?(b+)?(c))* /
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is (function(){return "zaacbbbcac"})() and RegExp is
+    /(z)((a+)?(b+)?(c))* /
+---*/
 
 __executed = /(z)((a+)?(b+)?(c))*/.exec((function(){return "zaacbbbcac"})());
 
@@ -41,5 +42,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#4: __executed = /(z)((a+)?(b+)?(c))*/.exec((function(){return "zaacbbbcac"})()); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T7.js
index 7dbbb81e0..dc9fd0989 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T7.js
- * @description String is {toString:function(){throw "intostr";}} and RegExp is /[a-z]/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is {toString:function(){throw "intostr";}} and RegExp is
+    /[a-z]/
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +18,3 @@ try {
 		$ERROR('#1.2: /[a-z]/.exec({toString:function(){throw "intostr"}}) throw "intostr". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T8.js
index 7d52b7a71..956421df1 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T8.js
- * @description String is {toString:void 0, valueOf:function(){throw "invalof";}} and RegExp is /[a-z]/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: >
+    String is {toString:void 0, valueOf:function(){throw "invalof";}}
+    and RegExp is /[a-z]/
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +18,3 @@ try {
     $ERROR('#1.2: /[a-z]/.exec({toString:void 0, valueOf:function(){throw "invalof"}}) throw "invalof". Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T9.js
index f1dd9d5d6..5be324ebf 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
- * returns an Array object containing the results of the match, or null if the string did not match
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A1_T9.js
- * @description String is undefined variable and RegExp is /1|12/
- */
+/*---
+info: >
+    RegExp.prototype.exec(string) Performs a regular expression match of ToString(string) against the regular expression and
+    returns an Array object containing the results of the match, or null if the string did not match
+description: String is undefined variable and RegExp is /1|12/
+---*/
 
 var __string;
 
@@ -18,4 +17,3 @@ if (__re.exec(__string) !== null) {
 }
 
 function __string(){};
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T1.js
index ef0e75779..4954ba0cc 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T1.js
- * @description The internal [[Class]] property is "Object"
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The internal [[Class]] property is "Object"
+---*/
 
 __instance = new Object;
 
@@ -20,5 +20,3 @@ try {
 		$ERROR('#1.2: __instance = new Object; __instance.exec = RegExp.prototype.exec. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T10.js
index eb3c0d302..1811b10b9 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T10.js
- * @description The tested object is undefined
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is undefined
+---*/
 
 exec = RegExp.prototype.exec;
 
@@ -18,5 +18,3 @@ try {
 		$ERROR('#1.2: exec = RegExp.prototype.exec; exec("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T2.js
index 3ad0c6a36..64598565d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T2.js
- * @description The tested object is Math
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is Math
+---*/
 
 __instance = Math;
 
@@ -21,5 +21,3 @@ try {
 		$ERROR('#1.2: __instance = Math; __instance.exec = RegExp.prototype.exec;  with(__instance) exec("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T3.js
index d95f43afa..adb5a2058 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T3.js
- * @description The tested object is function object
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is function object
+---*/
 
 __instance.exec = RegExp.prototype.exec;
 
@@ -21,4 +21,3 @@ try {
 }
 
 function __instance(){};
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T4.js
index 54732989f..cdfaac28f 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T4.js
- * @description The tested object is new String("[a-b]")
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new String("[a-b]")
+---*/
 
 __instance = new String("[a-b]");
 
@@ -22,5 +22,3 @@ with(__instance){
     	}
    }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T5.js
index 1fe90d769..89be44645 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T5.js
- * @description The tested object is new Boolean(false)
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new Boolean(false)
+---*/
 
 __instance = new Boolean(false);
 
@@ -22,5 +22,3 @@ with(__instance) {
     }
   }  
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T6.js
index 7ecc6c9ef..4a70ac2f1 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T6.js
- * @description The tested object is new Number(1.0)
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new Number(1.0)
+---*/
 
 __instance = new Number(1.0);
 
@@ -20,5 +20,3 @@ try {
 		$ERROR('#1.2: __instance = new Number(1.0); __instance.exec = RegExp.prototype.exec; __instance["exec"]("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T7.js
index 1c698ff1d..468beb97e 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T7.js
- * @description The tested object is false
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is false
+---*/
 
 __instance = false;
 
@@ -20,5 +20,3 @@ try {
 		$ERROR('#1.2: __instance = false; Object.prototype.exec = RegExp.prototype.exec; __instance.exec("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T8.js
index f95548b61..d4d6f6d0a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T8.js
- * @description The tested object is "."
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is "."
+---*/
 
 __instance = ".";
 
@@ -20,5 +20,3 @@ try {
 		$ERROR('#1.2: __instance = "."; Object.prototype.exec = RegExp.prototype.exec; __instance.exec("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T9.js
index ea43ba4db..3d34e2f45 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A2_T9.js
- * @description The tested object is 1.0
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is 1.0
+---*/
 
 __instance = 1.0;
 
@@ -20,5 +20,3 @@ try {
 		$ERROR('#1.2: __instance = 1.0; Object.prototype.exec = RegExp.prototype.exec; __instance.exec("message to investigate"). Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T1.js
index 2425d0941..32cec81d0 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T1.js
- * @description RegExp is /(?:ab|cd)\d?/g and tested string is "ab  cd2  ab34  cd"
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: "RegExp is /(?:ab|cd)\\d?/g and tested string is \"ab  cd2  ab34  cd\""
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#2: __executed = /(?:ab|cd)\\d?/g.exec("ab  cd2  ab34  cd"); __matched[' + index + '] === ' + __expected[index] + '. Actual: ' + __matched[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T2.js
index 65ba482a6..066861d74 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T2.js
- * @description RegExp is /[Nn]evermore/g and tested string is very long string
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: RegExp is /[Nn]evermore/g and tested string is very long string
+---*/
 
 __the__raven = "	Once upon a midnight dreary, while I pondered weak and weary," +
         "Over many a quaint and curious volume of forgotten lore," +
@@ -152,5 +151,3 @@ do{
 if (__matched !== NEVERMORE) {
 	$ERROR('#1: __re = /[Nn]evermore/g; __executed = __re.exec(__the__raven)'+__matched);
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T3.js
index d7dab0af9..b05fd87af 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T3.js
- * @description RegExp is /[Nn]?evermore/g and tested string is very long string
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: RegExp is /[Nn]?evermore/g and tested string is very long string
+---*/
 
 __the__raven = "	Once upon a midnight dreary, while I pondered weak and weary," +
         "Over many a quaint and curious volume of forgotten lore," +
@@ -152,5 +151,3 @@ do{
 if (__matched !== NEVERMORE_AND_EVERMORE) {
 	$ERROR('#1: __re = /[Nn]?evermore/g; __executed = __re.exec(__the__raven)'+__matched);
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T4.js
index 72cac2ed5..8ed9f64c1 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T4.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T4.js
- * @description RegExp is /([Nn]?ever|([Nn]othing\s{1,}))more/g and tested string is very long string
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: >
+    RegExp is /([Nn]?ever|([Nn]othing\s{1,}))more/g and tested string
+    is very long string
+---*/
 
 __the__raven = "	Once upon a midnight dreary, while I pondered weak and weary," +
         "Over many a quaint and curious volume of forgotten lore," +
@@ -152,5 +153,3 @@ do{
 if (__matched !== ALL_THE_HOPELESS_MORE) {
 	$ERROR('#1: __re = /([Nn]?ever|([Nn]othing\\s{1,}))more/g; __executed = __re.exec(__the__raven)'+__matched);
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T5.js
index 1625679e0..f6ba5c3fa 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T5.js
- * @description RegExp is /\d+/g and tested string is "123 456 789"
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: RegExp is /\d+/g and tested string is "123 456 789"
+---*/
 
 __re = /\d+/g;
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#2: __executed = /\\d+/g.exec("123 456 789"); __matched[' + index + '] === ' + __expected[index] + '. Actual: ' + __matched[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T6.js
index 3ab41a91c..207761cde 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T6.js
- * @description RegExp is /(\d+)/g and tested string is "123 456 789"
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: RegExp is /(\d+)/g and tested string is "123 456 789"
+---*/
 
 __re = /(\d+)/g;
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#2: __executed = /(\\d+)/g.exec("123 456 789"); __matched[' + index + '] === ' + __expected[index] + '. Actual: ' + __matched[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T7.js
index 1160c0ac0..d9a48ed58 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T7.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true and lastIndex not changed manually,
- * next exec calling start to match from position where current match finished
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A3_T7.js
- * @description RegExp is /\d+/ and tested string is "123 456 789"
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true and lastIndex not changed manually,
+    next exec calling start to match from position where current match finished
+description: RegExp is /\d+/ and tested string is "123 456 789"
+---*/
 
 __re = /\d+/;
 
@@ -36,5 +35,3 @@ for(var index=0; index<__expected.length; index++) {
     $ERROR('#2: __executed = /\\d+/.exec("123 456 789"); __matched[' + index + '] === ' + __expected[index] + '. Actual: ' + __matched[index]);
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T1.js
index 56d1f7e62..1b04a40fa 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T1.js
- * @description Call first exec, then set re.lastIndex = 12 and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: Call first exec, then set re.lastIndex = 12 and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +67,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = 12; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T10.js
index 0d880dd0f..2ff8a1f9b 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T10.js
- * @description Call first exec, then set re.lastIndex = {valueOf:function(){return 12;}} and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex =
+    {valueOf:function(){return 12;}} and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -70,5 +71,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __obj = {valueOf:function(){return 12;}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T11.js
index 3a8a07cea..463d16510 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T11.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T11.js
- * @description Call first exec, then set re.lastIndex = {valueOf:function(){throw "intoint";}} and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex = {valueOf:function(){throw
+    "intoint";}} and again call exec
+includes: [$FAIL.js]
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -51,5 +53,3 @@ try {
 		$ERROR('#5.2: __obj = {valueOf:function(){throw "intoint";}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42")  throw "intoint". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T12.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T12.js
index 44ae47514..dc5bbe899 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T12.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T12.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T12.js
- * @description Call first exec, then set re.lastIndex = {toString:function(){return 12;},valueOf:function(){return {};}} and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex =
+    {toString:function(){return 12;},valueOf:function(){return {};}}
+    and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -70,5 +72,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __obj = {toString:function(){return 12;},valueOf:function(){return {};}}; __re.lastIndex = __obj; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T2.js
index 485c6e7fa..638184c45 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T2.js
- * @description Call first exec, then set re.lastIndex = undefined and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex = undefined and again call
+    exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +69,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = undefined; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T3.js
index 07daf65ea..54a891507 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T3.js
- * @description Call first exec, then set re.lastIndex = void 0 and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: Call first exec, then set re.lastIndex = void 0 and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +67,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = void 0; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T4.js
index cfdb7a7bd..513dbbe0e 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T4.js
- * @description Call first exec, then set re.lastIndex = null and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: Call first exec, then set re.lastIndex = null and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +67,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = null; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T5.js
index da1c8bc04..5c0d8561a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T5.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T5.js
- * @description Call first exec, then set re.lastIndex = x and again call exec, where x is undefined variable
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex = x and again call exec,
+    where x is undefined variable
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -70,4 +71,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T6.js
index 482bb420f..2bfa2b1f8 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T6.js
- * @description Call first exec, then set re.lastIndex = false and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: Call first exec, then set re.lastIndex = false and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +67,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = false; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T7.js
index 3d08c9098..f7d9fac24 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T7.js
- * @description Call first exec, then set re.lastIndex = Math.NaN and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex = Math.NaN and again call
+    exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +69,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; re.lastIndex = Math.NaN; __executed = __re.exec("aacd2233ab12nm444ab42"); __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T8.js
index 7d79fd939..97b017e92 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T8.js
- * @description Call first exec, then set re.lastIndex = "12" and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: Call first exec, then set re.lastIndex = "12" and again call exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +67,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g; __re.lastIndex = "12"; __executed = __re.exec("aacd2233ab12nm444ab42");__executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T9.js
index 3a001d425..6364fa4a5 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * If global is true next exec calling start to match from lastIndex position
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A4_T9.js
- * @description Call first exec, then set re.lastIndex = "eleven" and again call exec
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    If global is true next exec calling start to match from lastIndex position
+description: >
+    Call first exec, then set re.lastIndex = "eleven" and again call
+    exec
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 
@@ -68,5 +69,3 @@ for(var index=0; index<__expected.length; index++) {
 		$ERROR('#8: __re = /(?:ab|cd)\\d?/g;__re.lastIndex = "eleven"; __executed = __re.exec("aacd2233ab12nm444ab42");  __executed = __re.exec("aacd2233ab12nm444ab42"); __executed[' + index + '] === ' + __expected[index] + '. Actual: ' + __executed[index]);
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T1.js
index 36a518f16..782b99acb 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * Let global is true and let I = If ToInteger(lastIndex).
- * Then if I<0 orI>length then set lastIndex to 0 and return null
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T1.js
- * @description First call /(?:ab|cd)\d?/g.exec("aac1dz2233a1bz12nm444ab42"), and then First call /(?:ab|cd)\d?/g.exec("aacd22")
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    Let global is true and let I = If ToInteger(lastIndex).
+    Then if I<0 orI>length then set lastIndex to 0 and return null
+description: >
+    First call /(?:ab|cd)\d?/g.exec("aac1dz2233a1bz12nm444ab42"), and
+    then First call /(?:ab|cd)\d?/g.exec("aacd22")
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 __executed = __re.exec("aac1dz2233a1bz12nm444ab42");
@@ -50,5 +51,3 @@ if (__executed) {
 if (__re.lastIndex !== 0) {
 	$ERROR('#6: __re = /(?:ab|cd)\\d?/g; __executed = __re.exec("aacd22"); __re.lastIndex === 0. Actual: ' + (__re.lastIndex));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T2.js
index 8de8ba885..9b0e20127 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * Let global is true and let I = If ToInteger(lastIndex).
- * Then if I<0 orI>length then set lastIndex to 0 and return null
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T2.js
- * @description Set lastIndex to 100 and call /(?:ab|cd)\d?/g.exec("aacd22 ")
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    Let global is true and let I = If ToInteger(lastIndex).
+    Then if I<0 orI>length then set lastIndex to 0 and return null
+description: "Set lastIndex to 100 and call /(?:ab|cd)\\d?/g.exec(\"aacd22 \")"
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 __re.lastIndex=100;
@@ -23,5 +22,3 @@ if (__executed) {
 if (__re.lastIndex !== 0) {
 	$ERROR('#2: __re = /(?:ab|cd)\\d?/g; __re.lastIndex=100; __executed = __re.exec("aacd22 "); __re.lastIndex === 0. Actual: ' + (__re.lastIndex));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T3.js
index 7e2d76626..b76dd8e75 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec behavior depends on global property.
- * Let global is true and let I = If ToInteger(lastIndex).
- * Then if I<0 orI>length then set lastIndex to 0 and return null
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A5_T3.js
- * @description Set lastIndex to -1 and call /(?:ab|cd)\d?/g.exec("aacd22 ")
- */
+/*---
+info: >
+    RegExp.prototype.exec behavior depends on global property.
+    Let global is true and let I = If ToInteger(lastIndex).
+    Then if I<0 orI>length then set lastIndex to 0 and return null
+description: "Set lastIndex to -1 and call /(?:ab|cd)\\d?/g.exec(\"aacd22 \")"
+---*/
 
 __re = /(?:ab|cd)\d?/g;
 __re.lastIndex=-1;
@@ -36,5 +35,3 @@ if (__executed) {
 if (__re.lastIndex !== 0) {
 	$ERROR('#4: __re = /(?:ab|cd)\\d?/g; __re.lastIndex=-1; __executed = __re.test("aacd22 "); __re.lastIndex=-100; __executed = __re.test("aacd22 "); __re.lastIndex === 0. Actual: ' + (__re.lastIndex));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A6.js
index 5e71a618c..56dd3d0aa 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec has not prototype property
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A6.js
- * @description Checking RegExp.prototype.exec.prototype
- */
+/*---
+info: RegExp.prototype.exec has not prototype property
+description: Checking RegExp.prototype.exec.prototype
+---*/
 
 //CHECK#1
 if (RegExp.prototype.exec.prototype !== undefined) {
   $ERROR('#1: RegExp.prototype.exec.prototype === undefined. Actual: ' + (RegExp.prototype.exec.prototype));
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A7.js
index 7285a2ab1..fa03dda1d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.exec can't be used as constructor
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A7.js
- * @description Checking if creating the RegExp.prototype.exec object fails
- */
+/*---
+info: RegExp.prototype.exec can't be used as constructor
+description: Checking if creating the RegExp.prototype.exec object fails
+---*/
 
 __FACTORY = RegExp.prototype.exec;
 
@@ -18,4 +16,3 @@ try {
     $ERROR('#1.2: __FACTORY = RegExp.prototype.exec throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A8.js
index ffe5d7b01..cdf0f62ac 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.exec.length property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A8.js
- * @description Checking if enumerating the RegExp.prototype.exec.length property fails
- */
+/*---
+info: The RegExp.prototype.exec.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the RegExp.prototype.exec.length property
+    fails
+---*/
 
 //CHECK#0
 if (RegExp.prototype.exec.hasOwnProperty('length') !== true) {
@@ -28,5 +28,3 @@ for (p in RegExp.prototype.exec){
 if (count !== 0) {
   $ERROR('#2: count = 0; for (p in RegExp.prototype.exec){ if (p==="length") count++; } count === 0. Actual: ' + (count));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A9.js
index 1e67a2125..762a6644b 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.exec.length property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.6/15.10.6.2/S15.10.6.2_A9.js
- * @description Checking if deleting the RegExp.prototype.exec.length property fails
- */
+/*---
+info: The RegExp.prototype.exec.length property has the attribute DontDelete
+description: >
+    Checking if deleting the RegExp.prototype.exec.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if ((RegExp.prototype.exec.hasOwnProperty('length') !== true)) {
@@ -22,5 +23,3 @@ if (delete RegExp.prototype.exec.length !== false) {
 if (RegExp.prototype.exec.hasOwnProperty('length') !== true) {
   $ERROR('#2: delete RegExp.prototype.exec.length; RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A10.js
index ada503cda..f1150a469 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.test.length property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A10.js
- * @description Checking if varying the RegExp.prototype.test.length property fails
- */
+/*---
+info: The RegExp.prototype.test.length property has the attribute ReadOnly
+description: Checking if varying the RegExp.prototype.test.length property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.test.hasOwnProperty('length') !== true) {
@@ -21,5 +20,3 @@ RegExp.prototype.test.length = function(){return "shifted";};
 if (RegExp.prototype.test.length !== __obj) {
   $ERROR('#2: __obj = RegExp.prototype.test.length; RegExp.prototype.test.length = function(){return "shifted";}; RegExp.prototype.test.length === __obj. Actual: ' + (RegExp.prototype.test.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A11.js
index faefeada3..888c1403a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A11.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the test method is 1
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A11.js
- * @description Checking RegExp.prototype.test.length
- */
+/*---
+info: The length property of the test method is 1
+description: Checking RegExp.prototype.test.length
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.test.hasOwnProperty("length") !== true) {
@@ -17,5 +16,3 @@ if (RegExp.prototype.test.hasOwnProperty("length") !== true) {
 if (RegExp.prototype.test.length !== 1) {
   $ERROR('#2: RegExp.prototype.test.length === 1. Actual: ' + (RegExp.prototype.test.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T1.js
index bb51ec13f..3478c2b52 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T1.js
- * @description RegExp is /1|12/ and tested string is "123"
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /1|12/ and tested string is "123"
+---*/
 
 var __string = "123";
 __re = /1|12/;
@@ -15,5 +13,3 @@ __re = /1|12/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = "123";__re = /1|12/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T10.js
index b2817a297..273fa0941 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T10.js
- * @description RegExp is /1|12/ and tested string is 1.01
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /1|12/ and tested string is 1.01
+---*/
 
 var __string = 1.01;
 __re = /1|12/;
@@ -15,5 +13,3 @@ __re = /1|12/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = 1.01;__re = /1|12/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T11.js
index 2687e40cb..5c60598e3 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T11.js
- * @description RegExp is /2|12/ and tested string is new Number(1.012)
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /2|12/ and tested string is new Number(1.012)
+---*/
 
 var __string = new Number(1.012);
 __re = /2|12/;
@@ -15,5 +13,3 @@ __re = /2|12/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = new Number(1.012); __re = /2|12/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T12.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T12.js
index 95ff76d74..d63ad848c 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T12.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T12.js
- * @description RegExp is /\.14/ and tested string is {toString:function(){return Math.PI;}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /\.14/ and tested string is {toString:function(){return
+    Math.PI;}}
+---*/
 
 var __string = {toString:function(){return Math.PI;}};
 __re = /\.14/;
@@ -15,5 +15,3 @@ __re = /\.14/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = {toString:function(){return Math.PI;}}; __re = /\\.14/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T13.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T13.js
index b489ac423..c71e9f9af 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T13.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T13.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T13.js
- * @description RegExp is /t[a-b|q-s]/ and tested string is true
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /t[a-b|q-s]/ and tested string is true
+---*/
 
 var __string = true;
 __re = /t[a-b|q-s]/;
@@ -15,5 +13,3 @@ __re = /t[a-b|q-s]/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = true;__re = /t[a-b|q-s]/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T14.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T14.js
index 7d92aae10..d0c23c6cd 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T14.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T14.js
- * @description RegExp is /AL|se/ and tested string is new Boolean
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /AL|se/ and tested string is new Boolean
+---*/
 
 var __string = new Boolean;
 __re = /AL|se/;
@@ -15,5 +13,3 @@ __re = /AL|se/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = new Boolean;__re = /AL|se/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T15.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T15.js
index d5fa26f76..eb7823a2a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T15.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T15.js
- * @description RegExp is /LS/i and tested string is {toString:function(){return false;}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /LS/i and tested string is {toString:function(){return
+    false;}}
+---*/
 
 var __string = {toString:function(){return false;}};
 __re = /LS/i;
@@ -15,5 +15,3 @@ __re = /LS/i;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = {toString:function(){return false;}}; __re = /LS/i; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T16.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T16.js
index 7dedbf60e..4620338ce 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T16.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T16.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T16.js
- * @description RegExp is /undefined/ and call test() without arguments
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /undefined/ and call test() without arguments
+---*/
 
 __re = /undefined/;
 
@@ -14,5 +12,3 @@ __re = /undefined/;
 if (__re.test() !== (__re.exec() !== null)) {
 	$ERROR('#0: __re = /undefined/; __re.test() === (__re.exec() !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T17.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T17.js
index 0e4bab34c..1077183dd 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T17.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T17.js
- * @description RegExp is /ll|l/ and tested string is null
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /ll|l/ and tested string is null
+---*/
 
 __re = /ll|l/;
 
@@ -14,5 +12,3 @@ __re = /ll|l/;
 if (__re.test(null) !== (__re.exec(null) !== null)) {
 	$ERROR('#0: __re = /ll|l/; __re.test(null) === (__re.exec(null) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T18.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T18.js
index 7931a811c..e05484807 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T18.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T18.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T18.js
- * @description RegExp is /nd|ne/ and tested string is undefined
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /nd|ne/ and tested string is undefined
+---*/
 
 __re = /nd|ne/;
 
@@ -14,5 +12,3 @@ __re = /nd|ne/;
 if (__re.test(undefined) !== (__re.exec(undefined) !== null)) {
 	$ERROR('#0: __re = /nd|ne/; __re.test(undefined) === (__re.exec(undefined) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T19.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T19.js
index 8621eff94..b0b7c478e 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T19.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T19.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T19.js
- * @description RegExp is /e{1}/ and tested string is void 0
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /e{1}/ and tested string is void 0
+---*/
 
 __re = /e{1}/;
 
@@ -14,5 +12,3 @@ __re = /e{1}/;
 if (__re.test(void 0) !== (__re.exec(void 0) !== null)) {
 	$ERROR('#0: __re = /e{1}/; __re.test(void 0) === (__re.exec(void 0) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T2.js
index f171f2300..5d131d636 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T2.js
- * @description RegExp is /((1)|(12))((3)|(23))/ and tested string is new String("123")
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /((1)|(12))((3)|(23))/ and tested string is new
+    String("123")
+---*/
 
 var __string = new String("123");
 __re = /((1)|(12))((3)|(23))/;
@@ -15,5 +15,3 @@ __re = /((1)|(12))((3)|(23))/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = new String("123"); __re = /((1)|(12))((3)|(23))/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T20.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T20.js
index 9548d0c37..fa6961557 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T20.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T20.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T20.js
- * @description RegExp is /[a-f]d/ and tested string is x, where x is undefined
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /[a-f]d/ and tested string is x, where x is undefined
+---*/
 
 __re = /[a-f]d/;
 
@@ -16,4 +14,3 @@ if (__re.test(x) !== (__re.exec(x) !== null)) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T21.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T21.js
index 7d881ac7a..649c8219f 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T21.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T21.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T21.js
- * @description RegExp is /[a-z]n/ and tested string is x, where x is function(){}()
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /[a-z]n/ and tested string is x, where x is
+    function(){}()
+---*/
 
 __re = /[a-z]n/;
 
@@ -14,5 +14,3 @@ __re = /[a-z]n/;
 if (__re.test(function(){}()) !== (__re.exec(function(){}()) !== null)) {
 	$ERROR('#0: __re = /[a-z]n/; __re.test(function(){}()) === (__re.exec(function(){}()) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T3.js
index e4e2d476f..ab16c7b50 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T3.js
- * @description RegExp is /a[a-z]{2,4}/ and tested string is new Object("abcdefghi")
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /a[a-z]{2,4}/ and tested string is new
+    Object("abcdefghi")
+---*/
 
 var __string = new Object("abcdefghi");
 __re = /a[a-z]{2,4}/;
@@ -15,5 +15,3 @@ __re = /a[a-z]{2,4}/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = new Object("abcdefghi"); __re = /a[a-z]{2,4}/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T4.js
index 6bb802c1d..04354540f 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T4.js
- * @description RegExp is /a[a-z]{2,4}?/ and tested string is {toString:function(){return "abcdefghi";}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /a[a-z]{2,4}?/ and tested string is
+    {toString:function(){return "abcdefghi";}}
+---*/
 
 var __string = {toString:function(){return "abcdefghi";}};
 __re = /a[a-z]{2,4}?/;
@@ -15,5 +15,3 @@ __re = /a[a-z]{2,4}?/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = {toString:function(){return "abcdefghi";}}; __re = /a[a-z]{2,4}?/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T5.js
index 40987cabf..1086fef1d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T5.js
- * @description RegExp is /(aa|aabaac|ba|b|c)* / and tested string is {toString:function(){return {};}, valueOf:function(){return "aabaac";}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /(aa|aabaac|ba|b|c)* / and tested string is
+    {toString:function(){return {};}, valueOf:function(){return
+    "aabaac";}}
+---*/
 
 var __string = {toString:function(){return {};}, valueOf:function(){return "aabaac";}};
 __re = /(aa|aabaac|ba|b|c)*/;
@@ -15,5 +16,3 @@ __re = /(aa|aabaac|ba|b|c)*/;
 if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 	$ERROR('#0: var __string = {toString:function(){return {};}, valueOf:function(){return "aabaac";}}; __re = /(aa|aabaac|ba|b|c)*/; __re.test(__string) === (__re.exec(__string) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T6.js
index 67c631529..a48836223 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T6.js
- * @description RegExp is /(z)((a+)?(b+)?(c))* / and tested string is (function(){return "zaacbbbcac"})()
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /(z)((a+)?(b+)?(c))* / and tested string is
+    (function(){return "zaacbbbcac"})()
+---*/
 
 __re = /(z)((a+)?(b+)?(c))*/;
 
@@ -14,5 +14,3 @@ __re = /(z)((a+)?(b+)?(c))*/;
 if (__re.test((function(){return "zaacbbbcac"})()) !== (__re.exec((function(){return "zaacbbbcac"})()) !== null)) {
 	$ERROR('#0: __re = /(z)((a+)?(b+)?(c))*/; __re.test((function(){return "zaacbbbcac"})()) === (__re.exec((function(){return "zaacbbbcac"})()) !== null)');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T7.js
index 2f58c4a4f..3a6dc5fca 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T7.js
- * @description RegExp is /[a-z]/ and tested string is {toString:function(){throw "intostr";}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /[a-z]/ and tested string is {toString:function(){throw
+    "intostr";}}
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +16,3 @@ try {
 		$ERROR('#1.2: /[a-z]/.test({toString:function(){throw "intostr";}}) throw "intostr". Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T8.js
index c26af1273..5ff70a365 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T8.js
- * @description RegExp is /[a-z]/ and tested string is {toString:void 0, valueOf:function(){throw "invalof";}}
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: >
+    RegExp is /[a-z]/ and tested string is {toString:void 0,
+    valueOf:function(){throw "invalof";}}
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +16,3 @@ try {
     $ERROR('#1.2: /[a-z]/.test({toString:void 0, valueOf:function(){throw "invalof";}}) throw "invalof". Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T9.js
index f4c2b1494..0dd107d98 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Equivalent to the expression RegExp.prototype.exec(string) != null
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A1_T9.js
- * @description RegExp is /1|12/ and tested string is function object
- */
+/*---
+info: Equivalent to the expression RegExp.prototype.exec(string) != null
+description: RegExp is /1|12/ and tested string is function object
+---*/
 
 var __string;
 __re = /1|12/;
@@ -17,4 +15,3 @@ if (__re.test(__string) !== (__re.exec(__string) !== null)) {
 }
 
 function __string(){};
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T1.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T1.js
index a439f4d8b..7432c26da 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T1.js
- * @description The tested object is new Object
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new Object
+---*/
 
 __instance = new Object;
 
@@ -20,5 +20,3 @@ try {
     $ERROR('#1.2: __instance = new Object; __instance.test = RegExp.prototype.test. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T10.js
index 460a9300f..a76717616 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T10.js
- * @description The tested object is undefined
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is undefined
+---*/
 
 test = RegExp.prototype.test;
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: test = RegExp.prototype.test; test("message to investigate"). Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T2.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T2.js
index 818fac34f..f48f3f85b 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T2.js
- * @description The tested object is Math
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is Math
+---*/
 
 __instance = Math;
 
@@ -21,6 +21,3 @@ try {
     $ERROR('#1.2: __instance = Math; __instance.test = RegExp.prototype.test;  with(__instance) test("message to investigate"). Actual: ' + (e));
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T3.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T3.js
index 022921d03..306303d3c 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T3.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T3.js
- * @description The tested object is function object
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is function object
+---*/
 
 __instance.test = RegExp.prototype.test;
 
@@ -21,4 +21,3 @@ try {
 }
 
 function __instance(){};
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T4.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T4.js
index 1c6a3b6a1..e3b0352e5 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T4.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T4.js
- * @description The tested object is new String("[a-b]")
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new String("[a-b]")
+---*/
 
 __instance = new String("[a-b]");
 
@@ -22,5 +22,3 @@ with(__instance){
       }
    }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T5.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T5.js
index 7b36fed26..d3bb9eb82 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T5.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T5.js
- * @description The tested object is new Boolean(false)
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new Boolean(false)
+---*/
 
 __instance = new Boolean(false);
 
@@ -22,4 +22,3 @@ with(__instance) {
     }
   }  
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T6.js
index a7f773750..c28e57914 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T6.js
- * @description The tested object is new Number(1.0)
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is new Number(1.0)
+---*/
 
 __instance = new Number(1.0);
 
@@ -20,5 +20,3 @@ try {
     $ERROR('#1.2: __instance = new Number(1.0); __instance.test = RegExp.prototype.test; __instance["test"]("message to investigate"). Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T7.js
index 053c11c7e..9e2b6e990 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T7.js
- * @description The tested object is false
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is false
+---*/
 
 __instance = false;
 
@@ -20,6 +20,3 @@ try {
     $ERROR('#1.2: __instance = false; Object.prototype.test = RegExp.prototype.test; __instance.test("message to investigate"). Actual: ' + (e));
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T8.js
index 67dbbf1cf..e292f8199 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T8.js
- * @description The tested object is "."
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is "."
+---*/
 
 __instance = ".";
 
@@ -20,4 +20,3 @@ try {
     $ERROR('#1.2: __instance = "."; Object.prototype.test = RegExp.prototype.test; __instance.test("message to investigate"). Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T9.js
index 754f0c536..53dcdcd56 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A TypeError exception is thrown if the this value is not an object for which the value of the internal [[Class]] property is "RegExp"
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A2_T9.js
- * @description The tested object is 1.0
- */
+/*---
+info: >
+    A TypeError exception is thrown if the this value is not an object for
+    which the value of the internal [[Class]] property is "RegExp"
+description: The tested object is 1.0
+---*/
 
 __instance = 1.0;
 
@@ -20,5 +20,3 @@ try {
     $ERROR('#1.2: __instance = 1.0; Object.prototype.test = RegExp.prototype.test; __instance.test("message to investigate"). Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A6.js
index 5634afb38..b4570d20d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A6.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.test has not prototype property
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A6.js
- * @description Checking RegExp.prototype.test.prototype
- */
+/*---
+info: RegExp.prototype.test has not prototype property
+description: Checking RegExp.prototype.test.prototype
+---*/
 
 //CHECK#1
 if (RegExp.prototype.test.prototype !== undefined) {
   $ERROR('#1: RegExp.prototype.test.prototype === undefined. Actual: ' + (RegExp.prototype.test.prototype));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A7.js
index dbbc5a305..34e6e916e 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.test can't be used as constructor
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A7.js
- * @description Checking if creating the RegExp.prototype.test object fails
- */
+/*---
+info: RegExp.prototype.test can't be used as constructor
+description: Checking if creating the RegExp.prototype.test object fails
+---*/
 
 __FACTORY = RegExp.prototype.test;
 
@@ -18,4 +16,3 @@ try {
     $ERROR('#1.2: __FACTORY = RegExp.prototype.test throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A8.js
index 39e2f2fa7..0d116c90a 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.test.length property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A8.js
- * @description Checking if enumerating the RegExp.prototype.test.length property fails
- */
+/*---
+info: The RegExp.prototype.test.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the RegExp.prototype.test.length property
+    fails
+---*/
 
 //CHECK#0
 if (RegExp.prototype.test.hasOwnProperty('length') !== true) {
@@ -28,5 +28,3 @@ for (p in RegExp.prototype.test){
 if (count !== 0) {
   $ERROR('#2: count = 0; for (p in RegExp.prototype.test){ if (p==="length") count++; } count === 0. Actual: ' + (count));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A9.js
index f5a6aa7b9..8acfb7487 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.test.length property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.6/15.10.6.3/S15.10.6.3_A9.js
- * @description Checking if deleting RegExp.prototype.test.length property fails
- */
+/*---
+info: The RegExp.prototype.test.length property has the attribute DontDelete
+description: Checking if deleting RegExp.prototype.test.length property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if ((RegExp.prototype.exec.hasOwnProperty('length') !== true)) {
@@ -22,5 +21,3 @@ if (delete RegExp.prototype.exec.length !== false) {
 if (RegExp.prototype.exec.hasOwnProperty('length') !== true) {
   $ERROR('#2: delete RegExp.prototype.exec.length; RegExp.prototype.exec.hasOwnProperty(\'length\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A10.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A10.js
index 59c73b9c4..545e1ab5f 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A10.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.toString.length property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A10.js
- * @description Checking if varying the RegExp.prototype.toString.length property fails
- */
+/*---
+info: The RegExp.prototype.toString.length property has the attribute ReadOnly
+description: >
+    Checking if varying the RegExp.prototype.toString.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.toString.hasOwnProperty('length') !== true) {
@@ -21,5 +22,3 @@ RegExp.prototype.toString.length = function(){return "shifted";};
 if (RegExp.prototype.toString.length !== __obj) {
 	$ERROR('#2: __obj = RegExp.prototype.toString.length; RegExp.prototype.toString.length = function(){return "shifted";}; RegExp.prototype.toString.length === __obj. Actual: ' + (RegExp.prototype.toString.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A11.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A11.js
index 23f54b523..3cac9e18e 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A11.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A11.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toString method is 1
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A11.js
- * @description Checking RegExp.prototype.toString.length
- */
+/*---
+info: The length property of the toString method is 1
+description: Checking RegExp.prototype.toString.length
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (RegExp.prototype.toString.hasOwnProperty("length") !== true) {
@@ -17,5 +16,3 @@ if (RegExp.prototype.toString.hasOwnProperty("length") !== true) {
 if (RegExp.prototype.toString.length !== 0) {
 	$ERROR('#2: RegExp.prototype.toString.length === 0. Actual: ' + (RegExp.prototype.toString.length));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A6.js
index 66acbd26e..2235cc583 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A6.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.toString has not prototype property
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A6.js
- * @description Checking RegExp.prototype.toString.prototype
- */
+/*---
+info: RegExp.prototype.toString has not prototype property
+description: Checking RegExp.prototype.toString.prototype
+---*/
 
 //CHECK#1
 if (RegExp.prototype.toString.prototype !== undefined) {
 	$ERROR('#1: RegExp.prototype.toString.prototype === undefined. Actual: ' + (RegExp.prototype.toString.prototype));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A7.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A7.js
index cc3296e3c..d27c1cb5d 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A7.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp.prototype.toString can't be used as constructor
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A7.js
- * @description Checking if creating the RegExp.prototype.toString object fails
- */
+/*---
+info: RegExp.prototype.toString can't be used as constructor
+description: Checking if creating the RegExp.prototype.toString object fails
+---*/
 
 __FACTORY = RegExp.prototype.toString;
 
@@ -18,4 +16,3 @@ try {
     $ERROR('#1.2: __FACTORY = RegExp.prototype.toString throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A8.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A8.js
index ae1eed75e..fbaf9a1d2 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A8.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.toString.length property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A8.js
- * @description Checking if enumerating the RegExp.prototype.toString.length property fails
- */
+/*---
+info: The RegExp.prototype.toString.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the RegExp.prototype.toString.length
+    property fails
+---*/
 
 //CHECK#0
 if (RegExp.prototype.toString.hasOwnProperty('length') !== true) {
@@ -28,5 +28,3 @@ for (p in RegExp.prototype.toString){
 if (count !== 0) {
 	$ERROR('#2: count = 0; for (p in RegExp.prototype.toString){ if (p==="length") count++; } count === 0. Actual: ' + (count));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A9.js b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A9.js
index 677fd21aa..98568b225 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A9.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp.prototype.toString.length property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.6/15.10.6.4/S15.10.6.4_A9.js
- * @description Checking if deleting the RegExp.prototype.toString.length property fails
- */
+/*---
+info: The RegExp.prototype.toString.length property has the attribute DontDelete
+description: >
+    Checking if deleting the RegExp.prototype.toString.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if ((RegExp.prototype.toString.hasOwnProperty('length') !== true)) {
@@ -22,5 +23,3 @@ if (delete RegExp.prototype.toString.length !== false) {
 if (RegExp.prototype.toString.hasOwnProperty('length') !== true) {
 	$ERROR('#2: delete RegExp.prototype.toString.length; RegExp.prototype.toString.hasOwnProperty(\'length\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/15.10.6.js b/test/suite/ch15/15.10/15.10.6/15.10.6.js
index 0f8543e4b..034c556f1 100644
--- a/test/suite/ch15/15.10/15.10.6/15.10.6.js
+++ b/test/suite/ch15/15.10/15.10.6/15.10.6.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.6/15.10.6.js

- * @description RegExp.prototype is itself a RegExp

- */

-

-

-function testcase() {

-  var s = Object.prototype.toString.call(RegExp.prototype);

-  return s === '[object RegExp]';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype is itself a RegExp
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = Object.prototype.toString.call(RegExp.prototype);
+  return s === '[object RegExp]';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T1.js b/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T1.js
index 5363d1890..9611e66c9 100644
--- a/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of RegExp.prototype.constructor is the built-in RegExp constructor
- *
- * @path ch15/15.10/15.10.6/S15.10.6.1_A1_T1.js
- * @description Compare RegExp.prototype.constructor with RegExp
- */
+/*---
+info: >
+    The initial value of RegExp.prototype.constructor is the built-in RegExp
+    constructor
+description: Compare RegExp.prototype.constructor with RegExp
+---*/
 
 //CHECK#1
 if (RegExp.prototype.constructor !== RegExp) {
 	$ERROR('#1: RegExp.prototype.constructor === RegExp. Actual: ' + (RegExp.prototype.constructor));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T2.js b/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T2.js
index 28384a3e8..2c1de28fc 100644
--- a/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/S15.10.6.1_A1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of RegExp.prototype.constructor is the built-in RegExp constructor
- *
- * @path ch15/15.10/15.10.6/S15.10.6.1_A1_T2.js
- * @description Compare instance.constructor !== RegExp, where instance is new RegExp.prototype.constructor
- */
+/*---
+info: >
+    The initial value of RegExp.prototype.constructor is the built-in RegExp
+    constructor
+description: >
+    Compare instance.constructor !== RegExp, where instance is new
+    RegExp.prototype.constructor
+---*/
 
 __FACTORY = RegExp.prototype.constructor;
 
@@ -21,5 +23,3 @@ if ((__instance instanceof RegExp) !== true) {
 if (__instance.constructor !== RegExp) {
 	$ERROR('#2: __FACTORY = RegExp.prototype.constructor; __instance = new __FACTORY; __instance.constructor === RegExp. Actual: ' + (__instance.constructor));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T1.js b/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T1.js
index aec954bef..f18865b26 100644
--- a/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the RegExp prototype object is the Object prototype
- *
- * @path ch15/15.10/15.10.6/S15.10.6_A1_T1.js
- * @description Checking Object.prototype.isPrototypeOf(RegExp.prototype)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the RegExp prototype
+    object is the Object prototype
+description: Checking Object.prototype.isPrototypeOf(RegExp.prototype)
+---*/
 
 //CHECK#1
 if (Object.prototype.isPrototypeOf(RegExp.prototype) !== true) {
 	$ERROR('#1: Object.prototype.isPrototypeOf(RegExp.prototype) === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T2.js b/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T2.js
index c937bdbf5..44b1fa94c 100644
--- a/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.6/S15.10.6_A1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the RegExp prototype object is the Object prototype
- *
- * @path ch15/15.10/15.10.6/S15.10.6_A1_T2.js
- * @description Add new property to Object.prototype and check it of RegExp.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the RegExp prototype
+    object is the Object prototype
+description: >
+    Add new property to Object.prototype and check it of
+    RegExp.prototype
+---*/
 
 Object.prototype.indicator = 1;
 
@@ -14,5 +16,3 @@ Object.prototype.indicator = 1;
 if (RegExp.prototype.indicator !== 1) {
 	$ERROR('#1: Object.prototype.indicator = 1; RegExp.prototype.indicator === 1. Actual: ' + (RegExp.prototype.indicator));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
index 6d5d532ac..c7bc914d8 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js

- * @description RegExp.prototype.source is of type String

- */

-

-

-function testcase() {

-  return (typeof(RegExp.prototype.source)) === 'string';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.source is of type String
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.source)) === 'string';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
index c3203d3b4..de58f15cf 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js

- * @description RegExp.prototype.source is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'source');

-  

-  if (d.writable === false &&

-      d.enumerable === false &&

-      d.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.source is a data property with default attribute
+    values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'source');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
index 346a6b7c7..fcd0035b9 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
- * @description Checking if varying the source property fails
- */
+/*---
+info: The RegExp instance source property has the attribute ReadOnly
+description: Checking if varying the source property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /./;
 
@@ -23,5 +22,3 @@ __re.source = "shifted";
 if (__re.source !== __obj) {
   $ERROR('#2: __re = /./; __obj = __re.source; __re.source = "shifted"; __re.source === __obj. Actual: ' + (__re.source));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
index 56a8b048d..5d738b682 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
- * @description Checking if enumerating the source property of RegExp instance fails
- */
+/*---
+info: The RegExp instance source property has the attribute DontEnum
+description: >
+    Checking if enumerating the source property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[1-2]","i");
 
@@ -28,6 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[1-2]","i"); for (p in __re){ if (p==="source") count++; } count === 0. Actual: ' + (count));
-}  
-
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
index 086a41336..27e303ef5 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
- * @description Checking if deleting the source property fails
- */
+/*---
+info: The RegExp instance source property has the attribute DontDelete
+description: Checking if deleting the source property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.source) !== false) {
 if (__re.hasOwnProperty('source') !== true) {
 	$ERROR('#2: __re = new RegExp;delete __re.source === true; __re.hasOwnProperty(\'source\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
index 16051f71d..b37256dbc 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js

- * @description RegExp.prototype.global is of type Boolean

- */

-

-

-function testcase() {

-  return (typeof(RegExp.prototype.global)) === 'boolean';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.global is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.global)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
index e0855df0d..f1b5a918b 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js

- * @description RegExp.prototype.global is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, 'global');

-  

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.global is a data property with default attribute
+    values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, 'global');
+  
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
index 22ffb66ff..300e1d781 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
- * @description Checking if varying the global property fails
- */
+/*---
+info: The RegExp instance global property has the attribute ReadOnly
+description: Checking if varying the global property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /^|^/;
 
@@ -23,5 +22,3 @@ __re.global = "shifted";
 if (__re.global !== __obj) {
   $ERROR('#2: __re = /^|^/; __obj = __re.global; __re.global = "shifted"; __re.global === __obj. Actual: ' + (__re.global));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
index 0c08304aa..d3ad4cf34 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
- * @description Checking if enumerating the global property of RegExp instance fails
- */
+/*---
+info: The RegExp instance global property has the attribute DontEnum
+description: >
+    Checking if enumerating the global property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[o-o]","m");
 
@@ -28,6 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[o-o]","m"); for (p in __re){ if (p==="global") count++; } count === 0. Actual: ' + (count));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
index 91ad471d6..c13b35b5c 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
- * @description Checking if deleting the global property fails
- */
+/*---
+info: The RegExp instance global property has the attribute DontDelete
+description: Checking if deleting the global property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.global) !== false) {
 if (__re.hasOwnProperty('global') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.global === true; __re.hasOwnProperty(\'global\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
index daf56877d..ceec1b577 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js

- * @description RegExp.prototype.ignoreCase is of type Boolean

- */

-

-

-function testcase() {

-  return (typeof(RegExp.prototype.ignoreCase)) === 'boolean';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.ignoreCase is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.ignoreCase)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
index 7bf678bfb..58698a971 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js

- * @description RegExp.prototype.ignoreCase is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'ignoreCase');

-  

-  if (d.writable === false &&

-      d.enumerable === false &&

-      d.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.ignoreCase is a data property with default
+    attribute values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'ignoreCase');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
index da394d9ff..9938c0ac5 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
- * @description Checking if varying the ignoreCase property fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute ReadOnly
+description: Checking if varying the ignoreCase property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /a|b|c/;
 
@@ -23,5 +22,3 @@ __re.ignoreCase = "shifted";
 if (__re.ignoreCase !== __obj) {
   $ERROR('#2: __re = /a|b|c/; __obj = __re.ignoreCase; __re.ignoreCase = "shifted"; __re.ignoreCase === __obj. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
index be28f3197..675cd4c4d 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
- * @description Checking if enumerating the ignoreCase property of RegExp instance fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute DontEnum
+description: >
+    Checking if enumerating the ignoreCase property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[|||||||]","");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[|||||||]",""); for (p in __re){ if (p==="ignoreCase") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
index 28f85198d..d6a14a432 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
- * @description Checking if deleting the ignoreCase property fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute DontDelete
+description: Checking if deleting the ignoreCase property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,7 +23,3 @@ if ((delete __re.ignoreCase) !== false) {
 if (__re.hasOwnProperty('ignoreCase') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.ignoreCase === true; __re.hasOwnProperty(\'ignoreCase\') === true');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
index b55fdc583..27f81b956 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js

- * @description RegExp.prototype.multiline is of type Boolean

- */

-

-

-function testcase() {

-  return (typeof(RegExp.prototype.multiline)) === 'boolean';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.multiline is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.multiline)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
index 7c34aa1d7..67cafe728 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js

- * @description RegExp.prototype.multiline is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'multiline');

-  

-  if (d.writable === false &&

-      d.enumerable === false &&

-      d.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.multiline is a data property with default
+    attribute values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'multiline');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
index 51b4435da..9d026df9e 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
- * @description Checking if varying the multiline property fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute ReadOnly
+description: Checking if varying the multiline property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /\n/;
 
@@ -23,5 +22,3 @@ __re.multiline = "shifted";
 if (__re.multiline !== __obj) {
   $ERROR('#2: __re = /\\n/; __obj = __re.multiline; __re.multiline = "shifted"; __re.multiline === __obj. Actual: ' + (__re.multiline));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
index f3301c89c..275fcc76f 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
- * @description Checking if enumerating the multiline property of RegExp instance fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute DontEnum
+description: >
+    Checking if enumerating the multiline property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[\u0041-\u0049]");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[\\u0041-\\u0049]"); for (p in __re){ if (p==="multiline") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
index 13a045a06..190883c76 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
- * @description Checking if deleting the multiline property fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute DontDelete
+description: Checking if deleting the multiline property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.multiline) !== false) {
 if (__re.hasOwnProperty('multiline') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.multiline === true; __re.hasOwnProperty(\'multiline\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
index 0d00243cc..a74dc090e 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js

- * @description RegExp.prototype.lastIndex is of type Number

- */

-

-

-function testcase() {

-  return (typeof(RegExp.prototype.lastIndex)) === 'number';

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.lastIndex is of type Number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.lastIndex)) === 'number';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
index e7c88868e..6ecb66bc2 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js

- * @description RegExp.prototype.lastIndex is a data property with specified attribute values

- */

-

-

-function testcase() {

-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'lastIndex');

-  

-  if (d.writable === true &&

-      d.enumerable === false &&

-      d.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.lastIndex is a data property with specified
+    attribute values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'lastIndex');
+  
+  if (d.writable === true &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
index c2213511b..69a57cde2 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance lastIndex property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
- * @description Checking if enumerating the lastIndex property of RegExp instance fails
- */
+/*---
+info: The RegExp instance lastIndex property has the attribute DontEnum
+description: >
+    Checking if enumerating the lastIndex property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("A?B");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("A?B"); for (p in __re){ if (p==="lastIndex") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
index 0150240ce..e0337ff60 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance lastIndex property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
- * @description Checking if deleting the lastIndex property fails
- */
+/*---
+info: The RegExp instance lastIndex property has the attribute DontDelete
+description: Checking if deleting the lastIndex property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.lastIndex) !== false) {
 if (__re.hasOwnProperty('lastIndex') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.lastIndex === true; __re.hasOwnProperty(\'lastIndex\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
index 7153f569f..e936fcc1a 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[call]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A1_T1.js
- * @description Checking if call of RegExp instance fails
- */
+/*---
+info: RegExp instance has not [[call]] property
+description: Checking if call of RegExp instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: /[^a]*/() throw TypeError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
index 29b687f5c..97c81d329 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[call]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A1_T2.js
- * @description Checking if call of RegExp("a|b","g")() fails
- */
+/*---
+info: RegExp instance has not [[call]] property
+description: Checking if call of RegExp("a|b","g")() fails
+---*/
 
 //CHECK#1
 try {
@@ -16,6 +14,3 @@ try {
     $ERROR('#1.2: RegExp("a|b","g")() throw TypeError. Actual: ' + (e));
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
index 357fd953f..1144bf86e 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[construct]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A2_T1.js
- * @description Checking if creating new RegExp instance fails
- */
+/*---
+info: RegExp instance has not [[construct]] property
+description: Checking if creating new RegExp instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
     $ERROR('#1.2: new /z/() throw TypeError. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
index fd7df6512..0bf9401ec 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[construct]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A2_T2.js
- * @description Checking if creating "new RegExp" instance fails
- */
+/*---
+info: RegExp instance has not [[construct]] property
+description: Checking if creating "new RegExp" instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
     $ERROR('#1.2: new new RegExp throw TypeError. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
index 25ce3575f..47257c4cc 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance type is RegExp
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A3_T1.js
- * @description Checking type of RegExp instance with operators typeof, instanceof and check it constructor.
- * RegExp instance is /[^a]* /
- */
+/*---
+info: RegExp instance type is RegExp
+description: >
+    Checking type of RegExp instance with operators typeof, instanceof
+    and check it constructor.  RegExp instance is /[^a]* /
+---*/
 
 __re = /[^a]*/;
 
@@ -25,5 +24,3 @@ if (__re.constructor !== RegExp) {
 if ((__re instanceof RegExp) !== true) {
 	$ERROR('#3: __re = /[^a]*/; (__re instanceof RegExp) === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
index 5b1d51d09..82e3473f9 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance type is RegExp
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A3_T2.js
- * @description Checking type of RegExp instance with operators typeof, instanceof and check it constructor.
- * RegExp instance is new RegExp
- */
+/*---
+info: RegExp instance type is RegExp
+description: >
+    Checking type of RegExp instance with operators typeof, instanceof
+    and check it constructor.  RegExp instance is new RegExp
+---*/
 
 __re = new RegExp;
 
@@ -25,5 +24,3 @@ if (__re.constructor !== RegExp) {
 if ((__re instanceof RegExp) !== true) {
 	$ERROR('#3: __re = new RegExp; (__re instanceof RegExp) === true');
 }
-
-
diff --git a/test/suite/ch15/15.11/15.11-1.js b/test/suite/ch15/15.11/15.11-1.js
index cb91a2eee..bb9ffbd64 100644
--- a/test/suite/ch15/15.11/15.11-1.js
+++ b/test/suite/ch15/15.11/15.11-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11-1.js

- * @description Error - ConversionError has been removed from IE9 standard mode

- */

-

-

-function testcase() {

-        return typeof ConversionError === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Error - ConversionError has been removed from IE9 standard mode
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return typeof ConversionError === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11-2.js b/test/suite/ch15/15.11/15.11-2.js
index 26368d242..f25ea5094 100644
--- a/test/suite/ch15/15.11/15.11-2.js
+++ b/test/suite/ch15/15.11/15.11-2.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11-2.js

- * @description Error - RegExpError has been removed from IE9 standard mode

- */

-

-

-function testcase() {

-        return typeof RegExpError === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Error - RegExpError has been removed from IE9 standard mode
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return typeof RegExpError === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A1_T1.js b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A1_T1.js
index d39a29049..eafe4dd91 100644
--- a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument "message" is not undefined, the message property of the newly constructed object is
- * set to ToString(message)
- *
- * @path ch15/15.11/15.11.1/S15.11.1.1_A1_T1.js
- * @description Checking message property of different error objects
- */
+/*---
+info: >
+    If the argument "message" is not undefined, the message property of the newly constructed object is
+    set to ToString(message)
+description: Checking message property of different error objects
+---*/
 
 function otherScope(msg)
 {
@@ -49,4 +48,3 @@ if(err4.message!=="msg4"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A2_T1.js b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A2_T1.js
index b681dc8d6..509e6712f 100644
--- a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A2_T1.js
+++ b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original Error prototype
- * object, the one that is the initial value of Error.prototype (15.11.3.1)
- *
- * @path ch15/15.11/15.11.1/S15.11.1.1_A2_T1.js
- * @description Checking prototype of the newly constructed Error object
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the original Error prototype
+    object, the one that is the initial value of Error.prototype (15.11.3.1)
+description: Checking prototype of the newly constructed Error object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +16,3 @@ if(!Error.prototype.isPrototypeOf(err1)){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A3_T1.js b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A3_T1.js
index b9bf2cc7a..3120943c8 100644
--- a/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A3_T1.js
+++ b/test/suite/ch15/15.11/15.11.1/S15.11.1.1_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "Error"
- *
- * @path ch15/15.11/15.11.1/S15.11.1.1_A3_T1.js
- * @description Checking Class of the newly constructed Error object using toSting() function
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "Error"
+description: >
+    Checking Class of the newly constructed Error object using
+    toSting() function
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +17,3 @@ if(err1.toString()!=='[object '+ 'Error' +']'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.1/S15.11.1_A1_T1.js b/test/suite/ch15/15.11/15.11.1/S15.11.1_A1_T1.js
index edc20a3a8..c6611959c 100644
--- a/test/suite/ch15/15.11/15.11.1/S15.11.1_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.1/S15.11.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The function call Error(...) is equivalent to the object creation expression new
- * Error(...) with the same arguments
- *
- * @path ch15/15.11/15.11.1/S15.11.1_A1_T1.js
- * @description Checking constructor of the newly constructed Error object
- */
+/*---
+info: >
+    The function call Error(...) is equivalent to the object creation expression new
+    Error(...) with the same arguments
+description: Checking constructor of the newly constructed Error object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +17,3 @@ if(err1.constructor!==Error){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A1_T1.js b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A1_T1.js
index 4fe9dc58f..8a81a95f4 100644
--- a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument "message" is not undefined, the message property of the newly constructed object is
- * set to ToString(message)
- *
- * @path ch15/15.11/15.11.2/S15.11.2.1_A1_T1.js
- * @description Checking message property of different error objects
- */
+/*---
+info: >
+    If the argument "message" is not undefined, the message property of the newly constructed object is
+    set to ToString(message)
+description: Checking message property of different error objects
+---*/
 
 function otherScope(msg)
 {
@@ -49,4 +48,3 @@ if(err4.message!=="msg4"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A2_T1.js b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A2_T1.js
index f574d222a..18370413a 100644
--- a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A2_T1.js
+++ b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original Error prototype
- * object, the one that is the initial value of Error.prototype (15.11.3.1)
- *
- * @path ch15/15.11/15.11.2/S15.11.2.1_A2_T1.js
- * @description Checking prototype of the newly constructed Error object
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the original Error prototype
+    object, the one that is the initial value of Error.prototype (15.11.3.1)
+description: Checking prototype of the newly constructed Error object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +16,3 @@ if(!Error.prototype.isPrototypeOf(err1)){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A3_T1.js b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A3_T1.js
index 22cd7eac0..8afef68f5 100644
--- a/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A3_T1.js
+++ b/test/suite/ch15/15.11/15.11.2/S15.11.2.1_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "Error"
- *
- * @path ch15/15.11/15.11.2/S15.11.2.1_A3_T1.js
- * @description Checking Class of the newly constructed Error object using toSting() function
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "Error"
+description: >
+    Checking Class of the newly constructed Error object using
+    toSting() function
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +17,3 @@ if(err1.toString()!=='[object '+ 'Error' +']'){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A1_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A1_T1.js
index 12bfdf2b6..59c7e655f 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Error.prototype property has the attributes {DontDelete}
- *
- * @path ch15/15.11/15.11.3/S15.11.3.1_A1_T1.js
- * @description Checking if deleting the Error.prototype property fails
- */
+/*---
+info: Error.prototype property has the attributes {DontDelete}
+description: Checking if deleting the Error.prototype property fails
+---*/
 
 var proto=Error.prototype;
 //////////////////////////////////////////////////////////////////////////////
@@ -24,4 +22,3 @@ if(Error.prototype!==proto){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A2_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A2_T1.js
index a50147e8e..2e5164646 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A2_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Error.prototype property has the attributes {DontEnum}
- *
- * @path ch15/15.11/15.11.3/S15.11.3.1_A2_T1.js
- * @description Checking if enumerating the Error.prototype property fails
- */
+/*---
+info: Error.prototype property has the attributes {DontEnum}
+description: Checking if enumerating the Error.prototype property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -39,4 +37,3 @@ if (cout !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A3_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A3_T1.js
index 4229efe59..99614a20d 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A3_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Error.prototype property has the attributes {ReadOnly}
- *
- * @path ch15/15.11/15.11.3/S15.11.3.1_A3_T1.js
- * @description Checking if varying the Error.prototype property fails
- */
+/*---
+info: Error.prototype property has the attributes {ReadOnly}
+description: Checking if varying the Error.prototype property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -38,4 +36,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A4_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A4_T1.js
index 55469a992..943496050 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A4_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3.1_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Error has property prototype
- *
- * @path ch15/15.11/15.11.3/S15.11.3.1_A4_T1.js
- * @description Checking Error.hasOwnProperty('prototype')
- */
+/*---
+info: The Error has property prototype
+description: Checking Error.hasOwnProperty('prototype')
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (!(Error.hasOwnProperty('prototype'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3_A1_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3_A1_T1.js
index 75e8bfd44..051001033 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3_A1_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Error constructor is the Function prototype object(15.3.4)
- *
- * @path ch15/15.11/15.11.3/S15.11.3_A1_T1.js
- * @description Checking prototype of constructor of the newly constructed Error object
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Error constructor
+    is the Function prototype object(15.3.4)
+description: >
+    Checking prototype of constructor of the newly constructed Error
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -24,4 +26,3 @@ if(!Function.prototype.isPrototypeOf(Error.constructor)){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.3/S15.11.3_A2_T1.js b/test/suite/ch15/15.11/15.11.3/S15.11.3_A2_T1.js
index 4cc976bfd..80a00cbf6 100644
--- a/test/suite/ch15/15.11/15.11.3/S15.11.3_A2_T1.js
+++ b/test/suite/ch15/15.11/15.11.3/S15.11.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property value is 1
- *
- * @path ch15/15.11/15.11.3/S15.11.3_A2_T1.js
- * @description Checking length property
- */
+/*---
+info: The length property value is 1
+description: Checking length property
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -24,4 +22,3 @@ if(Error.constructor.length!==1){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.2/15.11.4.2-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.2/15.11.4.2-1.js
index 2dc2b04b1..cc0fa4374 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.2/15.11.4.2-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.2/15.11.4.2-1.js
@@ -1,22 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.2/15.11.4.2-1.js

- * @description Error.prototype.name is not enumerable.

- */

-

-

-

-

-function testcase() {

-        for (var i in Error.prototype) {

-            if (i==="name") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Error.prototype.name is not enumerable.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        for (var i in Error.prototype) {
+            if (i==="name") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.3/15.11.4.3-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.3/15.11.4.3-1.js
index 74ce0ce0f..bb391739d 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.3/15.11.4.3-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.3/15.11.4.3-1.js
@@ -1,22 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.3/15.11.4.3-1.js

- * @description Error.prototype.message is not enumerable.

- */

-

-

-

-

-function testcase() {

-        for (var i in Error.prototype) {

-            if (i==="message") {

-                return false;

-            }

-        }

-        return true;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Error.prototype.message is not enumerable.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        for (var i in Error.prototype) {
+            if (i==="message") {
+                return false;
+            }
+        }
+        return true;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-10-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-10-1.js
index d897e52e5..e88c62f92 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-10-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-10-1.js
@@ -1,17 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-10-1.js

- * @description Error.prototype.toString return the result of concatenating 'name', ':', a single space character, and 'msg' when 'name' and 'msg' are non-empty string

- */

-

-

-function testcase() {

-        var errObj = new Error("ErrorMessage");

-        errObj.name = "ErrorName";

-        return errObj.toString() === "ErrorName: ErrorMessage";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString return the result of concatenating
+    'name', ':', a single space character, and 'msg' when 'name' and
+    'msg' are non-empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("ErrorMessage");
+        errObj.name = "ErrorName";
+        return errObj.toString() === "ErrorName: ErrorMessage";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-1.js
index 6156ad2c3..0662afadf 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-1.js

- * @description Error.prototype.toString - 'Error' is returned when 'name' is absent and empty string is returned when 'msg' is undefined

- */

-

-

-function testcase() {

-        var errObj = new Error();

-        return errObj.toString() === "Error";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString - 'Error' is returned when 'name' is
+    absent and empty string is returned when 'msg' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+        return errObj.toString() === "Error";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-2.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-2.js
index b3f85693a..a20573b69 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-2.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-2.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-6-2.js

- * @description Error.prototype.toString - 'Error' is returned when 'name' is absent and value of 'msg' is returned when 'msg' is non-empty string

- */

-

-

-function testcase() {

-        var errObj = new Error("ErrorMessage");

-        return errObj.toString() === "Error: ErrorMessage";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString - 'Error' is returned when 'name' is
+    absent and value of 'msg' is returned when 'msg' is non-empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("ErrorMessage");
+        return errObj.toString() === "Error: ErrorMessage";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-1.js
index 8541ba36c..21c4d5386 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-1.js

- * @description Error.prototype.toString return the value of 'msg' when 'name' is empty string and 'msg' isn't undefined

- */

-

-

-function testcase() {

-        var errObj = new Error("ErrorMessage");

-        errObj.name = "";

-        return errObj.toString() === "ErrorMessage";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString return the value of 'msg' when 'name' is
+    empty string and 'msg' isn't undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("ErrorMessage");
+        errObj.name = "";
+        return errObj.toString() === "ErrorMessage";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-2.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-2.js
index 627e83e59..86822ef82 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-2.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-8-2.js

- * @description Error.prototype.toString return empty string when 'name' is empty string and 'msg' is undefined

- */

-

-

-function testcase() {

-        var errObj = new Error();

-        errObj.name = "";

-        return errObj.toString() === "";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString return empty string when 'name' is empty
+    string and 'msg' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+        errObj.name = "";
+        return errObj.toString() === "";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-9-1.js b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-9-1.js
index fda516b62..e6e2a486a 100644
--- a/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-9-1.js
+++ b/test/suite/ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-9-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.11/15.11.4/15.11.4.4/15.11.4.4-9-1.js

- * @description Error.prototype.toString return 'name' when 'name' is non-empty string and 'msg' is empty string

- */

-

-

-function testcase() {

-        var errObj = new Error();

-        errObj.name = "ErrorName";

-        return errObj.toString() === "ErrorName";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Error.prototype.toString return 'name' when 'name' is non-empty
+    string and 'msg' is empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+        errObj.name = "ErrorName";
+        return errObj.toString() === "ErrorName";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T1.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T1.js
index 7cd2f6c02..ca5d54501 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T1.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Error.prototype.constructor is the built-in Error constructor
- *
- * @path ch15/15.11/15.11.4/S15.11.4.1_A1_T1.js
- * @description Checking Error.prototype.constructor
- */
+/*---
+info: >
+    The initial value of Error.prototype.constructor is the built-in Error
+    constructor
+description: Checking Error.prototype.constructor
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (Error.prototype.constructor !== Error) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T2.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T2.js
index 9954e3f87..ee073cf41 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T2.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.1_A1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Error.prototype.constructor is the built-in Error constructor
- *
- * @path ch15/15.11/15.11.4/S15.11.4.1_A1_T2.js
- * @description Checking if creating "new Error.prototype.constructor" passes and checking its properties
- */
+/*---
+info: >
+    The initial value of Error.prototype.constructor is the built-in Error
+    constructor
+description: >
+    Checking if creating "new Error.prototype.constructor" passes and
+    checking its properties
+---*/
 
 constr = Error.prototype.constructor;
 
@@ -53,4 +55,3 @@ if (err.valueOf().toString() !== to_string_result) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A1.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A1.js
index 5a93eb456..e699e7c57 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A1.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Error.prototype has name property
- *
- * @path ch15/15.11/15.11.4/S15.11.4.2_A1.js
- * @description Checking Error.prototype.name
- */
+/*---
+info: The Error.prototype has name property
+description: Checking Error.prototype.name
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -15,4 +13,3 @@ if (!Error.prototype.hasOwnProperty('name')) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A2.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A2.js
index 66eab2c82..01e330424 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A2.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.2_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Error.prototype.name is "Error"
- *
- * @path ch15/15.11/15.11.4/S15.11.4.2_A2.js
- * @description Checking value of Error.prototype.name
- */
+/*---
+info: The initial value of Error.prototype.name is "Error"
+description: Checking value of Error.prototype.name
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -15,4 +13,3 @@ if (Error.prototype.name!=="Error") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A1.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A1.js
index dc51512fd..879ade692 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A1.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Error.prototype has message property
- *
- * @path ch15/15.11/15.11.4/S15.11.4.3_A1.js
- * @description Checking Error.prototype.message
- */
+/*---
+info: The Error.prototype has message property
+description: Checking Error.prototype.message
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -15,4 +13,3 @@ if (!Error.prototype.hasOwnProperty('message')) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A2.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A2.js
index 48ada9c30..f032ea74c 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A2.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.3_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Error.prototype.message is ""
- *
- * @path ch15/15.11/15.11.4/S15.11.4.3_A2.js
- * @description Checking value of Error.prototype.message
- */
+/*---
+info: The initial value of Error.prototype.message is ""
+description: Checking value of Error.prototype.message
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -15,4 +13,3 @@ if (typeof Error.prototype.message !== "string") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A1.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A1.js
index b0ff33231..212c470de 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A1.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Error.prototype has toString property
- *
- * @path ch15/15.11/15.11.4/S15.11.4.4_A1.js
- * @description Checking Error.prototype.toString
- */
+/*---
+info: The Error.prototype has toString property
+description: Checking Error.prototype.toString
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -15,4 +13,3 @@ if (!Error.prototype.hasOwnProperty('toString')) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A2.js b/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A2.js
index 297a97b8f..7cd3e6d77 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A2.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4.4_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Error.prototype.toString returns an implementation defined string
- *
- * @path ch15/15.11/15.11.4/S15.11.4.4_A2.js
- * @description Checking if call of Error.prototype.toSting() fails
- */
+/*---
+info: The Error.prototype.toString returns an implementation defined string
+description: Checking if call of Error.prototype.toSting() fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -22,4 +20,3 @@ if (toStr===undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4_A1.js b/test/suite/ch15/15.11/15.11.4/S15.11.4_A1.js
index 9bbd6a9e8..72f4100e6 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4_A1.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Error prototype object is the Object prototype
- * object(15.2.3.1)
- *
- * @path ch15/15.11/15.11.4/S15.11.4_A1.js
- * @description Get Error.prototype and compare with Object.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Error prototype object is the Object prototype
+    object(15.2.3.1)
+description: Get Error.prototype and compare with Object.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#1
@@ -16,4 +15,3 @@ if (!Object.prototype.isPrototypeOf(Error.prototype)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4_A2.js b/test/suite/ch15/15.11/15.11.4/S15.11.4_A2.js
index ec39fe60d..b728591c2 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4_A2.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Class]] property of Error prototype object is "Error"
- *
- * @path ch15/15.11/15.11.4/S15.11.4_A2.js
- * @description Getting the value of the internal [[Class]] property using Error.prototype.toString() function
- */
+/*---
+info: >
+    The value of the internal [[Class]] property of Error prototype object is
+    "Error"
+description: >
+    Getting the value of the internal [[Class]] property using
+    Error.prototype.toString() function
+---*/
 
 Error.prototype.toString=Object.prototype.toString;
 __tostr = Error.prototype.toString();
@@ -18,4 +20,3 @@ if (__tostr !== "[object Error]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4_A3.js b/test/suite/ch15/15.11/15.11.4/S15.11.4_A3.js
index 6b39d0bca..2e20ba950 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4_A3.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4_A3.js
@@ -1,21 +1,21 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since Error prototype object is not function it has not [[call]] method
- *
- * @path ch15/15.11/15.11.4/S15.11.4_A3.js
- * @description Checking if call of Error prototype as a function fails
- */
+/*---
+info: Since Error prototype object is not function it has not [[call]] method
+description: Checking if call of Error prototype as a function fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
 	Error.prototype();
-	$FAIL('#1: "Error.prototype()" lead to throwing exception');

-} catch (e) {

+	$FAIL('#1: "Error.prototype()" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.11/15.11.4/S15.11.4_A4.js b/test/suite/ch15/15.11/15.11.4/S15.11.4_A4.js
index 2b9dd3ce9..cc62d6192 100644
--- a/test/suite/ch15/15.11/15.11.4/S15.11.4_A4.js
+++ b/test/suite/ch15/15.11/15.11.4/S15.11.4_A4.js
@@ -1,21 +1,21 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since Error prototype object is not function it has not [[create]] method
- *
- * @path ch15/15.11/15.11.4/S15.11.4_A4.js
- * @description Checking if creating "new Error.prototype" fails
- */
+/*---
+info: Since Error prototype object is not function it has not [[create]] method
+description: Checking if creating "new Error.prototype" fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try {
 	__instance = new Object.prototype;
-	$FAIL('#1: "__instance = new Object.prototype" lead to throwing exception');

-} catch (e) {

+	$FAIL('#1: "__instance = new Object.prototype" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.12/15.12-0-1.js b/test/suite/ch15/15.12/15.12-0-1.js
index 558ac4ac3..f0d2651f4 100644
--- a/test/suite/ch15/15.12/15.12-0-1.js
+++ b/test/suite/ch15/15.12/15.12-0-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object.

- * 4.2 calls out JSON as one of the built-in objects.

- *

- * @path ch15/15.12/15.12-0-1.js

- * @description JSON must be a built-in object

- */

-

-

-function testcase() {

-  var o = JSON;

-  if (typeof(o) === "object") {  

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object.
+    4.2 calls out JSON as one of the built-in objects.
+description: JSON must be a built-in object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = JSON;
+  if (typeof(o) === "object") {  
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12-0-2.js b/test/suite/ch15/15.12/15.12-0-2.js
index 97b8d4577..85a308052 100644
--- a/test/suite/ch15/15.12/15.12-0-2.js
+++ b/test/suite/ch15/15.12/15.12-0-2.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object, and must not support [[Construct]].

- * step 4 in 11.2.2 should throw a TypeError exception.

- *

- * @path ch15/15.12/15.12-0-2.js

- * @description JSON must not support the [[Construct]] method

- */

-

-

-function testcase() {

-  var o = JSON;

-

-  try {

-    var j = new JSON();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object, and must not support [[Construct]].
+    step 4 in 11.2.2 should throw a TypeError exception.
+description: JSON must not support the [[Construct]] method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = JSON;
+
+  try {
+    var j = new JSON();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12-0-3.js b/test/suite/ch15/15.12/15.12-0-3.js
index f1e291387..2fbbc341d 100644
--- a/test/suite/ch15/15.12/15.12-0-3.js
+++ b/test/suite/ch15/15.12/15.12-0-3.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object, and must not support [[Call]].

- * step 5 in 11.2.3 should throw a TypeError exception.

- *

- * @path ch15/15.12/15.12-0-3.js

- * @description JSON must not support the [[Call]] method

- */

-

-

-function testcase() {

-  var o = JSON;

-

-  try {

-    var j = JSON();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object, and must not support [[Call]].
+    step 5 in 11.2.3 should throw a TypeError exception.
+description: JSON must not support the [[Call]] method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = JSON;
+
+  try {
+    var j = JSON();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12-0-4.js b/test/suite/ch15/15.12/15.12-0-4.js
index fc0516c82..b2c82c185 100644
--- a/test/suite/ch15/15.12/15.12-0-4.js
+++ b/test/suite/ch15/15.12/15.12-0-4.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The last paragraph in section 15 says "every other property described

- * in this section has the attribute {... [[Enumerable]] : false ...}

- * unless otherwise specified. This default applies to the properties on

- * JSON, and we should not be able to enumerate them.

- *

- * @path ch15/15.12/15.12-0-4.js

- * @description JSON object's properties must be non enumerable

- */

-

-

-function testcase() { 

-  var o = JSON;

-  var i = 0;

-  for (var p in o) {

-    i++;

-  }

-    

-  if (i === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The last paragraph in section 15 says "every other property described
+    in this section has the attribute {... [[Enumerable]] : false ...}
+    unless otherwise specified. This default applies to the properties on
+    JSON, and we should not be able to enumerate them.
+description: JSON object's properties must be non enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+  var o = JSON;
+  var i = 0;
+  for (var p in o) {
+    i++;
+  }
+    
+  if (i === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-1.js
index 1e9ba28fd..ee774fe52 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-1.js

- * @description The JSON lexical grammar treats whitespace as a token seperator

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('12\t\r\n 34'); // should produce a syntax error as whitespace results in two tokens

-    }

-  catch (e) {

-      if (e.name === 'SyntaxError') return true;

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: The JSON lexical grammar treats whitespace as a token seperator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('12\t\r\n 34'); // should produce a syntax error as whitespace results in two tokens
+    }
+  catch (e) {
+      if (e.name === 'SyntaxError') return true;
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-2.js
index a34bb3375..2da058e8b 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-2.js

- * @description <VT> is not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\u000b1234'); // should produce a syntax error 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    <VT> is not valid JSON whitespace as specified by the production
+    JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\u000b1234'); // should produce a syntax error 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-3.js
index 727099e4c..22136d56e 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-3.js

- * @description <FF> is not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\u000c1234'); // should produce a syntax error 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    <FF> is not valid JSON whitespace as specified by the production
+    JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\u000c1234'); // should produce a syntax error 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-4.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-4.js
index 15a533e8e..3c2457574 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-4.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-4.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-4.js

- * @description <NBSP> is not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\u00a01234'); // should produce a syntax error 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    <NBSP> is not valid JSON whitespace as specified by the production
+    JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\u00a01234'); // should produce a syntax error 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-5.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-5.js
index 7d306f87d..33b65a267 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-5.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-5.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-5.js

- * @description <ZWSPP> is not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\u200b1234'); // should produce a syntax error 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    <ZWSPP> is not valid JSON whitespace as specified by the
+    production JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\u200b1234'); // should produce a syntax error 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-6.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-6.js
index 9505cdb1a..4dde840e2 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-6.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-6.js

- * @description <BOM> is not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\ufeff1234'); // should produce a syntax error a

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    <BOM> is not valid JSON whitespace as specified by the production
+    JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\ufeff1234'); // should produce a syntax error a
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-7.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-7.js
index 7d33a040f..36102b973 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-7.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-7.js

- * @description other category z spaces are not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    // the following should produce a syntax error 

-    JSON.parse('\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u30001234'); 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-     }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    other category z spaces are not valid JSON whitespace as specified
+    by the production JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    // the following should produce a syntax error 
+    JSON.parse('\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u30001234'); 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+     }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-8.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-8.js
index 503e664d7..0a4b4f214 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-8.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-8.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-8.js

- * @description U+2028 and U+2029 are not valid JSON whitespace as specified by the production JSONWhitespace.

- */

-

-

-function testcase() {

-  

-  try {

-    JSON.parse('\u2028\u20291234'); // should produce a syntax error 

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    U+2028 and U+2029 are not valid JSON whitespace as specified by
+    the production JSONWhitespace.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  try {
+    JSON.parse('\u2028\u20291234'); // should produce a syntax error 
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-9.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-9.js
index 93f4a377e..27b7ae9a3 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-9.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-9.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-0-9.js

- * @description Whitespace characters can appear before/after any JSONtoken

- */

-

-

-function testcase() {

-

-    JSON.parse('\t\r \n{\t\r \n'+

-                   '"property"\t\r \n:\t\r \n{\t\r \n}\t\r \n,\t\r \n' +

-                   '"prop2"\t\r \n:\t\r \n'+

-                        '[\t\r \ntrue\t\r \n,\t\r \nnull\t\r \n,123.456\t\r \n]'+

-                     '\t\r \n}\t\r \n');  // should JOSN parse without error

-    return true;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Whitespace characters can appear before/after any JSONtoken
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+    JSON.parse('\t\r \n{\t\r \n'+
+                   '"property"\t\r \n:\t\r \n{\t\r \n}\t\r \n,\t\r \n' +
+                   '"prop2"\t\r \n:\t\r \n'+
+                        '[\t\r \ntrue\t\r \n,\t\r \nnull\t\r \n,123.456\t\r \n]'+
+                     '\t\r \n}\t\r \n');  // should JOSN parse without error
+    return true;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-1.js
index 3c82d72a9..65d1e6814 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-1.js

- * @description The JSON lexical grammar treats <TAB> as a whitespace character

- */

-

-

-function testcase() {

-  if (JSON.parse('\t1234')!==1234) return false; // <TAB> should be ignored

-  try {

-    JSON.parse('12\t34'); // <TAB> should produce a syntax error as whitespace results in two tokens

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: The JSON lexical grammar treats <TAB> as a whitespace character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (JSON.parse('\t1234')!==1234) return false; // <TAB> should be ignored
+  try {
+    JSON.parse('12\t34'); // <TAB> should produce a syntax error as whitespace results in two tokens
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-2.js
index db9274467..0dafa198f 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-2.js

- * @description The JSON lexical grammar treats <CR> as a whitespace character

- */

-

-

-function testcase() {

-  if (JSON.parse('\r1234')!==1234) return false; // <cr> should be ignored

-  try {

-    JSON.parse('12\r34'); // <CR> should produce a syntax error as whitespace results in two tokens

-    }

-  catch (e) {

-      if (e.name === 'SyntaxError') return true;

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: The JSON lexical grammar treats <CR> as a whitespace character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (JSON.parse('\r1234')!==1234) return false; // <cr> should be ignored
+  try {
+    JSON.parse('12\r34'); // <CR> should produce a syntax error as whitespace results in two tokens
+    }
+  catch (e) {
+      if (e.name === 'SyntaxError') return true;
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-3.js
index 478c5159b..f53ce1929 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-3.js

- * @description The JSON lexical grammar treats <LF> as a whitespace character

- */

-

-

-function testcase() {

-  if (JSON.parse('\n1234')!==1234) return false; // <LF> should be ignored

-  try {

-    JSON.parse('12\n34'); // <LF> should produce a syntax error as whitespace results in two tokens

-    }

-  catch (e) {

-      if (e.name === 'SyntaxError') return true;

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: The JSON lexical grammar treats <LF> as a whitespace character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (JSON.parse('\n1234')!==1234) return false; // <LF> should be ignored
+  try {
+    JSON.parse('12\n34'); // <LF> should produce a syntax error as whitespace results in two tokens
+    }
+  catch (e) {
+      if (e.name === 'SyntaxError') return true;
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-4.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-4.js
index 846f73743..1b617675c 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-4.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g1-4.js

- * @description The JSON lexical grammar treats <SP> as a whitespace character

- */

-

-

-function testcase() {

- if (JSON.parse(' 1234')!=1234) return false; // <SP> should be ignored

-  try {

-    JSON.parse('12 34'); // <SP> should produce a syntax error as whitespace results in two tokens

-    }

-  catch (e) {

-      if (e.name === 'SyntaxError') return true;

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: The JSON lexical grammar treats <SP> as a whitespace character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+ if (JSON.parse(' 1234')!=1234) return false; // <SP> should be ignored
+  try {
+    JSON.parse('12 34'); // <SP> should produce a syntax error as whitespace results in two tokens
+    }
+  catch (e) {
+      if (e.name === 'SyntaxError') return true;
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-1.js
index fb659899f..06208e2e0 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-1.js

- * @description JSONStrings can be written using double quotes

- */

-

-

-function testcase() {

-  return JSON.parse('"abc"')==="abc"; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSONStrings can be written using double quotes
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.parse('"abc"')==="abc"; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-2.js
index 92f5a6bb1..69ce73ce1 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-2.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-2.js

- * @description A JSONString may not be delimited by single quotes 

- */

-function testcase() {

-    try {

-        if (JSON.parse("'abc'") ==='abc') return false;

-       }

-     catch (e) {

-        return true;

-        }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: A JSONString may not be delimited by single quotes
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        if (JSON.parse("'abc'") ==='abc') return false;
+       }
+     catch (e) {
+        return true;
+        }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-3.js
index 999874409..869057b0e 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-3.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-3.js

- * @description A JSONString may not be delimited by Uncode escaped quotes 

- */

-function testcase() {

-    try {

-        if (JSON.parse("\\u0022abc\\u0022") ==='abc') return false;

-       }

-     catch (e) {

-        return true;

-        }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: A JSONString may not be delimited by Uncode escaped quotes
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        if (JSON.parse("\\u0022abc\\u0022") ==='abc') return false;
+       }
+     catch (e) {
+        return true;
+        }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-4.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-4.js
index d4de78be9..f440dbce7 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-4.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-4.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-4.js

- * @description A JSONString must both begin and end with double quotes

- */

-function testcase() {

-    try {

-        if (JSON.parse('"ab'+"c'") ==='abc') return false;

-       }

-     catch (e) {

-        return true;

-        }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: A JSONString must both begin and end with double quotes
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        if (JSON.parse('"ab'+"c'") ==='abc') return false;
+       }
+     catch (e) {
+        return true;
+        }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-5.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-5.js
index 2426de9b5..6ef3adbb7 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-5.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-5.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g2-5.js

- * @description A JSONStrings can contain no JSONStringCharacters (Empty JSONStrings)

- */

-

-

-function testcase() {

-  return JSON.parse('""')===""; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSONStrings can contain no JSONStringCharacters (Empty
+    JSONStrings)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.parse('""')===""; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-1.js
index f1dfd81c9..26b5a1423 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-1.js

- * @description The JSON lexical grammar does not allow a JSONStringCharacter to be any of the Unicode characters U+0000 thru U+0007

- */

-

-

-function testcase() {

-  try {

-    JSON.parse('"\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007"'); // invalid string characters should produce a syntax error

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammar does not allow a JSONStringCharacter to
+    be any of the Unicode characters U+0000 thru U+0007
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.parse('"\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007"'); // invalid string characters should produce a syntax error
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-2.js
index e1a6db9b6..d563efa55 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-2.js

- * @description The JSON lexical grammar does not allow a JSONStringCharacter to be any of the Unicode characters U+0008 thru U+000F

- */

-

-

-function testcase() {

-  try {

-    JSON.parse('"\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f"'); // invalid string characters should produce a syntax error

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammar does not allow a JSONStringCharacter to
+    be any of the Unicode characters U+0008 thru U+000F
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.parse('"\u0008\u0009\u000a\u000b\u000c\u000d\u000e\u000f"'); // invalid string characters should produce a syntax error
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-3.js
index dd06226bb..559306f45 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-3.js

- * @description The JSON lexical grammar does not allow a JSONStringCharacter to be any of the Unicode characters U+0010 thru U+0017

- */

-

-

-function testcase() {

-  try {

-    JSON.parse('"\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017"'); // invalid string characters should produce a syntax error

-    }

-  catch (e) {

-      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammar does not allow a JSONStringCharacter to
+    be any of the Unicode characters U+0010 thru U+0017
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.parse('"\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017"'); // invalid string characters should produce a syntax error
+    }
+  catch (e) {
+      return true; // treat any exception as a pass, other tests ensure that JSON.parse throws SyntaxError exceptions
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-4.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-4.js
index f5f48409c..2f2d1cbe1 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-4.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g4-4.js

- * @description The JSON lexical grammar does not allow a JSONStringCharacter to be any of the Unicode characters U+0018 thru U+001F

- */

-

-

-function testcase() {

-  try {

-    JSON.parse('"\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f"'); // invalid string characters should produce a syntax error

-    }

-  catch (e) {

-      if (e.name === 'SyntaxError') return true;

-      }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammar does not allow a JSONStringCharacter to
+    be any of the Unicode characters U+0018 thru U+001F
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.parse('"\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f"'); // invalid string characters should produce a syntax error
+    }
+  catch (e) {
+      if (e.name === 'SyntaxError') return true;
+      }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-1.js
index 4450bfd32..7563e5ba6 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-1.js
@@ -1,14 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-1.js

- * @description The JSON lexical grammar allows Unicode escape sequences in a JSONString

- */

-function testcase() {

-    return JSON.parse('"\\u0058"')==='X'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammar allows Unicode escape sequences in a
+    JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\u0058"')==='X'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-2.js
index 0b1838b4c..dd19388be 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-2.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-2.js

- * @description A JSONStringCharacter UnicodeEscape may not have fewer than 4 hex characters

- */

-function testcase() {

-    try {

-        JSON.parse('"\\u005"') 

-       }

-     catch (e) {

-        return e.name==='SyntaxError'

-        }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSONStringCharacter UnicodeEscape may not have fewer than 4 hex
+    characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        JSON.parse('"\\u005"') 
+       }
+     catch (e) {
+        return e.name==='SyntaxError'
+        }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-3.js
index 34e9479d8..eb326c737 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-3.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g5-3.js

- * @description A JSONStringCharacter UnicodeEscape may not include any non=hex characters

- */

-function testcase() {

-    try {

-        JSON.parse('"\\u0X50"') 

-       }

-     catch (e) {

-        return e.name==='SyntaxError'

-        }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSONStringCharacter UnicodeEscape may not include any non=hex
+    characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        JSON.parse('"\\u0X50"') 
+       }
+     catch (e) {
+        return e.name==='SyntaxError'
+        }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-1.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-1.js
index 70c91c101..6d3d73dc4 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-1.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-1.js

- * @description The JSON lexical grammer allows '/' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\/"')==='/'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows '/' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\/"')==='/'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-2.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-2.js
index 9b2c93bc0..b48eb0952 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-2.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-2.js

- * @description The JSON lexical grammer allows '' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\\\"')==='\\'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows '' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\\\"')==='\\'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-3.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-3.js
index 0f3b38930..375b6b2c4 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-3.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-3.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-3.js

- * @description The JSON lexical grammer allows 'b' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\b"')==='\b'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows 'b' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\b"')==='\b'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-4.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-4.js
index 8a9f169ff..a71f6bbc8 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-4.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-4.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-4.js

- * @description The JSON lexical grammer allows 'f' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\f"')==='\f'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows 'f' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\f"')==='\f'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-5.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-5.js
index e63743ad6..be8743fca 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-5.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-5.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-5.js

- * @description The JSON lexical grammer allows 'n' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\n"')==='\n'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows 'n' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\n"')==='\n'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-6.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-6.js
index 7f1c51777..c1668bd4e 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-6.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-6.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-6.js

- * @description The JSON lexical grammer allows 'r' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\r"')==='\r'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows 'r' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\r"')==='\r'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-7.js b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-7.js
index ed95c0f7b..c5c8b9fe1 100644
--- a/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-7.js
+++ b/test/suite/ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-7.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.1/15.12.1.1/15.12.1.1-g6-7.js

- * @description The JSON lexical grammer allows 't' as a JSONEscapeCharacter after '' in a JSONString

- */

-

-

-function testcase() {

-    return JSON.parse('"\\t"')==='\t'; 

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    The JSON lexical grammer allows 't' as a JSONEscapeCharacter after
+    '' in a JSONString
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return JSON.parse('"\\t"')==='\t'; 
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-0-1.js b/test/suite/ch15/15.12/15.12.2/15.12.2-0-1.js
index 54867640d..aab230aab 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-0-1.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-0-1.js
@@ -1,32 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object.

- * 

- * Section 15 says that every built-in Function object described in this

- * section � whether as a constructor, an ordinary function, or both � has

- * a length property whose value is an integer. Unless otherwise specified,

- * this value is equal to the largest number of named arguments shown in

- * the section headings for the function description, including optional

- * parameters.

- * 

- * This default applies to JSON.parse, and it must exist as a function

- * taking 2 parameters.

- *

- * @path ch15/15.12/15.12.2/15.12.2-0-1.js

- * @description JSON.parse must exist as a function

- */

-

-

-function testcase() {

-  var f = JSON.parse;

-

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object.
+    Section 15 says that every built-in Function object described in this
+    section � whether as a constructor, an ordinary function, or both � has
+    a length property whose value is an integer. Unless otherwise specified,
+    this value is equal to the largest number of named arguments shown in
+    the section headings for the function description, including optional
+    parameters.
+    This default applies to JSON.parse, and it must exist as a function
+    taking 2 parameters.
+description: JSON.parse must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = JSON.parse;
+
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-0-2.js b/test/suite/ch15/15.12/15.12.2/15.12.2-0-2.js
index 7bd3aa176..015c13f4c 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-0-2.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-0-2.js
@@ -1,32 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object.

- * 

- * Section 15 says that every built-in Function object described in this

- * section � whether as a constructor, an ordinary function, or both � has

- * a length property whose value is an integer. Unless otherwise specified,

- * this value is equal to the largest number of named arguments shown in

- * the section headings for the function description, including optional

- * parameters.

- * 

- * This default applies to JSON.parse, and it must exist as a function

- * taking 2 parameters.

- *

- * @path ch15/15.12/15.12.2/15.12.2-0-2.js

- * @description JSON.parse must exist as a function taking 2 parameters

- */

-

-

-function testcase() {

-  var f = JSON.parse;

-

-  if (typeof(f) === "function" && f.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object.
+    Section 15 says that every built-in Function object described in this
+    section � whether as a constructor, an ordinary function, or both � has
+    a length property whose value is an integer. Unless otherwise specified,
+    this value is equal to the largest number of named arguments shown in
+    the section headings for the function description, including optional
+    parameters.
+    This default applies to JSON.parse, and it must exist as a function
+    taking 2 parameters.
+description: JSON.parse must exist as a function taking 2 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = JSON.parse;
+
+  if (typeof(f) === "function" && f.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-0-3.js b/test/suite/ch15/15.12/15.12.2/15.12.2-0-3.js
index 8e4741b6e..91ad7fc4d 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-0-3.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-0-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The initial value of [[Configurable]] on JSON is true. This means we

- * should be able to delete (8.6.2.5) the stringify and parse properties.

- *

- * @path ch15/15.12/15.12.2/15.12.2-0-3.js

- * @description JSON.parse must be deletable (configurable)

- */

-

-

-function testcase() {

-  var o = JSON;

-  var desc = Object.getOwnPropertyDescriptor(o, "parse");

-  return desc.configurable === true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The initial value of [[Configurable]] on JSON is true. This means we
+    should be able to delete (8.6.2.5) the stringify and parse properties.
+description: JSON.parse must be deletable (configurable)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = JSON;
+  var desc = Object.getOwnPropertyDescriptor(o, "parse");
+  return desc.configurable === true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-1.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-1.js
index 0945ddd7d..eba852bb8 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-1.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-1.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-1.js

- * @description JSON.parse - parsing an object where property name is a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ ' + nullChars[index] + ' : "John" } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property name is a null
+    character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ ' + nullChars[index] + ' : "John" } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-10.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-10.js
index c08b6b35c..b4f4b6b15 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-10.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-10.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-10.js

- * @description JSON.parse - parsing an object where property value middles with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ "name" : ' + "Jo" + nullChars[index] + "hn" + ' } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property value middles with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ "name" : ' + "Jo" + nullChars[index] + "hn" + ' } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-2.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-2.js
index dd4807aa5..5711d7fd9 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-2.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-2.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-2.js

- * @description JSON.parse - parsing an object where property name starts with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ ' + nullChars[index] + "name" + ' : "John" } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property name starts with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ ' + nullChars[index] + "name" + ' : "John" } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-3.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-3.js
index c5416123d..fee50f99c 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-3.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-3.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-3.js

- * @description JSON.parse - parsing an object where property name ends with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{' + "name" + nullChars[index] + ' : "John" } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property name ends with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{' + "name" + nullChars[index] + ' : "John" } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-4.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-4.js
index 6a53e470f..2fb0e340a 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-4.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-4.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-4.js

- * @description JSON.parse - parsing an object where property name starts and ends with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{' + nullChars[index] + "name" + nullChars[index] + ' : "John" } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property name starts and ends
+    with a null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{' + nullChars[index] + "name" + nullChars[index] + ' : "John" } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-5.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-5.js
index cd0a5c43b..6eb1e5a26 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-5.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-5.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-5.js

- * @description JSON.parse - parsing an object where property name middles with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ ' + "na" + nullChars[index] + "me" + ' : "John" } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property name middles with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ ' + "na" + nullChars[index] + "me" + ' : "John" } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-6.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-6.js
index 59b719ef9..6d6a7c0ef 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-6.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-6.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-6.js

- * @description JSON.parse - parsing an object where property value is a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ "name" : ' + nullChars[index] + ' } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property value is a null
+    character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ "name" : ' + nullChars[index] + ' } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-7.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-7.js
index 855733a1d..815b5dc91 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-7.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-7.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-7.js

- * @description JSON.parse - parsing an object where property value starts with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ "name" : ' + nullChars[index] + "John" + ' } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property value starts with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ "name" : ' + nullChars[index] + "John" + ' } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-8.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-8.js
index a18494959..5ec624989 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-8.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-8.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-8.js

- * @description JSON.parse - parsing an object where property value ends with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ "name" : ' + "John" + nullChars[index] + ' } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property value ends with a
+    null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ "name" : ' + "John" + nullChars[index] + ' } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/15.12.2-2-9.js b/test/suite/ch15/15.12/15.12.2/15.12.2-2-9.js
index 424d2e17f..0a62e1cb9 100644
--- a/test/suite/ch15/15.12/15.12.2/15.12.2-2-9.js
+++ b/test/suite/ch15/15.12/15.12.2/15.12.2-2-9.js
@@ -1,60 +1,62 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.2/15.12.2-2-9.js

- * @description JSON.parse - parsing an object where property value starts and ends with a null character

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var nullChars = new Array();

-        nullChars[0] = '\"\u0000\"';

-        nullChars[1] = '\"\u0001\"';

-        nullChars[2] = '\"\u0002\"';

-        nullChars[3] = '\"\u0003\"';

-        nullChars[4] = '\"\u0004\"';

-        nullChars[5] = '\"\u0005\"';

-        nullChars[6] = '\"\u0006\"';

-        nullChars[7] = '\"\u0007\"';

-        nullChars[8] = '\"\u0008\"';

-        nullChars[9] = '\"\u0009\"';

-        nullChars[10] = '\"\u000A\"';

-        nullChars[11] = '\"\u000B\"';

-        nullChars[12] = '\"\u000C\"';

-        nullChars[13] = '\"\u000D\"';

-        nullChars[14] = '\"\u000E\"';

-        nullChars[15] = '\"\u000F\"';

-        nullChars[16] = '\"\u0010\"';

-        nullChars[17] = '\"\u0011\"';

-        nullChars[18] = '\"\u0012\"';

-        nullChars[19] = '\"\u0013\"';

-        nullChars[20] = '\"\u0014\"';

-        nullChars[21] = '\"\u0015\"';

-        nullChars[22] = '\"\u0016\"';

-        nullChars[23] = '\"\u0017\"';

-        nullChars[24] = '\"\u0018\"';

-        nullChars[25] = '\"\u0019\"';

-        nullChars[26] = '\"\u001A\"';

-        nullChars[27] = '\"\u001B\"';

-        nullChars[28] = '\"\u001C\"';

-        nullChars[29] = '\"\u001D\"';

-        nullChars[30] = '\"\u001E\"';

-        nullChars[31] = '\"\u001F\"';

-

-        for (var index in nullChars) {

-            try {

-                var obj = JSON.parse('{ "name" : ' + nullChars[index] + "John" + nullChars[index] + ' } ');

-                result = (result && false);

-            } catch (e) {

-                result = (result && (e instanceof SyntaxError));

-            }

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.parse - parsing an object where property value starts and
+    ends with a null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var nullChars = new Array();
+        nullChars[0] = '\"\u0000\"';
+        nullChars[1] = '\"\u0001\"';
+        nullChars[2] = '\"\u0002\"';
+        nullChars[3] = '\"\u0003\"';
+        nullChars[4] = '\"\u0004\"';
+        nullChars[5] = '\"\u0005\"';
+        nullChars[6] = '\"\u0006\"';
+        nullChars[7] = '\"\u0007\"';
+        nullChars[8] = '\"\u0008\"';
+        nullChars[9] = '\"\u0009\"';
+        nullChars[10] = '\"\u000A\"';
+        nullChars[11] = '\"\u000B\"';
+        nullChars[12] = '\"\u000C\"';
+        nullChars[13] = '\"\u000D\"';
+        nullChars[14] = '\"\u000E\"';
+        nullChars[15] = '\"\u000F\"';
+        nullChars[16] = '\"\u0010\"';
+        nullChars[17] = '\"\u0011\"';
+        nullChars[18] = '\"\u0012\"';
+        nullChars[19] = '\"\u0013\"';
+        nullChars[20] = '\"\u0014\"';
+        nullChars[21] = '\"\u0015\"';
+        nullChars[22] = '\"\u0016\"';
+        nullChars[23] = '\"\u0017\"';
+        nullChars[24] = '\"\u0018\"';
+        nullChars[25] = '\"\u0019\"';
+        nullChars[26] = '\"\u001A\"';
+        nullChars[27] = '\"\u001B\"';
+        nullChars[28] = '\"\u001C\"';
+        nullChars[29] = '\"\u001D\"';
+        nullChars[30] = '\"\u001E\"';
+        nullChars[31] = '\"\u001F\"';
+
+        for (var index in nullChars) {
+            try {
+                var obj = JSON.parse('{ "name" : ' + nullChars[index] + "John" + nullChars[index] + ' } ');
+                result = (result && false);
+            } catch (e) {
+                result = (result && (e instanceof SyntaxError));
+            }
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.2/S15.12.2_A1.js b/test/suite/ch15/15.12/15.12.2/S15.12.2_A1.js
index eeb59283a..553d32e96 100644
--- a/test/suite/ch15/15.12/15.12.2/S15.12.2_A1.js
+++ b/test/suite/ch15/15.12/15.12.2/S15.12.2_A1.js
@@ -1,12 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * JSON.parse must create a property with the given property name
- *
- * @path ch15/15.12/15.12.2/S15.12.2_A1.js
- * @description Tests that JSON.parse treats "__proto__" as a regular property name
- */
+/*---
+info: JSON.parse must create a property with the given property name
+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) {
@@ -15,4 +14,3 @@ if (Object.getPrototypeOf(x) !== Object.prototype) {
 if (!Array.isArray(x.__proto__)) {
   $FAIL('#2: JSON.parse did not set "__proto__" as a regular property');
 }
-
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-0-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-0-1.js
index 4f9216a9a..3634e5834 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-0-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-0-1.js
@@ -1,32 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object.

- * 

- * Section 15 says that every built-in Function object described in this

- * section � whether as a constructor, an ordinary function, or both � has

- * a length property whose value is an integer. Unless otherwise specified,

- * this value is equal to the largest number of named arguments shown in

- * the section headings for the function description, including optional

- * parameters.

- * 

- * This default applies to JSON.stringify, and it must exist as a function

- * taking 3 parameters.

- *

- * @path ch15/15.12/15.12.3/15.12.3-0-1.js

- * @description JSON.stringify must exist as be a function

- */

-

-

-function testcase() {

-  var f = JSON.stringify;

-

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object.
+    Section 15 says that every built-in Function object described in this
+    section � whether as a constructor, an ordinary function, or both � has
+    a length property whose value is an integer. Unless otherwise specified,
+    this value is equal to the largest number of named arguments shown in
+    the section headings for the function description, including optional
+    parameters.
+    This default applies to JSON.stringify, and it must exist as a function
+    taking 3 parameters.
+description: JSON.stringify must exist as be a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = JSON.stringify;
+
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-0-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3-0-2.js
index c728f269f..510618d9f 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-0-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-0-2.js
@@ -1,32 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The name JSON must be bound to an object.

- * 

- * Section 15 says that every built-in Function object described in this

- * section � whether as a constructor, an ordinary function, or both � has

- * a length property whose value is an integer. Unless otherwise specified,

- * this value is equal to the largest number of named arguments shown in

- * the section headings for the function description, including optional

- * parameters.

- * 

- * This default applies to JSON.stringify, and it must exist as a function

- * taking 3 parameters.

- *

- * @path ch15/15.12/15.12.3/15.12.3-0-2.js

- * @description JSON.stringify must exist as be a function taking 3 parameters

- */

-

-

-function testcase() {

-  var f = JSON.stringify;

-

-  if (typeof(f) === "function" && f.length === 3) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The name JSON must be bound to an object.
+    Section 15 says that every built-in Function object described in this
+    section � whether as a constructor, an ordinary function, or both � has
+    a length property whose value is an integer. Unless otherwise specified,
+    this value is equal to the largest number of named arguments shown in
+    the section headings for the function description, including optional
+    parameters.
+    This default applies to JSON.stringify, and it must exist as a function
+    taking 3 parameters.
+description: JSON.stringify must exist as be a function taking 3 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = JSON.stringify;
+
+  if (typeof(f) === "function" && f.length === 3) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-0-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3-0-3.js
index 39d5cf59d..a04a949d5 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-0-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-0-3.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * This test should be run without any built-ins being added/augmented.

- * The initial value of [[Configurable]] on JSON is true. This means we

- * should be able to delete (8.6.2.5) the stringify and parse properties.

- *

- * @path ch15/15.12/15.12.3/15.12.3-0-3.js

- * @description JSON.stringify must be deletable (configurable)

- */

-

-

-function testcase() {

-  var o = JSON;

-  var desc = Object.getOwnPropertyDescriptor(o, "stringify");

-  if (desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    This test should be run without any built-ins being added/augmented.
+    The initial value of [[Configurable]] on JSON is true. This means we
+    should be able to delete (8.6.2.5) the stringify and parse properties.
+description: JSON.stringify must be deletable (configurable)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = JSON;
+  var desc = Object.getOwnPropertyDescriptor(o, "stringify");
+  if (desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-1.js
index 813b7fb37..4fe34de2e 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-1.js

- * @description JSON.stringify(undefined) returns undefined

- */

-

-

-function testcase() {

-  return JSON.stringify(undefined) === undefined;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify(undefined) returns undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(undefined) === undefined;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-10.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-10.js
index 32e885fb6..f68b2967c 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-10.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-10.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-10.js

- * @description A JSON.stringify replacer function applied to a top level scalar value can return undefined.

- */

-

-

-function testcase() {

-  return JSON.stringify(42, function(k, v) { return undefined }) === undefined;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSON.stringify replacer function applied to a top level scalar
+    value can return undefined.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(42, function(k, v) { return undefined }) === undefined;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-11.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-11.js
index e40181e45..c5243c990 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-11.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-11.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-11.js

- * @description A JSON.stringify replacer function applied to a top level Object can return undefined.

- */

-

-

-function testcase() {

-  return JSON.stringify({prop:1}, function(k, v) { return undefined }) === undefined;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSON.stringify replacer function applied to a top level Object
+    can return undefined.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify({prop:1}, function(k, v) { return undefined }) === undefined;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-12.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-12.js
index dd294997b..165d03290 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-12.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-12.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-12.js

- * @description A JSON.stringify replacer function applied to a top level scalar can return an Array.

- */

-

-

-function testcase() {

-  return JSON.stringify(42, function(k, v) { return v==42 ?[4,2]:v }) === '[4,2]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSON.stringify replacer function applied to a top level scalar
+    can return an Array.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(42, function(k, v) { return v==42 ?[4,2]:v }) === '[4,2]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-13.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-13.js
index dc9475223..26a7b577c 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-13.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-13.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-13.js

- * @description A JSON.stringify replacer function applied to a top level scalar can return an Object.

- */

-

-

-function testcase() {

-  return JSON.stringify(42, function(k, v) { return v==42 ? {forty:2}: v}) === '{"forty":2}';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSON.stringify replacer function applied to a top level scalar
+    can return an Object.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(42, function(k, v) { return v==42 ? {forty:2}: v}) === '{"forty":2}';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-14.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-14.js
index a50366264..29cca1fef 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-14.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-14.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-14.js

- * @description Applying JSON.stringify to a  function returns undefined.

- */

-

-

-function testcase() {

-  return JSON.stringify(function() {}) === undefined;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Applying JSON.stringify to a  function returns undefined.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(function() {}) === undefined;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-15.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-15.js
index efd20c865..cf9433a45 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-15.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-15.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-15.js

- * @description Applying JSON.stringify with a replacer function to a function returns the replacer value.

- */

-

-

-function testcase() {

-  return JSON.stringify(function() {}, function(k,v) {return 99}) === '99';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Applying JSON.stringify with a replacer function to a function
+    returns the replacer value.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(function() {}, function(k,v) {return 99}) === '99';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-16.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-16.js
index a5adee475..698e2a963 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-16.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-16.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-16.js

- * @description JSON.stringify - stringifying an object where property name is the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1); 

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property name is the
+    union of all null character (The abstract operation Quote(value)
+    step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1); 
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-17.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-17.js
index 703dd0b6f..2cfbb844c 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-17.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-17.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-17.js

- * @description JSON.stringify - stringifying an object where property name starts with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fname": "John" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property name starts
+    with the union of all null character (The abstract operation
+    Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fname": "John" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-18.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-18.js
index af3f8f199..e9d9087a7 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-18.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-18.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-18.js

- * @description JSON.stringify - stringifying an object where property name ends with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property name ends
+    with the union of all null character (The abstract operation
+    Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-19.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-19.js
index fb0378b62..4a4f5c0e3 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-19.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-19.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-19.js

- * @description JSON.stringify - stringifying an object where property name starts and ends with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fname\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property name starts
+    and ends with the union of all null character (The abstract
+    operation Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fname\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F": "John" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-2.js
index a3c3d602c..cae488522 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-2.js

- * @description A JSON.stringify replacer function works is applied to a top level undefined value.

- */

-

-

-function testcase() {

-  return JSON.stringify(undefined, function(k, v) { return "replacement" }) === '"replacement"';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    A JSON.stringify replacer function works is applied to a top level
+    undefined value.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(undefined, function(k, v) { return "replacement" }) === '"replacement"';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-20.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-20.js
index 28b656cda..c8073215d 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-20.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-20.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-20.js

- * @description JSON.stringify - stringifying an object where property name middles with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "na\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fme": "John" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property name
+    middles with the union of all null character (The abstract
+    operation Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "na\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fme": "John" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-21.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-21.js
index 60df392dd..be2ad74ff 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-21.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-21.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-21.js

- * @description JSON.stringify - stringifying an object where property value is the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property value is
+    the union of all null character (The abstract operation
+    Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-22.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-22.js
index baa8fbc36..14a7f8dcb 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-22.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-22.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-22.js

- * @description JSON.stringify - stringifying an object where property value starts with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001FJohn" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property value
+    starts with the union of all null character (The abstract
+    operation Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001FJohn" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-23.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-23.js
index 0670562a5..aba641376 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-23.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-23.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-23.js

- * @description JSON.stringify - stringifying an object where property value ends with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name": "John\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property value ends
+    with the union of all null character (The abstract operation
+    Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name": "John\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-24.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-24.js
index eb55b2ce2..20d9f1f67 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-24.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-24.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-24.js

- * @description JSON.stringify - stringifying an object where property value starts and ends with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001FJohn\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property value
+    starts and ends with the union of all null character (The abstract
+    operation Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name": "\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001FJohn\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-25.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-25.js
index cdcb163fc..51e62a954 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-25.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-25.js
@@ -1,57 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-25.js

- * @description JSON.stringify - stringifying an object where property value middles with the union of all null character (The abstract operation Quote(value) step 2.c)

- */

-

-

-function testcase() {

-

-        var result = true;

-

-        var expectedNullChars = new Array();

-        expectedNullChars[0] = "\\u0000";

-        expectedNullChars[1] = "\\u0001";

-        expectedNullChars[2] = "\\u0002";

-        expectedNullChars[3] = "\\u0003";

-        expectedNullChars[4] = "\\u0004";

-        expectedNullChars[5] = "\\u0005";

-        expectedNullChars[6] = "\\u0006";

-        expectedNullChars[7] = "\\u0007";

-        expectedNullChars[8] = "\\b";

-        expectedNullChars[9] = "\\t";

-        expectedNullChars[10] = "\\n";

-        expectedNullChars[11] = "\\u000b";

-        expectedNullChars[12] = "\\f";

-        expectedNullChars[13] = "\\r";

-        expectedNullChars[14] = "\\u000e";

-        expectedNullChars[15] = "\\u000f";

-        expectedNullChars[16] = "\\u0010";

-        expectedNullChars[17] = "\\u0011";

-        expectedNullChars[18] = "\\u0012";

-        expectedNullChars[19] = "\\u0013";

-        expectedNullChars[20] = "\\u0014";

-        expectedNullChars[21] = "\\u0015";

-        expectedNullChars[22] = "\\u0016";

-        expectedNullChars[23] = "\\u0017";

-        expectedNullChars[24] = "\\u0018";

-        expectedNullChars[25] = "\\u0019";

-        expectedNullChars[26] = "\\u001a";

-        expectedNullChars[27] = "\\u001b";

-        expectedNullChars[28] = "\\u001c";

-        expectedNullChars[29] = "\\u001d";

-        expectedNullChars[30] = "\\u001e";

-        expectedNullChars[31] = "\\u001f";

-

-        for (var index in expectedNullChars) {

-

-            var str = JSON.stringify({ "name": "Jo\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fhn" });

-            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);

-        }

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - stringifying an object where property value
+    middles with the union of all null character (The abstract
+    operation Quote(value) step 2.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+
+        var expectedNullChars = new Array();
+        expectedNullChars[0] = "\\u0000";
+        expectedNullChars[1] = "\\u0001";
+        expectedNullChars[2] = "\\u0002";
+        expectedNullChars[3] = "\\u0003";
+        expectedNullChars[4] = "\\u0004";
+        expectedNullChars[5] = "\\u0005";
+        expectedNullChars[6] = "\\u0006";
+        expectedNullChars[7] = "\\u0007";
+        expectedNullChars[8] = "\\b";
+        expectedNullChars[9] = "\\t";
+        expectedNullChars[10] = "\\n";
+        expectedNullChars[11] = "\\u000b";
+        expectedNullChars[12] = "\\f";
+        expectedNullChars[13] = "\\r";
+        expectedNullChars[14] = "\\u000e";
+        expectedNullChars[15] = "\\u000f";
+        expectedNullChars[16] = "\\u0010";
+        expectedNullChars[17] = "\\u0011";
+        expectedNullChars[18] = "\\u0012";
+        expectedNullChars[19] = "\\u0013";
+        expectedNullChars[20] = "\\u0014";
+        expectedNullChars[21] = "\\u0015";
+        expectedNullChars[22] = "\\u0016";
+        expectedNullChars[23] = "\\u0017";
+        expectedNullChars[24] = "\\u0018";
+        expectedNullChars[25] = "\\u0019";
+        expectedNullChars[26] = "\\u001a";
+        expectedNullChars[27] = "\\u001b";
+        expectedNullChars[28] = "\\u001c";
+        expectedNullChars[29] = "\\u001d";
+        expectedNullChars[30] = "\\u001e";
+        expectedNullChars[31] = "\\u001f";
+
+        for (var index in expectedNullChars) {
+
+            var str = JSON.stringify({ "name": "Jo\u0000\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u0009\u000A\u000B\u000C\u000D\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001Fhn" });
+            result = (result && str.indexOf(expectedNullChars[index]) !== -1 && str.indexOf(expectedNullChars[index]) !== -1);
+        }
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-26.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-26.js
index 36c5c306b..95c0e8a89 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-26.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-26.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-26.js

- * @description JSON.stringify - the last element of the concatenation is ']' (The abstract operation JA(value) step 10.b.iii)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        arrObj[0] = "a";

-        arrObj[1] = "b";

-        arrObj[2] = "c";

-

-        var jsonText = JSON.stringify(arrObj, undefined, "").toString();

-        return jsonText.charAt(jsonText.length - 1) === "]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify - the last element of the concatenation is ']' (The
+    abstract operation JA(value) step 10.b.iii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        arrObj[0] = "a";
+        arrObj[1] = "b";
+        arrObj[2] = "c";
+
+        var jsonText = JSON.stringify(arrObj, undefined, "").toString();
+        return jsonText.charAt(jsonText.length - 1) === "]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-3.js
index 4d5b2c2d3..4f2669dae 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-3.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-3.js

- * @description A JSON.stringify correctly works on top level string values.

- */

-

-

-function testcase() {

-  return JSON.stringify("a string") === '"a string"';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: A JSON.stringify correctly works on top level string values.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify("a string") === '"a string"';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-4.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-4.js
index 676a7bd13..2508f2895 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-4.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-4.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-4.js

- * @description JSON.stringify correctly works on top level Number values.

- */

-

-

-function testcase() {

-  return JSON.stringify(123) === '123';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level Number values.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(123) === '123';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-5.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-5.js
index 405e52138..fc2b2cead 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-5.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-5.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-5.js

- * @description JSON.stringify correctly works on top level Boolean values.

- */

-

-

-function testcase() {

-  return JSON.stringify(true) === 'true';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level Boolean values.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(true) === 'true';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-6.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-6.js
index 04fa3c79c..6863cc0c3 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-6.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-6.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-6.js

- * @description JSON.stringify correctly works on top level null values.

- */

-

-

-function testcase() {

-  return JSON.stringify(null) === 'null';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level null values.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(null) === 'null';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-7.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-7.js
index 4cdeafa3b..4a1e8a397 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-7.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-7.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-7.js

- * @description JSON.stringify correctly works on top level Number objects.

- */

-

-

-function testcase() {

-  return JSON.stringify(new Number(42)) === '42';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level Number objects.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(new Number(42)) === '42';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-8.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-8.js
index 898549693..2018a37ac 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-8.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-8.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-8.js

- * @description JSON.stringify correctly works on top level String objects.

- */

-

-

-function testcase() {

-  return JSON.stringify(new String('wrappered')) === '"wrappered"';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level String objects.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(new String('wrappered')) === '"wrappered"';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-11-9.js b/test/suite/ch15/15.12/15.12.3/15.12.3-11-9.js
index db0c543c2..728ff2711 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-11-9.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-11-9.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-11-9.js

- * @description JSON.stringify correctly works on top level Boolean objects.

- */

-

-

-function testcase() {

-  return JSON.stringify(new Boolean(false)) === 'false';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify correctly works on top level Boolean objects.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify(new Boolean(false)) === 'false';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-4-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-4-1.js
index 8fab14660..7d4da1364 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-4-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-4-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-4-1.js

- * @description JSON.stringify ignores replacer aruguments that are not functions or arrays..

- */

-

-

-function testcase() {

-  try {

-     return JSON.stringify([42],{})=== '[42]';

-     }

-   catch (e) {return  false}

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify ignores replacer aruguments that are not functions
+    or arrays..
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+     return JSON.stringify([42],{})=== '[42]';
+     }
+   catch (e) {return  false}
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-5-a-i-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-5-a-i-1.js
index a350ffabb..3d8875662 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-5-a-i-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-5-a-i-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-5-a-i-1.js

- * @description JSON.stringify converts Number wrapper object space aruguments to Number values

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, new Number(5))=== JSON.stringify(obj,null, 5);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts Number wrapper object space aruguments to
+    Number values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, new Number(5))=== JSON.stringify(obj,null, 5);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-5-b-i-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-5-b-i-1.js
index 803d08f9d..837979b32 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-5-b-i-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-5-b-i-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-5-b-i-1.js

- * @description JSON.stringify converts String wrapper object space aruguments to String values

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, new String('xxx'))=== JSON.stringify(obj,null, 'xxx');

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts String wrapper object space aruguments to
+    String values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, new String('xxx'))=== JSON.stringify(obj,null, 'xxx');
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-1.js
index 60bcfda5f..234d20598 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-a-1.js

- * @description JSON.stringify treats numeric space arguments greater than 10 the same as a  space argument of 10.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, 10)=== JSON.stringify(obj,null, 100);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats numeric space arguments greater than 10 the
+    same as a  space argument of 10.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, 10)=== JSON.stringify(obj,null, 100);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-2.js
index 42a149b41..4cc1fb46a 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-a-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-a-2.js

- * @description JSON.stringify truccates non-integer numeric space arguments to their integer part.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, 5.99999)=== JSON.stringify(obj,null, 5);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify truccates non-integer numeric space arguments to
+    their integer part.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, 5.99999)=== JSON.stringify(obj,null, 5);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-1.js
index 7b07d8442..bb8ad815e 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-b-1.js

- * @description JSON.stringify treats numeric space arguments less than 1 (0.999999)the same as emptry string space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, 0.999999)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats numeric space arguments less than 1
+    (0.999999)the same as emptry string space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, 0.999999)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-2.js
index 0e0404ac7..69e1da3da 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-b-2.js

- * @description JSON.stringify treats numeric space arguments less than 1 (0)the same as emptry string space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, 0)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats numeric space arguments less than 1 (0)the
+    same as emptry string space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, 0)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-3.js
index 2d0f5c1b4..ccb509fcb 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-b-3.js

- * @description JSON.stringify treats numeric space arguments less than 1 (-5) the same as emptry string space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, -5)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats numeric space arguments less than 1 (-5) the
+    same as emptry string space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, -5)=== JSON.stringify(obj);  /* emptry string should be same as no space arg */
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-4.js b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-4.js
index e08dd093c..b168b29ce 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-4.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-6-b-4.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-6-b-4.js

- * @description JSON.stringify treats numeric space arguments (in the range 1..10) is equivalent to a string of spaces of that length.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  var fiveSpaces = '     ';

-  //               '12345'

-  return JSON.stringify(obj,null, 5)=== JSON.stringify(obj, null, fiveSpaces);  

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats numeric space arguments (in the range 1..10)
+    is equivalent to a string of spaces of that length.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  var fiveSpaces = '     ';
+  //               '12345'
+  return JSON.stringify(obj,null, 5)=== JSON.stringify(obj, null, fiveSpaces);  
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-7-a-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-7-a-1.js
index 7ef1492b2..69f79980f 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-7-a-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-7-a-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-7-a-1.js

- * @description JSON.stringify only uses the first 10 characters of a string space arguments.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj,null, '0123456789xxxxxxxxx')=== JSON.stringify(obj,null, '0123456789');  

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify only uses the first 10 characters of a string space
+    arguments.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj,null, '0123456789xxxxxxxxx')=== JSON.stringify(obj,null, '0123456789');  
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-1.js
index aee8ced9c..c8b358058 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-8-a-1.js

- * @description JSON.stringify treats an empty string space argument the same as a missing space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj)=== JSON.stringify(obj,null, '');

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats an empty string space argument the same as a
+    missing space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj)=== JSON.stringify(obj,null, '');
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-2.js
index 7e2bd348c..31d33172c 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-8-a-2.js

- * @description JSON.stringify treats an Boolean space argument the same as a missing space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj)=== JSON.stringify(obj,null, true);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats an Boolean space argument the same as a
+    missing space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj)=== JSON.stringify(obj,null, true);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-3.js
index cf53e02b5..c0f6b05ee 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-8-a-3.js

- * @description JSON.stringify treats an null space argument the same as a missing space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj)=== JSON.stringify(obj,null, null);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats an null space argument the same as a missing
+    space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj)=== JSON.stringify(obj,null, null);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-4.js b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-4.js
index 65ebadfc8..faeab00a0 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-4.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-4.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-8-a-4.js

- * @description JSON.stringify treats an Boolean wrapper space argument the same as a missing space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj)=== JSON.stringify(obj,null, new Boolean(true));

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats an Boolean wrapper space argument the same
+    as a missing space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj)=== JSON.stringify(obj,null, new Boolean(true));
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-5.js b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-5.js
index 3b92557ce..74962aabb 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-5.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3-8-a-5.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3-8-a-5.js

- * @description JSON.stringify treats non-Number or String object space arguments the same as a missing space argument.

- */

-

-

-function testcase() {

-  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};

-  return JSON.stringify(obj)=== JSON.stringify(obj,null, obj);

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify treats non-Number or String object space arguments
+    the same as a missing space argument.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {a1: {b1: [1,2,3,4], b2: {c1: 1, c2: 2}},a2: 'a2'};
+  return JSON.stringify(obj)=== JSON.stringify(obj,null, obj);
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-1.js
index 0a5a9761e..ab5d4dbd8 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-2-b-i-1.js

- * @description JSON.stringify converts string wrapper objects returned from a toJSON call to literal strings.

- */

-

-

-function testcase() {

-  var obj = {

-    prop:42,

-    toJSON: function () {return 'fortytwo objects'}

-    };

-  return JSON.stringify([obj]) === '["fortytwo objects"]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts string wrapper objects returned from a
+    toJSON call to literal strings.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {
+    prop:42,
+    toJSON: function () {return 'fortytwo objects'}
+    };
+  return JSON.stringify([obj]) === '["fortytwo objects"]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-2.js
index e75171469..17b8b5286 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-2-b-i-2.js

- * @description JSON.stringify converts Number wrapper objects returned from a toJSON call to literal Number.

- */

-

-

-function testcase() {

-  var obj = {

-    prop:42,

-    toJSON: function () {return new Number(42)}

-    };

-  return JSON.stringify([obj]) === '[42]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts Number wrapper objects returned from a
+    toJSON call to literal Number.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {
+    prop:42,
+    toJSON: function () {return new Number(42)}
+    };
+  return JSON.stringify([obj]) === '[42]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-3.js
index 848127295..dad0a71c4 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-2-b-i-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-2-b-i-3.js

- * @description JSON.stringify converts Boolean wrapper objects returned from a toJSON call to literal Boolean values.

- */

-

-

-function testcase() {

-  var obj = {

-    prop:42,

-    toJSON: function () {return new Boolean(true)}

-    };

-  return JSON.stringify([obj]) === '[true]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts Boolean wrapper objects returned from a
+    toJSON call to literal Boolean values.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {
+    prop:42,
+    toJSON: function () {return new Boolean(true)}
+    };
+  return JSON.stringify([obj]) === '[true]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-1.js
index a1e71cd73..f612adc36 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-3-a-1.js

- * @description JSON.stringify converts string wrapper objects returned from replacer functions to literal strings.

- */

-

-

-function testcase() {

-  return JSON.stringify([42], function(k,v) {return v===42? new String('fortytwo'):v}) === '["fortytwo"]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts string wrapper objects returned from
+    replacer functions to literal strings.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify([42], function(k,v) {return v===42? new String('fortytwo'):v}) === '["fortytwo"]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-2.js
index 679c252a9..7a264e55f 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-3-a-2.js

- * @description JSON.stringify converts Number wrapper objects returned from replacer functions to literal numbers.

- */

-

-

-function testcase() {

-  return JSON.stringify([42], function(k,v) {return v===42? new Number(84):v}) === '[84]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts Number wrapper objects returned from
+    replacer functions to literal numbers.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify([42], function(k,v) {return v===42? new Number(84):v}) === '[84]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-3.js
index 6124fcd92..cf403d36e 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_2-3-a-3.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_2-3-a-3.js

- * @description JSON.stringify converts Boolean wrapper objects returned from replacer functions to literal numbers.

- */

-

-

-function testcase() {

-  return JSON.stringify([42], function(k,v) {return v===42? new Boolean(false):v}) === '[false]';

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    JSON.stringify converts Boolean wrapper objects returned from
+    replacer functions to literal numbers.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return JSON.stringify([42], function(k,v) {return v===42? new Boolean(false):v}) === '[false]';
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-1.js b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-1.js
index cbab742f7..e196d0df6 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-1.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_4-1-1.js

- * @description JSON.stringify a circular object throws a error

- */

-

-

-function testcase() {

-  var obj = {};

-  obj.prop = obj;

-  try {

-     JSON.stringify(obj);

-     return false;  // should not reach here

-     }

-   catch (e) {return true}

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify a circular object throws a error
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {};
+  obj.prop = obj;
+  try {
+     JSON.stringify(obj);
+     return false;  // should not reach here
+     }
+   catch (e) {return true}
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-2.js b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-2.js
index a8157f6fe..c72e18a12 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-2.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_4-1-2.js

- * @description JSON.stringify a circular object throws a TypeError

- */

-

-

-function testcase() {

-  var obj = {};

-  obj.prop = obj;

-  try {

-     JSON.stringify(obj);

-     return false;  // should not reach here

-     }

-   catch (e) {return e.name==='TypeError'}

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify a circular object throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {};
+  obj.prop = obj;
+  try {
+     JSON.stringify(obj);
+     return false;  // should not reach here
+     }
+   catch (e) {return e.name==='TypeError'}
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-3.js b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-3.js
index 6a66e87aa..0a8112965 100644
--- a/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-3.js
+++ b/test/suite/ch15/15.12/15.12.3/15.12.3_4-1-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.12/15.12.3/15.12.3_4-1-3.js

- * @description JSON.stringify a indirectly circular object throws a error

- */

-

-

-function testcase() {

-  var obj = {p1: {p2: {}}};

-  obj.p1.p2.prop = obj;

-  try {

-     JSON.stringify(obj);

-     return false;  // should not reach here

-     }

-   catch (e) {return  true}

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: JSON.stringify a indirectly circular object throws a error
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {p1: {p2: {}}};
+  obj.p1.p2.prop = obj;
+  try {
+     JSON.stringify(obj);
+     return false;  // should not reach here
+     }
+   catch (e) {return  true}
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T1.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T1.js
index e1600158c..d29cd6f58 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object(value) is called and the value is null, undefined or not supplied,
- * create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A1_T1.js
- * @description Creating Object(null) and checking its properties
- */
+/*---
+info: >
+    When the Object(value) is called and the value is null, undefined or not supplied,
+    create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
+description: Creating Object(null) and checking its properties
+---*/
 
 var __obj = Object(null);
 
@@ -32,4 +31,3 @@ if (__obj.toLocaleString() !== n__obj.toLocaleString()) {
 if (typeof __obj !== typeof n__obj) {
 	$ERROR('#5');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T2.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T2.js
index 0f3c00142..ef93548e7 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object(value) is called and the value is null, undefined or not supplied,
- * create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A1_T2.js
- * @description Creating Object(void 0) and checking its properties
- */
+/*---
+info: >
+    When the Object(value) is called and the value is null, undefined or not supplied,
+    create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
+description: Creating Object(void 0) and checking its properties
+---*/
 
 //var y= void 0;
 
@@ -35,4 +34,3 @@ if (__obj.toLocaleString() !== n__obj.toLocaleString()) {
 if (typeof __obj !== typeof n__obj) {
 	$ERROR('#5');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T3.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T3.js
index a9189377f..9dcba8df5 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T3.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object(value) is called and the value is null, undefined or not supplied,
- * create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A1_T3.js
- * @description Creating Object() and checking its properties
- */
+/*---
+info: >
+    When the Object(value) is called and the value is null, undefined or not supplied,
+    create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
+description: Creating Object() and checking its properties
+---*/
 
 var __obj = Object();
 
@@ -32,4 +31,3 @@ if (__obj.toLocaleString() !== n__obj.toLocaleString()) {
 if (typeof __obj !== typeof n__obj) {
 	$ERROR('#5');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T4.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T4.js
index aa4aafc1b..37e6bbc49 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T4.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object(value) is called and the value is null, undefined or not supplied,
- * create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A1_T4.js
- * @description Creating Object(undefined) and checking its properties
- */
+/*---
+info: >
+    When the Object(value) is called and the value is null, undefined or not supplied,
+    create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
+description: Creating Object(undefined) and checking its properties
+---*/
 
 var __obj = Object(undefined);
 
@@ -32,4 +31,3 @@ if (__obj.toLocaleString() !== n__obj.toLocaleString()) {
 if (typeof __obj !== typeof n__obj) {
 	$ERROR('#5');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T5.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T5.js
index dc083d0ba..94f0195a2 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T5.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object(value) is called and the value is null, undefined or not supplied,
- * create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A1_T5.js
- * @description Creating Object(x) and checking its properties
- */
+/*---
+info: >
+    When the Object(value) is called and the value is null, undefined or not supplied,
+    create and return a new Object object if the object constructor had been called with the same arguments (15.2.2.1)
+description: Creating Object(x) and checking its properties
+---*/
 
 var __obj = Object(x);
 
@@ -34,4 +33,3 @@ if (typeof __obj !== typeof n__obj) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T1.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T1.js
index a3a93e7b2..65ef96545 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T1.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T1.js
- * @description Calling Object function with boolean argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with boolean argument value
+includes: [$FAIL.js]
+---*/
 
 var bool = true;
 
@@ -32,4 +32,3 @@ if (!obj) {
 if (obj === true) {
   $ERROR('#5: Object(true) returns ToObject(true)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T10.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T10.js
index 8ac9aa497..412c6a4eb 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T10.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T10.js
- * @description Calling Object function with array of numbers as argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with array of numbers as argument value
+---*/
 
 var arr = [1,2,3];
 
@@ -24,7 +23,3 @@ arr.push(4);
 if ((n_obj !== arr)||(n_obj[3]!==4)) {
   $ERROR('#2: Object([1,2,3]) returns ToObject([1,2,3])');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T11.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T11.js
index c7f605bb0..e536fabbf 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T11.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T11.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T11.js
- * @description Calling Object function with function declaration as argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with function declaration as argument value
+---*/
 
 //CHECK#1
 if (typeof func !== 'undefined') {
@@ -25,5 +24,3 @@ if ((n_obj.constructor !== Function)||(n_obj()!==1)) {
 if (typeof func !== 'undefined') {
   $ERROR('#3:  function expression can\'t be declarated');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T12.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T12.js
index e151c6b0b..94ef8d45b 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T12.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T12.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T12.js
- * @description Calling Object function with numeric expression as argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with numeric expression as argument value
+---*/
 
 var obj = Object(1.1*([].length+{q:1}["q"]));
 
@@ -26,4 +25,3 @@ if ((obj != 1.1)||(obj === 1.1)) {
   $ERROR('#4: Object(expression) returns ToObject(expression)');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T13.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T13.js
index 19ffdbe7d..c9390afa6 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T13.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T13.js
- * @description Calling Object function with boolean expression as argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with boolean expression as argument value
+---*/
 
 var obj = Object((1===1)&&(!false));
 
@@ -30,4 +29,3 @@ if (!(obj)) {
 if (obj===true) {
   $ERROR('#3: Object(expression) returns ToObject(expression)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T14.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T14.js
index 559c8ea5b..b20431e03 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T14.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T14.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T14.js
- * @description Calling Object function with sum of empty string and a number as argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: >
+    Calling Object function with sum of empty string and a number as
+    argument value
+---*/
 
 var obj = Object(""+1);
 
@@ -25,4 +26,3 @@ if (typeof obj !== "object") {
 if ((obj != "1")||(obj === "1")) {
   $ERROR('#4: Object(expression) returns ToObject(expression)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T2.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T2.js
index ab02565a2..f8c8ec5fe 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T2.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T2.js
- * @description Calling Object function with number argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with number argument value
+---*/
 
 var num = 1.1;
 
@@ -33,4 +32,3 @@ if ((obj != 1.1)||(obj === 1.1)) {
   $ERROR('#4: Object(1.1) returns ToObject(1.1)');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T3.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T3.js
index 019ac0f7f..7cdc8fe84 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T3.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T3.js
- * @description Calling Object function with string argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with string argument value
+---*/
 
 var str = 'Luke Skywalker';
 
@@ -32,4 +31,3 @@ if (typeof obj !== "object") {
 if ((obj != "Luke Skywalker")||(obj === "Luke Skywalker")) {
   $ERROR('#4: Object("Luke Skywalker") returns ToObject("Luke Skywalker")');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T4.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T4.js
index 68d45f46d..a9450368e 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T4.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T4.js
- * @description Calling Object function with object argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with object argument value
+includes: [$FAIL.js]
+---*/
 
 var obj = {flag:true};
 
@@ -22,5 +22,3 @@ var n_obj = Object(obj);
 if ((n_obj !== obj)||(!(n_obj['flag']))) {
   $ERROR('#2: Object({flag:true}) returns ToObject({flag:true})');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T5.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T5.js
index bc23aa00a..66c470131 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T5.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T5.js
- * @description Calling Object function with NaN argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with NaN argument value
+---*/
 
 var num = NaN;
 
@@ -28,4 +27,3 @@ if (typeof obj!=="object") {
   $ERROR('#2: Object(NaN) returns ToObject(NaN)');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T6.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T6.js
index c4d11409a..ee140a5dd 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T6.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T6.js
- * @description Calling Object function with Infinity argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with Infinity argument value
+---*/
 
 var num = Infinity;
 
@@ -32,5 +31,3 @@ if (typeof obj!=="object") {
 if ((obj != Infinity)||(obj === Infinity)) {
   $ERROR('#4: Object(Infinity) returns ToObject(Infinity)');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T7.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T7.js
index f5947948b..f3f5ff5ba 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T7.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T7.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T7.js
- * @description Calling Object function with empty string argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with empty string argument value
+includes: [$FAIL.js]
+---*/
 
 var str = '';
 
@@ -32,4 +32,3 @@ if (typeof obj !== "object") {
 if ((obj != "")||(obj === "")) {
   $ERROR('#4: Object("") returns ToObject("")');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T8.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T8.js
index fbd9419ba..5a6008826 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T8.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T8.js
- * @description Calling Object function with function variable argument value
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: Calling Object function with function variable argument value
+---*/
 
 var func = function(){return 1;};
 
@@ -22,5 +21,3 @@ var n_obj = Object(func);
 if ((n_obj !== func)||(n_obj()!==1)) {
   $ERROR('#2: Object(function) returns function');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T9.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T9.js
index f8e0020fe..2fd2d7961 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T9.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A2_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object function is called with one argument value,
- * and the value neither is null nor undefined, and is supplied, return ToObject(value)
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A2_T9.js
- * @description Calling Object function with function argument value. The function is declared
- */
+/*---
+info: >
+    When the Object function is called with one argument value,
+    and the value neither is null nor undefined, and is supplied, return ToObject(value)
+description: >
+    Calling Object function with function argument value. The function
+    is declared
+---*/
 
 //CHECK#1
 if (typeof func !== 'function') {
@@ -22,5 +23,3 @@ if ((n_obj !== func)||(n_obj()!==1)) {
 }
 
 function func(){return 1;};
-
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T1.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T1.js
index d3f235bb0..8d49189ce 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T1.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A3_T1.js
- * @description Creating an object with "Object(1,2,3)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "Object(1,2,3)"
+---*/
 
 var obj = Object(1,2,3);
 
@@ -24,4 +24,3 @@ if (typeof obj !== "object") {
 if ((obj != 1)||(obj === 1)) {
   $ERROR('3#: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T2.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T2.js
index 7f6468dc8..3a4b7553c 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T2.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A3_T2.js
- * @description Creating an object with "Object(null,2,3)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "Object(null,2,3)"
+---*/
 
 var obj = Object(null,2,3);
 
@@ -19,4 +19,3 @@ if (obj.constructor !== Object) {
 if (typeof obj !== "object") {
   $ERROR('#2: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T3.js b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T3.js
index 5766eecc3..ff0045a4c 100644
--- a/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T3.js
+++ b/test/suite/ch15/15.2/15.2.1/S15.2.1.1_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.1/S15.2.1.1_A3_T3.js
- * @description Creating an object with "Object((null,2,3),1,2)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "Object((null,2,3),1,2)"
+---*/
 
 var obj = Object((null,2,3),1,2);
 
@@ -24,4 +24,3 @@ if (typeof obj !== "object") {
 if ((obj != 3)||(obj === 3)) {
   $ERROR('3#: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T1.js
index 56010d916..1ad7ec8c8 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T1.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with no arguments the following steps are taken:
- * (The argument value was not supplied or its type was Null or Undefined.)
- *   i)	Create a new native ECMAScript object.
- *  ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
- * iii) 	The [[Class]] property of the newly constructed object is set to "Object".
- *  iv) 	The newly constructed object has no [[Value]] property.
- *   v) 	Return the newly created native object
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A1_T1.js
- * @description Creating new Object() and checking its properties
- */
+/*---
+info: >
+    When the Object constructor is called with no arguments the following steps are taken:
+    (The argument value was not supplied or its type was Null or Undefined.)
+    i)	Create a new native ECMAScript object.
+    ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
+    iii) 	The [[Class]] property of the newly constructed object is set to "Object".
+    iv) 	The newly constructed object has no [[Value]] property.
+    v) 	Return the newly created native object
+description: Creating new Object() and checking its properties
+---*/
 
 var obj = new Object();
 
@@ -41,5 +40,3 @@ if (obj.toString() !== to_string_result) {
 if (obj.valueOf().toString() !== to_string_result.toString()) {
   $ERROR('#4: when new Object() calls the newly constructed object has no [[Value]] property.');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T2.js
index ad4af73a8..0f75aa460 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T2.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with no arguments the following steps are taken:
- * (The argument value was not supplied or its type was Null or Undefined.)
- *   i)	Create a new native ECMAScript object.
- *  ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
- * iii) 	The [[Class]] property of the newly constructed object is set to "Object".
- *  iv) 	The newly constructed object has no [[Value]] property.
- *   v) 	Return the newly created native object
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A1_T2.js
- * @description Creating new Object(void 0) and checking its properties
- */
+/*---
+info: >
+    When the Object constructor is called with no arguments the following steps are taken:
+    (The argument value was not supplied or its type was Null or Undefined.)
+    i)	Create a new native ECMAScript object.
+    ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
+    iii) 	The [[Class]] property of the newly constructed object is set to "Object".
+    iv) 	The newly constructed object has no [[Value]] property.
+    v) 	Return the newly created native object
+description: Creating new Object(void 0) and checking its properties
+---*/
 
 //var foo = void 0;
 var obj = new Object(void 0);
@@ -42,5 +41,3 @@ if (obj.toString() !== to_string_result) {
 if (obj.valueOf().toString() !== to_string_result.toString()) {
   $ERROR('#4: when new Object(undefined) calls the newly constructed object has no [[Value]] property.');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T3.js
index 137907120..f5bbaf28c 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T3.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with no arguments the following steps are taken:
- * (The argument value was not supplied or its type was Null or Undefined.)
- *   i)	Create a new native ECMAScript object.
- *  ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
- * iii) 	The [[Class]] property of the newly constructed object is set to "Object".
- *  iv) 	The newly constructed object has no [[Value]] property.
- *   v) 	Return the newly created native object
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A1_T3.js
- * @description Creating new Object(null) and checking its properties
- */
+/*---
+info: >
+    When the Object constructor is called with no arguments the following steps are taken:
+    (The argument value was not supplied or its type was Null or Undefined.)
+    i)	Create a new native ECMAScript object.
+    ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
+    iii) 	The [[Class]] property of the newly constructed object is set to "Object".
+    iv) 	The newly constructed object has no [[Value]] property.
+    v) 	Return the newly created native object
+description: Creating new Object(null) and checking its properties
+---*/
 
 var obj = new Object(null);
 
@@ -41,5 +40,3 @@ if (obj.toString() !== to_string_result) {
 if (obj.valueOf().toString() !== to_string_result.toString()) {
   $ERROR('#4: when new Object(null) calls the newly constructed object has no [[Value]] property.');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T4.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T4.js
index b8af18c92..e52be6bab 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T4.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T4.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with no arguments the following steps are taken:
- * (The argument value was not supplied or its type was Null or Undefined.)
- *   i)	Create a new native ECMAScript object.
- *  ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
- * iii) 	The [[Class]] property of the newly constructed object is set to "Object".
- *  iv) 	The newly constructed object has no [[Value]] property.
- *   v) 	Return the newly created native object
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A1_T4.js
- * @description Creating new Object(undefined) and checking its properties
- */
+/*---
+info: >
+    When the Object constructor is called with no arguments the following steps are taken:
+    (The argument value was not supplied or its type was Null or Undefined.)
+    i)	Create a new native ECMAScript object.
+    ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
+    iii) 	The [[Class]] property of the newly constructed object is set to "Object".
+    iv) 	The newly constructed object has no [[Value]] property.
+    v) 	Return the newly created native object
+description: Creating new Object(undefined) and checking its properties
+---*/
 
 var obj = new Object(undefined);
 
@@ -41,5 +40,3 @@ if (obj.toString() !== to_string_result) {
 if (obj.valueOf().toString() !== to_string_result.toString()) {
   $ERROR('#4: when new Object(undefined) calls the newly constructed object has no [[Value]] property.');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T5.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T5.js
index ced23c45e..f7e51eef2 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T5.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A1_T5.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with no arguments the following steps are taken:
- * (The argument value was not supplied or its type was Null or Undefined.)
- *   i)	Create a new native ECMAScript object.
- *  ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
- * iii) 	The [[Class]] property of the newly constructed object is set to "Object".
- *  iv) 	The newly constructed object has no [[Value]] property.
- *   v) 	Return the newly created native object
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A1_T5.js
- * @description Creating new Object(x), where x is "undefined", and checking it properties
- */
+/*---
+info: >
+    When the Object constructor is called with no arguments the following steps are taken:
+    (The argument value was not supplied or its type was Null or Undefined.)
+    i)	Create a new native ECMAScript object.
+    ii) 	The [[Prototype]] property of the newly constructed object is set to the Object prototype object.
+    iii) 	The [[Class]] property of the newly constructed object is set to "Object".
+    iv) 	The newly constructed object has no [[Value]] property.
+    v) 	Return the newly created native object
+description: >
+    Creating new Object(x), where x is "undefined", and checking it
+    properties
+---*/
 
 var obj = new Object(x);
 
@@ -43,5 +44,3 @@ if (obj.valueOf().toString() !== to_string_result.toString()) {
 }
 
 var x;
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T1.js
index 1c6b7a408..6056e1f2e 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T1.js
- * @description The value is Object
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is Object
+---*/
 
 var obj = {prop:1};
 
@@ -22,4 +21,3 @@ if (n_obj !== obj) {
 if (n_obj['prop'] !== 1) {
   $ERROR('#2: When the Object constructor is called and if the value is an Object simply value returns.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T2.js
index 0a5e9aaee..7e4477b4f 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T2.js
- * @description The value is a function variable
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is a function variable
+---*/
 
 var func = function(){return 1;};
 
@@ -23,4 +22,3 @@ if (n_obj() !== 1) {
   $ERROR('When the Object constructor is called and if the value is an Object simply value returns');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T3.js
index 95fb8bb5d..b31082112 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T3.js
- * @description The value is an array
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is an array
+---*/
 
 var arr = [1,2,3];
 
@@ -24,4 +23,3 @@ if (n_obj !== arr) {
 if (n_obj[3] !== 4) {
   $ERROR('#2: When the Object constructor is called and if the value is an Object simply value returns.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T4.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T4.js
index 8a80c5246..bfc11331c 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T4.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T4.js
- * @description The value is "this"
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is "this"
+---*/
 
 var x=1;
 
@@ -24,4 +23,3 @@ if (n_obj !== obj) {
 if (n_obj['x'] !== 1) {
   $ERROR('#2: When the Object constructor is called and if the value is an Object simply value returns.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T5.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T5.js
index 08e181ca7..9411d3fa3 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T5.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T5.js
- * @description The value is a Date object
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is a Date object
+---*/
 
 var obj = new Date(1978,3);
 
@@ -22,4 +21,3 @@ if (n_obj !== obj) {
 if ((n_obj.getFullYear() !== 1978)||(n_obj.getMonth() !== 3)) {
   $ERROR('#2: When the Object constructor is called and if the value is an Object simply value returns.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T6.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T6.js
index 511d634de..1354bf397 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T6.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T6.js
- * @description The value is a declared function
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is a declared function
+---*/
 
 var n_obj = new Object(func);
 
@@ -22,4 +21,3 @@ if (n_obj() !== 1) {
 }
 
 function func(){return 1;};
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T7.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T7.js
index 7eca9ee88..1323e8c58 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T7.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A2_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the value is a native ECMAScript object, do not create a new object but simply return value
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A2_T7.js
- * @description The value is a function declaration
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the value is a native ECMAScript object, do not create a new object but simply return value
+description: The value is a function declaration
+---*/
 
 //CHECK#0
 if (typeof func !== 'undefined') {
@@ -30,5 +29,3 @@ if (n_obj() !== 1) {
 if (typeof func !== 'undefined') {
   $ERROR('#3: function expression can\'t be declarated');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T1.js
index bff76869f..4b1766c12 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is String, return ToObject(string)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A3_T1.js
- * @description Argument value is a nonempty string
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is String, return ToObject(string)
+description: Argument value is a nonempty string
+includes: [$FAIL.js]
+---*/
 
 var str = 'Obi-Wan Kenobi';
 
@@ -38,5 +38,3 @@ if ( n_obj != str) {
 if ( n_obj === str) {
   $ERROR('#5: When the Object constructor is called with String argument return ToObject(string)');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T2.js
index 5eaabce76..f1cca3fff 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is String, return ToObject(string)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A3_T2.js
- * @description Argument value is an empty string
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is String, return ToObject(string)
+description: Argument value is an empty string
+includes: [$FAIL.js]
+---*/
 
 var str = '';
 
@@ -37,4 +37,3 @@ if ( n_obj != str) {
 if ( n_obj === str) {
   $ERROR('#5: When the Object constructor is called with String argument return ToObject(string)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T3.js
index 35252975d..e1ff028db 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is String, return ToObject(string)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A3_T3.js
- * @description Argument value is sum of empty string and number
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is String, return ToObject(string)
+description: Argument value is sum of empty string and number
+---*/
 
 var n_obj = new Object(""+1);
 
@@ -30,4 +29,3 @@ if ( n_obj != "1") {
 if ( n_obj === "1") {
   $ERROR('#5: When the Object constructor is called with String argument return ToObject(string)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T1.js
index 5e74f7e7c..487c52136 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Boolean, return ToObject(boolean)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A4_T1.js
- * @description Argument value is "true"
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Boolean, return ToObject(boolean)
+description: Argument value is "true"
+includes: [$FAIL.js]
+---*/
 
 var bool = true;
 
@@ -37,4 +37,3 @@ if ( n_obj != bool) {
 if ( n_obj === bool) {
   $ERROR('#5: When the Object constructor is called with Boolean argument return ToObject(boolean)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T2.js
index 61fd00c95..3e7817985 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Boolean, return ToObject(boolean)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A4_T2.js
- * @description Argument value is "false"
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Boolean, return ToObject(boolean)
+description: Argument value is "false"
+includes: [$FAIL.js]
+---*/
 
 var bool = false;
 
@@ -37,4 +37,3 @@ if ( n_obj != bool) {
 if ( n_obj === bool) {
   $ERROR('#5: When the Object constructor is called with Boolean argument return ToObject(boolean)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T3.js
index 4695170da..f77b3f2f4 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Boolean, return ToObject(boolean)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A4_T3.js
- * @description Argument value is boolean expression
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Boolean, return ToObject(boolean)
+description: Argument value is boolean expression
+---*/
 
 var n_obj = new Object((1===1)&&!(false));
 
@@ -30,4 +29,3 @@ if ( n_obj != true) {
 if ( n_obj === true) {
   $ERROR('#5: When the Object constructor is called with Boolean argument return ToObject(boolean)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T1.js
index 05ca35957..508d32c16 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Number, return ToObject(number)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A5_T1.js
- * @description Argument value is any number
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Number, return ToObject(number)
+description: Argument value is any number
+includes: [$FAIL.js]
+---*/
 
 var num = 1.0;
 
@@ -37,4 +37,3 @@ if ( n_obj != num) {
 if ( n_obj === num) {
   $ERROR('#5: When the Object constructor is called with Number argument return ToObject(number)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T2.js
index 6a72708c5..a5efb294b 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Number, return ToObject(number)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A5_T2.js
- * @description Argument value is NaN
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Number, return ToObject(number)
+description: Argument value is NaN
+includes: [$FAIL.js]
+---*/
 
 var num = NaN;
 
@@ -27,4 +27,3 @@ if (n_obj.constructor !== Number) {
 if (typeof n_obj !== 'object') {
   $ERROR('#3: When the Object constructor is called with Number argument return ToObject(number)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T3.js
index dc99dbd32..e73e25340 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Number, return ToObject(number)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A5_T3.js
- * @description Argument value is Infinity
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Number, return ToObject(number)
+description: Argument value is Infinity
+includes: [$FAIL.js]
+---*/
 
 var num = Infinity;
 
@@ -37,4 +37,3 @@ if ( n_obj != num) {
 if ( n_obj === num) {
   $ERROR('#5: When the Object constructor is called with Number argument return ToObject(number)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T4.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T4.js
index 8a34a2f08..90208b2cb 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T4.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A5_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Object constructor is called with one argument value and
- * the type of value is Number, return ToObject(number)
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A5_T4.js
- * @description Argument value is numeric expression
- */
+/*---
+info: >
+    When the Object constructor is called with one argument value and
+    the type of value is Number, return ToObject(number)
+description: Argument value is numeric expression
+---*/
 
 var n_obj = new Object( 2*([].length + {q:1}["q"]));
 
@@ -30,4 +29,3 @@ if ( n_obj != 2) {
 if ( n_obj === 2) {
   $ERROR('#5: When the Object constructor is called with Number argument return ToObject(number)');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T1.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T1.js
index 7fd7a4fbe..e81e72e9c 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T1.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A6_T1.js
- * @description Creating an object with "new Object(1,2,3)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "new Object(1,2,3)"
+---*/
 
 var obj = new Object(1,2,3);
 
@@ -24,4 +24,3 @@ if (typeof obj !== "object") {
 if ((obj != 1)||(obj === 1)) {
   $ERROR('3#: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T2.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T2.js
index cb3892024..b57784ea2 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T2.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A6_T2.js
- * @description Creating an object with "new Object(null,2,3)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "new Object(null,2,3)"
+---*/
 
 var obj = new Object(null,2,3);
 
@@ -19,4 +19,3 @@ if (obj.constructor !== Object) {
 if (typeof obj !== "object") {
   $ERROR('#2: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T3.js b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T3.js
index 1c20cd4d2..8ed3fce5a 100644
--- a/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T3.js
+++ b/test/suite/ch15/15.2/15.2.2/S15.2.2.1_A6_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since calling Object as a function is identical to calling a function, list of arguments bracketing is allowed
- *
- * @path ch15/15.2/15.2.2/S15.2.2.1_A6_T3.js
- * @description Creating an object with "new Object((null,2,3),2,3)"
- */
+/*---
+info: >
+    Since calling Object as a function is identical to calling a function,
+    list of arguments bracketing is allowed
+description: Creating an object with "new Object((null,2,3),2,3)"
+---*/
 
 var obj = new Object((null,2,3),1,2);
 
@@ -24,4 +24,3 @@ if (typeof obj !== "object") {
 if ((obj != 3)||(obj === 3)) {
   $ERROR('3#: Since Object as a function calling is the same as function calling list of arguments can appears in braces;');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.1/15.2.3.1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.1/15.2.3.1.js
index 9c5a88700..3ac88615c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.1/15.2.3.1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.1/15.2.3.1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.1/15.2.3.1.js

- * @description Object.prototype is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, 'prototype');

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype is a data property with default attribute values
+    (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, 'prototype');
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A1.js
index 8bcab1529..6d267b5bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A1.js
- * @description Checking if varying "Object.prototype" property fails
- */
+/*---
+info: The Object.prototype property has the attribute ReadOnly
+description: Checking if varying "Object.prototype" property fails
+---*/
 
 var obj = Object.prototype;
 Object.prototype = function(){return "shifted";};
@@ -23,4 +21,3 @@ try {
 } catch (e) {
   ;
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A2.js
index b7d9b42d9..ee63b7e17 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A2.js
- * @description Checking if enumerating "Object.prototype" property fails
- */
+/*---
+info: The Object.prototype property has the attribute DontEnum
+description: Checking if enumerating "Object.prototype" property fails
+---*/
 
 // CHECK#1
 if (Object.propertyIsEnumerable('prototype')) {
@@ -23,4 +21,3 @@ for (p in Object){
 if (cout !== 0) {
   $ERROR('#2: the Object.prototype property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A3.js
index bcccb67ef..a8914daca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.1/S15.2.3.1_A3.js
@@ -16,4 +16,3 @@ delete Object.prototype;
 if (!(Object.hasOwnProperty('prototype'))) {
   $ERROR('#2: the Object.prototype property has the attributes DontDelete.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-1.js
index 0018ee6b8..2fb884675 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-1.js

- * @description Object.preventExtensions must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.preventExtensions;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.preventExtensions must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.preventExtensions;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-2.js
index 94f9f66ef..85e888bda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-0-2.js

- * @description Object.preventExtensions must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.preventExtensions.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions must exist as a function taking 1
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.preventExtensions.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-1.js
index aeb1d4276..0de526cdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-1.js

- * @description Object.preventExtensions throws TypeError if 'O' is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.preventExtensions(undefined);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.preventExtensions throws TypeError if 'O' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.preventExtensions(undefined);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-2.js
index baa4d2e19..2a3c4cf3d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-2.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-2.js

- * @description Object.preventExtensions throws TypeError if 'O' is null

- */

-

-

-function testcase() {

-        try {

-            Object.preventExtensions(null);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.preventExtensions throws TypeError if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.preventExtensions(null);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-3.js
index da445a1b7..9bfdf7ab9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-3.js

- * @description Object.preventExtensions throws TypeError if 'O' is a boolean primitive value

- */

-

-

-function testcase() {

-        try {

-            Object.preventExtensions(true);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions throws TypeError if 'O' is a boolean
+    primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.preventExtensions(true);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-4.js
index a56a22a9c..c32fb08c3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1-4.js

- * @description Object.preventExtensions throws TypeError if 'O' is a string primitive value

- */

-

-

-function testcase() {

-        try {

-            Object.preventExtensions("abc");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions throws TypeError if 'O' is a string
+    primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.preventExtensions("abc");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1.js
index 7b64dd588..eb7d5c9fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-1.js

- * @description Object.preventExtensions throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.preventExtensions(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions throws TypeError if type of first param
+    is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.preventExtensions(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2-1.js
index 45293a09b..92764f6b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2-1.js

- * @description Object.preventExtensions - repeated calls to preventExtensions have no side effects

- */

-

-

-function testcase() {

-        var obj = {};

-        var testResult1 = true;

-        var testResult2 = true;

-

-        var preCheck = Object.isExtensible(obj);

-

-        Object.preventExtensions(obj);

-        testResult1 = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-        testResult2 = Object.isExtensible(obj);

-

-        return preCheck && !testResult1 && !testResult2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - repeated calls to preventExtensions
+    have no side effects
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var testResult1 = true;
+        var testResult2 = true;
+
+        var preCheck = Object.isExtensible(obj);
+
+        Object.preventExtensions(obj);
+        testResult1 = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+        testResult2 = Object.isExtensible(obj);
+
+        return preCheck && !testResult1 && !testResult2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2.js
index 0ac2ca6aa..6f866b702 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The effect of preventExtentions must be testable by calling isExtensible

- *

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-2.js

- * @description Object.preventExtensions returns its arguments after setting its extensible property to false

- */

-

-

-function testcase() {

-  var o  = {};

-  var o2 = undefined;

-

-  o2 = Object.preventExtensions(o);

-  if (o2 === o && Object.isExtensible(o2) === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: The effect of preventExtentions must be testable by calling isExtensible
+description: >
+    Object.preventExtensions returns its arguments after setting its
+    extensible property to false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o  = {};
+  var o2 = undefined;
+
+  o2 = Object.preventExtensions(o);
+  if (o2 === o && Object.isExtensible(o2) === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-1.js
index bf4f4e544..bd2f20952 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-1.js

- * @description Object.preventExtensions - Object.isExtensible(arg) returns false if arg is the returned object

- */

-

-

-function testcase() {

-        var obj = {};

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-

-        return preCheck && !Object.isExtensible(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - Object.isExtensible(arg) returns false
+    if arg is the returned object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+
+        return preCheck && !Object.isExtensible(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-10.js
index dbcbede7b..6f22af637 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-10.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-10.js

- * @description Object.preventExtensions - indexed properties cannot be added into an Error object

- */

-

-

-function testcase() {

-        var errObj = new Error();

-        var preCheck = Object.isExtensible(errObj);

-        Object.preventExtensions(errObj);

-

-        errObj[0] = 12;

-        return preCheck && !errObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    an Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+        var preCheck = Object.isExtensible(errObj);
+        Object.preventExtensions(errObj);
+
+        errObj[0] = 12;
+        return preCheck && !errObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-11.js
index 596c46ade..e2dca21b0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-11.js

- * @description Object.preventExtensions - indexed properties cannot be added into an Arguments object

- */

-

-

-function testcase() {

-        var argObj;

-        (function () {

-            argObj = arguments;

-        }());

-        var preCheck = Object.isExtensible(argObj);

-        Object.preventExtensions(argObj);

-

-        argObj[0] = 12;

-        return preCheck && !argObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj;
+        (function () {
+            argObj = arguments;
+        }());
+        var preCheck = Object.isExtensible(argObj);
+        Object.preventExtensions(argObj);
+
+        argObj[0] = 12;
+        return preCheck && !argObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-12.js
index b37ef8762..e7afc92e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-12.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-12.js

- * @description Object.preventExtensions - named properties cannot be added into the returned object

- */

-

-

-function testcase() {

-        var obj = {};

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-

-        obj.exName = 2;

-        return preCheck && !Object.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into
+    the returned object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+
+        obj.exName = 2;
+        return preCheck && !Object.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-13.js
index 1a486dfe7..6891380f9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-13.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-13.js

- * @description Object.preventExtensions - named properties cannot be added into a Function object

- */

-

-

-function testcase() {

-        var funObj = function () { };

-        var preCheck = Object.isExtensible(funObj);

-        Object.preventExtensions(funObj);

-

-        funObj.exName = 2;

-        return preCheck && !funObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+        var preCheck = Object.isExtensible(funObj);
+        Object.preventExtensions(funObj);
+
+        funObj.exName = 2;
+        return preCheck && !funObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-14.js
index 841b559aa..5d42b9b28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-14.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-14.js

- * @description Object.preventExtensions - named properties cannot be added into an Array object

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var preCheck = Object.isExtensible(arrObj);

-        Object.preventExtensions(arrObj);

-

-        arrObj.exName = 2;

-        return preCheck && !arrObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into
+    an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var preCheck = Object.isExtensible(arrObj);
+        Object.preventExtensions(arrObj);
+
+        arrObj.exName = 2;
+        return preCheck && !arrObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-15.js
index 5a9394c85..c5214556a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-15.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-15.js

- * @description Object.preventExtensions - named properties cannot be added into a String object

- */

-

-

-function testcase() {

-        var strObj = new String("bbq");

-        var preCheck = Object.isExtensible(strObj);

-        Object.preventExtensions(strObj);

-

-        strObj.exName = 2;

-        return preCheck && !strObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("bbq");
+        var preCheck = Object.isExtensible(strObj);
+        Object.preventExtensions(strObj);
+
+        strObj.exName = 2;
+        return preCheck && !strObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-16.js
index 0def55696..4d9e06dd1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-16.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-16.js

- * @description Object.preventExtensions - named properties cannot be added into a Boolean object

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(true);

-        var preCheck = Object.isExtensible(boolObj);

-        Object.preventExtensions(boolObj);

-

-        boolObj.exName = 2;

-        return preCheck && !boolObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(true);
+        var preCheck = Object.isExtensible(boolObj);
+        Object.preventExtensions(boolObj);
+
+        boolObj.exName = 2;
+        return preCheck && !boolObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-17.js
index 4f80ac823..266567ef8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-17.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-17.js

- * @description Object.preventExtensions - named properties cannot be added into a Number object

- */

-

-

-function testcase() {

-        var numObj = new Number(123);

-        var preCheck = Object.isExtensible(numObj);

-        Object.preventExtensions(numObj);

-

-        numObj.exName = 2;

-        return preCheck && !numObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(123);
+        var preCheck = Object.isExtensible(numObj);
+        Object.preventExtensions(numObj);
+
+        numObj.exName = 2;
+        return preCheck && !numObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-18.js
index 868c8ba35..ed2cc24b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-18.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-18.js

- * @description Object.preventExtensions - named properties cannot be added into a Date object

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-        var preCheck = Object.isExtensible(dateObj);

-        Object.preventExtensions(dateObj);

-

-        dateObj.exName = 2;

-        return preCheck && !dateObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+        var preCheck = Object.isExtensible(dateObj);
+        Object.preventExtensions(dateObj);
+
+        dateObj.exName = 2;
+        return preCheck && !dateObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-19.js
index 84ea46999..226238b3c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-19.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-19.js

- * @description Object.preventExtensions - named properties cannot be added into a RegExp object

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-        var preCheck = Object.isExtensible(regObj);

-        Object.preventExtensions(regObj);

-

-        regObj.exName = 2;

-        return preCheck && !regObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into a
+    RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+        var preCheck = Object.isExtensible(regObj);
+        Object.preventExtensions(regObj);
+
+        regObj.exName = 2;
+        return preCheck && !regObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-2.js
index 738374dc4..751ba3e7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-2.js

- * @description Object.preventExtensions - indexed properties cannot be added into the returned object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-

-        obj[0] = 12;

-        return preCheck && !obj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    the returned object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+
+        obj[0] = 12;
+        return preCheck && !obj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-20.js
index e9abef7c1..7ae1741ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-20.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-20.js

- * @description Object.preventExtensions - named properties cannot be added into an Error object

- */

-

-

-function testcase() {

-        var errObj = new Error();

-        var preCheck = Object.isExtensible(errObj);

-        Object.preventExtensions(errObj);

-

-        errObj.exName = 2;

-        return preCheck && !errObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into
+    an Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+        var preCheck = Object.isExtensible(errObj);
+        Object.preventExtensions(errObj);
+
+        errObj.exName = 2;
+        return preCheck && !errObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-21.js
index c01bca2c8..45108861b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-21.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-21.js

- * @description Object.preventExtensions - named properties cannot be added into an Arguments object

- */

-

-

-function testcase() {

-        var argObj;

-        (function () {

-            argObj = arguments;

-        }());

-        var preCheck = Object.isExtensible(argObj);

-        Object.preventExtensions(argObj);

-

-        argObj.exName = 2;

-        return preCheck && !argObj.hasOwnProperty("exName");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - named properties cannot be added into
+    an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj;
+        (function () {
+            argObj = arguments;
+        }());
+        var preCheck = Object.isExtensible(argObj);
+        Object.preventExtensions(argObj);
+
+        argObj.exName = 2;
+        return preCheck && !argObj.hasOwnProperty("exName");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-22.js
index b97de0915..781dc9d6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-22.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-22.js

- * @description Object.preventExtensions - properties can still be deleted after extensions have been prevented

- */

-

-

-function testcase() {

-        var obj = { prop: 12 };

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-

-        delete obj.prop;

-

-        return preCheck && !obj.hasOwnProperty("prop");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - properties can still be deleted after
+    extensions have been prevented
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: 12 };
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+
+        delete obj.prop;
+
+        return preCheck && !obj.hasOwnProperty("prop");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-23.js
index 52d35b192..bd296a39e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-23.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-23.js

- * @description Object.preventExtensions - properties can still be reassigned after extensions have been prevented

- */

-

-

-function testcase() {

-        var obj = { prop: 12 };

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-

-        obj.prop = -1;

-

-        return preCheck && obj.prop === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - properties can still be reassigned
+    after extensions have been prevented
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: 12 };
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+
+        obj.prop = -1;
+
+        return preCheck && obj.prop === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-24.js
index da1f635cb..50fbc1d65 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-24.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-24.js

- * @description Object.preventExtensions - [[Extensible]]: false on a prototype doesn't prevent adding properties to an instance that inherits from that prototype

- */

-

-

-function testcase() {

-        var proto = {};

-        var preCheck = Object.isExtensible(proto);

-        Object.preventExtensions(proto);

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        child.prop = 10;

-

-        return preCheck && child.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - [[Extensible]]: false on a prototype
+    doesn't prevent adding properties to an instance that inherits
+    from that prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        var preCheck = Object.isExtensible(proto);
+        Object.preventExtensions(proto);
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        child.prop = 10;
+
+        return preCheck && child.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-3.js
index 99dd62c56..3c418019e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-3.js

- * @description Object.preventExtensions - indexed properties cannot be added into a Function object

- */

-

-

-function testcase() {

-        var funObj = function () { };

-        var preCheck = Object.isExtensible(funObj);

-        Object.preventExtensions(funObj);

-

-        funObj[0] = 12;

-        return preCheck && !funObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+        var preCheck = Object.isExtensible(funObj);
+        Object.preventExtensions(funObj);
+
+        funObj[0] = 12;
+        return preCheck && !funObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-4.js
index 8eae2c7c1..e73c96fc1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-4.js

- * @description Object.preventExtensions - indexed properties cannot be added into an Array object

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var preCheck = Object.isExtensible(arrObj);

-        Object.preventExtensions(arrObj);

-

-        arrObj[0] = 12;

-        return preCheck && !arrObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var preCheck = Object.isExtensible(arrObj);
+        Object.preventExtensions(arrObj);
+
+        arrObj[0] = 12;
+        return preCheck && !arrObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5-1.js
index fc6361bf3..c19800c02 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5-1.js

- * @description Object.preventExtensions - indexed properties cannot be added into a String object

- */

-

-

-function testcase() {

-        var strObj = new String("bbq");

-        var preCheck = Object.isExtensible(strObj);

-        Object.preventExtensions(strObj);

-

-        strObj[10] = 12;

-        return preCheck && !strObj.hasOwnProperty("10");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("bbq");
+        var preCheck = Object.isExtensible(strObj);
+        Object.preventExtensions(strObj);
+
+        strObj[10] = 12;
+        return preCheck && !strObj.hasOwnProperty("10");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5.js
index a07b18fee..42a01e7f0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-5.js

- * @description Object.preventExtensions - indexed properties cannot be added into a String object

- */

-

-

-function testcase() {

-        var strObj = new String();

-        var preCheck = Object.isExtensible(strObj);

-        Object.preventExtensions(strObj);

-        try {

-            Object.defineProperty(strObj, "0", { value: "c" });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && preCheck &&

-                !strObj.hasOwnProperty("0") && typeof strObj[0] === "undefined";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String();
+        var preCheck = Object.isExtensible(strObj);
+        Object.preventExtensions(strObj);
+        try {
+            Object.defineProperty(strObj, "0", { value: "c" });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && preCheck &&
+                !strObj.hasOwnProperty("0") && typeof strObj[0] === "undefined";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-6.js
index 63e15e531..7cb967016 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-6.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-6.js

- * @description Object.preventExtensions - indexed properties cannot be added into a Boolean object

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(true);

-        var preCheck = Object.isExtensible(boolObj);

-        Object.preventExtensions(boolObj);

-

-        boolObj[0] = 12;

-        return preCheck && !boolObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(true);
+        var preCheck = Object.isExtensible(boolObj);
+        Object.preventExtensions(boolObj);
+
+        boolObj[0] = 12;
+        return preCheck && !boolObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-7.js
index b23297487..9f3edc584 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-7.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-7.js

- * @description Object.preventExtensions - indexed properties cannot be added into a Number object

- */

-

-

-function testcase() {

-        var numObj = new Number(123);

-        var preCheck = Object.isExtensible(numObj);

-        Object.preventExtensions(numObj);

-

-        numObj[0] = 12;

-        return preCheck && !numObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(123);
+        var preCheck = Object.isExtensible(numObj);
+        Object.preventExtensions(numObj);
+
+        numObj[0] = 12;
+        return preCheck && !numObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-8.js
index 4fb83988a..f24123183 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-8.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-8.js

- * @description Object.preventExtensions - indexed properties cannot be added into a Date object

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-        var preCheck = Object.isExtensible(dateObj);

-        Object.preventExtensions(dateObj);

-

-        dateObj[0] = 12;

-        return preCheck && !dateObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+        var preCheck = Object.isExtensible(dateObj);
+        Object.preventExtensions(dateObj);
+
+        dateObj[0] = 12;
+        return preCheck && !dateObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-9.js
index e433b4182..a70c1a12b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-9.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.10/15.2.3.10-3-9.js

- * @description Object.preventExtensions - indexed properties cannot be added into a RegExp object

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-        var preCheck = Object.isExtensible(regObj);

-        Object.preventExtensions(regObj);

-

-        regObj[0] = 12;

-        return preCheck && !regObj.hasOwnProperty("0");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.preventExtensions - indexed properties cannot be added into
+    a RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+        var preCheck = Object.isExtensible(regObj);
+        Object.preventExtensions(regObj);
+
+        regObj[0] = 12;
+        return preCheck && !regObj.hasOwnProperty("0");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-1.js
index c6a58865e..5b13bf51b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-1.js

- * @description Object.isSealed must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.isSealed;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.isSealed;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-2.js
index f9ee123a6..b97c654d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-0-2.js

- * @description Object.isSealed must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.isSealed.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.isSealed.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-1.js
index 0df7b4421..744b0ecbf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-1.js

- * @description Object.isSealed throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.isSealed(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed throws TypeError if type of first param is not
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.isSealed(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-1.js
index 1cab51634..8cd11fa8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-1.js

- * @description Object.isSealed returns false for all built-in objects (Global)

- */

-

-

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var b = Object.isSealed(this);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Global)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var b = Object.isSealed(this);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-10.js
index bf9505f15..3a21dd461 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-10.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-10.js

- * @description Object.isSealed returns false for all built-in objects (Boolean)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Boolean);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Boolean);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-11.js
index f59e38033..379274061 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-11.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-11.js

- * @description Object.isSealed returns false for all built-in objects (Boolean.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Boolean.prototype);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Boolean.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Boolean.prototype);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-12.js
index 387abd9cb..9f0872aaf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-12.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-12.js

- * @description Object.isSealed returns false for all built-in objects (Number)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Number);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Number);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-13.js
index 34ac27b05..27c771669 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-13.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-13.js

- * @description Object.isSealed returns false for all built-in objects (Number.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Number.prototype);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Number.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Number.prototype);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-14.js
index 7f2af0771..5ec3c865d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-14.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-14.js

- * @description Object.isSealed returns false for all built-in objects (Math)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Math);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Math);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-15.js
index aa6edf99b..6f313575f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-15.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-15.js

- * @description Object.isSealed returns false for all built-in objects (Date)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Date);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Date);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-16.js
index 2a69cd452..bf260ad70 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-16.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-16.js

- * @description Object.isSealed returns false for all built-in objects (Date.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Date.prototype);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Date.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Date.prototype);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-17.js
index 4c1ee1de4..0671fe3ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-17.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-17.js

- * @description Object.isSealed returns false for all built-in objects (RegExp)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(RegExp);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (RegExp)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(RegExp);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-18.js
index b9674eb0b..3abb11e77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-18.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-18.js

- * @description Object.isSealed returns false for all built-in objects (RegExp.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(RegExp.prototype);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (RegExp.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(RegExp.prototype);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-19.js
index 1b3d5b545..295600a52 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-19.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-19.js

- * @description Object.isSealed returns false for all built-in objects (Error)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Error);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Error)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Error);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-2.js
index ae248b344..9b3dc5484 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-2.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-2.js

- * @description Object.isSealed returns false for all built-in objects (Object)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Object);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Object);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-20.js
index 03f9f8dd8..4da51801a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-20.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-20.js

- * @description Object.isSealed returns false for all built-in objects (Error.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Error.prototype);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Error.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Error.prototype);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-21.js
index abf27edbd..01c3418cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-21.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-21.js

- * @description Object.isSealed returns false for all built-in objects (EvalError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(EvalError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (EvalError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(EvalError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-22.js
index c9410e443..a9cbbbe00 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-22.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-22.js

- * @description Object.isSealed returns false for all built-in objects (RangeError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(RangeError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (RangeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(RangeError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-23.js
index 770249e49..cc6f29964 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-23.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-23.js

- * @description Object.isSealed returns false for all built-in objects (ReferenceError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(ReferenceError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (ReferenceError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(ReferenceError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-24.js
index 20d1afef1..d3e496ab7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-24.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-24.js

- * @description Object.isSealed returns false for all built-in objects (SyntaxError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(SyntaxError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (SyntaxError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(SyntaxError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-25.js
index 4fe323e39..047f26032 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-25.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-25.js

- * @description Object.isSealed returns false for all built-in objects (TypeError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(TypeError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (TypeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(TypeError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-26.js
index 97853c21d..bcb000d7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-26.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-26.js

- * @description Object.isSealed returns false for all built-in objects (URIError)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(URIError);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (URIError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(URIError);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-27.js
index 33dbc58d6..84a516890 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-27.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-27.js

- * @description Object.isSealed returns false for all built-in objects (JSON)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(JSON);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(JSON);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-3.js
index 73cc9daa3..e3da13c31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-3.js

- * @description Object.isSealed returns false for all built-in objects (Object.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Object.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Object.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Object.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-4.js
index 4b772d480..9c8fbdcb9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-4.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-4.js

- * @description Object.isSealed returns false for all built-in objects (Function)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Function);

-  if (b === false) {

-    return true;

-  }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Function);
+  if (b === false) {
+    return true;
+  }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-5.js
index 857d1ecaa..e40e52140 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-5.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-5.js

- * @description Object.isSealed returns false for all built-in objects (Function.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Function.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Function.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Function.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-6.js
index 636520d06..0810f684d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-6.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-6.js

- * @description Object.isSealed returns false for all built-in objects (Array)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Array);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Array);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-7.js
index ccfec1754..b46a10d62 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-7.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-7.js

- * @description Object.isSealed returns false for all built-in objects (Array.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(Array.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (Array.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(Array.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-8.js
index 25bfcaf5d..3767fc68c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-8.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-8.js

- * @description Object.isSealed returns false for all built-in objects (String)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(String);

-  if (b === false) {

-    return true;

-  }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isSealed returns false for all built-in objects (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(String);
+  if (b === false) {
+    return true;
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-9.js
index cebe4c529..14d4db355 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-9.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.11/15.2.3.11-4-9.js

- * @description Object.isSealed returns false for all built-in objects (String.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isSealed(String.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isSealed returns false for all built-in objects
+    (String.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isSealed(String.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-1.js
index 912e74e99..bda34e6fd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-1.js

- * @description Object.isFrozen must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.isFrozen;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.isFrozen;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-2.js
index c8d712b8c..8bacd16fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-0-2.js

- * @description Object.isFrozen must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.isFrozen.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.isFrozen.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-1.js
index 4fabb1a91..566add2d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-1.js

- * @description Object.isFrozen - TypeError is thrown when the first param 'O' is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.isFrozen(undefined);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - TypeError is thrown when the first param 'O' is
+    undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.isFrozen(undefined);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-2.js
index 4942dfd26..6d1cc0abf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-2.js

- * @description Object.isFrozen - TypeError is thrown when the first param 'O' is null

- */

-

-

-function testcase() {

-        try {

-            Object.isFrozen(null);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - TypeError is thrown when the first param 'O' is
+    null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.isFrozen(null);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-3.js
index 28cf8a4a7..5415ad7ee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-3.js

- * @description Object.isFrozen - TypeError is thrown when the first param 'O' is a boolean

- */

-

-

-function testcase() {

-        try {

-            Object.isFrozen(true);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - TypeError is thrown when the first param 'O' is
+    a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.isFrozen(true);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-4.js
index f0c379686..4cce95ea3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-4.js

- * @description Object.isFrozen - TypeError is thrown when the first param 'O' is a string

- */

-

-

-function testcase() {

-        try {

-            Object.isFrozen("abc");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - TypeError is thrown when the first param 'O' is
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.isFrozen("abc");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-5.js
index 85d67a4f3..05c5e71f5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-5.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-5.js

- * @description Object.isFrozen applies to dense array

- */

-

-

-function testcase() {

-        var obj = Object.freeze([0, 1, 2]);

-        return Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen applies to dense array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = Object.freeze([0, 1, 2]);
+        return Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-6.js
index 911755182..dc780e887 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-6.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-6.js

- * @description Object.isFrozen applies to sparse array

- */

-

-

-function testcase() {

-        var sparseArr = [0, 1];

-        sparseArr[10000] = 10000;

-

-        sparseArr = Object.freeze(sparseArr);

-        return Object.isFrozen(sparseArr);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen applies to sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var sparseArr = [0, 1];
+        sparseArr[10000] = 10000;
+
+        sparseArr = Object.freeze(sparseArr);
+        return Object.isFrozen(sparseArr);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-7.js
index 90ca4a7ec..24067b68b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-7.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1-7.js

- * @description Object.isFrozen applies to non-array object which contains index named properties

- */

-

-

-function testcase() {

-        var obj = Object.freeze({ 0: 0, 1: 1, 1000: 1000 });

-        return Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen applies to non-array object which contains index
+    named properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = Object.freeze({ 0: 0, 1: 1, 1000: 1000 });
+        return Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1.js
index 8cefa768e..e6838c12c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-1.js

- * @description Object.isFrozen throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.isFrozen(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen throws TypeError if type of first param is not
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.isFrozen(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-1.js
index b44df0656..59638063e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-1.js

- * @description Object.isFrozen - inherited data property is not considered into the for each loop

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "Father", {

-            value: 10,

-            writable: false,

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.preventExtensions(child);

-

-        return Object.isFrozen(child);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - inherited data property is not considered into
+    the for each loop
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "Father", {
+            value: 10,
+            writable: false,
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.preventExtensions(child);
+
+        return Object.isFrozen(child);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-2.js
index 55d256e9d..694de6274 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-2.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-2.js

- * @description Object.isFrozen - inherited accessor property is not considered into the for each loop

- */

-

-

-function testcase() {

-

-        var proto = {};

-        

-        function get_func() {

-            return 10;

-        }

-        function set_func() { }

-

-        Object.defineProperty(proto, "Father", {

-            get: get_func,

-            set: set_func,

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.preventExtensions(child);

-

-        return Object.isFrozen(child);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - inherited accessor property is not considered
+    into the for each loop
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        
+        function get_func() {
+            return 10;
+        }
+        function set_func() { }
+
+        Object.defineProperty(proto, "Father", {
+            get: get_func,
+            set: set_func,
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.preventExtensions(child);
+
+        return Object.isFrozen(child);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-1.js
index 6dab6318f..d30a4a9f1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-1.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-1.js

- * @description Object.isFrozen - 'P' is own data property

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 12,

-            writable: true,

-            configurable: false

-        });

-

-        Object.preventExtensions(obj);

-

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'P' is own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 12,
+            writable: true,
+            configurable: false
+        });
+
+        Object.preventExtensions(obj);
+
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-11.js
index bb31a7f1f..bed2d9099 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-11.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-11.js

- * @description Object.isFrozen - 'O' is the Arguments object

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        Object.preventExtensions(arg);

-        return !Object.isFrozen(arg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'O' is the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        Object.preventExtensions(arg);
+        return !Object.isFrozen(arg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-12.js
index fbe9f6706..9f31c542f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-12.js

- * @description Object.isFrozen - 'O' is a String object

- */

-

-

-function testcase() {

-

-        var obj = new String("abc");

-

-        obj.len = 100;

-

-        Object.preventExtensions(obj);

-

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'O' is a String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new String("abc");
+
+        obj.len = 100;
+
+        Object.preventExtensions(obj);
+
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-13.js
index 3d6fbefea..8eda04219 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-13.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-13.js

- * @description Object.isFrozen - 'O' is a Function object

- */

-

-

-function testcase() {

-

-        var obj = function () { };

-        

-        Object.defineProperty(obj, "property", {

-            value: 12,

-            writable: true,

-            configurable: false

-        });

-

-        Object.preventExtensions(obj);

-

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'O' is a Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function () { };
+        
+        Object.defineProperty(obj, "property", {
+            value: 12,
+            writable: true,
+            configurable: false
+        });
+
+        Object.preventExtensions(obj);
+
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-14.js
index 6c0d93a15..61861167f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-14.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-14.js

- * @description Object.isFrozen - 'O' is an Array object

- */

-

-

-function testcase() {

-

-        var obj = [2];

-        obj.len = 200;

-

-        Object.preventExtensions(obj);

-

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'O' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = [2];
+        obj.len = 200;
+
+        Object.preventExtensions(obj);
+
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-2.js
index 578340ea9..1512012ef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-2.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-2.js

- * @description Object.isFrozen - 'P' is own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            value: 9,

-            writable: false,

-            configurable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        Object.defineProperty(child, "foo", {

-            value: 12,

-            writable: true,

-            configurable: false

-        });

-

-        Object.preventExtensions(child);

-        return !Object.isFrozen(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own data property that overrides an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            value: 9,
+            writable: false,
+            configurable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        Object.defineProperty(child, "foo", {
+            value: 12,
+            writable: true,
+            configurable: false
+        });
+
+        Object.preventExtensions(child);
+        return !Object.isFrozen(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-3.js
index e44df4732..b1160b27c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-3.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-3.js

- * @description Object.isFrozen - 'P' is own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 9;

-            },

-            configurable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-

-        Object.defineProperty(child, "foo", {

-            value: 12,

-            configurable: true

-        });

-

-        Object.preventExtensions(child);

-        return !Object.isFrozen(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own data property that overrides an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 9;
+            },
+            configurable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+
+        Object.defineProperty(child, "foo", {
+            value: 12,
+            configurable: true
+        });
+
+        Object.preventExtensions(child);
+        return !Object.isFrozen(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-4.js
index add9d32e7..12b027fa9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-4.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-4.js

- * @description Object.isFrozen - 'P' is own accessor property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            get: function () {

-                return 9;

-            },

-            configurable: true

-        });

-

-        Object.preventExtensions(obj);

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen - 'P' is own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            get: function () {
+                return 9;
+            },
+            configurable: true
+        });
+
+        Object.preventExtensions(obj);
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-5.js
index 3f9819845..34cbe705f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-5.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-5.js

- * @description Object.isFrozen - 'P' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 9;

-            },

-            configurable: true

-        });

-

-        Object.preventExtensions(child);

-        return !Object.isFrozen(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own accessor property that overrides an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 9;
+            },
+            configurable: true
+        });
+
+        Object.preventExtensions(child);
+        return !Object.isFrozen(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-6.js
index 9cb1c9c95..96d5b5056 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-6.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-6.js

- * @description Object.isFrozen - 'P' is own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 12;

-            },

-            configurable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 9;

-            },

-            configurable: true

-        });

-

-        Object.preventExtensions(child);

-        return !Object.isFrozen(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own accessor property that overrides an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 12;
+            },
+            configurable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 9;
+            },
+            configurable: true
+        });
+
+        Object.preventExtensions(child);
+        return !Object.isFrozen(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-7.js
index 03d5c55ab..0695c71e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-7.js

- * @description Object.isFrozen - 'P' is own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.preventExtensions(obj);

-        return !Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own accessor property without a get
+    function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.preventExtensions(obj);
+        return !Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-8.js
index 9d99bf5c5..9cb070075 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-8.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-a-8.js

- * @description Object.isFrozen - 'P' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 9;

-            },

-            configurable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        Object.defineProperty(child, "foo", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.preventExtensions(child);

-        return !Object.isFrozen(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen - 'P' is own accessor property without a get
+    function that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 9;
+            },
+            configurable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        Object.defineProperty(child, "foo", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.preventExtensions(child);
+        return !Object.isFrozen(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-b-i-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-b-i-1.js
index 9eda988f2..d9a559a62 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-b-i-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-b-i-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-b-i-1.js

- * @description Object.isFrozen returns false if 'O' contains own writable data property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            value: 20,

-            writable: true,

-            configurable: false

-        });

-        Object.preventExtensions(obj);

-        return !Object.isFrozen(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false if 'O' contains own writable data
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            value: 20,
+            writable: true,
+            configurable: false
+        });
+        Object.preventExtensions(obj);
+        return !Object.isFrozen(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-1.js
index 3db731b6a..1332c6f9a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-1.js

- * @description Object.isFrozen returns false if 'O' contains own configurable data property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            value: 20,

-            writable: false,

-            configurable: true

-        });

-

-        Object.preventExtensions(obj);

-        return !Object.isFrozen(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false if 'O' contains own configurable
+    data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            value: 20,
+            writable: false,
+            configurable: true
+        });
+
+        Object.preventExtensions(obj);
+        return !Object.isFrozen(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-2.js
index cd0facb65..d9b7011d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-2.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-2-c-2.js

- * @description Object.isFrozen returns false if 'O' contains own configurable accessor property

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func() { }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            configurable: true

-        });

-

-        Object.preventExtensions(obj);

-        return !Object.isFrozen(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false if 'O' contains own configurable
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func() { }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            configurable: true
+        });
+
+        Object.preventExtensions(obj);
+        return !Object.isFrozen(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-1.js
index f52be604e..e3cd2ae3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-1.js

- * @description Object.isFrozen returns false for all built-in objects (Global)

- */

-

-

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var b = Object.isFrozen(this);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Global)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var b = Object.isFrozen(this);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-10.js
index 4777048b2..77dd03b25 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-10.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-10.js

- * @description Object.isFrozen returns false for all built-in objects (Boolean)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Boolean);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Boolean);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-11.js
index 840cb0203..581f15a7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-11.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-11.js

- * @description Object.isFrozen returns false for all built-in objects (Boolean.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Boolean.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Boolean.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Boolean.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-12.js
index ae18072e9..4c2eedac9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-12.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-12.js

- * @description Object.isFrozen returns false for all built-in objects (Number)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Number);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Number);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-13.js
index 1858cbf3f..fc72b44d4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-13.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-13.js

- * @description Object.isFrozen returns false for all built-in objects (Number.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Number.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Number.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Number.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-14.js
index a94e893f9..f52e11d21 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-14.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-14.js

- * @description Object.isFrozen returns false for all built-in objects (Math)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Math);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Math);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-15.js
index c384a7187..03a2a590d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-15.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-15.js

- * @description Object.isFrozen returns false for all built-in objects (Date)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Date);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Date);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-16.js
index 7b8a27198..f5a40ec63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-16.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-16.js

- * @description Object.isFrozen returns false for all built-in objects (Date.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Date.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Date.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Date.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-17.js
index 791df22b2..29714ad0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-17.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-17.js

- * @description Object.isFrozen returns false for all built-in objects (RegExp)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(RegExp);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (RegExp)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(RegExp);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-18.js
index 88969f6b6..aebe6c09b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-18.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-18.js

- * @description Object.isFrozen returns false for all built-in objects (RegExp.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(RegExp.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (RegExp.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(RegExp.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-19.js
index 2f81fdc37..ffcc3511e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-19.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-19.js

- * @description Object.isFrozen returns false for all built-in objects (Error)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Error);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Error)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Error);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-2.js
index 0cdefefb8..024d44702 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-2.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-2.js

- * @description Object.isFrozen returns false for all built-in objects (Object)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Object);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Object);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-20.js
index 124a6b355..edaa6d2bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-20.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-20.js

- * @description Object.isFrozen returns false for all built-in objects (Error.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Error.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Error.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Error.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-21.js
index 260edaac4..4ebc9a124 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-21.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-21.js

- * @description Object.isFrozen returns false for all built-in objects (EvalError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(EvalError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (EvalError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(EvalError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-22.js
index 138d117af..f9640309c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-22.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-22.js

- * @description Object.isFrozen returns false for all built-in objects (RangeError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(RangeError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (RangeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(RangeError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-23.js
index c17addab7..7ff03a72b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-23.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-23.js

- * @description Object.isFrozen returns false for all built-in objects (ReferenceError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(ReferenceError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (ReferenceError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(ReferenceError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-24.js
index ac633899a..81ce556c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-24.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-24.js

- * @description Object.isFrozen returns false for all built-in objects (SyntaxError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(SyntaxError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (SyntaxError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(SyntaxError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-25.js
index 5d5fa4459..a901a9276 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-25.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-25.js

- * @description Object.isFrozen returns false for all built-in objects (TypeError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(TypeError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (TypeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(TypeError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-26.js
index a8a9cc765..96e7e244a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-26.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-26.js

- * @description Object.isFrozen returns false for all built-in objects (URIError)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(URIError);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (URIError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(URIError);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-27.js
index f1f8d0b38..5752b0d85 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-27.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-27.js

- * @description Object.isFrozen returns false for all built-in objects (JSON)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(JSON);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(JSON);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-28.js
index 227ec8ddd..a0eb76951 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-28.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-28.js

- * @description Object.isFrozen returns true when all own properties of 'O' are not writable and not configurable, and 'O' is not extensible

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo1", {

-            value: 20,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-

-        function get_func() {

-            return 10;

-        }

-        function set_func() { }

-

-        Object.defineProperty(obj, "foo2", {

-            get: get_func,

-            set: set_func,

-            configurable: false

-        });

-

-        Object.preventExtensions(obj);

-        return Object.isFrozen(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns true when all own properties of 'O' are
+    not writable and not configurable, and 'O' is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo1", {
+            value: 20,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+
+        function get_func() {
+            return 10;
+        }
+        function set_func() { }
+
+        Object.defineProperty(obj, "foo2", {
+            get: get_func,
+            set: set_func,
+            configurable: false
+        });
+
+        Object.preventExtensions(obj);
+        return Object.isFrozen(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-3.js
index d6ea70c33..3228b6afc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-3.js

- * @description Object.isFrozen returns false for all built-in objects (Object.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Object.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Object.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Object.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-4.js
index 9ce20b282..d91d7a423 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-4.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-4.js

- * @description Object.isFrozen returns false for all built-in objects (Function)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Function);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Function);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-5.js
index 38e190942..227c177e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-5.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-5.js

- * @description Object.isFrozen returns false for all built-in objects (Function.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Function.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Function.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Function.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-6.js
index 92b12f752..3b00d1e57 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-6.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-6.js

- * @description Object.isFrozen returns false for all built-in objects (Array)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Array);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Array);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-7.js
index aefa2a273..7975b301e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-7.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-7.js

- * @description Object.isFrozen returns false for all built-in objects (Array.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(Array.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (Array.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(Array.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-8.js
index 13f2839c0..43dad61d3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-8.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-8.js

- * @description Object.isFrozen returns false for all built-in objects (String)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(String);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false for all built-in objects (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(String);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-9.js
index ea08b11eb..d7bf3ae45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-9.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-3-9.js

- * @description Object.isFrozen returns false for all built-in objects (String.prototype)

- */

-

-

-function testcase() {

-  var b = Object.isFrozen(String.prototype);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isFrozen returns false for all built-in objects
+    (String.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Object.isFrozen(String.prototype);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-4-1.js
index 7e1adf2fc..f5182454d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-4-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.12/15.2.3.12-4-1.js

- * @description Object.isFrozen returns false if extensible is true

- */

-

-

-function testcase() {

-        return !Object.isFrozen({});

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isFrozen returns false if extensible is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return !Object.isFrozen({});
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-1.js
index a1b8af495..c78ed6ba8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-1.js

- * @description Object.isExtensible must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.isExtensible ;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.isExtensible ;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-2.js
index 188f3637a..0eb109813 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-2.js

- * @description Object.isExtensible must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.isExtensible.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.isExtensible.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-3.js
index 580a74bc3..a90ab545a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-3.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * A newly created object using the Object contructor has its [[Extensible]]

- * property set to true by default (15.2.2.1, step 8).

- *

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-0-3.js

- * @description Object.isExtensible is true for objects created using the Object constructor

- */

-

-

-function testcase() {

-  var o = new Object();

-

-  if (Object.isExtensible(o) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    A newly created object using the Object contructor has its [[Extensible]]
+    property set to true by default (15.2.2.1, step 8).
+description: >
+    Object.isExtensible is true for objects created using the Object
+    constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = new Object();
+
+  if (Object.isExtensible(o) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-1.js
index 2f56bab0d..062f02ab6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-1.js

- * @description Object.isExtensible throws TypeError if 'O' is undefined

- */

-

-

-function testcase() {

-

-        try {

-            Object.isExtensible(undefined);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible throws TypeError if 'O' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.isExtensible(undefined);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-2.js
index bcd5f7109..70d6dc8f9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-2.js

- * @description Object.isExtensible throws TypeError if 'O' is null

- */

-

-

-function testcase() {

-

-        try {

-            Object.isExtensible(null);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible throws TypeError if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.isExtensible(null);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-3.js
index b1dbdac42..046d57720 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-3.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-3.js

- * @description Object.isExtensible throws TypeError if 'O' is a boolean

- */

-

-

-function testcase() {

-

-        try {

-            Object.isExtensible(true);

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible throws TypeError if 'O' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.isExtensible(true);
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-4.js
index a631c7f67..504e19432 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1-4.js

- * @description Object.isExtensible throws TypeError if 'O' is a string

- */

-

-

-function testcase() {

-

-        try {

-            Object.isExtensible("abc");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible throws TypeError if 'O' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.isExtensible("abc");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1.js
index 40b06312a..4de2443af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-1.js

- * @description Object.isExtensible throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.isExtensible(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible throws TypeError if type of first param is not
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.isExtensible(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-1.js
index db28c866a..e9a9c30e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-1.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-1.js

- * @description Object.isExtensible returns true for all built-in objects (Global)

- */

-

-global = this;

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var e = Object.isExtensible(this);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Global)
+includes: [runTestCase.js]
+---*/
+
+global = this;
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var e = Object.isExtensible(this);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-10.js
index be96e68f7..cef59132f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-10.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-10.js

- * @description Object.isExtensible returns true for all built-in objects (RegExp)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(RegExp);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (RegExp)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(RegExp);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-11.js
index 02e67cabe..1cda8522b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-11.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-11.js

- * @description Object.isExtensible returns true for all built-in objects (Error)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Error);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Error)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Error);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-12.js
index 03fe35383..d5b0103e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-12.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-12.js

- * @description Object.isExtensible returns true for all built-in objects (JSON)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(JSON);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(JSON);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-13.js
index 48199f682..607259cf3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-13.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-13.js

- * @description Object.isExtensible returns true for all built-in objects (Function.constructor)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Function.constructor);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Function.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Function.constructor);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-14.js
index ce00b6893..034a42c84 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-14.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-14.js

- * @description Object.isExtensible returns true for all built-in objects (Function.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Function.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Function.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Function.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-15.js
index dffd187d2..1fdb6bfc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-15.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-15.js

- * @description Object.isExtensible returns true for all built-in objects (Array.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Array.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Array.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Array.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-16.js
index 787f80d9f..8b0509439 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-16.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-16.js

- * @description Object.isExtensible returns true for all built-in objects (String.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(String.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (String.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(String.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-17.js
index b08e5b31d..d14686542 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-17.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-17.js

- * @description Object.isExtensible returns true for all built-in objects (Boolean.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Boolean.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Boolean.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Boolean.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-18.js
index eba331547..0140e17fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-18.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-18.js

- * @description Object.isExtensible returns true for all built-in objects (Number.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Number.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Number.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Number.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-19.js
index 1d03541fa..14770fec0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-19.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-19.js

- * @description Object.isExtensible returns true for all built-in objects (Date.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Date.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Date.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Date.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-2.js
index bb7295b87..6aafa0602 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-2.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-2.js

- * @description Object.isExtensible returns true for all built-in objects (Object)

- */

-

-

-function testcase() {

-  var o = {};

-  var e = Object.isExtensible(o);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+  var e = Object.isExtensible(o);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-20.js
index 6c927bbf3..84f036e5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-20.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-20.js

- * @description Object.isExtensible returns true for all built-in objects (RegExp.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(RegExp.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (RegExp.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(RegExp.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-21.js
index 4d136e745..b7622cd99 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-21.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Function.constructor

- * Function.prototype

- * Array.prototype

- * String.prototype

- * Boolean.prototype

- * Number.prototype

- * Date.prototype

- * RegExp.prototype

- * Error.prototype

- *

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-21.js

- * @description Object.isExtensible returns true for all built-in objects (Error.prototype)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Error.prototype);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Function.constructor
+    Function.prototype
+    Array.prototype
+    String.prototype
+    Boolean.prototype
+    Number.prototype
+    Date.prototype
+    RegExp.prototype
+    Error.prototype
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Error.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Error.prototype);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-22.js
index 924b3537f..ce7f300d3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-22.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-22.js

- * @description Object.isExtensible returns true if 'O' is extensible

- */

-

-

-function testcase() {

-

-        var obj = {};

-        return Object.isExtensible(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true if 'O' is extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        return Object.isExtensible(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-23.js
index 1b58c388f..6ee6266c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-23.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-23.js

- * @description Object.isExtensible returns false if 'O' is not extensible

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.preventExtensions(obj);

-        return !Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns false if 'O' is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.preventExtensions(obj);
+        return !Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-24.js
index 02c0673c9..c04ecd67b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-24.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-24.js

- * @description Object.isExtensible returns true if O is extensible and has a prototype that is extensible

- */

-

-

-function testcase() {

-       

-        var proto = {};

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var obj = new ConstructFun();

-

-        return Object.isExtensible(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true if O is extensible and has a
+    prototype that is extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+       
+        var proto = {};
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var obj = new ConstructFun();
+
+        return Object.isExtensible(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-25.js
index bc53a5a82..f53cee05e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-25.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-25.js

- * @description Object.isExtensible returns true if O is extensible and has a prototype that is not extensible

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.preventExtensions(proto);

-      

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var obj = new ConstructFun();

-

-        return Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true if O is extensible and has a
+    prototype that is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.preventExtensions(proto);
+      
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var obj = new ConstructFun();
+
+        return Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-26.js
index a1f3cec59..1a5682bf2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-26.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-26.js

- * @description Object.isExtensible returns false if O is not extensible and has a prototype that is extensible

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-

-        Object.preventExtensions(obj);

-

-        return !Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns false if O is not extensible and has a
+    prototype that is extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+
+        Object.preventExtensions(obj);
+
+        return !Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-27.js
index baad65259..899d31a7f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-27.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-27.js

- * @description Object.isExtensible returns false if O is not extensible and has a prototype that is not extensible

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.preventExtensions(proto);

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var obj = new ConstructFun();

-        Object.preventExtensions(obj);

-

-        return !Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns false if O is not extensible and has a
+    prototype that is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.preventExtensions(proto);
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var obj = new ConstructFun();
+        Object.preventExtensions(obj);
+
+        return !Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-29.js
index 1c9d43da4..03dcf1259 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-29.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-29.js

- * @description Object.isExtensible returns true for the global object

- */

-

-

-function testcase() {

-

-        return Object.isExtensible(fnGlobalObject());

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        return Object.isExtensible(fnGlobalObject());
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-3.js
index c7bfad694..3f0b1f5ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-3.js

- * @description Object.isExtensible returns true for all built-in objects (Function)

- */

-

-

-function testcase() {

-  function foo() {}

- 

-  var e = Object.isExtensible(foo);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.isExtensible returns true for all built-in objects
+    (Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() {}
+ 
+  var e = Object.isExtensible(foo);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-4.js
index ac43ea3d9..eba4148a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-4.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-4.js

- * @description Object.isExtensible returns true for all built-in objects (Array)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Array);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Array);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-5.js
index 0ea55b88a..19b9f52d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-5.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-5.js

- * @description Object.isExtensible returns true for all built-in objects (String)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(String);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(String);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-6.js
index affa22075..43b048b94 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-6.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-6.js

- * @description Object.isExtensible returns true for all built-in objects (Boolean)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Boolean);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Boolean);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-7.js
index 17f6d8b5e..ea03a79b5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-7.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-7.js

- * @description Object.isExtensible returns true for all built-in objects (Number)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Number);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Number);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-8.js
index 551f0bc44..7116be830 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-8.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-8.js

- * @description Object.isExtensible returns true for all built-in objects (Math)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Math);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Math);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-9.js
index bb85ed6bb..f9296c56d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-9.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.13/15.2.3.13-2-9.js

- * @description Object.isExtensible returns true for all built-in objects (Date)

- */

-

-

-function testcase() {

-  var e = Object.isExtensible(Date);

-  if (e === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.isExtensible returns true for all built-in objects (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var e = Object.isExtensible(Date);
+  if (e === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-1.js
index 05491bd71..7ec5d71ed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-1.js

- * @description Object.keys must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.keys;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.keys;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-2.js
index 6ddc02a0f..a2cd2e2f6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-0-2.js

- * @description Object.keys must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.keys.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.keys.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-1.js
index 68d0af18c..fb7db8874 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-1.js

- * @description Object.keys throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-  try {

-    Object.keys(0);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys throws TypeError if type of first param is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.keys(0);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-2.js
index 7dce96b70..d99bf9b46 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-2.js

- * @description Object.keys throws TypeError if type of first param is not Object (boolean)

- */

-

-

-function testcase() {

-  try {

-    Object.keys(true);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys throws TypeError if type of first param is not Object
+    (boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.keys(true);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-3.js
index 191a34d43..728a20120 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-3.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-3.js

- * @description Object.keys throws TypeError if type of first param is not Object (string)

- */

-

-

-function testcase() {

-  try {

-    Object.keys('abc');

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys throws TypeError if type of first param is not Object
+    (string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.keys('abc');
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-4.js
index 49a5c500b..a4d2b3f7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-4.js

- * @description Object.keys throws TypeError if type of first param is not Object (null)

- */

-

-

-function testcase() {

-  try {

-    Object.keys(null);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys throws TypeError if type of first param is not Object
+    (null)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.keys(null);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-5.js
index 9bc567b4b..27fb6e1c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-5.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-1-5.js

- * @description Object.keys throws TypeError if type of first param is not Object (undefined)

- */

-

-

-function testcase() {

-  try {

-    Object.keys(undefined);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys throws TypeError if type of first param is not Object
+    (undefined)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.keys(undefined);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-1.js
index 9f4bd02b0..1bbb8614e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-1.js

- * @description Object.keys returns the standard built-in Array

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  if (Array.isArray(a) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  if (Array.isArray(a) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-2.js
index 2169d1d48..73d435e10 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-2.js

- * @description Object.keys returns the standard built-in Array (check [[Class]]

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  var s = Object.prototype.toString.call(a);

-  if (s === '[object Array]') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array (check [[Class]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  var s = Object.prototype.toString.call(a);
+  if (s === '[object Array]') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-3.js
index 0dfbe1a7a..399dea52b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-3.js

- * @description Object.keys returns the standard built-in Array (Array overridden)

- */

-

-

-function testcase() {

-  function Array() { }

-

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-

-  var s = Object.prototype.toString.call(a);

-  if (s === '[object Array]') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array (Array overridden)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function Array() { }
+
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+
+  var s = Object.prototype.toString.call(a);
+  if (s === '[object Array]') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-4.js
index 9ce80ed94..39e308d9f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-4.js

- * @description Object.keys returns the standard built-in Array that is extensible

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  if (Object.isExtensible(a) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array that is extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  if (Object.isExtensible(a) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-5.js
index 0469d5a97..51a7c89f0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-5.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-5.js

- * @description Object.keys returns the standard built-in Array that is not sealed

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  if (Object.isSealed(a) === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array that is not sealed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  if (Object.isSealed(a) === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-6.js
index 196835023..7bbd0ca15 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-6.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-6.js

- * @description Object.keys returns the standard built-in Array that is not frozen

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  if (Object.isFrozen(a) === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys returns the standard built-in Array that is not frozen
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  if (Object.isFrozen(a) === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-7.js
index e8611c9ee..02affcd09 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-7.js

- * @description Object.keys - 'n' is 0 when 'O' doesn't contain own enumerable data or accessor properties

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop1", {

-            value: 1001,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop2", {

-            get: function () {

-                return 1002;

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return arr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - 'n' is 0 when 'O' doesn't contain own enumerable
+    data or accessor properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop1", {
+            value: 1001,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop2", {
+            get: function () {
+                return 1002;
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return arr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-8.js
index f104f7ed4..9f7cee089 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-8.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-2-8.js

- * @description Object.keys - 'n' is the correct value when enumerable properties exist in 'O'

- */

-

-

-function testcase() {

-        var obj = {

-            prop1: 1001,

-            prop2: function () {

-                return 1002;

-            }

-        };

-

-        Object.defineProperty(obj, "prop3", {

-            value: 1003,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop4", {

-            get: function () {

-                return 1004;

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return (arr.length === 2) && (arr[0] === "prop1") && (arr[1] === "prop2");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - 'n' is the correct value when enumerable properties
+    exist in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {
+            prop1: 1001,
+            prop2: function () {
+                return 1002;
+            }
+        };
+
+        Object.defineProperty(obj, "prop3", {
+            value: 1003,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop4", {
+            get: function () {
+                return 1004;
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return (arr.length === 2) && (arr[0] === "prop1") && (arr[1] === "prop2");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-1.js
index 760e7edfd..4163bffb7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-1.js

- * @description Object.keys returns the standard built-in Array containing own enumerable properties

- */

-

-

-function testcase() {

-  var o = { x: 1, y: 2};

-

-  var a = Object.keys(o);

-  if (a.length === 2 &&

-      a[0] === 'x' &&

-      a[1] === 'y') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys returns the standard built-in Array containing own
+    enumerable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = { x: 1, y: 2};
+
+  var a = Object.keys(o);
+  if (a.length === 2 &&
+      a[0] === 'x' &&
+      a[1] === 'y') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-2.js
index f22b320bb..936c26576 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-2.js

- * @description Object.keys returns the standard built-in Array containing own enumerable properties (function)

- */

-

-

-function testcase() {

-  function foo() {}

-  foo.x = 1;

-  

-  var a = Object.keys(foo);

-  if (a.length === 1 &&

-      a[0] === 'x') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys returns the standard built-in Array containing own
+    enumerable properties (function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() {}
+  foo.x = 1;
+  
+  var a = Object.keys(foo);
+  if (a.length === 1 &&
+      a[0] === 'x') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-3.js
index e12f7b022..5b57dd02c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-3.js

- * @description Object.keys returns the standard built-in Array containing own enumerable properties (array)

- */

-

-

-function testcase() {

-  var o = [1, 2];

-  var a = Object.keys(o);

-  if (a.length === 2 &&

-      a[0] === '0' &&

-      a[1] === '1') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys returns the standard built-in Array containing own
+    enumerable properties (array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = [1, 2];
+  var a = Object.keys(o);
+  if (a.length === 2 &&
+      a[0] === '0' &&
+      a[1] === '1') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-4.js
index d998bb0ef..7b64e1b95 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-4.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-4.js

- * @description Object.keys of an arguments object returns the indices of the given arguments

- */

-function testcase() {

-  function testArgs2(x, y, z) {

-    // Properties of the arguments object are enumerable.

-    var a = Object.keys(arguments);

-    if (a.length === 2 && a[0] in arguments && a[1] in arguments)

-      return true;

-  }

-  function testArgs3(x, y, z) {

-    // Properties of the arguments object are enumerable.

-    var a = Object.keys(arguments);

-    if (a.length === 3 && a[0] in arguments && a[1] in arguments && a[2] in arguments)

-      return true;

-  }

-  function testArgs4(x, y, z) {

-    // Properties of the arguments object are enumerable.

-    var a = Object.keys(arguments);

-    if (a.length === 4 && a[0] in arguments && a[1] in arguments && a[2] in arguments && a[3] in arguments)

-      return true;

-  }

-  return testArgs2(1, 2) && testArgs3(1, 2, 3) && testArgs4(1, 2, 3, 4);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys of an arguments object returns the indices of the
+    given arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function testArgs2(x, y, z) {
+    // Properties of the arguments object are enumerable.
+    var a = Object.keys(arguments);
+    if (a.length === 2 && a[0] in arguments && a[1] in arguments)
+      return true;
+  }
+  function testArgs3(x, y, z) {
+    // Properties of the arguments object are enumerable.
+    var a = Object.keys(arguments);
+    if (a.length === 3 && a[0] in arguments && a[1] in arguments && a[2] in arguments)
+      return true;
+  }
+  function testArgs4(x, y, z) {
+    // Properties of the arguments object are enumerable.
+    var a = Object.keys(arguments);
+    if (a.length === 4 && a[0] in arguments && a[1] in arguments && a[2] in arguments && a[3] in arguments)
+      return true;
+  }
+  return testArgs2(1, 2) && testArgs3(1, 2, 3) && testArgs4(1, 2, 3, 4);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-5.js
index 1f2c71d54..81ade0174 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-5.js
@@ -1,21 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-5.js

- * @description Object.keys must return a fresh array on each invocation

- */

-

-

-function testcase() {

-  var literal = {a: 1};

-  var keysBefore = Object.keys(literal);

-  if (keysBefore[0] != 'a') return false;

-  keysBefore[0] = 'x';

-  var keysAfter = Object.keys(literal);

-  return (keysBefore[0] == 'x') && (keysAfter[0] == 'a');

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys must return a fresh array on each invocation
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var literal = {a: 1};
+  var keysBefore = Object.keys(literal);
+  if (keysBefore[0] != 'a') return false;
+  keysBefore[0] = 'x';
+  var keysAfter = Object.keys(literal);
+  return (keysBefore[0] == 'x') && (keysAfter[0] == 'a');
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-6.js
index 0e4044f5d..12eba61e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-6.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-6.js

- * @description Object.keys - returns the standard built-in Array (instanceof Array)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var arr = Object.keys(obj);

-

-        return arr instanceof Array;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - returns the standard built-in Array (instanceof
+    Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var arr = Object.keys(obj);
+
+        return arr instanceof Array;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-7.js
index 8236ae44e..26d31792b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-3-7.js

- * @description Object.keys - length of the returned array equals the number of own enumerable properties of 'O'

- */

-

-

-function testcase() {

-        var obj = { prop1: 1001, prop2: 1002 };

-

-        Object.defineProperty(obj, "prop3", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop4", {

-            get: function () {

-                return 1003;

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return arr.length === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - length of the returned array equals the number of
+    own enumerable properties of 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 1001, prop2: 1002 };
+
+        Object.defineProperty(obj, "prop3", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop4", {
+            get: function () {
+                return 1003;
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return arr.length === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-4-1.js
index 3deffaea3..5b4f869ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-4-1.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-4-1.js

- * @description Object.keys - elements of the returned array start from index 0

- */

-

-

-function testcase() {

-        var obj = { prop1: 1001, prop2: 1002 };

-

-        Object.defineProperty(obj, "prop3", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop4", {

-            get: function () {

-                return 1003;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return arr.hasOwnProperty(0) && arr[0] === "prop1";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys - elements of the returned array start from index 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 1001, prop2: 1002 };
+
+        Object.defineProperty(obj, "prop3", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop4", {
+            get: function () {
+                return 1003;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return arr.hasOwnProperty(0) && arr[0] === "prop1";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-1.js
index cb754c44b..14540382e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-1.js

- * @description Object.keys - own enumerable data property of 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "prop", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return arr.hasOwnProperty(0) && arr[0] === "prop";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable data property of 'O' is defined in
+    returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "prop", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return arr.hasOwnProperty(0) && arr[0] === "prop";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-10.js
index d8a381d47..90c4f87cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-10.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-10.js

- * @description Object.keys - inherted enumerable accessor property that is over-ridden by non-enumerable own accessor property is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () { },

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            get: function () { },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "prop") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherted enumerable accessor property that is
+    over-ridden by non-enumerable own accessor property is not defined
+    in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () { },
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            get: function () { },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "prop") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-11.js
index 54b407eb4..fa1e26579 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-11.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-11.js

- * @description Object.keys - own enumerable indexed data property of dense array 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = [1, 2, 3, 4, 5];

-

-        var arr = Object.keys(obj);

-

-        var initValue = 0;

-        for (var p in arr) {

-            if (arr.hasOwnProperty(p)) {

-                if (arr[p] !== initValue.toString()) {

-                    return false;

-                }

-                initValue++;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed data property of dense array
+    'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [1, 2, 3, 4, 5];
+
+        var arr = Object.keys(obj);
+
+        var initValue = 0;
+        for (var p in arr) {
+            if (arr.hasOwnProperty(p)) {
+                if (arr[p] !== initValue.toString()) {
+                    return false;
+                }
+                initValue++;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-12.js
index 104d6c3c8..a578567da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-12.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-12.js

- * @description Object.keys - own enumerable indexed accessor property of dense array 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = [2, 3, 4, 5];

-

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 6;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr.hasOwnProperty(p)) {

-                if (arr[p] === "prop") {

-                    return true;

-                }

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed accessor property of dense
+    array 'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [2, 3, 4, 5];
+
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 6;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr.hasOwnProperty(p)) {
+                if (arr[p] === "prop") {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-13.js
index 4d723e82d..fd511d2e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-13.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-13.js

- * @description Object.keys - own enumerable indexed data property of sparse array 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = [1, , 3, , 5];

-

-        Object.defineProperty(obj, 5, {

-            value: 7,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, 10000, {

-            value: "ElementWithLargeIndex",

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        var index;

-        var initValue = 0;

-        for (index = 0; index < 3; index++) {

-            if (arr[index] !== initValue.toString()) {

-                return false;

-            }

-            initValue += 2;

-        }

-

-        if (arr.length !== 4 || arr[3] !== "10000") {

-            return false;

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed data property of sparse array
+    'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [1, , 3, , 5];
+
+        Object.defineProperty(obj, 5, {
+            value: 7,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, 10000, {
+            value: "ElementWithLargeIndex",
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        var index;
+        var initValue = 0;
+        for (index = 0; index < 3; index++) {
+            if (arr[index] !== initValue.toString()) {
+                return false;
+            }
+            initValue += 2;
+        }
+
+        if (arr.length !== 4 || arr[3] !== "10000") {
+            return false;
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-14.js
index cb42e6a3a..136331ac0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-14.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-14.js

- * @description Object.keys - own enumerable indexed accessor property of sparse array 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = [1, , 3, , 5];

-

-        Object.defineProperty(obj, "10000", {

-            get: function () {

-                return "ElementWithLargeIndex";

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "10000") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed accessor property of sparse
+    array 'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [1, , 3, , 5];
+
+        Object.defineProperty(obj, "10000", {
+            get: function () {
+                return "ElementWithLargeIndex";
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "10000") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-15.js
index b16750439..2ff6352b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-15.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-15.js

- * @description Object.keys - own enumerable indexed data property of String object 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = new String("xyz");

-        obj[-20] = -20;

-        obj[20] = 20;

-

-        Object.defineProperty(obj, "prop", {

-            value: 1003,

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var i = 0; i < arr.length; i++) {

-            if (!obj.hasOwnProperty(arr[i])) {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed data property of String
+    object 'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new String("xyz");
+        obj[-20] = -20;
+        obj[20] = 20;
+
+        Object.defineProperty(obj, "prop", {
+            value: 1003,
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var i = 0; i < arr.length; i++) {
+            if (!obj.hasOwnProperty(arr[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-16.js
index 835398932..a24585798 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-16.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-16.js

- * @description Object.keys - own enumerable indexed accessor property of String object 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = new String("xyz");

-        obj[-20] = -20;

-        obj[20] = 20;

-

-        Object.defineProperty(obj, "prop1", {

-            get: function () { },

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(obj, "prop2", {

-            get: function () { },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var i = 0; i < arr.length; i++) {

-            if (!obj.hasOwnProperty(arr[i])) {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable indexed accessor property of String
+    object 'O' is defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new String("xyz");
+        obj[-20] = -20;
+        obj[20] = 20;
+
+        Object.defineProperty(obj, "prop1", {
+            get: function () { },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(obj, "prop2", {
+            get: function () { },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var i = 0; i < arr.length; i++) {
+            if (!obj.hasOwnProperty(arr[i])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-2.js
index 52a0f0be7..2939df6bb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-2.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-2.js

- * @description Object.keys - own enumerable accessor property of 'O' is defined in returned array

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 1003;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        return arr.hasOwnProperty(0) && arr[0] === "prop";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - own enumerable accessor property of 'O' is defined
+    in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 1003;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        return arr.hasOwnProperty(0) && arr[0] === "prop";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-3.js
index b04517d1b..8d638d32d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-3.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-3.js

- * @description Object.keys - non-enumerable own data property of 'O' is not defined in returned array

- */

-

-

-function testcase() {

-        var obj = { prop1: 1001, prop2: 1002 };

-

-        Object.defineProperty(obj, "prop3", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop4", {

-            value: 1004,

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr.hasOwnProperty(p)) {

-                if (arr[p] === "prop4") {

-                    return false;

-                }

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - non-enumerable own data property of 'O' is not
+    defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 1001, prop2: 1002 };
+
+        Object.defineProperty(obj, "prop3", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop4", {
+            value: 1004,
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr.hasOwnProperty(p)) {
+                if (arr[p] === "prop4") {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-4.js
index 6f343ed6a..8c41215c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-4.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-4.js

- * @description Object.keys - non-enumerable own accessor property of 'O' is not defined in returned array

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop1", {

-            get: function () { },

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(obj, "prop2", {

-            get: function () { },

-            enumerable: false,

-            configurable: true

-        });

-        Object.defineProperty(obj, "prop3", {

-            get: function () { },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr.hasOwnProperty(p)) {

-                if (arr[p] === "prop2") {

-                    return false;

-                }

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - non-enumerable own accessor property of 'O' is not
+    defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop1", {
+            get: function () { },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(obj, "prop2", {
+            get: function () { },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(obj, "prop3", {
+            get: function () { },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr.hasOwnProperty(p)) {
+                if (arr[p] === "prop2") {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-5.js
index 1eca1c751..69080d431 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-5.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-5.js

- * @description Object.keys - inherited enumerable data property of 'O' is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "inheritedProp", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        obj.prop = 1004;

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "inheritedProp") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherited enumerable data property of 'O' is not
+    defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "inheritedProp", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        obj.prop = 1004;
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "inheritedProp") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-6.js
index 246248fd9..ff250bb1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-6.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-6.js

- * @description Object.keys - inherited enumerable accessor property of 'O' is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "inheritedProp", {

-            get: function () {

-                return 1003;

-            },

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 1004;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "inheritedProp") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherited enumerable accessor property of 'O' is not
+    defined in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "inheritedProp", {
+            get: function () {
+                return 1003;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 1004;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "inheritedProp") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-7.js
index 09ccb04b1..b5f9ff524 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-7.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-7.js

- * @description Object.keys - inherted enumerable data property that is over-ridden by non-enumerable own data property is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            value: 1004,

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "prop") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherted enumerable data property that is
+    over-ridden by non-enumerable own data property is not defined in
+    returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            value: 1004,
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "prop") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-8.js
index 30fa15d77..252523865 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-8.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-8.js

- * @description Object.keys - inherted enumerable data property that is over-ridden by non-enumerable own accessor property is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            value: 1003,

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            get: function () { },

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "prop") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherted enumerable data property that is
+    over-ridden by non-enumerable own accessor property is not defined
+    in returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            value: 1003,
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            get: function () { },
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "prop") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-9.js
index 081de43cd..ed8d55a6e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-9.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-9.js

- * @description Object.keys - inherted enumerable accessor property that is over-ridden by non-enumerable own data property is not defined in returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () { },

-            enumerable: true,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            value: 1003,

-            enumerable: false,

-            configurable: true

-        });

-

-        var arr = Object.keys(obj);

-

-        for (var p in arr) {

-            if (arr[p] === "prop") {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - inherted enumerable accessor property that is
+    over-ridden by non-enumerable own data property is not defined in
+    returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () { },
+            enumerable: true,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            value: 1003,
+            enumerable: false,
+            configurable: true
+        });
+
+        var arr = Object.keys(obj);
+
+        for (var p in arr) {
+            if (arr[p] === "prop") {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-1.js
index 139a9203b..a5219bd1b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-1.js

- * @description Object.keys - 'value' attribute of element in returned array is correct.

- */

-

-

-function testcase() {

-        var obj = { prop1: 1 };

-

-        var array = Object.keys(obj);

-

-        var desc = Object.getOwnPropertyDescriptor(array, "0");

-

-        return desc.hasOwnProperty("value") && desc.value === "prop1";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - 'value' attribute of element in returned array is
+    correct.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 1 };
+
+        var array = Object.keys(obj);
+
+        var desc = Object.getOwnPropertyDescriptor(array, "0");
+
+        return desc.hasOwnProperty("value") && desc.value === "prop1";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-2.js
index 071b05f96..a0306e643 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-2.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-2.js

- * @description Object.keys - 'writable' attribute of element of returned array is correct

- */

-

-

-function testcase() {

-        var obj = { prop1: 100 };

-

-        var array = Object.keys(obj);

-

-        try {

-            array[0] = "isWritable";

-

-            var desc = Object.getOwnPropertyDescriptor(array, "0");

-

-            return array[0] === "isWritable" && desc.hasOwnProperty("writable") && desc.writable === true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - 'writable' attribute of element of returned array is
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 100 };
+
+        var array = Object.keys(obj);
+
+        try {
+            array[0] = "isWritable";
+
+            var desc = Object.getOwnPropertyDescriptor(array, "0");
+
+            return array[0] === "isWritable" && desc.hasOwnProperty("writable") && desc.writable === true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-3.js
index 19ce2c050..7aaf0a469 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-3.js

- * @description Object.keys - 'enumerable' attribute of element of returned array is correct

- */

-

-

-function testcase() {

-        var obj = { prop1: 100 };

-

-        var array = Object.keys(obj);

-        var desc = Object.getOwnPropertyDescriptor(array, "0");

-        var result = false;

-        for (var index in array) {

-            if (obj.hasOwnProperty(array[index]) && array[index] === "prop1") {

-                result = true;

-            }

-        }

-

-        return result && desc.hasOwnProperty("enumerable") && desc.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - 'enumerable' attribute of element of returned array
+    is correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 100 };
+
+        var array = Object.keys(obj);
+        var desc = Object.getOwnPropertyDescriptor(array, "0");
+        var result = false;
+        for (var index in array) {
+            if (obj.hasOwnProperty(array[index]) && array[index] === "prop1") {
+                result = true;
+            }
+        }
+
+        return result && desc.hasOwnProperty("enumerable") && desc.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-4.js
index 03d4fc152..9ac81fbcf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-a-4.js

- * @description Object.keys - Verify that 'configurable' attribute of element of returned array is correct

- */

-

-

-function testcase() {

-        var obj = { prop1: 100 };

-

-        var array = Object.keys(obj);

-        var desc = Object.getOwnPropertyDescriptor(array, "0");

-

-        delete array[0];

-

-        return typeof array[0] === "undefined" && desc.hasOwnProperty("configurable") && desc.configurable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - Verify that 'configurable' attribute of element of
+    returned array is correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 100 };
+
+        var array = Object.keys(obj);
+        var desc = Object.getOwnPropertyDescriptor(array, "0");
+
+        delete array[0];
+
+        return typeof array[0] === "undefined" && desc.hasOwnProperty("configurable") && desc.configurable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-b-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-b-1.js
index 44815b55c..ad1e6b14c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-b-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-b-1.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-5-b-1.js

- * @description Object.keys - Verify that 'index' of returned array is ascend by 1

- */

-

-

-function testcase() {

-        var obj = { prop1: 100, prop2: 200, prop3: 300 };

-

-        var array = Object.keys(obj);

-

-        var idx = 0;

-        for (var index in array) {

-            if (array.hasOwnProperty(index)) {

-                if (index !== idx.toString()) {

-                    return false;

-                }

-                idx++;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.keys - Verify that 'index' of returned array is ascend by 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 100, prop2: 200, prop3: 300 };
+
+        var array = Object.keys(obj);
+
+        var idx = 0;
+        for (var index in array) {
+            if (array.hasOwnProperty(index)) {
+                if (index !== idx.toString()) {
+                    return false;
+                }
+                idx++;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-1.js
index 75c37fc01..34694f0a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-1.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-1.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (dense array)

- */

-

-

-function testcase() {

-        var denseArray = [1, 2, 3];

-

-        var tempArray = [];

-        for (var p in denseArray) {

-            if (denseArray.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(denseArray);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (dense array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var denseArray = [1, 2, 3];
+
+        var tempArray = [];
+        for (var p in denseArray) {
+            if (denseArray.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(denseArray);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-2.js
index 677f978a2..a0f5ef75b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-2.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-2.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (sparse array)

- */

-

-

-function testcase() {

-        var sparseArray = [1, 2, , 4, , 6];

-

-        var tempArray = [];

-        for (var p in sparseArray) {

-            if (sparseArray.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(sparseArray);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (sparse array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var sparseArray = [1, 2, , 4, , 6];
+
+        var tempArray = [];
+        for (var p in sparseArray) {
+            if (sparseArray.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(sparseArray);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-3.js
index 6fd0b455f..069626c25 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-3.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (String object)

- */

-

-

-function testcase() {

-        var str = new String("abc");

-

-        var tempArray = [];

-        for (var p in str) {

-            if (str.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(str);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (String object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = new String("abc");
+
+        var tempArray = [];
+        for (var p in str) {
+            if (str.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(str);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-4.js
index a3bb0aee0..182d36c36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-4.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-4.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (Arguments object)

- */

-

-

-function testcase() {

-        var func = function (a, b, c) {

-            return arguments;

-        };

-

-        var args = func(1, "b", false);

-

-        var tempArray = [];

-        for (var p in args) {

-            if (args.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(args);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (Arguments object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (a, b, c) {
+            return arguments;
+        };
+
+        var args = func(1, "b", false);
+
+        var tempArray = [];
+        for (var p in args) {
+            if (args.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(args);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-5.js
index a6b455187..c977fd8c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-5.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-5.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (any other built-in object)

- */

-

-

-function testcase() {

-        var obj = new Date();

-        obj.prop1 = 100;

-        obj.prop2 = "prop2";

-

-        var tempArray = [];

-        for (var p in obj) {

-            if (obj.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(obj);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (any other built-in object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Date();
+        obj.prop1 = 100;
+        obj.prop2 = "prop2";
+
+        var tempArray = [];
+        for (var p in obj) {
+            if (obj.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(obj);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-6.js
index e292e0274..e8dbfae63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-6.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.14/15.2.3.14-6-6.js

- * @description Object.keys - the order of elements in returned array is the same with the order of properties in 'O' (global Object)

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-

-        var tempArray = [];

-        for (var p in obj) {

-            if (obj.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var returnedArray = Object.keys(obj);

-

-        for (var index in returnedArray) {

-            if (tempArray[index] !== returnedArray[index]) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.keys - the order of elements in returned array is the same
+    with the order of properties in 'O' (global Object)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+
+        var tempArray = [];
+        for (var p in obj) {
+            if (obj.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var returnedArray = Object.keys(obj);
+
+        for (var index in returnedArray) {
+            if (tempArray[index] !== returnedArray[index]) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-1.js
index 52e1580f5..931cf0fdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-1.js

- * @description Object.getPrototypeOf must exist as a function

- */

-

-

-function testcase() {

-  if (typeof(Object.getPrototypeOf) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (typeof(Object.getPrototypeOf) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-2.js
index 0960dc5b0..e32ce28ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-2.js

- * @description Object.getPrototypeOf must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-3.js
index 3d25c1749..8b49e8090 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-3.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-0-3.js

- * @description Object.getPrototypeOf must take 1 parameter

- */

-

-

-function testcase() {

-  try

-  {

-    Object.getPrototypeOf();

-  }

-  catch(e)

-  {

-    if(e instanceof TypeError)

-      return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf must take 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    Object.getPrototypeOf();
+  }
+  catch(e)
+  {
+    if(e instanceof TypeError)
+      return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-2.js
index a2fa479a4..fb24cab33 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-2.js

- * @description Object.getPrototypeOf throws TypeError if 'O' is null

- */

-

-

-function testcase() {

-        try {

-            Object.getPrototypeOf(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf throws TypeError if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getPrototypeOf(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-3.js
index 5bd690564..a2c614ae9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-3.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-3.js

- * @description Object.getPrototypeOf throws TypeError if 'O' is a boolean

- */

-

-

-function testcase() {

-        try {

-            Object.getPrototypeOf(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf throws TypeError if 'O' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getPrototypeOf(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-4.js
index 5d2197310..d65a92a45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1-4.js

- * @description Object.getPrototypeOf throws TypeError if 'O' is a string

- */

-

-

-function testcase() {

-        try {

-            Object.getPrototypeOf("abc");

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf throws TypeError if 'O' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getPrototypeOf("abc");
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1.js
index 43a84f367..b90b263bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-1.js

- * @description Object.getPrototypeOf throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-  try {

-    Object.getPrototypeOf(0);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf throws TypeError if type of first param is
+    not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.getPrototypeOf(0);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-1.js
index 5a5d728c4..ccb0819db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-1.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Boolean)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Boolean) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Boolean) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-10.js
index 221af2b74..6ba34d7c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-10.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-10.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (RegExp)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(RegExp) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (RegExp)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(RegExp) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-11.js
index 6c47f148a..e9d99568c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-11.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-11.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Error)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Error) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Error)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Error) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-12.js
index 2741f8058..a79e6b27d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-12.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-12.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (EvalError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(EvalError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (EvalError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(EvalError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-13.js
index 03cb7d27f..0768cb311 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-13.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-13.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (RangeError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(RangeError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (RangeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(RangeError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-14.js
index ba6db15e9..310271b2c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-14.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-14.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (ReferenceError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(ReferenceError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (ReferenceError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(ReferenceError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-15.js
index 73fdd9cc9..445a9c839 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-15.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-15.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (SyntaxError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(SyntaxError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (SyntaxError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(SyntaxError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-16.js
index b46a18049..526278bf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-16.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-16.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (TypeError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(TypeError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (TypeError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(TypeError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-17.js
index e174c8fb0..e8c0cb2d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-17.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-17.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (URIError)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(URIError) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (URIError)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(URIError) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-18.js
index c34eaa0af..d4cdc131b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-18.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-18.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (JSON)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(JSON) === Object.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(JSON) === Object.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-19.js
index 274955da5..3a1572987 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-19.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-19.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Object object)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        return Object.getPrototypeOf(obj) === Object.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Object object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        return Object.getPrototypeOf(obj) === Object.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-2.js
index 78c1db578..13c5a4ef9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-2.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Let 'x' be the return value from getPrototypeOf when called on d.

- * Then, x.isPrototypeOf(d) must be true.

- *

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-2.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (custom object)

- */

-

-

-function testcase() {

-  function base() {}

-

-  function derived() {}

-  derived.prototype = new base();

-

-  var d = new derived();

-  var x = Object.getPrototypeOf(d);

-  if (x.isPrototypeOf(d) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Let 'x' be the return value from getPrototypeOf when called on d.
+    Then, x.isPrototypeOf(d) must be true.
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (custom object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function base() {}
+
+  function derived() {}
+  derived.prototype = new base();
+
+  var d = new derived();
+  var x = Object.getPrototypeOf(d);
+  if (x.isPrototypeOf(d) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-20.js
index 55cc72f5c..da840bb78 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-20.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-20.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Function Object)

- */

-

-

-function testcase() {

-        var obj = function (a, b) {

-            return a + b;

-        };

-

-        return Object.getPrototypeOf(obj) === Function.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Function Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = function (a, b) {
+            return a + b;
+        };
+
+        return Object.getPrototypeOf(obj) === Function.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-21.js
index 28bf12a25..1d1228dd3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-21.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-21.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Array object)

- */

-

-

-function testcase() {

-        var arr = [1, 2, 3];

-

-        return Object.getPrototypeOf(arr) === Array.prototype; 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Array object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [1, 2, 3];
+
+        return Object.getPrototypeOf(arr) === Array.prototype; 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-22.js
index 474e0174d..ca7cc5922 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-22.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-22.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (String object)

- */

-

-

-function testcase() {

-        var obj = new String("abc");

-

-        return Object.getPrototypeOf(obj) === String.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (String object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new String("abc");
+
+        return Object.getPrototypeOf(obj) === String.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-23.js
index c3304b5c7..713ca9656 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-23.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-23.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Boolean object)

- */

-

-

-function testcase() {

-        var obj = new Boolean(true);

-

-        return Object.getPrototypeOf(obj) === Boolean.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Boolean object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Boolean(true);
+
+        return Object.getPrototypeOf(obj) === Boolean.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-24.js
index bd0727fdf..e40a3e1b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-24.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-24.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Number object)

- */

-

-

-function testcase() {

-        var obj = new Number(-3);

-

-        return Object.getPrototypeOf(obj) === Number.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Number object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Number(-3);
+
+        return Object.getPrototypeOf(obj) === Number.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-25.js
index 3234d3171..c9c83508a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-25.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-25.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Date object)

- */

-

-

-function testcase() {

-        var obj = new Date();

-

-        return Object.getPrototypeOf(obj) === Date.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Date object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Date();
+
+        return Object.getPrototypeOf(obj) === Date.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-26.js
index d7addbbac..a30c22268 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-26.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-26.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (RegExp object)

- */

-

-

-function testcase() {

-        var obj = new RegExp();

-

-        return Object.getPrototypeOf(obj) === RegExp.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (RegExp object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new RegExp();
+
+        return Object.getPrototypeOf(obj) === RegExp.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-27.js
index ab3a4649f..dfd558c65 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-27.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-27.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Error object)

- */

-

-

-function testcase() {

-        var obj = new Error();

-

-        return Object.getPrototypeOf(obj) === Error.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Error object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Error();
+
+        return Object.getPrototypeOf(obj) === Error.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-28.js
index 2ccc4da7b..0e0bde5c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-28.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-28.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (the Arguments object)

- */

-

-

-function testcase() {

-        function fun() {

-            return arguments;

-        }

-        var obj = fun(1, true, 3);

-

-        return Object.getPrototypeOf(obj) === Object.prototype;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (the Arguments object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function fun() {
+            return arguments;
+        }
+        var obj = fun(1, true, 3);
+
+        return Object.getPrototypeOf(obj) === Object.prototype;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-3.js
index d4adaa6ce..318430474 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-3.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-3.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Object)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Object) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Object) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-30.js
index 6d51ad723..6590ffe84 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-30.js
@@ -1,17 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-30.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (the global object)

- */

-

-

-function testcase() {

-        var proto = Object.getPrototypeOf(fnGlobalObject());

-

-        return proto.isPrototypeOf(fnGlobalObject()) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (the global object)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var proto = Object.getPrototypeOf(fnGlobalObject());
+
+        return proto.isPrototypeOf(fnGlobalObject()) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-31.js
index ee294d6e3..8cbd295a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-31.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-31.js

- * @description Object.getPrototypeOf returns null

- */

-

-

-function testcase() {

-

-        return (Object.getPrototypeOf(Object.prototype) === null);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getPrototypeOf returns null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return (Object.getPrototypeOf(Object.prototype) === null);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-4.js
index 9f1496686..d3d8668fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-4.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-4.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Function)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Function) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Function) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-5.js
index 2246b9419..8c480d270 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-5.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-5.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Array)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Array) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Array) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-6.js
index 79ceb6104..59a7fb9c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-6.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-6.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (String)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(String) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(String) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-7.js
index b8649548d..cdefc617f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-7.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-7.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Number)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Number) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Number) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-8.js
index ca185b18a..1c4133729 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-8.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-8.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Math)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Math) === Object.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Math) === Object.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-9.js
index 8516d6c6f..13811576c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-9.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.2/15.2.3.2-2-9.js

- * @description Object.getPrototypeOf returns the [[Prototype]] of its parameter (Date)

- */

-

-

-function testcase() {

-  if (Object.getPrototypeOf(Date) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getPrototypeOf returns the [[Prototype]] of its parameter
+    (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getPrototypeOf(Date) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-1.js
index 0e98d85af..d32ff320a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-1.js

- * @description Object.getOwnPropertyDescriptor must exist as a function

- */

-

-

-function testcase() {

-  if (typeof(Object.getOwnPropertyDescriptor) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (typeof(Object.getOwnPropertyDescriptor) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-2.js
index 2c317afb4..d7ae6c7af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-0-2.js

- * @description Object.getOwnPropertyDescriptor must exist as a function taking 2 parameters

- */

-

-

-function testcase() {

-  if (Object.getOwnPropertyDescriptor.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor must exist as a function taking 2
+    parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getOwnPropertyDescriptor.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-1.js
index 45672991e..fadf27121 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-1.js

- * @description Object.getOwnPropertyDescriptor - TypeError is thrown when first param is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyDescriptor(undefined, "foo");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - TypeError is thrown when first
+    param is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyDescriptor(undefined, "foo");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-2.js
index d0ca60bd3..9b14b6bf3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-2.js

- * @description Object.getOwnPropertyDescriptor - TypeError is thrown when first param is null

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyDescriptor(null, "foo");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - TypeError is thrown when first
+    param is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyDescriptor(null, "foo");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-3.js
index 49d65de1f..d5ee3b52b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-3.js

- * @description Object.getOwnPropertyDescriptor - TypeError is thrown when first param is a boolean

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyDescriptor(true, "foo");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - TypeError is thrown when first
+    param is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyDescriptor(true, "foo");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-4.js
index 28436e369..c059e75d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1-4.js

- * @description Object.getOwnPropertyDescriptor - TypeError is thrown when first param is a number

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyDescriptor(-2, "foo");

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - TypeError is thrown when first
+    param is a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyDescriptor(-2, "foo");
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1.js
index bcf05c73a..c49d3c196 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-1.js

- * @description Object.getOwnPropertyDescriptor throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-  try {

-    Object.getOwnPropertyDescriptor(0, "foo");

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor throws TypeError if type of first
+    param is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    Object.getOwnPropertyDescriptor(0, "foo");
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-1.js
index fb621c4d9..7547aeb4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-1.js

- * @description Object.getOwnPropertyDescriptor returns undefined for undefined property name

- */

-

-

-function testcase() {

-    var o = {};

-    var desc = Object.getOwnPropertyDescriptor(o, undefined);

-    if (desc === undefined) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for undefined
+    property name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    var desc = Object.getOwnPropertyDescriptor(o, undefined);
+    if (desc === undefined) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-10.js
index 6cf0684d0..152ab21b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-10.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-10.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is -0)

- */

-

-

-function testcase() {

-        var obj = { "0": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, -0);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, -0);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-11.js
index 0512ee893..c39ead675 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-11.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is positive number)

- */

-

-

-function testcase() {

-        var obj = { "30": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 30);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "30": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 30);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-12.js
index e616c4089..ec432ce71 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-12.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-12.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is negative number)

- */

-

-

-function testcase() {

-        var obj = { "-20": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, -20);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "-20": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, -20);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-13.js
index 8035cfe78..045abe7fa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-13.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-13.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is Infinity)

- */

-

-

-function testcase() {

-        var obj = { "Infinity": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, Infinity);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "Infinity": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, Infinity);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-14.js
index bf08382fb..8fb054bb3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-14.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-14.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is +Infinity)

- */

-

-

-function testcase() {

-        var obj = { "Infinity": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, +Infinity);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is +Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "Infinity": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, +Infinity);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-15.js
index b799c4d49..b88d02256 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-15.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-15.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is -Infinity)

- */

-

-

-function testcase() {

-        var obj = { "-Infinity": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, -Infinity);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "-Infinity": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, -Infinity);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-16.js
index 652e2cb44..3decd6fff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-16.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-16.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1(following 20 zeros))

- */

-

-

-function testcase() {

-        var obj = { "100000000000000000000": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 100000000000000000000);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1(following 20 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "100000000000000000000": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 100000000000000000000);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-17.js
index 9f7557983..43e3d6170 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-17.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-17.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1(following 21 zeros))

- */

-

-

-function testcase() {

-        var obj = { "1e+21": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1000000000000000000000);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1(following 21 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e+21": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1000000000000000000000);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-18.js
index 64720ecbd..e282524b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-18.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-18.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1(following 22 zeros))

- */

-

-

-function testcase() {

-        var obj = { "1e+22": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 10000000000000000000000);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1(following 22 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e+22": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 10000000000000000000000);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-19.js
index 99dc20541..c49087bbd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-19.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-19.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1e+20)

- */

-

-

-function testcase() {

-        var obj = { "100000000000000000000": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e+20);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1e+20)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "100000000000000000000": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e+20);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-2.js
index d11a6f0e9..645143162 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-2.js

- * @description Object.getOwnPropertyDescriptor returns undefined for null property name

- */

-

-

-function testcase() {

-    var o = {};

-    var desc = Object.getOwnPropertyDescriptor(o, null);

-    if (desc === undefined) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for null
+    property name
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    var desc = Object.getOwnPropertyDescriptor(o, null);
+    if (desc === undefined) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-20.js
index 4c06979cf..f609dca66 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-20.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-20.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to string (value is 1e+21)

- */

-

-

-function testcase() {

-        var obj = { "1e+21": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e+21);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to string (value is 1e+21)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e+21": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e+21);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-21.js
index 841c567b5..2d5129ea6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-21.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-21.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1e+22)

- */

-

-

-function testcase() {

-        var obj = { "1e+22": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e+22);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1e+22)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e+22": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e+22);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-22.js
index 985ee2a95..96da942a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-22.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-22.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 0.000001)

- */

-

-

-function testcase() {

-        var obj = { "0.000001": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 0.000001);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 0.000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0.000001": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 0.000001);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-23.js
index ab948760c..243c781c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-23.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-23.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 0.0000001)

- */

-

-

-function testcase() {

-        var obj = { "1e-7": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 0.0000001);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 0.0000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e-7": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 0.0000001);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-24.js
index 8923f7a12..8eb178ea3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-24.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-24.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 0.00000001)

- */

-

-

-function testcase() {

-        var obj = { "1e-8": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 0.00000001);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 0.00000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e-8": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 0.00000001);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-25.js
index b9785d643..82ce88216 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-25.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-25.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1e-7)

- */

-

-

-function testcase() {

-        var obj = { "1e-7": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e-7);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1e-7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1e-7": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e-7);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-26.js
index 568be47ee..14a05ebda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-26.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-26.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1e-6)

- */

-

-

-function testcase() {

-        var obj = { "0.000001": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e-6);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1e-6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0.000001": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e-6);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-27.js
index 5877e9120..6287d601c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-27.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-27.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 1e-5)

- */

-

-

-function testcase() {

-        var obj = { "0.00001": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1e-5);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 1e-5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0.00001": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1e-5);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-28.js
index 0a52795c3..0b35a1891 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-28.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-28.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an integer that converts to a string (value is 123)

- */

-

-

-function testcase() {

-        var obj = { "123": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 123);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an integer that
+    converts to a string (value is 123)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "123": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 123);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-29.js
index a74f37b86..fca650313 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-29.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-29.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a decimal that converts to a string (value is 123.456)

- */

-

-

-function testcase() {

-        var obj = { "123.456": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 123.456);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a decimal that
+    converts to a string (value is 123.456)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "123.456": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 123.456);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-3.js
index 9f4bb30b7..cda59f756 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-3.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-3.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is undefined

- */

-

-

-function testcase() {

-        var obj = { "undefined": 1 };

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, undefined);

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "undefined");

-

-        return desc1.value === 1 && desc2.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor - argument 'P' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "undefined": 1 };
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, undefined);
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "undefined");
+
+        return desc1.value === 1 && desc2.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-30.js
index 9980ea887..b80871053 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-30.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-30.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 100000000000000000000.123)

- */

-

-

-function testcase() {

-        var obj = { "100000000000000000000": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 100000000000000000000.123);

-

-        return typeof desc !== "undefined" && desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 100000000000000000000.123)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "100000000000000000000": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 100000000000000000000.123);
+
+        return typeof desc !== "undefined" && desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-31.js
index 1d3a07791..1f1ef3497 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-31.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-31.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 123.1234567)

- */

-

-

-function testcase() {

-        var obj = { "123.1234567": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 123.1234567);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 123.1234567)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "123.1234567": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 123.1234567);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-32.js
index 503ea0930..d64386326 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-32.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-32.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to an empty string 

- */

-

-

-function testcase() {

-        var obj = { "": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "");

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to an
+    empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "");
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-33.js
index e247a4364..b9853c969 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-33.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-33.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to string 'AB

- * \cd' 

- */

-

-

-function testcase() {

-        var obj = { "AB\n\\cd": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "AB\n\\cd");

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to
+    string 'AB  \cd'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "AB\n\\cd": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "AB\n\\cd");
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-34.js
index 6a874cbe0..9dc05cec4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-34.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-34.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to string 'undefined' 

- */

-

-

-function testcase() {

-        var obj = { "undefined": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "undefined");

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to
+    string 'undefined'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "undefined": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "undefined");
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-35.js
index 7caf165b2..eca3a6533 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-35.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-35.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to string 'null' 

- */

-

-

-function testcase() {

-        var obj = { "null": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "null");

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to
+    string 'null'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "null": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "null");
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-36.js
index 874abd29b..d26f7b94a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-36.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-36.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to string '123���¦�cd' 

- */

-

-

-function testcase() {

-        var obj = { "123���¦�cd": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "123���¦�cd");

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to
+    string '123���¦�cd'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "123���¦�cd": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "123���¦�cd");
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-37.js
index be35999d3..155151bfa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-37.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-37.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is applied to string '1' 

- */

-

-

-function testcase() {

-        var obj = { "1": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 1);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is applied to
+    string '1'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 1);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-38.js
index de3daeff9..8bae713c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-38.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-38.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an array that converts to a string

- */

-

-

-function testcase() {

-        var obj = { "1": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, [1]);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an array that
+    converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, [1]);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-39.js
index 640d447b1..55e75ee3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-39.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-39.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a String Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = { "Hello": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, new String("Hello"));

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a String Object
+    that converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "Hello": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, new String("Hello"));
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-4.js
index 969088008..f5b4e992a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-4.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is null that converts to string 'null'

- */

-

-

-function testcase() {

-        var obj = { "null": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, null);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is null that
+    converts to string 'null'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "null": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, null);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-40.js
index b3cd4dca7..6d7d9c188 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-40.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-40.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a Boolean Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = { "true": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, new Boolean(true));

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a Boolean Object
+    that converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "true": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, new Boolean(true));
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-41.js
index 801638df3..1659c6530 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-41.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-41.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a Number Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = { "123": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, new Number(123));

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a Number Object
+    that converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "123": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, new Number(123));
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-42.js
index de1cf2023..f6286e96b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-42.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-42.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an object which has an own toString method

- */

-

-

-function testcase() {

-        var obj = { "abc": 1 };

-

-        var ownProp = {

-            toString: function () {

-                return "abc";

-            }

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an object which
+    has an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "abc": 1 };
+
+        var ownProp = {
+            toString: function () {
+                return "abc";
+            }
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-43.js
index ca0d2aaee..d11e8d628 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-43.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-43.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an object which has an own valueOf method

- */

-

-

-function testcase() {

-        var obj = { "[object Object]": 1, "abc" : 2 };

-

-        var ownProp = {

-            valueOf: function () {

-                return "abc";

-            }

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an object which
+    has an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "[object Object]": 1, "abc" : 2 };
+
+        var ownProp = {
+            valueOf: function () {
+                return "abc";
+            }
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-44.js
index 1430f5dfb..46546cadf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-44.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-44.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an object that has an own toString method that returns an object and toValue method that returns a primitive value

- */

-

-

-function testcase() {

-        var obj = { "abc": 1 };

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "abc";

-            }

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);

-

-        return desc.value === 1 && valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an object that
+    has an own toString method that returns an object and toValue
+    method that returns a primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "abc": 1 };
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "abc";
+            }
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);
+
+        return desc.value === 1 && valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-45.js
index ee887d33f..ec9a78ba4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-45.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-45.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is an object which has an own toString and valueOf method

- */

-

-

-function testcase() {

-        var obj = { "bbq": 1, "abc": 2 };

-        var valueOfAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                return "bbq";

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "abc";

-            }

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);

-

-        return desc.value === 1 && !valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is an object which
+    has an own toString and valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "bbq": 1, "abc": 2 };
+        var valueOfAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                return "bbq";
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "abc";
+            }
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, ownProp);
+
+        return desc.value === 1 && !valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-46.js
index b6eb5f64d..0c4045c63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-46.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-46.js

- * @description Object.getOwnPropertyDescriptor - TypeError exception was thrown  when 'P' is an object that both toString and valueOf wouldn't return primitive value

- */

-

-

-function testcase() {

-        var obj = { "1": 1 };

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                toStringAccessed = true;

-                return [1];

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return [1];

-            }

-        };

-

-        try {

-            Object.getOwnPropertyDescriptor(obj, ownProp);

-            return false;

-        } catch (e) {

-            return toStringAccessed && valueOfAccessed && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - TypeError exception was thrown
+    when 'P' is an object that both toString and valueOf wouldn't
+    return primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "1": 1 };
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                toStringAccessed = true;
+                return [1];
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return [1];
+            }
+        };
+
+        try {
+            Object.getOwnPropertyDescriptor(obj, ownProp);
+            return false;
+        } catch (e) {
+            return toStringAccessed && valueOfAccessed && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-47.js
index 2428abae1..008e1a6c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-47.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-47.js

- * @description Object.getOwnPropertyDescriptor - uses inherited toString method when 'P' is an object with an own valueOf and inherited toString methods

- */

-

-

-function testcase() {

-        var proto = {};

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        proto.toString = function () {

-            toStringAccessed = true;

-            return "test";

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.valueOf = function () {

-            valueOfAccessed = true;

-            return "10";

-        };

-        var obj = { "10": "length1", "test": "length2" };

-        var desc = Object.getOwnPropertyDescriptor(obj, child);

-

-        return desc.value === "length2" && toStringAccessed && !valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - uses inherited toString method
+    when 'P' is an object with an own valueOf and inherited toString
+    methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        proto.toString = function () {
+            toStringAccessed = true;
+            return "test";
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.valueOf = function () {
+            valueOfAccessed = true;
+            return "10";
+        };
+        var obj = { "10": "length1", "test": "length2" };
+        var desc = Object.getOwnPropertyDescriptor(obj, child);
+
+        return desc.value === "length2" && toStringAccessed && !valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-5.js
index 87742841e..80876bbaa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-5.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-5.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a boolean whose value is false

- */

-

-

-function testcase() {

-        var obj = { "false": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, false);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a boolean whose
+    value is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "false": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, false);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-6.js
index 25604a243..4d5aeff8d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-6.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-6.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a boolean whose value is true

- */

-

-

-function testcase() {

-        var obj = { "true": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, true);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a boolean whose
+    value is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "true": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, true);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-7.js
index eb27dda50..cbe48fd4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-7.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is NaN)

- */

-

-

-function testcase() {

-        var obj = { "NaN": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, NaN);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "NaN": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, NaN);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-8.js
index 60f5ff25d..719d34636 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-8.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-8.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is 0)

- */

-

-

-function testcase() {

-        var obj = { "0": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, 0);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, 0);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-9.js
index d12b8e2ed..9c0c7f8d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-9.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-2-9.js

- * @description Object.getOwnPropertyDescriptor - argument 'P' is a number that converts to a string (value is +0)

- */

-

-

-function testcase() {

-        var obj = { "0": 1 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, +0);

-

-        return desc.value === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - argument 'P' is a number that
+    converts to a string (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "0": 1 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, +0);
+
+        return desc.value === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-1.js
index a10a10a53..80dce4cbf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-1.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own data property

- */

-

-

-function testcase() {

-

-        var obj = {

-            property: "ownDataProperty"

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.value === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor - 'P' is own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {
+            property: "ownDataProperty"
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.value === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-10.js
index 4068ab06d..d25d4f6a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-10.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-10.js

- * @description Object.getOwnPropertyDescriptor - 'P' is not an existing property

- */

-

-

-function testcase() {

-

-        var obj = {

-            property: "ownDataProperty"

-        };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "propertyNonExist");

-

-        return typeof desc === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor - 'P' is not an existing property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {
+            property: "ownDataProperty"
+        };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "propertyNonExist");
+
+        return typeof desc === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-13.js
index dd626f7e4..f908bf2e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-13.js

- * @description Object.getOwnPropertyDescriptor applied to the Arguments object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var arg = (function () {

-            return arguments;

-        }("ownProperty", true));

-

-        var desc = Object.getOwnPropertyDescriptor(arg, "0");

-

-        return desc.value === "ownProperty" && desc.writable === true && desc.enumerable === true && desc.configurable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor applied to the Arguments object
+    which implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg = (function () {
+            return arguments;
+        }("ownProperty", true));
+
+        var desc = Object.getOwnPropertyDescriptor(arg, "0");
+
+        return desc.value === "ownProperty" && desc.writable === true && desc.enumerable === true && desc.configurable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-14.js
index 02cbf85b9..4e30181d3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-14.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-14.js

- * @description Object.getOwnPropertyDescriptor applied to a String object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var str = new String("123");

-

-        var desc = Object.getOwnPropertyDescriptor(str, "2");

-

-        return desc.value === "3";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor applied to a String object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = new String("123");
+
+        var desc = Object.getOwnPropertyDescriptor(str, "2");
+
+        return desc.value === "3";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-15.js
index 3ee5b76f0..663539398 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-15.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-15.js

- * @description Object.getOwnPropertyDescriptor applied to a Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[1] = "ownProperty";

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "1");

-

-        return desc.value === "ownProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor applied to a Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[1] = "ownProperty";
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "1");
+
+        return desc.value === "ownProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-2.js
index 04bc6f3c6..d7daa6112 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-2.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-2.js

- * @description Object.getOwnPropertyDescriptor - 'P' is inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {

-            property: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.ptototype = proto;

-

-        var child = new Con();

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return typeof desc === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor - 'P' is inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            property: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.ptototype = proto;
+
+        var child = new Con();
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return typeof desc === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-3.js
index 819915886..6a21efe93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-3.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-3.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {

-            property: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.ptototype = proto;

-

-        var child = new Con();

-        child.property = "ownDataProperty";

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return desc.value === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is own data property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            property: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.ptototype = proto;
+
+        var child = new Con();
+        child.property = "ownDataProperty";
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return desc.value === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-4.js
index d01040304..a571ebc23 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-4.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-4.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "property", {

-            get: function () {

-                return "inheritedDataProperty";

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.ptototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "property", {

-            value: "ownDataProperty",

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return desc.value === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is own data property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "property", {
+            get: function () {
+                return "inheritedDataProperty";
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.ptototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "property", {
+            value: "ownDataProperty",
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return desc.value === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-5.js
index 27e53a1f3..a802d2a11 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-5.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-5.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own accessor property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var fun = function () {

-            return "ownAccessorProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.get === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyDescriptor - 'P' is own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var fun = function () {
+            return "ownAccessorProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.get === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-6.js
index 3fc884bd0..e083e6fa4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-6.js

- * @description Object.getOwnPropertyDescriptor - 'P' is inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-        var fun = function () {

-            return "ownAccessorProperty";

-        };

-        Object.defineProperty(proto, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return typeof desc === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        var fun = function () {
+            return "ownAccessorProperty";
+        };
+        Object.defineProperty(proto, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return typeof desc === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-7.js
index 1837b9e94..2e98db346 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-7.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {

-            property: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.ptototype = proto;

-

-        var child = new Con();

-        var fun = function () {

-            return "ownAccessorProperty";

-        };

-        Object.defineProperty(child, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return desc.get === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is own accessor property
+    that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            property: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.ptototype = proto;
+
+        var child = new Con();
+        var fun = function () {
+            return "ownAccessorProperty";
+        };
+        Object.defineProperty(child, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return desc.get === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-8.js
index 4703cf90f..70e762801 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-8.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-8.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "property", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.ptototype = proto;

-

-        var child = new Con();

-        var fun = function () {

-            return "ownAccessorProperty";

-        };

-        Object.defineProperty(child, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(child, "property");

-

-        return desc.get === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is own accessor property
+    that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "property", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.ptototype = proto;
+
+        var child = new Con();
+        var fun = function () {
+            return "ownAccessorProperty";
+        };
+        Object.defineProperty(child, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(child, "property");
+
+        return desc.get === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-9.js
index 539c6ce4d..9f87d6141 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-9.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-3-9.js

- * @description Object.getOwnPropertyDescriptor - 'P' is own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var fun = function () { };

-        Object.defineProperty(obj, "property", {

-            set: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.set === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - 'P' is own accessor property
+    without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var fun = function () { };
+        Object.defineProperty(obj, "property", {
+            set: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.set === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-1.js
index 8398cfaa9..74e421997 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-1.js

- * @description Object.getOwnPropertyDescriptor returns an object representing a data desc for valid data valued properties

- */

-

-

-function testcase() {

-    var o = {};

-    o["foo"] = 101;

-

-    var desc = Object.getOwnPropertyDescriptor(o, "foo");

-    if (desc.value === 101 &&

-        desc.enumerable === true &&

-        desc.writable === true &&

-        desc.configurable === true &&

-        !desc.hasOwnProperty("get") &&

-        !desc.hasOwnProperty("set")) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns an object representing a
+    data desc for valid data valued properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    o["foo"] = 101;
+
+    var desc = Object.getOwnPropertyDescriptor(o, "foo");
+    if (desc.value === 101 &&
+        desc.enumerable === true &&
+        desc.writable === true &&
+        desc.configurable === true &&
+        !desc.hasOwnProperty("get") &&
+        !desc.hasOwnProperty("set")) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-10.js
index fba505307..856ea95fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-10.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-10.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.decodeURIComponent)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "decodeURIComponent");

-  if (desc.value === global.decodeURIComponent &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.decodeURIComponent)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "decodeURIComponent");
+  if (desc.value === global.decodeURIComponent &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-100.js
index 5a01c8f9b..88ab14fe9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-100.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-100.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.atan2)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "atan2");

-  if (desc.value === Math.atan2 &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.atan2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "atan2");
+  if (desc.value === Math.atan2 &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-101.js
index c56a59603..899cae54c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-101.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-101.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.ceil)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "ceil");

-  if (desc.value === Math.ceil &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.ceil)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "ceil");
+  if (desc.value === Math.ceil &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-102.js
index 231baf3bf..649664633 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-102.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-102.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.cos)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "cos");

-  if (desc.value === Math.cos &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.cos)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "cos");
+  if (desc.value === Math.cos &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-103.js
index 037426b59..64cc34a7f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-103.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-103.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.exp)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "exp");

-  if (desc.value === Math.exp &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.exp)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "exp");
+  if (desc.value === Math.exp &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-104.js
index 74699a54e..62ac52ffa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-104.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-104.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.floor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "floor");

-  if (desc.value === Math.floor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.floor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "floor");
+  if (desc.value === Math.floor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-105.js
index 0ad153fec..7942c9dc5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-105.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-105.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.log)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "log");

-  if (desc.value === Math.log &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.log)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "log");
+  if (desc.value === Math.log &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-106.js
index 2a2a15a35..d2c0ea32d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-106.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-106.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.max)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "max");

-  if (desc.value === Math.max &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.max)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "max");
+  if (desc.value === Math.max &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-107.js
index 0f7c1205c..732a745d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-107.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-107.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.min)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "min");

-  if (desc.value === Math.min &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.min)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "min");
+  if (desc.value === Math.min &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-108.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-108.js
index 8c944cdac..534a5dc4f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-108.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-108.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-108.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.pow)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "pow");

-  if (desc.value === Math.pow &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.pow)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "pow");
+  if (desc.value === Math.pow &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-109.js
index 413710aaa..1a8064693 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-109.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-109.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.random)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "random");

-  if (desc.value === Math.random &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.random)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "random");
+  if (desc.value === Math.random &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-11.js
index 361325ca4..d735ded32 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-11.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-11.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.encodeURIComponent)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "encodeURIComponent");

-  if (desc.value === global.encodeURIComponent &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.encodeURIComponent)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "encodeURIComponent");
+  if (desc.value === global.encodeURIComponent &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-110.js
index adb28cfa3..e03c8fef2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-110.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-110.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.round)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "round");

-  if (desc.value === Math.round &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.round)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "round");
+  if (desc.value === Math.round &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-111.js
index 0e0d035a1..ee72e7f20 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-111.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-111.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.sin)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "sin");

-  if (desc.value === Math.sin &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.sin)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "sin");
+  if (desc.value === Math.sin &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-112.js
index e3326f72d..dd5dbc909 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-112.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-112.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.sqrt)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "sqrt");

-  if (desc.value === Math.sqrt &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.sqrt)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "sqrt");
+  if (desc.value === Math.sqrt &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-113.js
index e5d81563c..88426629a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-113.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-113.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.tan)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "tan");

-  if (desc.value === Math.tan &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.tan)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "tan");
+  if (desc.value === Math.tan &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-114.js
index f7e3795ad..11ed19f69 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-114.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-114.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.parse)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date, "parse");

-  if (desc.value === Date.parse &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.parse)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date, "parse");
+  if (desc.value === Date.parse &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-115.js
index b4504523a..2336cffc5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-115.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-115.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.UTC)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date, "UTC");

-  if (desc.value === Date.UTC &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.UTC)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date, "UTC");
+  if (desc.value === Date.UTC &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-116.js
index adbceea98..9694a198b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-116.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-116.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "constructor");

-  if (desc.value === Date.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "constructor");
+  if (desc.value === Date.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-117.js
index a7284c86c..a9993f4c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-117.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-117.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getTime)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getTime");

-  if (desc.value === Date.prototype.getTime &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getTime)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getTime");
+  if (desc.value === Date.prototype.getTime &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-118.js
index 6ce64ab64..294669765 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-118.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-118.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getTimezoneOffset)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getTimezoneOffset");

-  if (desc.value === Date.prototype.getTimezoneOffset &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getTimezoneOffset)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getTimezoneOffset");
+  if (desc.value === Date.prototype.getTimezoneOffset &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-120.js
index d41084703..158b42a60 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-120.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-120.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getFullYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getFullYear");

-  if (desc.value === Date.prototype.getFullYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getFullYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getFullYear");
+  if (desc.value === Date.prototype.getFullYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-121.js
index 610480294..83f8012b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-121.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-121.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getMonth)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMonth");

-  if (desc.value === Date.prototype.getMonth &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getMonth)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMonth");
+  if (desc.value === Date.prototype.getMonth &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-122.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-122.js
index ed5d7b2c6..c3583899b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-122.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-122.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-122.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getDate)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getDate");

-  if (desc.value === Date.prototype.getDate &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getDate)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getDate");
+  if (desc.value === Date.prototype.getDate &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-123.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-123.js
index 8629000b0..53fb2c0ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-123.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-123.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-123.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getDay)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getDay");

-  if (desc.value === Date.prototype.getDay &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getDay)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getDay");
+  if (desc.value === Date.prototype.getDay &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-124.js
index ca806f89d..565c2c836 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-124.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-124.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getHours)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getHours");

-  if (desc.value === Date.prototype.getHours &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getHours)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getHours");
+  if (desc.value === Date.prototype.getHours &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-125.js
index 42afd43cd..709883af0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-125.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-125.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getMinutes)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMinutes");

-  if (desc.value === Date.prototype.getMinutes &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getMinutes)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMinutes");
+  if (desc.value === Date.prototype.getMinutes &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-126.js
index 4809e2e5c..96a08ca8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-126.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-126.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getSeconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getSeconds");

-  if (desc.value === Date.prototype.getSeconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getSeconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getSeconds");
+  if (desc.value === Date.prototype.getSeconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-127.js
index 2c61b997a..2b0355d9e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-127.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-127.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getMilliseconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMilliseconds");

-  if (desc.value === Date.prototype.getMilliseconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getMilliseconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getMilliseconds");
+  if (desc.value === Date.prototype.getMilliseconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-128.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-128.js
index a67692e44..7c9d0d98f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-128.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-128.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-128.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCFullYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCFullYear");

-  if (desc.value === Date.prototype.getUTCFullYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCFullYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCFullYear");
+  if (desc.value === Date.prototype.getUTCFullYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-129.js
index 69f98f88e..4ad0cf51c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-129.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-129.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCMonth)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMonth");

-  if (desc.value === Date.prototype.getUTCMonth &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCMonth)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMonth");
+  if (desc.value === Date.prototype.getUTCMonth &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-130.js
index 70b05d952..89775d5b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-130.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-130.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCDate)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCDate");

-  if (desc.value === Date.prototype.getUTCDate &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCDate)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCDate");
+  if (desc.value === Date.prototype.getUTCDate &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-131.js
index 4bd3592f3..97bf06822 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-131.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-131.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCDay)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCDay");

-  if (desc.value === Date.prototype.getUTCDay &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCDay)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCDay");
+  if (desc.value === Date.prototype.getUTCDay &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-132.js
index da55c4aa5..a5071a741 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-132.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-132.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCHours)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCHours");

-  if (desc.value === Date.prototype.getUTCHours &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCHours)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCHours");
+  if (desc.value === Date.prototype.getUTCHours &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-133.js
index 5f1b961a0..f6b378d12 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-133.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-133.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCMinutes)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMinutes");

-  if (desc.value === Date.prototype.getUTCMinutes &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCMinutes)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMinutes");
+  if (desc.value === Date.prototype.getUTCMinutes &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-134.js
index f892aac1c..6912ee5d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-134.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-134.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCSeconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCSeconds");

-  if (desc.value === Date.prototype.getUTCSeconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCSeconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCSeconds");
+  if (desc.value === Date.prototype.getUTCSeconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-135.js
index 33d686bb2..6ada9e4ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-135.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-135.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.getUTCMilliseconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMilliseconds");

-  if (desc.value === Date.prototype.getUTCMilliseconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.getUTCMilliseconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "getUTCMilliseconds");
+  if (desc.value === Date.prototype.getUTCMilliseconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-136.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-136.js
index 69f130c85..2374b2969 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-136.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-136.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-136.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setTime)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setTime");

-  if (desc.value === Date.prototype.setTime &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setTime)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setTime");
+  if (desc.value === Date.prototype.setTime &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-138.js
index f53971a8e..f0cf80268 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-138.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-138.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setFullYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setFullYear");

-  if (desc.value === Date.prototype.setFullYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setFullYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setFullYear");
+  if (desc.value === Date.prototype.setFullYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-139.js
index 80b43fa72..e31fc131c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-139.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-139.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setMonth)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMonth");

-  if (desc.value === Date.prototype.setMonth &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setMonth)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMonth");
+  if (desc.value === Date.prototype.setMonth &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-14.js
index bdc8ef957..524314157 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-14.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-14.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.getPrototypeOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "getPrototypeOf");

-  if (desc.value === Object.getPrototypeOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.getPrototypeOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "getPrototypeOf");
+  if (desc.value === Object.getPrototypeOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-140.js
index 5136cf6e1..6ba5aa72d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-140.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-140.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setDate)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setDate");

-  if (desc.value === Date.prototype.setDate &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setDate)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setDate");
+  if (desc.value === Date.prototype.setDate &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-141.js
index c8d9529d7..d820c6adf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-141.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-141.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setHours)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setHours");

-  if (desc.value === Date.prototype.setHours &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setHours)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setHours");
+  if (desc.value === Date.prototype.setHours &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-142.js
index 0743743fb..4d77b8eb7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-142.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-142.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setMinutes)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMinutes");

-  if (desc.value === Date.prototype.setMinutes &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setMinutes)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMinutes");
+  if (desc.value === Date.prototype.setMinutes &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-143.js
index 1e6121ea0..5d9879a00 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-143.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-143.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setSeconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setSeconds");

-  if (desc.value === Date.prototype.setSeconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setSeconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setSeconds");
+  if (desc.value === Date.prototype.setSeconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-144.js
index 7bb4cbe17..1d3b2c900 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-144.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-144.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setMilliseconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMilliseconds");

-  if (desc.value === Date.prototype.setMilliseconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setMilliseconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setMilliseconds");
+  if (desc.value === Date.prototype.setMilliseconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-145.js
index 0201d81c6..f3a9b68a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-145.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-145.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCFullYear)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCFullYear");

-  if (desc.value === Date.prototype.setUTCFullYear &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCFullYear)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCFullYear");
+  if (desc.value === Date.prototype.setUTCFullYear &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-146.js
index 3750693a2..1b95f319b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-146.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-146.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCMonth)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMonth");

-  if (desc.value === Date.prototype.setUTCMonth &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCMonth)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMonth");
+  if (desc.value === Date.prototype.setUTCMonth &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-147.js
index e6120eb7d..64e248322 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-147.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-147.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCDate)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCDate");

-  if (desc.value === Date.prototype.setUTCDate &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCDate)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCDate");
+  if (desc.value === Date.prototype.setUTCDate &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-148.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-148.js
index 5dc720b75..bafed00e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-148.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-148.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-148.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCHours)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCHours");

-  if (desc.value === Date.prototype.setUTCHours &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCHours)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCHours");
+  if (desc.value === Date.prototype.setUTCHours &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-149.js
index 2151f2500..fdceed1cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-149.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-149.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCMinutes)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMinutes");

-  if (desc.value === Date.prototype.setUTCMinutes &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCMinutes)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMinutes");
+  if (desc.value === Date.prototype.setUTCMinutes &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-15.js
index 2287a65ab..7ba64860e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-15.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-15.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.getOwnPropertyDescriptor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyDescriptor");

-  if (desc.value === Object.getOwnPropertyDescriptor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.getOwnPropertyDescriptor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyDescriptor");
+  if (desc.value === Object.getOwnPropertyDescriptor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-150.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-150.js
index 914f992f0..06778985e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-150.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-150.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-150.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCSeconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCSeconds");

-  if (desc.value === Date.prototype.setUTCSeconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCSeconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCSeconds");
+  if (desc.value === Date.prototype.setUTCSeconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-151.js
index 24d3adc1b..00da3d604 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-151.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-151.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.setUTCMilliseconds)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMilliseconds");

-  if (desc.value === Date.prototype.setUTCMilliseconds &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.setUTCMilliseconds)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "setUTCMilliseconds");
+  if (desc.value === Date.prototype.setUTCMilliseconds &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-152.js
index 869e5acb0..3f91d7820 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-152.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-152.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toLocaleString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleString");

-  if (desc.value === Date.prototype.toLocaleString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toLocaleString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleString");
+  if (desc.value === Date.prototype.toLocaleString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-153.js
index 051037cf7..2c75f8ee0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-153.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-153.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toString");

-  if (desc.value === Date.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toString");
+  if (desc.value === Date.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-154.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-154.js
index 3ab333b7f..1a94b548d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-154.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-154.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-154.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toUTCString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toUTCString");

-  if (desc.value === Date.prototype.toUTCString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toUTCString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toUTCString");
+  if (desc.value === Date.prototype.toUTCString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-156.js
index cf2090aa4..785af8f04 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-156.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-156.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toTimeString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toTimeString");

-  if (desc.value === Date.prototype.toTimeString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toTimeString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toTimeString");
+  if (desc.value === Date.prototype.toTimeString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-157.js
index cb71ec841..dd4dc77ca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-157.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-157.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toDateString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toDateString");

-  if (desc.value === Date.prototype.toDateString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toDateString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toDateString");
+  if (desc.value === Date.prototype.toDateString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-158.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-158.js
index 8d4130dda..789d29867 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-158.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-158.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-158.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toLocaleDateString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleDateString");

-  if (desc.value === Date.prototype.toLocaleDateString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toLocaleDateString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleDateString");
+  if (desc.value === Date.prototype.toLocaleDateString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-159.js
index 1774cd06f..8a9283827 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-159.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-159.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toLocaleTimeString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleTimeString");

-  if (desc.value === Date.prototype.toLocaleTimeString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toLocaleTimeString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toLocaleTimeString");
+  if (desc.value === Date.prototype.toLocaleTimeString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-16.js
index bee18c436..2980f0e7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-16.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-16.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.getOwnPropertyNames)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyNames");

-  if (desc.value === Object.getOwnPropertyNames &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.getOwnPropertyNames)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyNames");
+  if (desc.value === Object.getOwnPropertyNames &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-160.js
index 66aa290ae..280f6c95c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-160.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-160.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.valueOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "valueOf");

-  if (desc.value === Date.prototype.valueOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "valueOf");
+  if (desc.value === Date.prototype.valueOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-161.js
index 1753888c1..ff5097a38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-161.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-161.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toISOString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toISOString");

-  if (desc.value === Date.prototype.toISOString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toISOString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toISOString");
+  if (desc.value === Date.prototype.toISOString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-162.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-162.js
index 5997e4319..405bd5c40 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-162.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-162.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-162.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Date.prototype.toJSON)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toJSON");

-  if (desc.value === Date.prototype.toJSON &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Date.prototype.toJSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toJSON");
+  if (desc.value === Date.prototype.toJSON &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-163.js
index cb5cf9cde..c9f6e2061 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-163.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-163.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RegExp.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "constructor");

-  if (desc.value === RegExp.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RegExp.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "constructor");
+  if (desc.value === RegExp.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-165.js
index def342d43..6a592efc7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-165.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-165.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RegExp.prototype.exec)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "exec");

-  if (desc.value === RegExp.prototype.exec &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RegExp.prototype.exec)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "exec");
+  if (desc.value === RegExp.prototype.exec &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-166.js
index 71b2f614e..bda1139df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-166.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-166.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RegExp.prototype.test)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "test");

-  if (desc.value === RegExp.prototype.test &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RegExp.prototype.test)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "test");
+  if (desc.value === RegExp.prototype.test &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-167.js
index 5804dbc65..a45461254 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-167.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-167.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RegExp.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "toString");

-  if (desc.value === RegExp.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RegExp.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "toString");
+  if (desc.value === RegExp.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-168.js
index 0c762967f..b5e9c5b73 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-168.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-168.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Error.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Error.prototype, "constructor");

-  if (desc.value === Error.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Error.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Error.prototype, "constructor");
+  if (desc.value === Error.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-169.js
index 3814cdc4f..3ef0c1cba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-169.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-169.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Error.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Error.prototype, "toString");

-  if (desc.value === Error.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Error.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Error.prototype, "toString");
+  if (desc.value === Error.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-17.js
index da331ff96..15966e21e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-17.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-17.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.create)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "create");

-  if (desc.value === Object.create &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "create");
+  if (desc.value === Object.create &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-170.js
index b5287f0a9..aa5b4f5b3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-170.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-170.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (EvalError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(EvalError.prototype, "constructor");

-  if (desc.value === EvalError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (EvalError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(EvalError.prototype, "constructor");
+  if (desc.value === EvalError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-171.js
index 32aaf397e..d8eb49e16 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-171.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-171.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (RangeError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RangeError.prototype, "constructor");

-  if (desc.value === RangeError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (RangeError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RangeError.prototype, "constructor");
+  if (desc.value === RangeError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-172.js
index b102aaab8..828c79d2d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-172.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-172.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (ReferenceError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(ReferenceError.prototype, "constructor");

-  if (desc.value === ReferenceError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (ReferenceError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(ReferenceError.prototype, "constructor");
+  if (desc.value === ReferenceError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-173.js
index 71759654b..b27fb4c53 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-173.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-173.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (SyntaxError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(SyntaxError.prototype, "constructor");

-  if (desc.value === SyntaxError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (SyntaxError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(SyntaxError.prototype, "constructor");
+  if (desc.value === SyntaxError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-174.js
index 6026b00c7..44cb795e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-174.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-174.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (TypeError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(TypeError.prototype, "constructor");

-  if (desc.value === TypeError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (TypeError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(TypeError.prototype, "constructor");
+  if (desc.value === TypeError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-175.js
index 20dec3447..68ce36430 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-175.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-175.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (URIError.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(URIError.prototype, "constructor");

-  if (desc.value === URIError.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (URIError.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(URIError.prototype, "constructor");
+  if (desc.value === URIError.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-176.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-176.js
index da2d77e4c..b28d19d3d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-176.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-176.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-176.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (JSON.stringify)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(JSON, "stringify");

-  if (desc.value === JSON.stringify &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (JSON.stringify)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(JSON, "stringify");
+  if (desc.value === JSON.stringify &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-177.js
index 85020b029..f8ededf0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-177.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-177.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (JSON.parse)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(JSON, "parse");

-  if (desc.value === JSON.parse &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (JSON.parse)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(JSON, "parse");
+  if (desc.value === JSON.parse &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-178.js
index 92b653434..8e82d029a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-178.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-178.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Global.NaN)

- */

-

-

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), "NaN");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

-  return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Global.NaN)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(), "NaN");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+  return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-179.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-179.js
index 15b4386e9..9128861f6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-179.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-179.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-179.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Global.Infinity)

- */

-

-

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(),  "Infinity");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

-  return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Global.Infinity)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(),  "Infinity");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+  return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-18.js
index 83bedcf81..0ca7f2f0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-18.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-18.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.defineProperty)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "defineProperty");

-  if (desc.value === Object.defineProperty &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.defineProperty)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "defineProperty");
+  if (desc.value === Object.defineProperty &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-180.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-180.js
index af88996f5..5e56f59a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-180.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-180.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-180.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Global.undefined)

- */

-

-

-function testcase() {

-  // in non-strict mode, 'this' is bound to the global object.

-  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(),  "undefined");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

-  return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Global.undefined)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  // in non-strict mode, 'this' is bound to the global object.
+  var desc = Object.getOwnPropertyDescriptor(fnGlobalObject(),  "undefined");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+  return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-182.js
index 59fc6b96f..1acaf538f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-182.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-182.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Object.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Object.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-183.js
index 393351600..869fca093 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-183.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-183.js

- * @description Object.getOwnPropertyDescriptor returns undefined for non-existent property (arguments_1) on built-in object (Function)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function, "arguments_1");

-

-  if (desc === undefined)

-    return true;

-  else

-    return false;  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for non-existent
+    property (arguments_1) on built-in object (Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function, "arguments_1");
+
+  if (desc === undefined)
+    return true;
+  else
+    return false;  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-184.js
index bacda16a2..17bb8fa9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-184.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-184.js

- * @description Object.getOwnPropertyDescriptor returns undefined for non-existent property (caller) on built-in object (Math)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "caller");

-

-  if (desc === undefined)

-    return true;  

-  else

-    return false;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for non-existent
+    property (caller) on built-in object (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "caller");
+
+  if (desc === undefined)
+    return true;  
+  else
+    return false;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-185.js
index 069fce14c..9d8c83ba3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-185.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-185.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Function.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Function.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-186.js
index f5bde9083..0708b526b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-186.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-186.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Function.length)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Function.length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-187.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-187.js
index 973f44624..800bcf809 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-187.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-187.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-187.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Function (instance).length)

- */

-

-

-function testcase() {

-  var f = Function('return 42;');

-

-  var desc = Object.getOwnPropertyDescriptor(f, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Function (instance).length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Function('return 42;');
+
+  var desc = Object.getOwnPropertyDescriptor(f, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
index f68671ea6..88a5637e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-188.js

- * @description Object.getOwnPropertyDescriptor returns undefined for non-existent properties on built-ins (Function (instance).name)

- */

-

-

-function testcase() {

-  var f = Function('return 42;');

-  var desc = Object.getOwnPropertyDescriptor(f, "functionNameHopefullyDoesNotExist");

-  return desc === undefined;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for non-existent
+    properties on built-ins (Function (instance).name)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Function('return 42;');
+  var desc = Object.getOwnPropertyDescriptor(f, "functionNameHopefullyDoesNotExist");
+  return desc === undefined;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-189.js
index 2d6cb2eaf..6bd5e1e54 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-189.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-189.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Array.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Array.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-19.js
index 3cdeb71af..6500eefe1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-19.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-19.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.defineProperties)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "defineProperties");

-  if (desc.value === Object.defineProperties &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.defineProperties)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "defineProperties");
+  if (desc.value === Object.defineProperties &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-190.js
index efb4893f7..ff09db02f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-190.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-190.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (String.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (String.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-191.js
index ba4702589..3edff1769 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-191.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-191.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (String.length)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (String.length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-192.js
index fb120d2bd..afe8bc49e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-192.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-192.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (String (instance).length)

- */

-

-

-function testcase() {

-  var s = new String("abc");

-  var desc = Object.getOwnPropertyDescriptor(s, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (String (instance).length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("abc");
+  var desc = Object.getOwnPropertyDescriptor(s, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-193.js
index ab6b993a3..8b940f85d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-193.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-193.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Boolean.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Boolean, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Boolean.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Boolean, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-194.js
index edb3e4bfd..793d33dfa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-194.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-194.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Boolean.length)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Boolean, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Boolean.length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Boolean, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-195.js
index 70e836e20..801846038 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-195.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-195.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-196.js
index bac9317e3..97470f93a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-196.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-196.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.MAX_VALUE)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "MAX_VALUE");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.MAX_VALUE)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "MAX_VALUE");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-197.js
index f99cd2904..862574285 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-197.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-197.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.MIN_VALUE)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "MIN_VALUE");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.MIN_VALUE)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "MIN_VALUE");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-198.js
index 6b2b838f5..cf7f44471 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-198.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-198.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.NaN)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "NaN");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "NaN");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-199.js
index 0e21ff80e..bd9fe65e4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-199.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-199.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.NEGATIVE_INFINITY)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "NEGATIVE_INFINITY");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.NEGATIVE_INFINITY)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "NEGATIVE_INFINITY");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-2.js
index 67e85d0a6..34e546f67 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-2.js

- * @description Object.getOwnPropertyDescriptor returns undefined for non-existent properties

- */

-

-

-function testcase() {

-    var o = {};

-

-    var desc = Object.getOwnPropertyDescriptor(o, "foo");

-    if (desc === undefined) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns undefined for non-existent
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+
+    var desc = Object.getOwnPropertyDescriptor(o, "foo");
+    if (desc === undefined) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-20.js
index 14b51387c..efdfd644a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-20.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-20.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.seal)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "seal");

-  if (desc.value === Object.seal &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.seal)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "seal");
+  if (desc.value === Object.seal &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-200.js
index c9854d54a..78ac5fb63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-200.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-200.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.POSITIVE_INFINITY)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "POSITIVE_INFINITY");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.POSITIVE_INFINITY)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "POSITIVE_INFINITY");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-201.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-201.js
index 97910f48f..73f3939bc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-201.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-201.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-201.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Number.length)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number, "length");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Number.length)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number, "length");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-202.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-202.js
index 91e5e0ac9..81043c373 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-202.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-202.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-202.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.E)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "E");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.E)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "E");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-203.js
index 60cf6e552..75d9eec80 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-203.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-203.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.LN10)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "LN10");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.LN10)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "LN10");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-204.js
index ef4bd2939..4b6c96451 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-204.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-204.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.LN2)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "LN2");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.LN2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "LN2");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-205.js
index 80892253d..ee57ca91e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-205.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-205.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.LOG2E)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "LOG2E");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.LOG2E)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "LOG2E");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-206.js
index 01c6ad2c2..cc2190297 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-206.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-206.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.LOG10E)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "LOG10E");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.LOG10E)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "LOG10E");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-207.js
index e8f042b85..c7347cad2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-207.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-207.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.PI)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "PI");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.PI)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "PI");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-208.js
index a27109c43..808c03646 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-208.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-208.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.SQRT1_2)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "SQRT1_2");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.SQRT1_2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "SQRT1_2");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-209.js
index 5b7163e00..f60e8c75b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-209.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-209.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Math.SQRT2)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "SQRT2");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Math.SQRT2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "SQRT2");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-21.js
index 2d2022c89..115b332bb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-21.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-21.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.freeze)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "freeze");

-  if (desc.value === Object.freeze &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.freeze)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "freeze");
+  if (desc.value === Object.freeze &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-210.js
index 610997aa7..23ce27b84 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-210.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-210.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Date.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Date, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Date.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Date, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-211.js
index 510a95543..c86d13ed8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-211.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-211.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RegExp.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RegExp.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-212.js
index 937e90fa1..a609e7da2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-212.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-212.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RegExp.prototype.source)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "source");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RegExp.prototype.source)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "source");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-213.js
index a90517b66..6c9badd55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-213.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-213.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RegExp.prototype.global)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "global");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RegExp.prototype.global)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "global");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214.js
index 9808f7f87..ef7e33aa9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-214.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RegExp.prototype.ignoreCase)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "ignoreCase");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RegExp.prototype.ignoreCase)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "ignoreCase");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215.js
index 5a53c0e09..076833803 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-215.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RegExp.prototype.multiline)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "multiline");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RegExp.prototype.multiline)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, "multiline");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-216.js
index 7e94fe568..38abae2c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-216.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-216.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (Error.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Error, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (Error.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Error, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-217.js
index 9fc072808..6a1b09b81 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-217.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-217.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (EvalError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(EvalError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (EvalError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(EvalError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-218.js
index 16047d9d7..8d1f4fa8d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-218.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-218.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (RangeError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(RangeError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (RangeError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RangeError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-219.js
index dc0f29563..b0e67fd01 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-219.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-219.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (ReferenceError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(ReferenceError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (ReferenceError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(ReferenceError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-22.js
index 67d4557d2..f238b0710 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-22.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-22.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.preventExtensions)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "preventExtensions");

-  if (desc.value === Object.preventExtensions &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.preventExtensions)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "preventExtensions");
+  if (desc.value === Object.preventExtensions &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-220.js
index aa62bba97..851ba121a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-220.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-220.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (SyntaxError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(SyntaxError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (SyntaxError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(SyntaxError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-221.js
index b1584381f..03fe2d83c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-221.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-221.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (TypeError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(TypeError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (TypeError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(TypeError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-222.js
index 523dda074..79f06c5b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-222.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-222.js

- * @description Object.getOwnPropertyDescriptor returns data desc (all false) for properties on built-ins (URIError.prototype)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(URIError, "prototype");

-

-  if (desc.writable === false &&

-      desc.enumerable === false &&

-      desc.configurable === false &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc (all false) for
+    properties on built-ins (URIError.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(URIError, "prototype");
+
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-223.js
index 2721117a4..c09bd2ded 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-223.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-223.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'value' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.value === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'value' property of
+    returned object is data property with correct 'value' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.value === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-224.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-224.js
index 5f47b06a9..eb996db9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-224.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-224.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-224.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'value' property of returned object is data property with correct 'writable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.value = "overwriteDataProperty";

-            return desc.value === "overwriteDataProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'value' property of
+    returned object is data property with correct 'writable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.value = "overwriteDataProperty";
+            return desc.value === "overwriteDataProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-225.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-225.js
index 7e12f1f4d..fb072aae9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-225.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-225.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-225.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'value' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var prop in desc) {

-            if (prop === "value") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'value' property of
+    returned object is data property with correct 'enumerable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var prop in desc) {
+            if (prop === "value") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-226.js
index 6eb5b2eda..245b9b762 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-226.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-226.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'value' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = "value" in desc;

-

-        try {

-            delete desc.value;

-            var propDeleted = "value" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'value' property of
+    returned object is data property with correct 'configurable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = "value" in desc;
+
+        try {
+            delete desc.value;
+            var propDeleted = "value" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-227.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-227.js
index 09fa0be24..2719f6b1f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-227.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-227.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-227.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'writable' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.writable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'writable' property
+    of returned object is data property with correct 'value' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.writable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-228.js
index 501d7e22f..81748bba9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-228.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-228.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'writable' property of returned object is data property with correct 'writable' attribute

- */

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.writable = "overwriteDataProperty";

-            return desc.writable === "overwriteDataProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'writable' property
+    of returned object is data property with correct 'writable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.writable = "overwriteDataProperty";
+            return desc.writable === "overwriteDataProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-229.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-229.js
index e2ab0d79a..4147269cc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-229.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-229.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-229.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'writable' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var props in desc) {

-            if (props === "writable") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'writable' property
+    of returned object is data property with correct 'enumerable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var props in desc) {
+            if (props === "writable") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-23.js
index af70e6a22..4d30ef763 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-23.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-23.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.isSealed)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "isSealed");

-  if (desc.value === Object.isSealed &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.isSealed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "isSealed");
+  if (desc.value === Object.isSealed &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-230.js
index 3b4c65749..f88abf5e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-230.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-230.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'writable' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = ("writable" in desc);

-

-        try {

-            delete desc.writable;

-            var propDeleted = "writable" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'writable' property
+    of returned object is data property with correct 'configurable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = ("writable" in desc);
+
+        try {
+            delete desc.writable;
+            var propDeleted = "writable" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-231.js
index ea52d5879..87aa41ea8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-231.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-231.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'enumerable' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'enumerable'
+    property of returned object is data property with correct 'value'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-232.js
index 61a0895fd..62f6e01a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-232.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-232.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'enumerable' property of returned object is data property with correct 'writable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.enumerable = "overwriteDataProperty";

-            return desc.enumerable === "overwriteDataProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'enumerable'
+    property of returned object is data property with correct
+    'writable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.enumerable = "overwriteDataProperty";
+            return desc.enumerable === "overwriteDataProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-233.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-233.js
index 1f38286d9..96dd31e09 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-233.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-233.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-233.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'enumerable' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var props in desc) {

-            if (props === "enumerable") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'enumerable'
+    property of returned object is data property with correct
+    'enumerable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var props in desc) {
+            if (props === "enumerable") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-234.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-234.js
index c496889bb..4d9508f80 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-234.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-234.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-234.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'enumerable' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = "enumerable" in desc;

-

-        try {

-            delete desc.enumerable;

-            var propDeleted = "enumerable" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'enumerable'
+    property of returned object is data property with correct
+    'configurable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = "enumerable" in desc;
+
+        try {
+            delete desc.enumerable;
+            var propDeleted = "enumerable" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-235.js
index d4c1a45a9..868ef106b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-235.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-235.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'configurable' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.configurable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'configurable'
+    property of returned object is data property with correct 'value'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.configurable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-236.js
index 8158a8c3d..1962cdaa4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-236.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-236.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'configurable' property of returned object is data property with correct 'writable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.writable = "overwriteDataProperty";

-            return desc.writable === "overwriteDataProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'configurable'
+    property of returned object is data property with correct
+    'writable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.writable = "overwriteDataProperty";
+            return desc.writable === "overwriteDataProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-237.js
index 7a310c9ab..7c800738d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-237.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-237.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'configurable' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var prop in desc) {

-            if (prop === "configurable") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'configurable'
+    property of returned object is data property with correct
+    'enumerable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var prop in desc) {
+            if (prop === "configurable") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-238.js
index 268870f76..7ed922570 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-238.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-238.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'configurable' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = { "property": "ownDataProperty" };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = "configurable" in desc;

-        

-        try {

-            delete desc.configurable;

-            var propDeleted = "configurable" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'configurable'
+    property of returned object is data property with correct
+    'configurable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": "ownDataProperty" };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = "configurable" in desc;
+        
+        try {
+            delete desc.configurable;
+            var propDeleted = "configurable" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-239.js
index 55ff355e6..5c5bb15cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-239.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-239.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'get' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownDataProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.get === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'get' property of
+    returned object is data property with correct 'value' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownDataProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.get === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-24.js
index 043aa1dd8..2ab0e145d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-24.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-24.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.isFrozen)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "isFrozen");

-  if (desc.value === Object.isFrozen &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.isFrozen)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "isFrozen");
+  if (desc.value === Object.isFrozen &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-240.js
index 299b94037..4b605fb3e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-240.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-240.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'get' property of returned object is data property with correct 'writable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownGetProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.get = "overwriteGetProperty";

-            return desc.get === "overwriteGetProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'get' property of
+    returned object is data property with correct 'writable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownGetProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.get = "overwriteGetProperty";
+            return desc.get === "overwriteGetProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-241.js
index ed2552ba0..527e0f5a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-241.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-241.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'get' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownDataProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var prop in desc) {

-            if (prop === "get") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'get' property of
+    returned object is data property with correct 'enumerable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownDataProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var prop in desc) {
+            if (prop === "get") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-242.js
index f792dec2e..8260002b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-242.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-242.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'get' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownDataProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            get: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = "get" in desc;

-

-        try {

-            delete desc.get;

-            var propDeleted = "get" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'get' property of
+    returned object is data property with correct 'configurable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownDataProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            get: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = "get" in desc;
+
+        try {
+            delete desc.get;
+            var propDeleted = "get" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-243.js
index 3ae753338..02831c153 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-243.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-243.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'set' property of returned object is data property with correct 'value' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownSetProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            set: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc.set === fun;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'set' property of
+    returned object is data property with correct 'value' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownSetProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            set: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc.set === fun;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-244.js
index ddf9e9834..285f3d55e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-244.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-244.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'set' property of returned object is data property with correct 'writable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownSetProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            set: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        try {

-            desc.set = "overwriteSetProperty";

-            return desc.set === "overwriteSetProperty";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'set' property of
+    returned object is data property with correct 'writable' attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownSetProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            set: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        try {
+            desc.set = "overwriteSetProperty";
+            return desc.set === "overwriteSetProperty";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-245.js
index 58636233f..b98ee69e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-245.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-245.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'set' property of returned object is data property with correct 'enumerable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownSetProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            set: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        var accessed = false;

-

-        for (var prop in desc) {

-            if (prop === "set") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'set' property of
+    returned object is data property with correct 'enumerable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownSetProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            set: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        var accessed = false;
+
+        for (var prop in desc) {
+            if (prop === "set") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-246.js
index d64c42c40..e9afcc29f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-246.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-246.js

- * @description Object.getOwnPropertyDescriptor - ensure that 'set' property of returned object is data property with correct 'configurable' attribute

- */

-

-

-function testcase() {

-        var obj = {};

-        var fun = function () {

-            return "ownSetProperty";

-        };

-        Object.defineProperty(obj, "property", {

-            set: fun,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        var propDefined = "set" in desc;

-

-        try {

-            delete desc.set;

-            var propDeleted = "set" in desc;

-

-            return propDefined && !propDeleted;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - ensure that 'set' property of
+    returned object is data property with correct 'configurable'
+    attribute
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var fun = function () {
+            return "ownSetProperty";
+        };
+        Object.defineProperty(obj, "property", {
+            set: fun,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        var propDefined = "set" in desc;
+
+        try {
+            delete desc.set;
+            var propDeleted = "set" in desc;
+
+            return propDefined && !propDeleted;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-247.js
index dc93e8dde..f5ace4046 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-247.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-247.js

- * @description Object.getOwnPropertyDescriptor - returned value is an instance of object

- */

-

-

-function testcase() {

-        var obj = { "property": 100 };

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return desc instanceof Object;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - returned value is an instance of
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "property": 100 };
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return desc instanceof Object;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-248.js
index 6257adbd3..ada93615a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-248.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-248.js

- * @description Object.getOwnPropertyDescriptor - returned object contains the property 'value' if the value of property 'value' is not explicitly specified when defined by Object.defineProperty

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "property", {

-            writable: true,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return "value" in desc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - returned object contains the
+    property 'value' if the value of property 'value' is not
+    explicitly specified when defined by Object.defineProperty
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "property", {
+            writable: true,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return "value" in desc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-249.js
index ef013f414..e2e95991a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-249.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-249.js

- * @description Object.getOwnPropertyDescriptor - returned object contains the property 'set' if the value of property 'set' is not explicitly specified when defined by Object.defineProperty.

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "property", {

-            get: function () { },

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return "set" in desc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - returned object contains the
+    property 'set' if the value of property 'set' is not explicitly
+    specified when defined by Object.defineProperty.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "property", {
+            get: function () { },
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return "set" in desc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-25.js
index ed54baa3e..4e3c623ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-25.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-25.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.isExtensible)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "isExtensible");

-  if (desc.value === Object.isExtensible &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.isExtensible)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "isExtensible");
+  if (desc.value === Object.isExtensible &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-250.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-250.js
index 8a6cdbf87..cb7ad8da3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-250.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-250.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-250.js

- * @description Object.getOwnPropertyDescriptor - returned object contains the property 'get' if the value of property 'get' is not explicitly specified when defined by Object.defineProperty.

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "property", {

-            set: function () {},

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-

-        return "get" in desc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor - returned object contains the
+    property 'get' if the value of property 'get' is not explicitly
+    specified when defined by Object.defineProperty.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "property", {
+            set: function () {},
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+
+        return "get" in desc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-26.js
index f2cf7912d..edc05298c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-26.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-26.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.keys)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object, "keys");

-  if (desc.value === Object.keys &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.keys)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object, "keys");
+  if (desc.value === Object.keys &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-27.js
index 0adaeeb61..896bb3ee3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-27.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-27.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "constructor");

-  if (desc.value === Object.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "constructor");
+  if (desc.value === Object.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-28.js
index 06c7ec874..3b49dd2cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-28.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-28.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "toString");

-  if (desc.value === Object.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "toString");
+  if (desc.value === Object.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-29.js
index 990a852fd..a29c5a44e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-29.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-29.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.valueOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "valueOf");

-  if (desc.value === Object.prototype.valueOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "valueOf");
+  if (desc.value === Object.prototype.valueOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-3.js
index ad8e9c019..e71ffe5a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-3.js

- * @description Object.getOwnPropertyDescriptor returns an object representing an accessor desc for valid accessor properties

- */

-

-

-function testcase() {

-    var o = {};

-

-    // dummy getter

-    var getter = function () { return 1; }

-    var d = { get: getter };

-

-    Object.defineProperty(o, "foo", d);

-

-    var desc = Object.getOwnPropertyDescriptor(o, "foo");

-    if (desc.get === getter &&

-        desc.set === undefined &&

-        desc.enumerable === false &&

-        desc.configurable === false) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns an object representing an
+    accessor desc for valid accessor properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+
+    // dummy getter
+    var getter = function () { return 1; }
+    var d = { get: getter };
+
+    Object.defineProperty(o, "foo", d);
+
+    var desc = Object.getOwnPropertyDescriptor(o, "foo");
+    if (desc.get === getter &&
+        desc.set === undefined &&
+        desc.enumerable === false &&
+        desc.configurable === false) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-30.js
index f4795e2ae..ace3550cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-30.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-30.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.isPrototypeOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "isPrototypeOf");

-  if (desc.value === Object.prototype.isPrototypeOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.isPrototypeOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "isPrototypeOf");
+  if (desc.value === Object.prototype.isPrototypeOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-31.js
index 56830b62a..60a6ab712 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-31.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-31.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.hasOwnProperty)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "hasOwnProperty");

-  if (desc.value === Object.prototype.hasOwnProperty &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.hasOwnProperty)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "hasOwnProperty");
+  if (desc.value === Object.prototype.hasOwnProperty &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-32.js
index 412910300..802e88528 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-32.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-32.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.propertyIsEnumerable)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "propertyIsEnumerable");

-  if (desc.value === Object.prototype.propertyIsEnumerable &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.propertyIsEnumerable)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "propertyIsEnumerable");
+  if (desc.value === Object.prototype.propertyIsEnumerable &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-33.js
index c122b45c3..57e8a3857 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-33.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-33.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Object.prototype.toLocaleString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "toLocaleString");

-  if (desc.value === Object.prototype.toLocaleString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Object.prototype.toLocaleString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Object.prototype, "toLocaleString");
+  if (desc.value === Object.prototype.toLocaleString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-34.js
index 155c150d5..6e2754f39 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-34.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-34.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Function.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "constructor");

-  if (desc.value === Function.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Function.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "constructor");
+  if (desc.value === Function.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-35.js
index 319376d53..7071f2a6c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-35.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-35.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Function.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "toString");

-  if (desc.value === Function.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Function.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "toString");
+  if (desc.value === Function.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-36.js
index e8df9e6e6..24c54de7f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-36.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-36.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Function.prototype.apply)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "apply");

-  if (desc.value === Function.prototype.apply &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Function.prototype.apply)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "apply");
+  if (desc.value === Function.prototype.apply &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-37.js
index f6330a4ca..3e08ed8a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-37.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-37.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Function.prototype.call)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "call");

-  if (desc.value === Function.prototype.call &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Function.prototype.call)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "call");
+  if (desc.value === Function.prototype.call &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-38.js
index 702da9218..58dbb37d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-38.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-38.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Function.prototype.bind)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "bind");

-  if (desc.value === Function.prototype.bind &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Function.prototype, "bind");
+  if (desc.value === Function.prototype.bind &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-39.js
index ad42d3a3b..d1c86f9e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-39.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-39.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "constructor");

-  if (desc.value === Array.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "constructor");
+  if (desc.value === Array.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-4.js
index d0526e482..e97c46458 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-4.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-4.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.eval)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "eval");

-  if (desc.value === global.eval &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.eval)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "eval");
+  if (desc.value === global.eval &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-40.js
index 99d7a880b..34dc57189 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-40.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-40.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.concat)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "concat");

-  if (desc.value === Array.prototype.concat &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.concat)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "concat");
+  if (desc.value === Array.prototype.concat &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-41.js
index e53738ed3..d2d65d397 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-41.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-41.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.join)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "join");

-  if (desc.value === Array.prototype.join &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.join)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "join");
+  if (desc.value === Array.prototype.join &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-42.js
index 5da001d78..6a0bd213b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-42.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-42.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.reverse)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reverse");

-  if (desc.value === Array.prototype.reverse &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.reverse)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reverse");
+  if (desc.value === Array.prototype.reverse &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-43.js
index 9bef18be9..fd466f859 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-43.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-43.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.slice)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "slice");

-  if (desc.value === Array.prototype.slice &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.slice)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "slice");
+  if (desc.value === Array.prototype.slice &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-44.js
index 5851791d4..8a69f69db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-44.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-44.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.sort)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "sort");

-  if (desc.value === Array.prototype.sort &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.sort)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "sort");
+  if (desc.value === Array.prototype.sort &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-45.js
index bb31d63b7..b76a23bc9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-45.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-45.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "toString");

-  if (desc.value === Array.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "toString");
+  if (desc.value === Array.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-46.js
index cfa4a14dc..41a958f1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-46.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-46.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.push)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "push");

-  if (desc.value === Array.prototype.push &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.push)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "push");
+  if (desc.value === Array.prototype.push &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-47.js
index fc4806147..3a8d6f6c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-47.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-47.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.pop)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "pop");

-  if (desc.value === Array.prototype.pop &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.pop)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "pop");
+  if (desc.value === Array.prototype.pop &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-48.js
index d6f6e8074..218469932 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-48.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-48.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.shift)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "shift");

-  if (desc.value === Array.prototype.shift &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.shift)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "shift");
+  if (desc.value === Array.prototype.shift &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-49.js
index 79c96545c..33fdae571 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-49.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-49.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.unshift)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "unshift");

-  if (desc.value === Array.prototype.unshift &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.unshift)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "unshift");
+  if (desc.value === Array.prototype.unshift &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-5.js
index ce8e102a0..7fb2b2106 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-5.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-5.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.parseInt)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "parseInt");

-  if (desc.value === global.parseInt &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.parseInt)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "parseInt");
+  if (desc.value === global.parseInt &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-50.js
index e07a10ae6..6006e91e2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-50.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-50.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.splice)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "splice");

-  if (desc.value === Array.prototype.splice &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.splice)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "splice");
+  if (desc.value === Array.prototype.splice &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-51.js
index 883b13cbd..19e1d7926 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-51.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-51.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.toLocaleString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "toLocaleString");

-  if (desc.value === Array.prototype.toLocaleString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.toLocaleString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "toLocaleString");
+  if (desc.value === Array.prototype.toLocaleString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-52.js
index c5bf6318f..514f3e3fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-52.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-52.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.indexOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "indexOf");

-  if (desc.value === Array.prototype.indexOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.indexOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "indexOf");
+  if (desc.value === Array.prototype.indexOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-53.js
index d410f3c51..403484590 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-53.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-53.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.lastIndexOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "lastIndexOf");

-  if (desc.value === Array.prototype.lastIndexOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.lastIndexOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "lastIndexOf");
+  if (desc.value === Array.prototype.lastIndexOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-54.js
index 57c34af71..070cb6995 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-54.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-54.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.every)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "every");

-  if (desc.value === Array.prototype.every &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.every)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "every");
+  if (desc.value === Array.prototype.every &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-55.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-55.js
index 544cb3332..e0d64109e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-55.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-55.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-55.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.some)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "some");

-  if (desc.value === Array.prototype.some &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.some)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "some");
+  if (desc.value === Array.prototype.some &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-56.js
index b21caca52..94c34de0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-56.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-56.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.forEach)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "forEach");

-  if (desc.value === Array.prototype.forEach &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.forEach)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "forEach");
+  if (desc.value === Array.prototype.forEach &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-57.js
index f067208b5..fa5ddc37d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-57.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-57.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.map)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "map");

-  if (desc.value === Array.prototype.map &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.map)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "map");
+  if (desc.value === Array.prototype.map &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-58.js
index 5b2db2cb7..8f0256c38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-58.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-58.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.filter)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "filter");

-  if (desc.value === Array.prototype.filter &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.filter)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "filter");
+  if (desc.value === Array.prototype.filter &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-59.js
index be10d32eb..c546cfa42 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-59.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-59.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.reduce)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");

-  if (desc.value === Array.prototype.reduce &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.reduce)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");
+  if (desc.value === Array.prototype.reduce &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-6.js
index 84f811112..0d4372521 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-6.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-6.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.parseFloat)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global, "parseFloat");

-  if (desc.value === global.parseFloat &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.parseFloat)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global, "parseFloat");
+  if (desc.value === global.parseFloat &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-60.js
index 47cf5192e..fc0a7edae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-60.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-60.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Array.prototype.reduceRight)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduceRight");

-  if (desc.value === Array.prototype.reduceRight &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Array.prototype.reduceRight)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduceRight");
+  if (desc.value === Array.prototype.reduceRight &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-61.js
index b0cf0c740..07b743f8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-61.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-61.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.fromCharCode)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String, "fromCharCode");

-  if (desc.value === String.fromCharCode &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.fromCharCode)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String, "fromCharCode");
+  if (desc.value === String.fromCharCode &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-62.js
index a908db273..9710555c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-62.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-62.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "constructor");

-  if (desc.value === String.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "constructor");
+  if (desc.value === String.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-63.js
index 26da43a49..98ca80e3c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-63.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-63.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.charAt)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "charAt");

-  if (desc.value === String.prototype.charAt &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.charAt)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "charAt");
+  if (desc.value === String.prototype.charAt &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-64.js
index 05a6ba670..690975a76 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-64.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-64.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.charCodeAt)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "charCodeAt");

-  if (desc.value === String.prototype.charCodeAt &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.charCodeAt)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "charCodeAt");
+  if (desc.value === String.prototype.charCodeAt &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-65.js
index d569aaf48..d425272e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-65.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-65.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.concat)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "concat");

-  if (desc.value === String.prototype.concat &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.concat)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "concat");
+  if (desc.value === String.prototype.concat &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-66.js
index 9491205b2..fda929368 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-66.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-66.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.indexOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "indexOf");

-  if (desc.value === String.prototype.indexOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.indexOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "indexOf");
+  if (desc.value === String.prototype.indexOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-67.js
index 8fa3c12dc..544e46fff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-67.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-67.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.lastIndexOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "lastIndexOf");

-  if (desc.value === String.prototype.lastIndexOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.lastIndexOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "lastIndexOf");
+  if (desc.value === String.prototype.lastIndexOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-68.js
index 457f0ac84..960b552ef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-68.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-68.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.match)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "match");

-  if (desc.value === String.prototype.match &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.match)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "match");
+  if (desc.value === String.prototype.match &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-69.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-69.js
index 6e8eaa3fb..b1b8a5f27 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-69.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-69.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-69.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.replace)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "replace");

-  if (desc.value === String.prototype.replace &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.replace)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "replace");
+  if (desc.value === String.prototype.replace &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-7.js
index 73d430e21..777872666 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-7.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-7.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.isNaN)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "isNaN");

-  if (desc.value === global.isNaN &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.isNaN)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "isNaN");
+  if (desc.value === global.isNaN &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-70.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-70.js
index 12e6aff97..c09e230aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-70.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-70.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-70.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.search)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "search");

-  if (desc.value === String.prototype.search &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.search)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "search");
+  if (desc.value === String.prototype.search &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-71.js
index ce1a61fa4..88972951e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-71.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-71.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.slice)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "slice");

-  if (desc.value === String.prototype.slice &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.slice)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "slice");
+  if (desc.value === String.prototype.slice &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-72.js
index 9ce23e85d..edd3c0847 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-72.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-72.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.split)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "split");

-  if (desc.value === String.prototype.split &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.split)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "split");
+  if (desc.value === String.prototype.split &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-73.js
index aeac26f13..717eaffbd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-73.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-73.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.substring)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "substring");

-  if (desc.value === String.prototype.substring &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.substring)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "substring");
+  if (desc.value === String.prototype.substring &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-75.js
index 989e91f65..37d910ab5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-75.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-75.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.toLowerCase)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLowerCase");

-  if (desc.value === String.prototype.toLowerCase &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.toLowerCase)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLowerCase");
+  if (desc.value === String.prototype.toLowerCase &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-76.js
index 590c5988a..aca53752a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-76.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-76.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toString");

-  if (desc.value === String.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toString");
+  if (desc.value === String.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-77.js
index 00d7401fa..5a27c1d9d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-77.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-77.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.toUpperCase)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toUpperCase");

-  if (desc.value === String.prototype.toUpperCase &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.toUpperCase)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toUpperCase");
+  if (desc.value === String.prototype.toUpperCase &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-78.js
index 3b534ba9f..883cbb4c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-78.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-78.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.valueOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "valueOf");

-  if (desc.value === String.prototype.valueOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "valueOf");
+  if (desc.value === String.prototype.valueOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-79.js
index aa02707ec..3ad252cda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-79.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-79.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.toLocaleLowerCase)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLocaleLowerCase");

-  if (desc.value === String.prototype.toLocaleLowerCase &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.toLocaleLowerCase)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLocaleLowerCase");
+  if (desc.value === String.prototype.toLocaleLowerCase &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-8.js
index b44c9a241..5e14341f2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-8.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-8.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.isFinite)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global,  "isFinite");

-  if (desc.value === global.isFinite &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.isFinite)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global,  "isFinite");
+  if (desc.value === global.isFinite &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-80.js
index 43389a461..9e26f1bd9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-80.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-80.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.toLocaleUpperCase)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLocaleUpperCase");

-  if (desc.value === String.prototype.toLocaleUpperCase &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.toLocaleUpperCase)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "toLocaleUpperCase");
+  if (desc.value === String.prototype.toLocaleUpperCase &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-81.js
index e83d30541..e683214cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-81.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-81.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.localeCompare)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "localeCompare");

-  if (desc.value === String.prototype.localeCompare &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.localeCompare)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "localeCompare");
+  if (desc.value === String.prototype.localeCompare &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-82.js
index ac2ca0118..d87579616 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-82.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-82.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (String.prototype.trim)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(String.prototype, "trim");

-  if (desc.value === String.prototype.trim &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (String.prototype.trim)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(String.prototype, "trim");
+  if (desc.value === String.prototype.trim &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-84.js
index cd9a503c3..b060a4161 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-84.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-84.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Boolean.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "constructor");

-  if (desc.value === Boolean.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Boolean.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "constructor");
+  if (desc.value === Boolean.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-85.js
index f29629938..befb05b7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-85.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-85.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Boolean.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "toString");

-  if (desc.value === Boolean.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Boolean.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "toString");
+  if (desc.value === Boolean.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-86.js
index 5357b4646..6c8bd0212 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-86.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-86.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Boolean.prototype.valueOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "valueOf");

-  if (desc.value === Boolean.prototype.valueOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Boolean.prototype.valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Boolean.prototype, "valueOf");
+  if (desc.value === Boolean.prototype.valueOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-88.js
index c5bc87945..a4e6efc12 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-88.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-88.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.constructor)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "constructor");

-  if (desc.value === Number.prototype.constructor &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.constructor)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "constructor");
+  if (desc.value === Number.prototype.constructor &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-89.js
index 1cff28ecb..ef56ee8a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-89.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-89.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.toString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toString");

-  if (desc.value === Number.prototype.toString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.toString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toString");
+  if (desc.value === Number.prototype.toString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-9.js
index 2f57361e1..7019f43ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-9.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-9.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Global.decodeURI)

- */

-

-

-function testcase() {

-  var global = fnGlobalObject();

-  var desc = Object.getOwnPropertyDescriptor(global, "decodeURI");

-  if (desc.value === global.decodeURI &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Global.decodeURI)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var global = fnGlobalObject();
+  var desc = Object.getOwnPropertyDescriptor(global, "decodeURI");
+  if (desc.value === global.decodeURI &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-90.js
index 15f66c6fa..929d4a395 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-90.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-90.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.toLocaleString)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toLocaleString");

-  if (desc.value === Number.prototype.toLocaleString &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.toLocaleString)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toLocaleString");
+  if (desc.value === Number.prototype.toLocaleString &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-91.js
index 05bc0e995..2ef4d84ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-91.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-91.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.toFixed)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toFixed");

-  if (desc.value === Number.prototype.toFixed &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.toFixed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toFixed");
+  if (desc.value === Number.prototype.toFixed &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-92.js
index 682cef875..29e5f018f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-92.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-92.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.toExponential)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toExponential");

-  if (desc.value === Number.prototype.toExponential &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.toExponential)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toExponential");
+  if (desc.value === Number.prototype.toExponential &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-93.js
index eb8dc281f..06e6e1b83 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-93.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-93.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.toPrecision)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toPrecision");

-  if (desc.value === Number.prototype.toPrecision &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.toPrecision)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "toPrecision");
+  if (desc.value === Number.prototype.toPrecision &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-94.js
index 87158de92..ac71ff7a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-94.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-94.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Number.prototype.valueOf)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "valueOf");

-  if (desc.value === Number.prototype.valueOf &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Number.prototype.valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Number.prototype, "valueOf");
+  if (desc.value === Number.prototype.valueOf &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-96.js
index f51feb9c8..3758a33eb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-96.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-96.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.abs)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "abs");

-  if (desc.value === Math.abs &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.abs)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "abs");
+  if (desc.value === Math.abs &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-97.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-97.js
index 06e3eb9f1..07e4b5366 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-97.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-97.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-97.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.acos)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "acos");

-  if (desc.value === Math.acos &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.acos)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "acos");
+  if (desc.value === Math.acos &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-98.js
index 41267fb1f..462dc675a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-98.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-98.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.asin)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "asin");

-  if (desc.value === Math.asin &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.asin)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "asin");
+  if (desc.value === Math.asin &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-99.js
index 88bdc41bb..50816ca81 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-99.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.3/15.2.3.3-4-99.js

- * @description Object.getOwnPropertyDescriptor returns data desc for functions on built-ins (Math.atan)

- */

-

-

-function testcase() {

-  var desc = Object.getOwnPropertyDescriptor(Math, "atan");

-  if (desc.value === Math.atan &&

-      desc.writable === true &&

-      desc.enumerable === false &&

-      desc.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyDescriptor returns data desc for functions on
+    built-ins (Math.atan)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(Math, "atan");
+  if (desc.value === Math.atan &&
+      desc.writable === true &&
+      desc.enumerable === false &&
+      desc.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-1.js
index 128223254..0b4f12cc5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-1.js

- * @description Object.getOwnPropertyNames must exist as a function

- */

-

-

-function testcase() {

-  if (typeof(Object.getOwnPropertyNames) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (typeof(Object.getOwnPropertyNames) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-2.js
index 8c4a69c23..03c9ee05c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-0-2.js

- * @description Object.getOwnPropertyNames must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.getOwnPropertyNames.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames must exist as a function taking 1
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.getOwnPropertyNames.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-2.js
index 4e7ffe5bb..f38f8d564 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-2.js

- * @description Object.getOwnPropertyNames throws TypeError if 'O' is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyNames(undefined);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames throws TypeError if 'O' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyNames(undefined);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-3.js
index 24f774da1..6d451e84d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-3.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-3.js

- * @description Object.getOwnPropertyNames throws TypeError if 'O' is null

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyNames(null);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames throws TypeError if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyNames(null);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-4.js
index a3c9f9781..10f01a3ee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-4.js

- * @description Object.getOwnPropertyNames throws TypeError if 'O' is a boolean

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyNames(true);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames throws TypeError if 'O' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyNames(true);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-5.js
index 4e5d6c231..e97e959d4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-5.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1-5.js

- * @description Object.getOwnPropertyNames throws TypeError if 'O' is a string

- */

-

-

-function testcase() {

-        try {

-            Object.getOwnPropertyNames("abc");

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames throws TypeError if 'O' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.getOwnPropertyNames("abc");
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1.js
index cd7acab93..a97e0656e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-1.js

- * @description Object.getOwnPropertyNames throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.getOwnPropertyNames(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames throws TypeError if type of first param
+    is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.getOwnPropertyNames(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-1.js
index fc3a6f1c3..da5e858e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-1.js

- * @description Object.getOwnPropertyNames - returned array is an array according to Array.isArray

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = Object.getOwnPropertyNames(obj);

-

-        return Array.isArray(result);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - returned array is an array according
+    to Array.isArray
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = Object.getOwnPropertyNames(obj);
+
+        return Array.isArray(result);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-2.js
index 3be99ea27..f697aebec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-2.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-2.js

- * @description Object.getOwnPropertyNames - returned array is an instance of Array

- */

-

-

-function testcase() {

-        var obj = {};

-        var result = Object.getOwnPropertyNames(obj);

-

-        return result instanceof Array;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames - returned array is an instance of Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var result = Object.getOwnPropertyNames(obj);
+
+        return result instanceof Array;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-3.js
index 450b4bc28..bd8c004ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-3.js

- * @description Object.getOwnPropertyNames - length of returned array is initialized to 0

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = Object.getOwnPropertyNames(obj);

-

-        return result.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - length of returned array is
+    initialized to 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = Object.getOwnPropertyNames(obj);
+
+        return result.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-4.js
index 310376bc3..ec558b0e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-2-4.js

- * @description Object.getOwnPropertyNames - returned array is the standard built-in constructor

- */

-

-

-function testcase() {

-        var oldArray = Array;

-        Array = function () {

-            throw new Error("invoke customer defined Array!");

-        };

-

-        var obj = {};

-        try {

-            var result = Object.getOwnPropertyNames(obj);

-            return Object.prototype.toString.call(result) === "[object Array]";

-        } catch (ex) {

-            return false;

-        } finally {

-            Array = oldArray;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - returned array is the standard
+    built-in constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var oldArray = Array;
+        Array = function () {
+            throw new Error("invoke customer defined Array!");
+        };
+
+        var obj = {};
+        try {
+            var result = Object.getOwnPropertyNames(obj);
+            return Object.prototype.toString.call(result) === "[object Array]";
+        } catch (ex) {
+            return false;
+        } finally {
+            Array = oldArray;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-3-1.js
index 4048d201b..d44c24e02 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-3-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-3-1.js

- * @description Object.getOwnPropertyNames - elements of the returned array start from index 0

- */

-

-

-function testcase() {

-        var obj = { prop1: 1001 };

-

-        var arr = Object.getOwnPropertyNames(obj);

-

-        return arr.hasOwnProperty(0) && arr[0] === "prop1";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - elements of the returned array start
+    from index 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop1: 1001 };
+
+        var arr = Object.getOwnPropertyNames(obj);
+
+        return arr.hasOwnProperty(0) && arr[0] === "prop1";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-1.js
index 536b2c535..87ef6390f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-1.js

- * @description Object.getOwnPropertyNames returns array of property names (Global)

- */

-

-

-function testcase() {

-        var result = Object.getOwnPropertyNames(fnGlobalObject());

-        var expResult = ["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNaN", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "JSON"];

-

-        var result1 = {};

-        for (var p in result) {

-            result1[result[p]] = true;

-        }

-

-        for (var p1 in expResult) {

-            if (!result1[expResult[p1]]) {

-                return false;

-            }

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames returns array of property names (Global)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var result = Object.getOwnPropertyNames(fnGlobalObject());
+        var expResult = ["NaN", "Infinity", "undefined", "eval", "parseInt", "parseFloat", "isNaN", "isFinite", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "Object", "Function", "Array", "String", "Boolean", "Number", "Date", "Date", "RegExp", "Error", "EvalError", "RangeError", "ReferenceError", "SyntaxError", "TypeError", "URIError", "Math", "JSON"];
+
+        var result1 = {};
+        for (var p in result) {
+            result1[result[p]] = true;
+        }
+
+        for (var p1 in expResult) {
+            if (!result1[expResult[p1]]) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-2.js
index 2b2f46434..08c0bd159 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-2.js

- * @description Object.getOwnPropertyNames returns array of property names (Object)

- */

-

-

-function testcase() {

-  var result = Object.getOwnPropertyNames(Object);

-  var expResult = ["getPrototypeOf", "getOwnPropertyDescriptor", "getOwnPropertyNames", "create", "defineProperty", "defineProperties", "seal", "freeze", "preventExtensions", "isSealed", "isFrozen", "isExtensible", "keys", "prototype", "length"];

-  var found;

-

-  return arrayContains(result, expResult);

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.getOwnPropertyNames returns array of property names (Object)
+includes:
+    - runTestCase.js
+    - arrayContains.js
+---*/
+
+function testcase() {
+  var result = Object.getOwnPropertyNames(Object);
+  var expResult = ["getPrototypeOf", "getOwnPropertyDescriptor", "getOwnPropertyNames", "create", "defineProperty", "defineProperties", "seal", "freeze", "preventExtensions", "isSealed", "isFrozen", "isExtensible", "keys", "prototype", "length"];
+  var found;
+
+  return arrayContains(result, expResult);
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-36.js
index dc5eb35e0..1184ca30f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-36.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-36.js

- * @description Object.getOwnPropertyNames - inherited data properties are not pushed into the returned array

- */

-

-

-function testcase() {

-

-        var proto = { "parent": "parent" };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var result = Object.getOwnPropertyNames(child);

-

-        for (var p in result) {

-            if (result[p] === "parent") {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited data properties are not
+    pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { "parent": "parent" };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var result = Object.getOwnPropertyNames(child);
+
+        for (var p in result) {
+            if (result[p] === "parent") {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-37.js
index 9c29b6daa..17fe1232f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-37.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-37.js

- * @description Object.getOwnPropertyNames - inherited accessor properties are not pushed into the returned array

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "parent", {

-            get: function () {

-                return "parent";

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var result = Object.getOwnPropertyNames(child);

-

-        for (var p in result) {

-            if (result[p] === "parent") {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited accessor properties are not
+    pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "parent", {
+            get: function () {
+                return "parent";
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var result = Object.getOwnPropertyNames(child);
+
+        for (var p in result) {
+            if (result[p] === "parent") {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-38.js
index 314850f2c..697000349 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-38.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-38.js

- * @description Object.getOwnPropertyNames - own data properties are pushed into the returned array

- */

-

-

-function testcase() {

-

-        var obj = { "a": "a" };

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        return result[0] === "a";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own data properties are pushed into
+    the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { "a": "a" };
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        return result[0] === "a";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-39.js
index 5e780f6e1..ea8b6b077 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-39.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-39.js

- * @description Object.getOwnPropertyNames - own accessor properties are pushed into the returned array

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "a", {

-            get: function () {

-                return "a";

-            },

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        return result[0] === "a";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own accessor properties are pushed
+    into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "a", {
+            get: function () {
+                return "a";
+            },
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        return result[0] === "a";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-40.js
index 4d5d9d051..61695a727 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-40.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-40.js

- * @description Object.getOwnPropertyNames - inherited data property of String object 'O' is not pushed into the returned array

- */

-

-

-function testcase() {

-        try {

-            var str = new String("abc");

-

-            String.prototype.protoProperty = "protoString";

-

-            var result = Object.getOwnPropertyNames(str);

-

-            for (var p in result) {

-                if (result[p] === "protoProperty") {

-                    return false;

-                }

-            }

-

-            return true;

-        } finally {

-            delete String.prototype.protoProperty;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited data property of String
+    object 'O' is not pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var str = new String("abc");
+
+            String.prototype.protoProperty = "protoString";
+
+            var result = Object.getOwnPropertyNames(str);
+
+            for (var p in result) {
+                if (result[p] === "protoProperty") {
+                    return false;
+                }
+            }
+
+            return true;
+        } finally {
+            delete String.prototype.protoProperty;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-41.js
index 8e230ca06..cdaea891e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-41.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-41.js

- * @description Object.getOwnPropertyNames - inherited accessor property of String object 'O' is not pushed into the returned array

- */

-

-

-function testcase() {

-        try {

-            var str = new String("abc");

-

-            Object.defineProperty(String.prototype, "protoProperty", {

-                get: function () {

-                    return "protoString";

-                },

-                configurable: true

-            });

-

-            var result = Object.getOwnPropertyNames(str);

-

-            for (var p in result) {

-                if (result[p] === "protoProperty") {

-                    return false;

-                }

-            }

-            return true;

-        } finally {

-            delete String.prototype.protoProperty;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited accessor property of String
+    object 'O' is not pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var str = new String("abc");
+
+            Object.defineProperty(String.prototype, "protoProperty", {
+                get: function () {
+                    return "protoString";
+                },
+                configurable: true
+            });
+
+            var result = Object.getOwnPropertyNames(str);
+
+            for (var p in result) {
+                if (result[p] === "protoProperty") {
+                    return false;
+                }
+            }
+            return true;
+        } finally {
+            delete String.prototype.protoProperty;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-42.js
index 0eeb9a811..48e3964b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-42.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-42.js

- * @description Object.getOwnPropertyNames - own data property of String object 'O' is pushed into the returned array

- */

-

-

-function testcase() {

-        var str = new String("abc");

-

-        Object.defineProperty(str, "ownProperty", {

-            value: "ownString",

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(str);

-

-        for (var p in result) {

-            if (result[p] === "ownProperty") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own data property of String object
+    'O' is pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = new String("abc");
+
+        Object.defineProperty(str, "ownProperty", {
+            value: "ownString",
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(str);
+
+        for (var p in result) {
+            if (result[p] === "ownProperty") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-43.js
index fd34f1ae9..4d60c9eae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-43.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-43.js

- * @description Object.getOwnPropertyNames - own accessor property of String object 'O' is pushed into the returned array

- */

-

-

-function testcase() {

-        var str = new String("abc");

-

-        Object.defineProperty(str, "ownProperty", {

-            get: function () {

-                return "ownString";

-            },

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(str);

-

-        for (var p in result) {

-            if (result[p] === "ownProperty") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own accessor property of String
+    object 'O' is pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = new String("abc");
+
+        Object.defineProperty(str, "ownProperty", {
+            get: function () {
+                return "ownString";
+            },
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(str);
+
+        for (var p in result) {
+            if (result[p] === "ownProperty") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-44.js
index 752465bb9..7203aa32e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-44.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-44.js

- * @description Object.getOwnPropertyNames - own index properties of String object are pushed into the returned Array

- */

-

-

-function testcase() {

-

-        var str = new String("abc");

-        str[5] = "de";

-

-        var expResult = ["0", "1", "2", "length", "5"];

-

-        var result = Object.getOwnPropertyNames(str);

-

-        return compareArray(expResult, result);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own index properties of String object
+    are pushed into the returned Array
+includes:
+    - runTestCase.js
+    - compareArray.js
+---*/
+
+function testcase() {
+
+        var str = new String("abc");
+        str[5] = "de";
+
+        var expResult = ["0", "1", "2", "length", "5"];
+
+        var result = Object.getOwnPropertyNames(str);
+
+        return compareArray(expResult, result);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-45.js
index ca5c1234e..d83960055 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-45.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-45.js

- * @description Object.getOwnPropertyNames - inherited data property of Array object 'O' is not pushed into the returned array.

- */

-

-

-function testcase() {

-        try {

-            var arr = [0, 1, 2];

-

-            Array.prototype.protoProperty = "protoArray";

-

-            var result = Object.getOwnPropertyNames(arr);

-

-            for (var p in result) {

-                if (result[p] === "protoProperty") {

-                    return false;

-                }

-            }

-            return true;

-        } finally {

-            delete Array.prototype.protoProperty;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited data property of Array
+    object 'O' is not pushed into the returned array.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var arr = [0, 1, 2];
+
+            Array.prototype.protoProperty = "protoArray";
+
+            var result = Object.getOwnPropertyNames(arr);
+
+            for (var p in result) {
+                if (result[p] === "protoProperty") {
+                    return false;
+                }
+            }
+            return true;
+        } finally {
+            delete Array.prototype.protoProperty;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-46.js
index fdb7d79a1..035ceb2a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-46.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-46.js

- * @description Object.getOwnPropertyNames - inherited accessor property of Array object 'O' is not pushed into the returned array.

- */

-

-

-function testcase() {

-        try {

-            var arr = [0, 1, 2];

-

-            Object.defineProperty(Array.prototype, "protoProperty", {

-                get: function () {

-                    return "protoArray";

-                },

-                configurable: true

-            });

-

-            var result = Object.getOwnPropertyNames(arr);

-

-            for (var p in result) {

-                if (result[p] === "protoProperty") {

-                    return false;

-                }

-            }

-            return true;

-        } finally {

-            delete Array.prototype.protoProperty;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - inherited accessor property of Array
+    object 'O' is not pushed into the returned array.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var arr = [0, 1, 2];
+
+            Object.defineProperty(Array.prototype, "protoProperty", {
+                get: function () {
+                    return "protoArray";
+                },
+                configurable: true
+            });
+
+            var result = Object.getOwnPropertyNames(arr);
+
+            for (var p in result) {
+                if (result[p] === "protoProperty") {
+                    return false;
+                }
+            }
+            return true;
+        } finally {
+            delete Array.prototype.protoProperty;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-47.js
index d40936ea3..25448d071 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-47.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-47.js

- * @description Object.getOwnPropertyNames - own data property of Array object 'O' is pushed into the returned array

- */

-

-

-function testcase() {

-        var arr = [0, 1, 2];

-        arr.ownProperty = "ownArray";

-

-        var result = Object.getOwnPropertyNames(arr);

-

-        for (var p in result) {

-            if (result[p] === "ownProperty") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own data property of Array object 'O'
+    is pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [0, 1, 2];
+        arr.ownProperty = "ownArray";
+
+        var result = Object.getOwnPropertyNames(arr);
+
+        for (var p in result) {
+            if (result[p] === "ownProperty") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-48.js
index 280eae9fa..b88958be3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-48.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-48.js

- * @description Object.getOwnPropertyNames - own accessor property of Array object 'O' is pushed into the returned array.

- */

-

-

-function testcase() {

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "ownProperty", {

-            get: function () {

-                return "ownArray";

-            },

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(arr);

-

-        for (var p in result) {

-            if (result[p] === "ownProperty") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own accessor property of Array object
+    'O' is pushed into the returned array.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "ownProperty", {
+            get: function () {
+                return "ownArray";
+            },
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(arr);
+
+        for (var p in result) {
+            if (result[p] === "ownProperty") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-49.js
index 6a8055cc0..17a564444 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-49.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-49.js

- * @description Object.getOwnPropertyNames - own index properties of Array objcect are pushed into the returned Array

- */

-

-

-function testcase() {

-        var arr = [0, 1, 2];

-

-        var expResult = ["0", "1", "2", "length"];

-

-        var result = Object.getOwnPropertyNames(arr);

-

-        return compareArray(expResult, result);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own index properties of Array objcect
+    are pushed into the returned Array
+includes:
+    - runTestCase.js
+    - compareArray.js
+---*/
+
+function testcase() {
+        var arr = [0, 1, 2];
+
+        var expResult = ["0", "1", "2", "length"];
+
+        var result = Object.getOwnPropertyNames(arr);
+
+        return compareArray(expResult, result);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-50.js
index ae52bd793..3ce201645 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-50.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-50.js

- * @description Object.getOwnPropertyNames - non-enumerable own property of 'O' is pushed into the returned Array

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "nonEnumerableProp", {

-            value: 10,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        return result[0] === "nonEnumerableProp";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - non-enumerable own property of 'O' is
+    pushed into the returned Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "nonEnumerableProp", {
+            value: 10,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        return result[0] === "nonEnumerableProp";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-1.js
index a5555e977..e12665325 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-1.js

- * @description Object.getOwnPropertyNames - descriptor of resultant array is all true

- */

-

-

-function testcase() {

-  var obj = new Object();

-  obj.x = 1;

-  obj.y = 2;

-  var result = Object.getOwnPropertyNames(obj);

-  var desc = Object.getOwnPropertyDescriptor(result,"0");

-  if (desc.enumerable === true &&

-      desc.configurable === true &&

-      desc.writable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - descriptor of resultant array is all
+    true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = new Object();
+  obj.x = 1;
+  obj.y = 2;
+  var result = Object.getOwnPropertyNames(obj);
+  var desc = Object.getOwnPropertyDescriptor(result,"0");
+  if (desc.enumerable === true &&
+      desc.configurable === true &&
+      desc.writable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-2.js
index b7de129c1..84d819374 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-2.js
@@ -1,42 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-2.js

- * @description Object.getOwnPropertyNames - all own properties are pushed into the returned array

- */

-

-

-function testcase() {

-        var obj = { "a": "a" };

-

-        Object.defineProperty(obj, "b", {

-            get: function () {

-                return "b";

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "c", {

-            get: function () {

-                return "c";

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "d", {

-            value: "d",

-            enumerable: false,

-            configurable: true

-        });

-

-        var result = Object.getOwnPropertyNames(obj);

-        var expResult = ["a", "b", "c", "d"];

-

-        return compareArray(expResult, result);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - all own properties are pushed into
+    the returned array
+includes:
+    - runTestCase.js
+    - compareArray.js
+---*/
+
+function testcase() {
+        var obj = { "a": "a" };
+
+        Object.defineProperty(obj, "b", {
+            get: function () {
+                return "b";
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "c", {
+            get: function () {
+                return "c";
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "d", {
+            value: "d",
+            enumerable: false,
+            configurable: true
+        });
+
+        var result = Object.getOwnPropertyNames(obj);
+        var expResult = ["a", "b", "c", "d"];
+
+        return compareArray(expResult, result);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-3.js
index b8d7574c4..bf4808b0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-3.js

- * @description Object.getOwnPropertyNames - own property named empty('') is pushed into the returned array

- */

-

-

-function testcase() {

-        var obj = { "": "empty" };

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        for (var p in result) {

-            if (result[p] === "") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - own property named empty('') is
+    pushed into the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "": "empty" };
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        for (var p in result) {
+            if (result[p] === "") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-4.js
index 0f97dc8af..4104b15c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-4.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-4.js

- * @description Object.getOwnPropertyNames - elements of the returned array are writable

- */

-

-

-function testcase() {

-        var obj = { "a": "a" };

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        try {

-            var beforeOverride = (result[0] === "a");

-            result[0] = "b";

-            var afterOverride = (result[0] === "b");

-

-            return beforeOverride && afterOverride;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - elements of the returned array are
+    writable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "a": "a" };
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        try {
+            var beforeOverride = (result[0] === "a");
+            result[0] = "b";
+            var afterOverride = (result[0] === "b");
+
+            return beforeOverride && afterOverride;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-5.js
index b39ebac3a..80cec267c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-5.js

- * @description Object.getOwnPropertyNames - elements of the returned array are enumerable

- */

-

-

-function testcase() {

-        var obj = { "a": "a" };

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        for (var p in result) {

-            if (result[p] === "a") {

-                return true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - elements of the returned array are
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "a": "a" };
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        for (var p in result) {
+            if (result[p] === "a") {
+                return true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-6.js
index 1dfcdd7e1..313b32b31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.4/15.2.3.4-4-b-6.js

- * @description Object.getOwnPropertyNames - elements of the returned array are configurable

- */

-

-

-function testcase() {

-        var obj = { "a": "a" };

-

-        var result = Object.getOwnPropertyNames(obj);

-

-        var beforeDeleted = (result.hasOwnProperty("0"));

-        delete result[0];

-        var afterDeleted = (result.hasOwnProperty("0"));

-

-        return beforeDeleted && !afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.getOwnPropertyNames - elements of the returned array are
+    configurable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "a": "a" };
+
+        var result = Object.getOwnPropertyNames(obj);
+
+        var beforeDeleted = (result.hasOwnProperty("0"));
+        delete result[0];
+        var afterDeleted = (result.hasOwnProperty("0"));
+
+        return beforeDeleted && !afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.4/S15.2.3.4_A1_T1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.4/S15.2.3.4_A1_T1.js
index 27446d532..e473f40a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.4/S15.2.3.4_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.4/S15.2.3.4_A1_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2011 Google, Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.getOwnProperties and Object.prototype.hasOwnProperty should
- * agree on what the own properties are.
- *
- * @path ch15/15.2/15.2.3/15.2.3.4/S15.2.3.4_A1_T1.js
- * @description Check that all the own property names reported by
- * Object.getOwnPropertyNames on a strict function are names that
- * hasOwnProperty agrees are own properties.
- * @onlyStrict
- */
+/*---
+info: >
+    Object.getOwnProperties and Object.prototype.hasOwnProperty should
+    agree on what the own properties are.
+description: >
+    Check that all the own property names reported by
+    Object.getOwnPropertyNames on a strict function are names that
+    hasOwnProperty agrees are own properties.
+flags: [onlyStrict]
+---*/
 
 "use strict";
 function foo() {}
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-1.js
index dfa779fa2..b9f551356 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-1.js

- * @description Object.create must exist as a function

- */

-

-

-function testcase() {

-  if (typeof(Object.create) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (typeof(Object.create) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-2.js
index f80b68210..faacba9e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-0-2.js

- * @description Object.create must exist as a function taking 2 parameters

- */

-

-

-function testcase() {

-  if (Object.create.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create must exist as a function taking 2 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.create.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-1.js
index db8875217..196cbb2d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-1.js

- * @description Object.create throws TypeError if 'O' is undefined

- */

-

-

-function testcase() {

-

-        try {

-            Object.create(undefined);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create throws TypeError if 'O' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create(undefined);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-2.js
index 4b6fca4d3..da0bd9db4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-2.js

- * @description Object.create TypeError is not thrown if 'O' is null

- */

-

-

-function testcase() {

-        try {

-            Object.create(null);

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create TypeError is not thrown if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.create(null);
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-3.js
index a4de55a2e..8bb7f42c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-3.js

- * @description Object.create throws TypeError if 'O' is a boolean primitive

- */

-

-

-function testcase() {

-

-        try {

-            Object.create(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create throws TypeError if 'O' is a boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-4.js
index 61170283f..f2e7765b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1-4.js

- * @description Object.create throws TypeError if 'O' is a number primitive

- */

-

-

-function testcase() {

-

-        try {

-            Object.create(2);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create throws TypeError if 'O' is a number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create(2);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1.js
index b88724082..8deb5e9e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-1.js

- * @description Object.create throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.create(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create throws TypeError if type of first param is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.create(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-1.js
index 9e36ee730..5c14d60c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * create sets the [[Prototype]] of the created object to first parameter.

- * This can be checked using isPrototypeOf, or getPrototypeOf.

- *

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-1.js

- * @description Object.create creates new Object

- */

-

-

-function testcase() {

-    function base() {}

-    var b = new base();

-    var prop = new Object();

-    var d = Object.create(b);

-

-    if (typeof d === 'object') {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    create sets the [[Prototype]] of the created object to first parameter.
+    This can be checked using isPrototypeOf, or getPrototypeOf.
+description: Object.create creates new Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    function base() {}
+    var b = new base();
+    var prop = new Object();
+    var d = Object.create(b);
+
+    if (typeof d === 'object') {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-2.js
index d91ece076..298d9ca45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-2-2.js

- * @description Object.create - returned object is an instance of Object

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({});

-        return newObj instanceof Object;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create - returned object is an instance of Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({});
+        return newObj instanceof Object;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-3-1.js
index 87381b28e..8a1f05705 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * create sets the [[Prototype]] of the created object to first parameter.

- * This can be checked using isPrototypeOf, or getPrototypeOf.

- *

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-3-1.js

- * @description Object.create sets the prototype of the passed-in object

- */

-

-

-function testcase() {

-    function base() {}

-    var b = new base();

-    var d = Object.create(b);

-

-    if (Object.getPrototypeOf(d) === b &&

-        b.isPrototypeOf(d) === true) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    create sets the [[Prototype]] of the created object to first parameter.
+    This can be checked using isPrototypeOf, or getPrototypeOf.
+description: Object.create sets the prototype of the passed-in object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    function base() {}
+    var b = new base();
+    var d = Object.create(b);
+
+    if (Object.getPrototypeOf(d) === b &&
+        b.isPrototypeOf(d) === true) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-1.js
index 4c0d6c331..db7ba49e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * create sets the [[Prototype]] of the created object to first parameter.

- * This can be checked using isPrototypeOf, or getPrototypeOf.

- *

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-1.js

- * @description Object.create sets the prototype of the passed-in object and adds new properties

- */

-

-

-function testcase() {

-    function base() {}

-    var b = new base();

-    var prop = new Object();

-    var d = Object.create(b,{ "x": {value: true,writable: false},

-                              "y": {value: "str",writable: false} });

-

-    if (Object.getPrototypeOf(d) === b &&

-        b.isPrototypeOf(d) === true &&

-        d.x === true &&

-        d.y === "str" &&

-        b.x === undefined &&

-        b.y === undefined) {

-      return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    create sets the [[Prototype]] of the created object to first parameter.
+    This can be checked using isPrototypeOf, or getPrototypeOf.
+description: >
+    Object.create sets the prototype of the passed-in object and adds
+    new properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    function base() {}
+    var b = new base();
+    var prop = new Object();
+    var d = Object.create(b,{ "x": {value: true,writable: false},
+                              "y": {value: "str",writable: false} });
+
+    if (Object.getPrototypeOf(d) === b &&
+        b.isPrototypeOf(d) === true &&
+        d.x === true &&
+        d.y === "str" &&
+        b.x === undefined &&
+        b.y === undefined) {
+      return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-10.js
index 24f542426..6ad445417 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-10.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-10.js

- * @description Object.create - argument 'Properties' is the Math object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var result = false;

-        Object.defineProperty(Math, "prop", {

-            get: function () {

-                result = (this === Math);

-                return {};

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            var newObj = Object.create({}, Math);

-            return result && newObj.hasOwnProperty("prop");

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is the Math object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        Object.defineProperty(Math, "prop", {
+            get: function () {
+                result = (this === Math);
+                return {};
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            var newObj = Object.create({}, Math);
+            return result && newObj.hasOwnProperty("prop");
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-100.js
index f2ec925e9..61e9fde44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-100.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-100.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is not present (8.10.5 step 4)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                value: "ownDataProperty"

-            }

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is not present (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                value: "ownDataProperty"
+            }
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-101.js
index fc189c047..d3c1cb92a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-101.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-101.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: false

-            }

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: false
+            }
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-102.js
index 37da96bde..f1d9bfa40 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-102.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-102.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-       

-        var proto = {

-            configurable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an inherited data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+       
+        var proto = {
+            configurable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-103.js
index 8a0ab5825..30e97f1d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-103.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-103.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            configurable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "configurable", {

-            value: false

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own data property that overrides an inherited data
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            configurable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "configurable", {
+            value: false
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-104.js
index 1a0ceb2d1..4bdc6da2d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-104.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-104.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "configurable", {

-            value: false

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own data property that overrides an inherited
+    accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "configurable", {
+            value: false
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-105.js
index 57fd329d4..e7c77133e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-105.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-105.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-106.js
index 8885749da..3ec686490 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-106.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-106.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-107.js
index 703236a0f..3788eb3ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-107.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-107.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            configurable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            configurable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-108.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-108.js
index fa58eefb8..93ba554a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-108.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-108.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-108.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-109.js
index df4ca63d3..6b4a15479 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-109.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-109.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-        Object.defineProperty(descObj, "configurable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own accessor property without a get function
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+        Object.defineProperty(descObj, "configurable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-11.js
index 68c465b25..e20f19640 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-11.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-11.js

- * @description Object.create - argument 'Properties' is a Date object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var props = new Date();

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Date;

-                return {};

-            },

-            enumerable: true

-        });

-        var newObj = Object.create({}, props);

-        return result && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a Date object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Date();
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Date;
+                return {};
+            },
+            enumerable: true
+        });
+        var newObj = Object.create({}, props);
+        return result && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-110.js
index 2952f0de8..0e4762c5d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-110.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-110.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "configurable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is own accessor property without a get function,
+    which overrides an inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "configurable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-111.js
index f18ba9488..2a12ba3b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-111.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-111.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "configurable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an inherited accessor property without a get
+    function (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "configurable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-112.js
index c10c6e052..5371270ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-112.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-112.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = function () { };

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the
+    'configurable' property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = function () { };
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-113.js
index e00bb78ce..0be6c569c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-113.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-113.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = [];

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = [];
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-114.js
index 256c43518..b6033afc0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-114.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-114.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new String();

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new String();
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-115.js
index 969c9a462..9b2e2820a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-115.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-115.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new Boolean(false);

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new Boolean(false);
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-116.js
index e0a983c3c..9bb72f78c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-116.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-116.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new Number(-9);

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new Number(-9);
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-117.js
index 906f30e04..c66dd185e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-117.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-117.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        try {

-            Math.configurable = true;

-

-            var newObj = Object.create({}, {

-                prop: Math

-            });

-

-            var result1 = newObj.hasOwnProperty("prop");

-            delete newObj.prop;

-            var result2 = newObj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete Math.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Math.configurable = true;
+
+            var newObj = Object.create({}, {
+                prop: Math
+            });
+
+            var result1 = newObj.hasOwnProperty("prop");
+            delete newObj.prop;
+            var result2 = newObj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete Math.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-118.js
index 5c130f8c3..2b9ec74f8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-118.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-118.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new Date();

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new Date();
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-119.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-119.js
index 95d2f1bd4..fba4af5b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-119.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-119.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-119.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new RegExp();

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new RegExp();
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-12.js
index 588572161..965bc1242 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-12.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-12.js

- * @description Object.create - argument 'Properties' is a RegExp object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var props = new RegExp();

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof RegExp;

-                return {};

-            },

-            enumerable: true

-        });

-        var newObj = Object.create({}, props);

-        return result && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a RegExp object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new RegExp();
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof RegExp;
+                return {};
+            },
+            enumerable: true
+        });
+        var newObj = Object.create({}, props);
+        return result && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-120.js
index 494b5d490..178d8724d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-120.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-120.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        try {

-            JSON.configurable = true;

-

-            var newObj = Object.create({}, {

-                prop: JSON 

-            });

-

-            var result1 = newObj.hasOwnProperty("prop");

-            delete newObj.prop;

-            var result2 = newObj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete JSON.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            JSON.configurable = true;
+
+            var newObj = Object.create({}, {
+                prop: JSON 
+            });
+
+            var result1 = newObj.hasOwnProperty("prop");
+            delete newObj.prop;
+            var result2 = newObj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete JSON.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-121.js
index de6cc0831..61660e804 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-121.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-121.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var descObj = new Error();

-

-        descObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = new Error();
+
+        descObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-122.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-122.js
index 4dd19de0a..cbc8b238a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-122.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-122.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-122.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.configurable = true;

-

-        var newObj = Object.create({}, {

-            prop: argObj

-        });

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the
+    'configurable' property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.configurable = true;
+
+        var newObj = Object.create({}, {
+            prop: argObj
+        });
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-124.js
index 14a98e4ab..2ed0e0239 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-124.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-124.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        try {

-            fnGlobalObject().configurable = true;

-

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject() 

-            });

-

-            var result1 = newObj.hasOwnProperty("prop");

-            delete newObj.prop;

-            var result2 = newObj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete fnGlobalObject().configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        try {
+            fnGlobalObject().configurable = true;
+
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject() 
+            });
+
+            var result1 = newObj.hasOwnProperty("prop");
+            delete newObj.prop;
+            var result2 = newObj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete fnGlobalObject().configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-125.js
index d4f253bd4..b9c6b7714 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-125.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-125.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is undefined (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: undefined

-            }

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is undefined (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: undefined
+            }
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-126.js
index 625b1d810..a86598d7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-126.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-126.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is null (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: null

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is null (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: null
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-127.js
index c36ad97c1..cb1989d6b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-127.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-127.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is true (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: true

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is true (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: true
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-128.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-128.js
index c13961a8e..4885b4fa0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-128.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-128.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-128.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is false (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: false

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is false (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: false
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-129.js
index aae9f820ff..2a28a0b4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-129.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-129.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is 0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: 0

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is 0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: 0
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-13.js
index 78288dabf..eb497c734 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-13.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-13.js

- * @description Object.create - argument 'Properties' is the JSON object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var result = false;

-

-        Object.defineProperty(JSON, "prop", {

-            get: function () {

-                result = (this === JSON);

-                return {};

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            var newObj = Object.create({}, JSON);

-            return result && newObj.hasOwnProperty("prop");

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is the JSON object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+
+        Object.defineProperty(JSON, "prop", {
+            get: function () {
+                result = (this === JSON);
+                return {};
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            var newObj = Object.create({}, JSON);
+            return result && newObj.hasOwnProperty("prop");
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-130.js
index 7bd59a67b..729111019 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-130.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-130.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is +0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: +0

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is +0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: +0
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-131.js
index 0360cf0c7..55f391696 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-131.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-131.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is -0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: -0

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is -0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: -0
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-132.js
index 9abb4ec06..30ae6f416 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-132.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-132.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is NaN (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: NaN

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is NaN (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: NaN
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-133.js
index 35feac6e7..b306886a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-133.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-133.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a positive number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: 123

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a positive number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: 123
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-134.js
index 2da25728f..581d7eeb2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-134.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-134.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a negative number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: -123

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a negative number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: -123
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-135.js
index b9532c0c7..b87ee2336 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-135.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-135.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: ""

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: ""
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-136.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-136.js
index 3c675e41a..23776f215 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-136.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-136.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-136.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a non-empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: "abc"

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a non-empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: "abc"
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-137.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-137.js
index b217fb1cf..26a4cf662 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-137.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-137.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-137.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a Function object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: function () { }

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a Function object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: function () { }
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-138.js
index fd7f2fef2..6e15104c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-138.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-138.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an Array object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: []

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an Array object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: []
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-139.js
index 03b20dbc4..f9932aae0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-139.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-139.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a String object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new String("abc")

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a String object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new String("abc")
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
index 4fe1b9988..6484f3969 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-14.js

- * @description Object.create - argument 'Properties' is an Error object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var props = new Error("test");

-        var result = false;

-

-        (Object.getOwnPropertyNames(props)).forEach(function(name){

-            props[name] = {value:11, configurable:true}

-        });

-

-        Object.defineProperty(props, "prop15_2_3_5_4_14", {

-            get: function () {

-                result = this instanceof Error;

-                return {};

-            },

-            enumerable: true

-        });

-        var newObj = Object.create({}, props);

-        return result && newObj.hasOwnProperty("prop15_2_3_5_4_14");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is an Error object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Error("test");
+        var result = false;
+
+        (Object.getOwnPropertyNames(props)).forEach(function(name){
+            props[name] = {value:11, configurable:true}
+        });
+
+        Object.defineProperty(props, "prop15_2_3_5_4_14", {
+            get: function () {
+                result = this instanceof Error;
+                return {};
+            },
+            enumerable: true
+        });
+        var newObj = Object.create({}, props);
+        return result && newObj.hasOwnProperty("prop15_2_3_5_4_14");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-140.js
index 1a3d6babb..e05ab4c2d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-140.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-140.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a Boolean object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new Boolean(true)

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a Boolean object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new Boolean(true)
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-141.js
index c32d0c707..7ca0a82ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-141.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-141.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a Number object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new Number(123)

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a Number object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new Number(123)
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-142.js
index c762596a2..c4aca5ea7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-142.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-142.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is the Math object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: Math

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is the Math object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: Math
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-143.js
index f525ab9fe..2723a8f9e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-143.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-143.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a Date object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new Date()

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a Date object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new Date()
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-144.js
index b3d4ed283..6e03121a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-144.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-144.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a RegExp object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new RegExp()

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a RegExp object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new RegExp()
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-145.js
index 889da7d22..da121110c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-145.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-145.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is the JSON object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: JSON

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is the JSON object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: JSON
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-146.js
index 92ca90398..f481055d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-146.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-146.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an Error object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new Error()

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an Error object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new Error()
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-147.js
index a4947e2fa..950dd4251 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-147.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-147.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is an Arguments object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: argObj

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is an Arguments object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: argObj
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-149.js
index dfd50d46a..ae14eb384 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-149.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-149.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is the global object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: fnGlobalObject()

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is the global object (8.10.5 step 4.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: fnGlobalObject()
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-15.js
index 20ba02141..187138e54 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-15.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-15.js

- * @description Object.create - argument 'Properties' is the Aguments object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var result = false;

-

-        var argObj = (function () { return arguments; })();

-

-        Object.defineProperty(argObj, "prop", {

-            get: function () {

-                result = ('[object Arguments]' === Object.prototype.toString.call(this));

-                return {};

-            },

-            enumerable: true

-        });

-

-        var newObj = Object.create({}, argObj);

-        return result && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is the Aguments object
+    (15.2.3.7 step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+
+        var argObj = (function () { return arguments; })();
+
+        Object.defineProperty(argObj, "prop", {
+            get: function () {
+                result = ('[object Arguments]' === Object.prototype.toString.call(this));
+                return {};
+            },
+            enumerable: true
+        });
+
+        var newObj = Object.create({}, argObj);
+        return result && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-150.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-150.js
index 77d3e7434..9811bd7e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-150.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-150.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-150.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is a string (value is 'false') which is treated as the value true (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: "false"

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is a string (value is 'false') which is treated as
+    the value true (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: "false"
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-151.js
index 95f9c4231..659aa0276 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-151.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-151.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is new Boolean(false) which is treated as the value true (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: new Boolean(false)

-            }

-        });

-

-        var beforeDeleted = newObj.hasOwnProperty("prop");

-

-        delete newObj.prop;

-

-        var afterDeleted = newObj.hasOwnProperty("prop");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is new Boolean(false) which is treated as the value
+    true (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: new Boolean(false)
+            }
+        });
+
+        var beforeDeleted = newObj.hasOwnProperty("prop");
+
+        delete newObj.prop;
+
+        var afterDeleted = newObj.hasOwnProperty("prop");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-152.js
index 50d8ed414..2a509baa1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-152.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-152.js

- * @description Object.create - 'value' property of one property in 'Properties' is present (8.10.5 step 5)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                value: 100

-            }

-        });

-

-        return newObj.prop === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is present (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                value: 100
+            }
+        });
+
+        return newObj.prop === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-153.js
index 6decc9821..bec6beefa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-153.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-153.js

- * @description Object.create - 'value' property of one property in 'Properties' is not present (8.10.5 step 5)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {}

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is not present (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {}
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-154.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-154.js
index 4b1fefb8e..709828207 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-154.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-154.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-154.js

- * @description Object.create - 'value' property of one property in 'Properties' is own data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                value: "ownDataProperty"

-            }

-        });

-

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own data property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                value: "ownDataProperty"
+            }
+        });
+
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-155.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-155.js
index ad79f31a5..568230247 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-155.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-155.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-155.js

- * @description Object.create - 'value' property of one property in 'Properties' is an inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "inheritedDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is an inherited data property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "inheritedDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-156.js
index 20846a496..31c2b6dbd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-156.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-156.js

- * @description Object.create - 'value' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        descObj.value = "ownDataProperty";

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own data property that overrides an inherited data property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        descObj.value = "ownDataProperty";
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-157.js
index f4d1cfee9..06523b5e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-157.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-157.js

- * @description Object.create - 'value' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownDataProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own data property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownDataProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-158.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-158.js
index 8b7afa595..bf3df5425 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-158.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-158.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-158.js

- * @description Object.create - 'value' property of one property in 'Properties' is own accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-159.js
index 1c6d3aa68..f1b5c9610 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-159.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-159.js

- * @description Object.create - 'value' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is an inherited accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-16.js
index c2d6df51c..e090341af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-16.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-16.js

- * @description Object.create - own enumerable data property in 'Properties' is defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {} 

-        });

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own enumerable data property in 'Properties' is
+    defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {} 
+        });
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-160.js
index 5079bda92..2a273a2a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-160.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-160.js

- * @description Object.create - 'value' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own accessor property that overrides an inherited data property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-161.js
index 0998ac349..69dc33a48 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-161.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-161.js

- * @description Object.create - 'value' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own accessor property that overrides an inherited accessor
+    property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-162.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-162.js
index 2cc3f6659..b1af60438 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-162.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-162.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-162.js

- * @description Object.create - 'value' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "value", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own accessor property without a get function (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "value", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-163.js
index c20bf0e0e..4cdbede50 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-163.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-163.js

- * @description Object.create - 'value' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "value", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is own accessor property without a get function, which overrides
+    an inherited accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "value", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-164.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-164.js
index 506bf44fb..1de1f2acf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-164.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-164.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-164.js

- * @description Object.create - 'value' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'value' property of one property in 'Properties'
+    is an inherited accessor property without a get function (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-165.js
index 57beb5c0c..178bd4825 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-165.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-165.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var Func = function (a, b) {

-            return a + b;

-        };

-

-        var fun = new Func();

-        fun.value = "FunValue";

-

-        var newObj = Object.create({}, {

-            prop: fun

-        });

-        return newObj.prop === "FunValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the 'value'
+    property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var Func = function (a, b) {
+            return a + b;
+        };
+
+        var fun = new Func();
+        fun.value = "FunValue";
+
+        var newObj = Object.create({}, {
+            prop: fun
+        });
+        return newObj.prop === "FunValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-166.js
index 445c08ed3..891335632 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-166.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-166.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var arr = [1, 2, 3];

-

-        arr.value = "ArrValue";

-

-        var newObj = Object.create({}, {

-            prop: arr

-        });

-

-        return newObj.prop === "ArrValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [1, 2, 3];
+
+        arr.value = "ArrValue";
+
+        var newObj = Object.create({}, {
+            prop: arr
+        });
+
+        return newObj.prop === "ArrValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-167.js
index dd9bef6a8..bc3063253 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-167.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-167.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var str = new String("abc");

-

-        str.value = "StrValue";

-

-        var newObj = Object.create({}, {

-            prop: str

-        });

-

-        return newObj.prop === "StrValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = new String("abc");
+
+        str.value = "StrValue";
+
+        var newObj = Object.create({}, {
+            prop: str
+        });
+
+        return newObj.prop === "StrValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-168.js
index 396d599f3..65f1125cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-168.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-168.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var booleanObj = new Boolean(false);

-

-        booleanObj.value = "BooleanValue";

-

-        var newObj = Object.create({}, {

-            prop: booleanObj

-        });

-

-        return newObj.prop === "BooleanValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var booleanObj = new Boolean(false);
+
+        booleanObj.value = "BooleanValue";
+
+        var newObj = Object.create({}, {
+            prop: booleanObj
+        });
+
+        return newObj.prop === "BooleanValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-169.js
index 5cc5366ec..86a73d759 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-169.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-169.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var numObj = new Number(123);

-

-        numObj.value = "NumValue";

-

-        var newObj = Object.create({}, {

-            prop: numObj

-        });

-

-        return newObj.prop === "NumValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var numObj = new Number(123);
+
+        numObj.value = "NumValue";
+
+        var newObj = Object.create({}, {
+            prop: numObj
+        });
+
+        return newObj.prop === "NumValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-17.js
index b92c513ed..26c993992 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-17.js

- * @description Object.create - own data property in 'Properties' which is not enumerable is not defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var props = {};

-        Object.defineProperty(props, "prop", {

-            value: {},

-            enumerable: false

-        });

-        var newObj = Object.create({}, props);

-

-        return !newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own data property in 'Properties' which is not
+    enumerable is not defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+        Object.defineProperty(props, "prop", {
+            value: {},
+            enumerable: false
+        });
+        var newObj = Object.create({}, props);
+
+        return !newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-170.js
index fbb3c76c2..50838931e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-170.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-170.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        try {

-            Math.value = "MathValue";

-

-            var newObj = Object.create({}, {

-                prop: Math

-            });

-

-            return newObj.prop === "MathValue";

-        } finally {

-            delete Math.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Math.value = "MathValue";
+
+            var newObj = Object.create({}, {
+                prop: Math
+            });
+
+            return newObj.prop === "MathValue";
+        } finally {
+            delete Math.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-171.js
index ba18b8505..dd5bd5d29 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-171.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-171.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var dateObj = new Date();

-

-        dateObj.value = "DateValue";

-

-        var newObj = Object.create({}, {

-            prop: dateObj

-        });

-

-        return newObj.prop === "DateValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var dateObj = new Date();
+
+        dateObj.value = "DateValue";
+
+        var newObj = Object.create({}, {
+            prop: dateObj
+        });
+
+        return newObj.prop === "DateValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-172.js
index 8dd2f53ae..9c9adee2c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-172.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-172.js

- * @description Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var regObj = new RegExp();

-

-        regObj.value = "RegExpValue";

-

-        var newObj = Object.create({}, {

-            prop: regObj

-        });

-

-        return newObj.prop === "RegExpValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a RegExp object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var regObj = new RegExp();
+
+        regObj.value = "RegExpValue";
+
+        var newObj = Object.create({}, {
+            prop: regObj
+        });
+
+        return newObj.prop === "RegExpValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-173.js
index 76fc77b5e..2465e25b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-173.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-173.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        try {

-            JSON.value = "JSONValue";

-

-            var newObj = Object.create({}, {

-                prop: JSON

-            });

-

-            return newObj.prop === "JSONValue";

-        } finally {

-            delete JSON.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            JSON.value = "JSONValue";
+
+            var newObj = Object.create({}, {
+                prop: JSON
+            });
+
+            return newObj.prop === "JSONValue";
+        } finally {
+            delete JSON.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-174.js
index 54cd9f718..4eed88a34 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-174.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-174.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var errorObj = new Error();

-

-        errorObj.value = "ErrorValue";

-

-        var newObj = Object.create({}, {

-            prop: errorObj

-        });

-

-        return newObj.prop === "ErrorValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var errorObj = new Error();
+
+        errorObj.value = "ErrorValue";
+
+        var newObj = Object.create({}, {
+            prop: errorObj
+        });
+
+        return newObj.prop === "ErrorValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-175.js
index 9216a1a5e..a10c404da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-175.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-175.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.value = "ArgValue";

-

-        var newObj = Object.create({}, {

-            prop: argObj

-        });

-

-        return newObj.prop === "ArgValue";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the
+    'value' property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.value = "ArgValue";
+
+        var newObj = Object.create({}, {
+            prop: argObj
+        });
+
+        return newObj.prop === "ArgValue";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-177.js
index d54ef7c16..e707598e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-177.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-177.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-

-        try {

-            fnGlobalObject().value = "GlobalValue";

-

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject()

-            });

-

-            return newObj.prop === "GlobalValue";

-        } finally {

-            delete fnGlobalObject().value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        try {
+            fnGlobalObject().value = "GlobalValue";
+
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject()
+            });
+
+            return newObj.prop === "GlobalValue";
+        } finally {
+            delete fnGlobalObject().value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-178.js
index b181a8c9e..32e7d05de 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-178.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-178.js

- * @description Object.create - 'writable' property of one property in 'Properties' is true (8.10.5 step 6)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: true

-            }

-        });

-

-        var beforeWrite = ((newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"));

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is true (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: true
+            }
+        });
+
+        var beforeWrite = ((newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined"));
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-179.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-179.js
index 31f23bc28..eaccecbc1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-179.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-179.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-179.js

- * @description Object.create - 'writable' property of one property in 'Properties' is not present (8.10.5 step 6)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                value: 100

-            }

-        });

-

-        var beforeWrite = (newObj.prop === 100);

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === 100);

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is not present (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                value: 100
+            }
+        });
+
+        var beforeWrite = (newObj.prop === 100);
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === 100);
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-18.js
index 93da06268..695fed325 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-18.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-18.js

- * @description Object.create - an enumerable inherited data property in 'Properties' is not defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        proto.prop = {};

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        var newObj = Object.create({}, child);

-

-        return !newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - an enumerable inherited data property in
+    'Properties' is not defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        proto.prop = {};
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        var newObj = Object.create({}, child);
+
+        return !newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-180.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-180.js
index c12b3fc84..529987f29 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-180.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-180.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-180.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: true

-            }

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own data property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: true
+            }
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-181.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-181.js
index 8a55a03f7..d947c00cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-181.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-181.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-181.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            writable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an inherited data property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            writable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-182.js
index 86c16dc28..cec7d4258 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-182.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-182.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            writable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        descObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own data property that overrides an inherited data
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            writable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        descObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-183.js
index 7b75feb13..13650c0f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-183.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-183.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "writable", {

-            value: true

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own data property that overrides an inherited
+    accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "writable", {
+            value: true
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-184.js
index d841acd7a..7952b9315 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-184.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-184.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-185.js
index 81e2443a6..b3eac77ca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-185.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-185.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an inherited accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-186.js
index 9c9433a54..6bb811e03 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-186.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-186.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            writable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    data property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            writable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-187.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-187.js
index 785a7d457..b1a93783a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-187.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-187.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-187.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-188.js
index c8f7e940b..0e24611e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-188.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-188.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var descObj = { value: 100 };

-

-        Object.defineProperty(descObj, "writable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.prop === 100);

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === 100);

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own accessor property without a get function
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = { value: 100 };
+
+        Object.defineProperty(descObj, "writable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.prop === 100);
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === 100);
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-189.js
index e1f91c994..da1905b80 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-189.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-189.js

- * @description Object.create - 'writable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "writable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is own accessor property without a get function,
+    which overrides an inherited accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "writable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-19.js
index fc85fe26c..b8cae8f1e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-19.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-19.js

- * @description Object.create -  own enumerable accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var props = {};

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        var newObj = Object.create({}, props);

-

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create -  own enumerable accessor property in 'Properties'
+    is defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        var newObj = Object.create({}, props);
+
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-190.js
index d05311921..21c9d1763 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-190.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-190.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var proto = { value: 100 };

-

-        Object.defineProperty(proto, "writable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var beforeWrite = (newObj.prop === 100);

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === 100);

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an inherited accessor property without a get
+    function (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { value: 100 };
+
+        Object.defineProperty(proto, "writable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var beforeWrite = (newObj.prop === 100);
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === 100);
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-191.js
index 790c8f575..bed0d5349 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-191.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-191.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var Func = function (a, b) {

-            return a + b;

-        };

-

-        var fun = new Func();

-        fun.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: fun

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var Func = function (a, b) {
+            return a + b;
+        };
+
+        var fun = new Func();
+        fun.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: fun
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-192.js
index 9c10fc7ba..2a6539b6c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-192.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-192.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var array = [1, 2, 3];

-

-        array.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: array

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var array = [1, 2, 3];
+
+        array.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: array
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-193.js
index 9528db032..d3c436f9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-193.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-193.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var str = new String("abc");

-

-        str.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: str

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = new String("abc");
+
+        str.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: str
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-194.js
index 4c8abc4e2..5be7ca980 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-194.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-194.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var booleanObj = new Boolean(false);

-

-        booleanObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: booleanObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var booleanObj = new Boolean(false);
+
+        booleanObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: booleanObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-195.js
index a3e33add9..411cbae7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-195.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-195.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var numObj = new Number(123);

-

-        numObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: numObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var numObj = new Number(123);
+
+        numObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: numObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-196.js
index 324c612cf..1a6a79e21 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-196.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-196.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        try {

-            Math.writable = true;

-

-            var newObj = Object.create({}, {

-                prop: Math

-            });

-

-            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-            newObj.prop = "isWritable";

-

-            var afterWrite = (newObj.prop === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Math.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Math.writable = true;
+
+            var newObj = Object.create({}, {
+                prop: Math
+            });
+
+            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+            newObj.prop = "isWritable";
+
+            var afterWrite = (newObj.prop === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Math.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-197.js
index cc5ed3743..b048f00de 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-197.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-197.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var dateObj = new Date();

-

-        dateObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: dateObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var dateObj = new Date();
+
+        dateObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: dateObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-198.js
index 4b0424b15..c9fd1d669 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-198.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-198.js

- * @description Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var regObj = new RegExp();

-

-        regObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: regObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a RegExp object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var regObj = new RegExp();
+
+        regObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: regObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-199.js
index b74e37546..3b2707315 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-199.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-199.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        try {

-            JSON.writable = true;

-

-            var newObj = Object.create({}, {

-                prop: JSON 

-            });

-

-            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-            newObj.prop = "isWritable";

-

-            var afterWrite = (newObj.prop === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete JSON.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            JSON.writable = true;
+
+            var newObj = Object.create({}, {
+                prop: JSON 
+            });
+
+            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+            newObj.prop = "isWritable";
+
+            var afterWrite = (newObj.prop === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete JSON.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-2.js
index e84197ba5..d5511d8c0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-2.js

- * @description Object.create - 'Properties' is undefined

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, undefined);

-        return (newObj instanceof Object);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.create - 'Properties' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, undefined);
+        return (newObj instanceof Object);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-20.js
index dbff16f38..ddce4152d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-20.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-20.js

- * @description Object.create - own accessor property in 'Properties' which is not enumerable is not defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var props = {};

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: false

-        });

-

-        var newObj = Object.create({}, props);

-

-        return !newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own accessor property in 'Properties' which is not
+    enumerable is not defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: false
+        });
+
+        var newObj = Object.create({}, props);
+
+        return !newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-200.js
index 197e4c49f..ca9585cd4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-200.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-200.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var errorObj = new Error();

-

-        errorObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: errorObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var errorObj = new Error();
+
+        errorObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: errorObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-201.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-201.js
index 35224d933..0b13f7865 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-201.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-201.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-201.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.writable = true;

-

-        var newObj = Object.create({}, {

-            prop: argObj

-        });

-

-        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-        newObj.prop = "isWritable";

-

-        var afterWrite = (newObj.prop === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the
+    'writable' property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.writable = true;
+
+        var newObj = Object.create({}, {
+            prop: argObj
+        });
+
+        var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+        newObj.prop = "isWritable";
+
+        var afterWrite = (newObj.prop === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-203.js
index 785d33ed3..e1179403a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-203.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-203.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        try {

-            fnGlobalObject().writable = true;

-

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject() 

-            });

-

-            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");

-

-            newObj.prop = "isWritable";

-

-            var afterWrite = (newObj.prop === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete fnGlobalObject().writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'writable'
+    property (8.10.5 step 6.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        try {
+            fnGlobalObject().writable = true;
+
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject() 
+            });
+
+            var beforeWrite = (newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined");
+
+            newObj.prop = "isWritable";
+
+            var afterWrite = (newObj.prop === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete fnGlobalObject().writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-204.js
index d75cb5260..a08555209 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-204.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-204.js

- * @description Object.create - 'writable' property of one property in 'Properties' is undefined (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                writable: undefined

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is undefined (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                writable: undefined
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-205.js
index c26712998..aacc4445f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-205.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-205.js

- * @description Object.create - 'writable' property of one property in 'Properties' is null (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: null

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is null (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: null
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-206.js
index 3a924b98b..dc2a25a74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-206.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-206.js

- * @description Object.create - 'writable' property of one property in 'Properties'  is true (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: true

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties'  is true (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: true
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-207.js
index 47f3d64d6..efdbedd54 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-207.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-207.js

- * @description Object.create - 'writable' property of one property in 'Properties' is false (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: false

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is false (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: false
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-208.js
index 8c9779649..13e50c099 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-208.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-208.js

- * @description Object.create - 'writable' property of one property in 'Properties' is 0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: 0

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is 0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: 0
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-209.js
index bf07b6c57..522377a05 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-209.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-209.js

- * @description Object.create - 'writable' property of one property in 'Properties' is +0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: +0

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is +0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: +0
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-21.js
index c7fa1e92a..ffed87727 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-21.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-21.js

- * @description Object.create - an enumerable inherited accessor property in 'Properties' is not defined in 'obj' (15.2.3.7 step 3)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        var newObj = Object.create({}, child);

-

-        return !newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - an enumerable inherited accessor property in
+    'Properties' is not defined in 'obj' (15.2.3.7 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        var newObj = Object.create({}, child);
+
+        return !newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-210.js
index 421cfdc37..d6e9d599c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-210.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-210.js

- * @description Object.create - 'writable' property of one property in 'Properties' is -0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: -0

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is -0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: -0
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-211.js
index 4a68d59a1..ab20eeb22 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-211.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-211.js

- * @description Object.create - 'writable' property of one property in 'Properties' is NaN (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: NaN

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is NaN (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: NaN
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-212.js
index 8c13a3ee3..1bddc8af2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-212.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-212.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a positive number primitive (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: 12

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a positive number primitive (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: 12
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-213.js
index d902f2aab..335ba037f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-213.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-213.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a negative number primitive (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: -9

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a negative number primitive (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: -9
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-214.js
index e50a42e18..033523048 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-214.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-214.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an empty string (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var descObj = {

-            writable: ""

-        };

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-

-        newObj.prop = 121;

-

-        return hasProperty && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an empty string (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var descObj = {
+            writable: ""
+        };
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        var hasProperty = newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+
+        newObj.prop = 121;
+
+        return hasProperty && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-215.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-215.js
index 70a00ee95..f5849eee3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-215.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-215.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-215.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a non-empty string (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: "abc"

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a non-empty string (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: "abc"
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-216.js
index 254a7670e..f0fa6ddb3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-216.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-216.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a Function object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: function () { }

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a Function object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: function () { }
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-217.js
index afe29e01d..3b3ee5b20 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-217.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-217.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an Array object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: []

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an Array object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: []
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-218.js
index b12f46fb4..2dab06c30 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-218.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-218.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a String object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new String()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a String object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new String()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-219.js
index 960f20727..7efa9aea7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-219.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-219.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a Boolean object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new Boolean()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a Boolean object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new Boolean()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-22.js
index a04dd654e..5c100e67c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-22.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-22.js

- * @description Object.create -  own enumerable data property that overrides an enumerable inherited data property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        proto.prop = {

-            value: "abc"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.prop = {

-            value: "bbq"

-        };

-        var newObj = Object.create({}, child);

-

-        return newObj.hasOwnProperty("prop") && newObj.prop === "bbq";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create -  own enumerable data property that overrides an
+    enumerable inherited data property in 'Properties' is defined in
+    'obj' (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        proto.prop = {
+            value: "abc"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.prop = {
+            value: "bbq"
+        };
+        var newObj = Object.create({}, child);
+
+        return newObj.hasOwnProperty("prop") && newObj.prop === "bbq";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-220.js
index 786f2c90c..53d67300d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-220.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-220.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a Number object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new Number()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a Number object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new Number()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-221.js
index cdc0f2b27..4ad0ea78f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-221.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-221.js

- * @description Object.create - 'writable' property of one property in 'Properties' is the Math object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: Math

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is the Math object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: Math
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-222.js
index 3f6c18829..75aa71796 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-222.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-222.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a Date object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new Date()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a Date object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new Date()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-223.js
index ca4e6edad..0526bbc4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-223.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-223.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a RegExp object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new RegExp()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a RegExp object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new RegExp()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-224.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-224.js
index 6a4db59e6..748c53c18 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-224.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-224.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-224.js

- * @description Object.create - 'writable' property of one property in 'Properties' is the JSON object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: JSON

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-        newObj.prop = 121;

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is the JSON object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: JSON
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+        newObj.prop = 121;
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-225.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-225.js
index 4e0e1c3cf..adf75074d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-225.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-225.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-225.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an Error object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new Error()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-        newObj.prop = 121;

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an Error object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new Error()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+        newObj.prop = 121;
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-226.js
index 749b73101..90efb60df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-226.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-226.js

- * @description Object.create - 'writable' property of one property in 'Properties' is an Arguments object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: argObj

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is an Arguments object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: argObj
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-228.js
index 00bff9b85..9c4230c31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-228.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-228.js

- * @description Object.create - 'writable' property of one property in 'Properties' is the global object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: fnGlobalObject()

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is the global object (8.10.5 step 6.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: fnGlobalObject()
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-229.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-229.js
index de5600fce..42ddfa190 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-229.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-229.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-229.js

- * @description Object.create - 'writable' property of one property in 'Properties' is a string (value is 'false') which is treated as the value true (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: "false"

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is a string (value is 'false') which is treated as
+    the value true (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: "false"
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-23.js
index c39f80739..c4f200488 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-23.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-23.js

- * @description Object.create - own enumerable data property that overrides an enumerable inherited accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return { value: 9 };

-            },

-            enumerable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "prop", {

-            value: {

-                value: 12

-            },

-            enumerable: true

-        });

-        var newObj = Object.create({}, child);

-

-        return newObj.hasOwnProperty("prop") && newObj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own enumerable data property that overrides an
+    enumerable inherited accessor property in 'Properties' is defined
+    in 'obj' (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return { value: 9 };
+            },
+            enumerable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "prop", {
+            value: {
+                value: 12
+            },
+            enumerable: true
+        });
+        var newObj = Object.create({}, child);
+
+        return newObj.hasOwnProperty("prop") && newObj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-230.js
index 2fecebb08..8610b7d1d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-230.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-230.js

- * @description Object.create - 'writable' property of one property in 'Properties' is new Boolean(false) which is treated as the value true (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                writable: new Boolean(false)

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 121;

-

-        return hasProperty && newObj.prop === 121;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'writable' property of one property in
+    'Properties' is new Boolean(false) which is treated as the value
+    true (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                writable: new Boolean(false)
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 121;
+
+        return hasProperty && newObj.prop === 121;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-231.js
index 563b4596d..92001895b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-231.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-231.js

- * @description Object.create - 'get'  property of one property in 'Properties' is present (8.10.5 step 7)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                get: function () {

-                    return "present";

-                }

-            }

-        });

-        return newObj.prop === "present";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get'  property of one property in 'Properties' is
+    present (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                get: function () {
+                    return "present";
+                }
+            }
+        });
+        return newObj.prop === "present";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-232.js
index 270f70370..cfe046816 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-232.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-232.js

- * @description Object.create - 'get'  property of one property in 'Properties' is not present (8.10.5 step 7)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {}

-        });

-        return typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get'  property of one property in 'Properties' is
+    not present (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {}
+        });
+        return typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-233.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-233.js
index bc12eabb9..fe3c22903 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-233.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-233.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-233.js

- * @description Object.create - 'get' property of one property in 'Properties' is own data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                get: function () {

-                    return "ownDataProperty";

-                }

-            }

-        });

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own data property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                get: function () {
+                    return "ownDataProperty";
+                }
+            }
+        });
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-234.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-234.js
index 5f257cc1c..ab9e6cac9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-234.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-234.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-234.js

- * @description Object.create - 'get' property of one property in 'Properties' is an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "inheritedDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    an inherited data property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "inheritedDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-235.js
index 54a15bcaa..38ffaf83a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-235.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-235.js

- * @description Object.create - 'get' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "get", {

-            value: function () {

-                return "ownDataProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "get", {
+            value: function () {
+                return "ownDataProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-236.js
index 5ef7fe074..fce1e81ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-236.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-236.js

- * @description Object.create - 'get' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "get", {

-            value: function () {

-                return "ownDataProperty";

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "get", {
+            value: function () {
+                return "ownDataProperty";
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-237.js
index 5dee0cb40..0d0e19c28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-237.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-237.js

- * @description Object.create - 'get' property of one property in 'Properties' is own accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-238.js
index 5ad3d4ea4..772ee301f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-238.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-238.js

- * @description Object.create - 'get' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.prop === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    an inherited accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.prop === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-239.js
index cc3fdb8cc..fff32869a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-239.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-239.js

- * @description Object.create - 'get' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-24.js
index 5caa0bc7e..976e4b78b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-24.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-24.js

- * @description Object.create - own enumerable accessor property that overrides an enumerable inherited data property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        proto.prop = {

-            value: 12

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "prop", {

-            get: function () {

-                return {

-                    value: 9

-                };

-            },

-            enumerable: true

-        });

-

-        var newObj = Object.create({}, child);

-

-        return newObj.hasOwnProperty("prop") && newObj.prop === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own enumerable accessor property that overrides an
+    enumerable inherited data property in 'Properties' is defined in
+    'obj' (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        proto.prop = {
+            value: 12
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "prop", {
+            get: function () {
+                return {
+                    value: 9
+                };
+            },
+            enumerable: true
+        });
+
+        var newObj = Object.create({}, child);
+
+        return newObj.hasOwnProperty("prop") && newObj.prop === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-240.js
index 40c32e1a9..d66572e19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-240.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-240.js

- * @description Object.create - 'get' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.prop === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.prop === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-241.js
index 7b6e4c8eb..b8403acd4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-241.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-241.js

- * @description Object.create - 'get' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var descObj = {};

-

-        Object.defineProperty(descObj, "get", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own accessor property without a get function (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var descObj = {};
+
+        Object.defineProperty(descObj, "get", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-242.js
index 839000b38..98784a606 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-242.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-242.js

- * @description Object.create - 'get' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "get", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    own accessor property without a get function, which overrides an
+    inherited accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "get", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-243.js
index 90c37b42d..6ea47a13e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-243.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-243.js

- * @description Object.create - 'get' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    an inherited accessor property without a get function (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-244.js
index c12424851..e79d42584 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-244.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-244.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var funObj = function () {};

-

-        funObj.get = function () {

-            return "VerifyFunctionObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: funObj

-        });

-

-        return newObj.prop === "VerifyFunctionObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the 'get'
+    property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () {};
+
+        funObj.get = function () {
+            return "VerifyFunctionObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: funObj
+        });
+
+        return newObj.prop === "VerifyFunctionObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-245.js
index fe74ad3d6..dfbe53530 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-245.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-245.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var arrayObj = [1, 2, 3];

-

-        arrayObj.get = function () {

-            return "VerifyArrayObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: arrayObj

-        });

-

-        return newObj.prop === "VerifyArrayObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrayObj = [1, 2, 3];
+
+        arrayObj.get = function () {
+            return "VerifyArrayObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: arrayObj
+        });
+
+        return newObj.prop === "VerifyArrayObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-246.js
index fe6804268..a66fa650a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-246.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-246.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var strObj = new String("abc");

-

-        strObj.get = function () {

-            return "VerifyStringObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: strObj

-        });

-

-        return newObj.prop === "VerifyStringObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("abc");
+
+        strObj.get = function () {
+            return "VerifyStringObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: strObj
+        });
+
+        return newObj.prop === "VerifyStringObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-247.js
index 69d46240a..032e09a5c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-247.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-247.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(true);

-

-        boolObj.get = function () {

-            return "VerifyBooleanObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: boolObj 

-        });

-

-        return newObj.prop === "VerifyBooleanObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(true);
+
+        boolObj.get = function () {
+            return "VerifyBooleanObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: boolObj 
+        });
+
+        return newObj.prop === "VerifyBooleanObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-248.js
index 95e559fe0..2917144dd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-248.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-248.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var numObj = new Number(5);

-

-        numObj.get = function () {

-            return "VerifyNumberObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: numObj 

-        });

-

-        return newObj.prop === "VerifyNumberObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(5);
+
+        numObj.get = function () {
+            return "VerifyNumberObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: numObj 
+        });
+
+        return newObj.prop === "VerifyNumberObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-249.js
index 8f6b48813..bcd99bcdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-249.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-249.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-

-        dateObj.get = function () {

-            return "VerifyDateObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: dateObj 

-        });

-

-        return newObj.prop === "VerifyDateObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+
+        dateObj.get = function () {
+            return "VerifyDateObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: dateObj 
+        });
+
+        return newObj.prop === "VerifyDateObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-25.js
index d5da21111..be7e809d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-25.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-25.js

- * @description Object.create - own enumerable accessor property that overrides an enumerable inherited accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a) 

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {

-                    value: 9

-                };

-            },

-            enumerable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "prop", {

-            get: function () {

-                return {

-                    value: 12

-                };

-            },

-            enumerable: true

-        });

-        var newObj = Object.create({}, child);

-

-        return newObj.hasOwnProperty("prop") && newObj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own enumerable accessor property that overrides an
+    enumerable inherited accessor property in 'Properties' is defined
+    in 'obj' (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {
+                    value: 9
+                };
+            },
+            enumerable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "prop", {
+            get: function () {
+                return {
+                    value: 12
+                };
+            },
+            enumerable: true
+        });
+        var newObj = Object.create({}, child);
+
+        return newObj.hasOwnProperty("prop") && newObj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-250.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-250.js
index 525228bf4..cdac7c4b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-250.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-250.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-250.js

- * @description Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-

-        regObj.get = function () {

-            return "VerifyRegExpObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: regObj

-        });

-

-        return newObj.prop === "VerifyRegExpObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a RegExp object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+
+        regObj.get = function () {
+            return "VerifyRegExpObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: regObj
+        });
+
+        return newObj.prop === "VerifyRegExpObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-251.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-251.js
index 9f1b6a574..5e434c063 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-251.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-251.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-251.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        try {

-            Math.get = function () {

-                return "VerifyMathObject";

-            };

-

-            var newObj = Object.create({}, {

-                prop: Math 

-            });

-

-            return newObj.prop === "VerifyMathObject";

-        } finally {

-            delete Math.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Math.get = function () {
+                return "VerifyMathObject";
+            };
+
+            var newObj = Object.create({}, {
+                prop: Math 
+            });
+
+            return newObj.prop === "VerifyMathObject";
+        } finally {
+            delete Math.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-252.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-252.js
index 60f9fb848..6b53ebf58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-252.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-252.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-252.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        JSON.get = function () {

-            return "VerifyJSONObject";

-        };

-

-        try {

-            var newObj = Object.create({}, {

-                prop: JSON 

-            });

-

-            return newObj.prop === "VerifyJSONObject";

-        } finally {

-            delete JSON.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        JSON.get = function () {
+            return "VerifyJSONObject";
+        };
+
+        try {
+            var newObj = Object.create({}, {
+                prop: JSON 
+            });
+
+            return newObj.prop === "VerifyJSONObject";
+        } finally {
+            delete JSON.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-253.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-253.js
index eec06cea9..a426d805f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-253.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-253.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-253.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var errObj = new Error("error");

-

-        errObj.get = function () {

-            return "VerifyErrorObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: errObj 

-        });

-

-        return newObj.prop === "VerifyErrorObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("error");
+
+        errObj.get = function () {
+            return "VerifyErrorObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: errObj 
+        });
+
+        return newObj.prop === "VerifyErrorObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-254.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-254.js
index abe6d7b39..2a5d30663 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-254.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-254.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-254.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.get = function () {

-            return "VerifyArgumentsObject";

-        };

-

-        var newObj = Object.create({}, {

-            prop: argObj

-        });

-

-        return newObj.prop === "VerifyArgumentsObject";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the 'get'
+    property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.get = function () {
+            return "VerifyArgumentsObject";
+        };
+
+        var newObj = Object.create({}, {
+            prop: argObj
+        });
+
+        return newObj.prop === "VerifyArgumentsObject";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-256.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-256.js
index fb5e46f11..d686fa1a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-256.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-256.js
@@ -1,27 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-256.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        fnGlobalObject().get = function () {

-            return "VerifyGlobalObject";

-        };

-

-        try {

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject()

-            });

-

-            return newObj.prop === "VerifyGlobalObject";

-        } finally {

-            delete fnGlobalObject().get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        fnGlobalObject().get = function () {
+            return "VerifyGlobalObject";
+        };
+
+        try {
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject()
+            });
+
+            return newObj.prop === "VerifyGlobalObject";
+        } finally {
+            delete fnGlobalObject().get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-257.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-257.js
index 7c698e03d..38a7e276a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-257.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-257.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-257.js

- * @description Object.create - 'get' property of one property in 'Properties' is undefined (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                get: undefined

-            }

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    undefined (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                get: undefined
+            }
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-258.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-258.js
index 40f29ef16..c3e45edde 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-258.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-258.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-258.js

- * @description Object.create - 'get' property of one property in 'Properties' is the primitive value null (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        try {

-            Object.create({}, {

-                prop: {

-                    get: null

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    the primitive value null (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.create({}, {
+                prop: {
+                    get: null
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-259.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-259.js
index 6003ac32d..761e65ff8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-259.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-259.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-259.js

- * @description Object.create - 'get' property of one property in 'Properties' is a boolean primitive (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        try {

-            Object.create({}, {

-                prop: {

-                    get: false

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    a boolean primitive (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.create({}, {
+                prop: {
+                    get: false
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-26.js
index 70ab28e62..66fdf48c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-26.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-26.js

- * @description Object.create - TypeError is thrown when own enumerable accessor property of 'Properties' without a get function (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = {};

-        Object.defineProperty(props, "prop", {

-            set: function () { },

-            enumerable: true

-        });

-        try {

-            Object.create({}, props);

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - TypeError is thrown when own enumerable accessor
+    property of 'Properties' without a get function (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+        Object.defineProperty(props, "prop", {
+            set: function () { },
+            enumerable: true
+        });
+        try {
+            Object.create({}, props);
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-260.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-260.js
index 387516da4..ec9fdbdea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-260.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-260.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-260.js

- * @description Object.create - 'get' property of one property in 'Properties' is a number primitive (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        try {

-            Object.create({}, {

-                prop: {

-                    get: 123

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    a number primitive (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.create({}, {
+                prop: {
+                    get: 123
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-261.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-261.js
index d4573c34f..8b521d4ee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-261.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-261.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-261.js

- * @description Object.create - 'get' property of one property in 'Properties' is a primitive string (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    get: "string"

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    a primitive string (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    get: "string"
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-262.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-262.js
index 7f479f80c..9b9662fd2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-262.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-262.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-262.js

- * @description Object.create - 'get' property of one property in 'Properties' is an Array object (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        try {

-            Object.create({}, {

-                prop: {

-                    get: [1, 2, 3]

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    an Array object (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.create({}, {
+                prop: {
+                    get: [1, 2, 3]
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-263.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-263.js
index dcf5354e1..47090d6e2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-263.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-263.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-263.js

- * @description Object.create - 'get' property of one property in 'Properties' is a function (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                get: function () { }

-            }

-        });

-

-        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'get' property of one property in 'Properties' is
+    a function (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                get: function () { }
+            }
+        });
+
+        return newObj.hasOwnProperty("prop") && typeof newObj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-266.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-266.js
index 565bf3a3a..248c824e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-266.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-266.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-266.js

- * @description Object.create - 'set' property of one property in 'Properties' is present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        var newObj = Object.create({}, {

-            prop: {

-                set: function (value) {

-                    data = value;

-                }

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    present (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+
+        var newObj = Object.create({}, {
+            prop: {
+                set: function (value) {
+                    data = value;
+                }
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-267.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-267.js
index 560e1410b..6ee5b2ace 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-267.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-267.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-267.js

- * @description Object.create - 'set' property of one property in 'Properties' is not present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                get: function () {

-                    return "data";

-                }

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && newObj.prop === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    not present (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                get: function () {
+                    return "data";
+                }
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && newObj.prop === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-268.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-268.js
index c5ddeb9d3..4c978a9bb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-268.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-268.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-268.js

- * @description Object.create - 'set' property of one property in 'Properties' is own data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        var newObj = Object.create({}, {

-            prop: {

-                set: function (value) {

-                    data = value;

-                }

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own data property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+
+        var newObj = Object.create({}, {
+            prop: {
+                set: function (value) {
+                    data = value;
+                }
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-269.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-269.js
index 43346cf4f..19853c711 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-269.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-269.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-269.js

- * @description Object.create - 'set' property of one property in 'Properties' is an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var proto = {

-            set: function (value) {

-                data = value;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: child 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    an inherited data property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var proto = {
+            set: function (value) {
+                data = value;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: child 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-27.js
index e6b9a1f11..7b4d53f98 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-27.js
@@ -1,39 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-27.js

- * @description Object.create - own enumerable accessor property in 'Properties' without a get function that overrides an enumerable inherited accessor property in 'Properties' is defined in 'obj' (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "prop", {

-            set: function () { },

-            enumerable: true

-        });

-

-        try {

-            Object.create({}, child);

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - own enumerable accessor property in 'Properties'
+    without a get function that overrides an enumerable inherited
+    accessor property in 'Properties' is defined in 'obj' (15.2.3.7
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "prop", {
+            set: function () { },
+            enumerable: true
+        });
+
+        try {
+            Object.create({}, child);
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-270.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-270.js
index f44ffb81f..50a3e84c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-270.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-270.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-270.js

- * @description Object.create - 'set' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-        var proto = {

-            set: function (value) {

-                data2 = value;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-        child.set = function (value) {

-            data1 = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: child 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+        var proto = {
+            set: function (value) {
+                data2 = value;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+        child.set = function (value) {
+            data1 = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: child 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-271.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-271.js
index 1a1e62347..a99a5a73c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-271.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-271.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-271.js

- * @description Object.create - 'set' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            value: function (value) {

-                data1 = value;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: child 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            value: function (value) {
+                data1 = value;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: child 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-272.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-272.js
index 92170eef9..f38841718 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-272.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-272.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-272.js

- * @description Object.create - 'set' property of one property in 'Properties' is own accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var descObj = {};

-

-        Object.defineProperty(descObj, "set", {

-            get: function () {

-                return function (value) {

-                    data = value;

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var descObj = {};
+
+        Object.defineProperty(descObj, "set", {
+            get: function () {
+                return function (value) {
+                    data = value;
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-273.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-273.js
index 91d99740e..d14a05260 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-273.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-273.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-273.js

- * @description Object.create - 'set' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var proto = {};

-

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: child 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    an inherited accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var proto = {};
+
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: child 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-274.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-274.js
index 5228d52cd..48e01d918 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-274.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-274.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-274.js

- * @description Object.create - 'set' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-

-        var proto = {};

-        proto.set = function (value) {

-            data2 = value;

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data1 = value;

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: child 

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+
+        var proto = {};
+        proto.set = function (value) {
+            data2 = value;
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data1 = value;
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: child 
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-275.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-275.js
index e43323920..8fd1b165b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-275.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-275.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-275.js

- * @description Object.create - 'set' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-        var proto = {};

-

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data1 = value;

-                };

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: child

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+        var proto = {};
+
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data1 = value;
+                };
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: child
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-276.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-276.js
index 20ccea5b7..7288ab87a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-276.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-276.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-276.js

- * @description Object.create - 'set' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var descObj = {};

-        Object.defineProperty(descObj, "set", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");

-

-        return hasProperty && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own accessor property without a get function (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var descObj = {};
+        Object.defineProperty(descObj, "set", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");
+
+        return hasProperty && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-277.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-277.js
index 1c8bbf310..0588aaa94 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-277.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-277.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-277.js

- * @description Object.create - 'set' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function () { };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: child

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");

-

-        return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    own accessor property without a get function, which overrides an
+    inherited accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function () { };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: child
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");
+
+        return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-278.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-278.js
index aa19e57db..7c12c34bc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-278.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-278.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-278.js

- * @description Object.create - 'set' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var child = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: child

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");

-

-        return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    an inherited accessor property without a get function (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var child = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: child
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");
+
+        return newObj.hasOwnProperty("prop") && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-279.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-279.js
index 06c1c6283..b01c8c273 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-279.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-279.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-279.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var funObj = function () { };

-        var data = "data";

-        funObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: funObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the 'set'
+    property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+        var data = "data";
+        funObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: funObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-28.js
index 30895d1e7..ddbf33bdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-28.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-28.js

- * @description Object.create - 'Properties' is a Function object which implements its own [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = function () { };

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a Function object which implements
+    its own [[Get]] method to access own enumerable property (15.2.3.7
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = function () { };
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-280.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-280.js
index ff4a32ad4..32840be58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-280.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-280.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-280.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var data = "data";

-        arrObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: arrObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var data = "data";
+        arrObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: arrObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-281.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-281.js
index c14253c0a..e3c6f12a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-281.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-281.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-281.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var strObj = new String();

-        var data = "data";

-        strObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: strObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String();
+        var data = "data";
+        strObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: strObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-282.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-282.js
index 8c69c3283..14b894d74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-282.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-282.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-282.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(true);

-        var data = "data";

-        boolObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: boolObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(true);
+        var data = "data";
+        boolObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: boolObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-283.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-283.js
index 0cb3a87e7..dae320db3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-283.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-283.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-283.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var numObj = new Number(5);

-        var data = "data";

-        numObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: numObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(5);
+        var data = "data";
+        numObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: numObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-284.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-284.js
index 1759ec79a..0f58587fa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-284.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-284.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-284.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        try {

-            Math.set = function (value) {

-                data = value;

-            };

-

-            var newObj = Object.create({}, {

-                prop: Math

-            });

-

-            var hasProperty = newObj.hasOwnProperty("prop");

-

-            newObj.prop = "overrideData";

-

-            return hasProperty && data === "overrideData";

-        } finally {

-            delete Math.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+
+        try {
+            Math.set = function (value) {
+                data = value;
+            };
+
+            var newObj = Object.create({}, {
+                prop: Math
+            });
+
+            var hasProperty = newObj.hasOwnProperty("prop");
+
+            newObj.prop = "overrideData";
+
+            return hasProperty && data === "overrideData";
+        } finally {
+            delete Math.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-285.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-285.js
index f23fe8589..1e7857a55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-285.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-285.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-285.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-        var data = "data";

-        dateObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: dateObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+        var data = "data";
+        dateObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: dateObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-286.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-286.js
index 1ec11bff3..c6236a4ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-286.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-286.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-286.js

- * @description Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-        var data = "data";

-        regObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: regObj

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a RegExp object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+        var data = "data";
+        regObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: regObj
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-287.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-287.js
index 948e89339..61bbfd44e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-287.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-287.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-287.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        try {

-            JSON.set = function (value) {

-                data = value;

-            };

-

-            var newObj = Object.create({}, {

-                prop: JSON

-            });

-

-            var hasProperty = newObj.hasOwnProperty("prop");

-

-            newObj.prop = "overrideData";

-

-            return hasProperty && data === "overrideData";

-        } finally {

-            delete JSON.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+
+        try {
+            JSON.set = function (value) {
+                data = value;
+            };
+
+            var newObj = Object.create({}, {
+                prop: JSON
+            });
+
+            var hasProperty = newObj.hasOwnProperty("prop");
+
+            newObj.prop = "overrideData";
+
+            return hasProperty && data === "overrideData";
+        } finally {
+            delete JSON.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-288.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-288.js
index 4651085b1..dabfb60c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-288.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-288.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-288.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var errObj = new Error("error");

-        var data = "data";

-

-        errObj.set = function (value) {

-            data = value;

-        };

-

-        var newObj = Object.create({}, {

-            prop: errObj

-        });

-

-        newObj.prop = "overrideData";

-

-        return newObj.hasOwnProperty("prop") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("error");
+        var data = "data";
+
+        errObj.set = function (value) {
+            data = value;
+        };
+
+        var newObj = Object.create({}, {
+            prop: errObj
+        });
+
+        newObj.prop = "overrideData";
+
+        return newObj.hasOwnProperty("prop") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-289.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-289.js
index 5615feb34..87208b6a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-289.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-289.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-289.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; })();

-

-        var data = "data";

-

-        argObj.set = function (value) {

-            data = value;

-        };

-

-        var newobj = Object.create({}, {

-            prop: argObj

-        });

-

-        var hasProperty = newobj.hasOwnProperty("prop");

-

-        newobj.prop = "overrideData";

-

-        return hasProperty && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the 'set'
+    property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; })();
+
+        var data = "data";
+
+        argObj.set = function (value) {
+            data = value;
+        };
+
+        var newobj = Object.create({}, {
+            prop: argObj
+        });
+
+        var hasProperty = newobj.hasOwnProperty("prop");
+
+        newobj.prop = "overrideData";
+
+        return hasProperty && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-29.js
index 62c39eb12..c09e1e2d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-29.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-29.js

- * @description Object.create - 'Properties' is an Array object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = [];

-        props.prop = {

-            value: {},

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is an Array object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = [];
+        props.prop = {
+            value: {},
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-291.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-291.js
index d3c24c0b0..d31d6ece5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-291.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-291.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-291.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        try {

-            fnGlobalObject().set = function (value) {

-                data = value;

-            };

-

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject()

-            });

-

-            var hasProperty = newObj.hasOwnProperty("prop");

-

-            newObj.prop = "overrideData";

-

-            return hasProperty && data === "overrideData";

-        } finally {

-            delete fnGlobalObject().set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var data = "data";
+
+        try {
+            fnGlobalObject().set = function (value) {
+                data = value;
+            };
+
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject()
+            });
+
+            var hasProperty = newObj.hasOwnProperty("prop");
+
+            newObj.prop = "overrideData";
+
+            return hasProperty && data === "overrideData";
+        } finally {
+            delete fnGlobalObject().set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-292.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-292.js
index de777cc66..ffe21c9d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-292.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-292.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-292.js

- * @description Object.create - 'set' property of one property in 'Properties' is undefined (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                set: undefined

-            }

-        });

-

-        newObj.prop = "overrideData";

-

-        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    undefined (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                set: undefined
+            }
+        });
+
+        newObj.prop = "overrideData";
+
+        return newObj.hasOwnProperty("prop") && typeof (newObj.prop) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-293.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-293.js
index 53eaf6613..1562d69db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-293.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-293.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-293.js

- * @description Object.create - 'set' property of one property in 'Properties' is a primitive value null (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: null

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a primitive value null (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: null
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-294.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-294.js
index 2a0d4f64d..8e11e6bd9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-294.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-294.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-294.js

- * @description Object.create - 'set' property of one property in 'Properties' is a primitive boolean value true (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: true

-                } 

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a primitive boolean value true (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: true
+                } 
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-295.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-295.js
index 18c78c5c6..ed51fad40 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-295.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-295.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-295.js

- * @description Object.create - 'set' property of one property in 'Properties' is a primitive number value (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: 123

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a primitive number value (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: 123
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-296.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-296.js
index 9ad65bdfa..21884b825 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-296.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-296.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-296.js

- * @description Object.create - 'set' property of one property in 'Properties' is a primitive string value (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: "abc"

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a primitive string value (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: "abc"
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-297.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-297.js
index 0160ba6e7..776c254f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-297.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-297.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-297.js

- * @description Object.create - 'set' property of one property in 'Properties' is an Date object (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: new Date()

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    an Date object (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: new Date()
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-298.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-298.js
index 01a6d857f..d8b20df27 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-298.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-298.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-298.js

- * @description Object.create - 'set' property of one property in 'Properties' is a function (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-        var data = "data";

-

-        var newObj = Object.create({}, {

-            prop: {

-                set: function (value) {

-                    data = value;

-                }

-            }

-        });

-

-        newObj.prop = "overrideData";

-

-        return newObj.hasOwnProperty("prop") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a function (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+
+        var newObj = Object.create({}, {
+            prop: {
+                set: function (value) {
+                    data = value;
+                }
+            }
+        });
+
+        newObj.prop = "overrideData";
+
+        return newObj.hasOwnProperty("prop") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-3.js
index 27fb1e897..cd6d080e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-3.js

- * @description Object.create throws TypeError if 'Properties' is null (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create throws TypeError if 'Properties' is null (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-30.js
index 9c6898b2f..a0d8faf02 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-30.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-30.js

- * @description Object.create - 'Properties' is a String object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new String();

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a String object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new String();
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-300.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-300.js
index e73359cb4..8db74f8c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-300.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-300.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-300.js

- * @description Object.create - 'set' property of one property in 'Properties' is a host object that isn't callable (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: fnGlobalObject()

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'set' property of one property in 'Properties' is
+    a host object that isn't callable (8.10.5 step 8.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: fnGlobalObject()
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-301.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-301.js
index 8af3f6b72..ba6e11728 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-301.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-301.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-301.js

- * @description Object.create - TypeError is thrown if both 'set' property and 'value' property of one property in 'Properties' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: function () { },

-                    value: 100

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - TypeError is thrown if both 'set' property and
+    'value' property of one property in 'Properties' are present
+    (8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: function () { },
+                    value: 100
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-302.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-302.js
index aa7798cd5..b2b5a41c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-302.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-302.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-302.js

- * @description Object.create - TypeError is thrown if both 'set' property and 'writable' property of one property in 'Properties' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    set: function () { },

-                    writable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - TypeError is thrown if both 'set' property and
+    'writable' property of one property in 'Properties' are present
+    (8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    set: function () { },
+                    writable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-303.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-303.js
index 10c088f83..99d623517 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-303.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-303.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-303.js

- * @description Object.create - TypeError is thrown if both 'get' property and 'value' property of one property in 'Properties' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    get: function () { },

-                    value: 100

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - TypeError is thrown if both 'get' property and
+    'value' property of one property in 'Properties' are present
+    (8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    get: function () { },
+                    value: 100
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-304.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-304.js
index c431a3d19..b10c79f82 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-304.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-304.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-304.js

- * @description Object.create - TypeError is thrown if both 'get' property and 'writable' property of one property in 'Properties' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: {

-                    get: function () { },

-                    writable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - TypeError is thrown if both 'get' property and
+    'writable' property of one property in 'Properties' are present
+    (8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: {
+                    get: function () { },
+                    writable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-305.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-305.js
index 3d6a94e37..e4f80f28c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-305.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-305.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-305.js

- * @description Object.create defines a data property when one property in 'Properties' is generic descriptor (8.12.9 step 4.a)

- */

-

-

-function testcase() {

-

-        try {

-            var newObj = Object.create({}, {

-                prop: {

-                    enumerable: true

-                }

-            });

-            return newObj.hasOwnProperty("prop");

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create defines a data property when one property in
+    'Properties' is generic descriptor (8.12.9 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            var newObj = Object.create({}, {
+                prop: {
+                    enumerable: true
+                }
+            });
+            return newObj.hasOwnProperty("prop");
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-306.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-306.js
index 329d31a4f..8c980c627 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-306.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-306.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-306.js

- * @description Object.create - [[Value]] is set as undefined if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-

-        try {

-            var newObj = Object.create({}, {

-                prop: {

-                    writable: true,

-                    configurable: true,

-                    enumerable: true

-                }

-            });

-            return newObj.hasOwnProperty("prop") && newObj.prop === undefined;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Value]] is set as undefined if it is absent in
+    data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            var newObj = Object.create({}, {
+                prop: {
+                    writable: true,
+                    configurable: true,
+                    enumerable: true
+                }
+            });
+            return newObj.hasOwnProperty("prop") && newObj.prop === undefined;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-307.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-307.js
index 41e876029..1edcfe152 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-307.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-307.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-307.js

- * @description Object.create - [[Writable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                value: 1001,

-                configurable: true,

-                enumerable: true

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        newObj.prop = 12;

-

-        return hasProperty && newObj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Writable]] is set as false if it is absent in
+    data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                value: 1001,
+                configurable: true,
+                enumerable: true
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        newObj.prop = 12;
+
+        return hasProperty && newObj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-308.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-308.js
index d7d8e5b68..5355e79da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-308.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-308.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-308.js

- * @description Object.create - [[Enumerable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var isEnumerable = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                value: 1001,

-                writable: true,

-                configurable: true

-            }

-        });

-

-        var hasProperty = newObj.hasOwnProperty("prop");

-

-        for (var p in newObj) {

-            if (p === "prop") {

-                isEnumerable = true;

-            }

-        }

-        return hasProperty && !isEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Enumerable]] is set as false if it is absent in
+    data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var isEnumerable = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                value: 1001,
+                writable: true,
+                configurable: true
+            }
+        });
+
+        var hasProperty = newObj.hasOwnProperty("prop");
+
+        for (var p in newObj) {
+            if (p === "prop") {
+                isEnumerable = true;
+            }
+        }
+        return hasProperty && !isEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-309.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-309.js
index 0a08caecd..947e5155b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-309.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-309.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-309.js

- * @description Object.create - [[Configurable]] is set as false if it is absent in data descriptor of one property in 'Properties' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var isNotConfigurable = false;

-

-        try {

-            var newObj = Object.create({}, {

-                prop: {

-                    value: 1001,

-                    writable: true,

-                    enumerable: true

-                }

-            });

-            var hasProperty = newObj.hasOwnProperty("prop");

-            delete newObj.prop;

-            isNotConfigurable = newObj.hasOwnProperty("prop");

-            return hasProperty && isNotConfigurable;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Configurable]] is set as false if it is absent
+    in data descriptor of one property in 'Properties' (8.12.9 step
+    4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var isNotConfigurable = false;
+
+        try {
+            var newObj = Object.create({}, {
+                prop: {
+                    value: 1001,
+                    writable: true,
+                    enumerable: true
+                }
+            });
+            var hasProperty = newObj.hasOwnProperty("prop");
+            delete newObj.prop;
+            isNotConfigurable = newObj.hasOwnProperty("prop");
+            return hasProperty && isNotConfigurable;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-31.js
index ec42b80a7..175868d1c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-31.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-31.js

- * @description Object.create - 'Properties' is a Boolean object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new Boolean(false);

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a Boolean object that uses
+    Object's [[Get]] method to access own enumerable property
+    (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Boolean(false);
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-310.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-310.js
index f84a8e804..7704b629a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-310.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-310.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-310.js

- * @description Object.create - [[Get]] is set as undefined if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                set: function () { },

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return newObj.hasOwnProperty("prop") && newObj.prop === undefined;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Get]] is set as undefined if it is absent in
+    accessor descriptor of one property in 'Properties' (8.12.9 step
+    4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                set: function () { },
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return newObj.hasOwnProperty("prop") && newObj.prop === undefined;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-311.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-311.js
index 3e3806f5d..68917de0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-311.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-311.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-311.js

- * @description Object.create - [[Set]] is set as undefined if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b)

- */

-

-

-function testcase() {

-        var newObj = Object.create({}, {

-            prop: {

-                get: function () {

-                    return "verifyCreate";

-                },

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");

-        var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";

-

-        var verifyGet = false;

-        if (newObj.prop === "verifyCreate") {

-            verifyGet = true;

-        }

-

-        var verifyEnumerable = false;

-        for (var p in newObj) {

-            if (p === "prop") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyConfigurable = false;

-        var hasProperty = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        verifyConfigurable = !newObj.hasOwnProperty("prop") && hasProperty;

-

-        return verifySet && verifyGet && verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Set]] is set as undefined if it is absent in
+    accessor descriptor of one property in 'Properties' (8.12.9 step
+    4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var newObj = Object.create({}, {
+            prop: {
+                get: function () {
+                    return "verifyCreate";
+                },
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(newObj, "prop");
+        var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";
+
+        var verifyGet = false;
+        if (newObj.prop === "verifyCreate") {
+            verifyGet = true;
+        }
+
+        var verifyEnumerable = false;
+        for (var p in newObj) {
+            if (p === "prop") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyConfigurable = false;
+        var hasProperty = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        verifyConfigurable = !newObj.hasOwnProperty("prop") && hasProperty;
+
+        return verifySet && verifyGet && verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-312.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-312.js
index 152f53b70..2b28d978c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-312.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-312.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-312.js

- * @description Object.create - [[Enumerable]] is set as false if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b)

- */

-

-

-function testcase() {

-        var isEnumerable = false;

-        var newObj = Object.create({}, {

-            prop: {

-                set: function () { },

-                get: function () { },

-                configurable: true

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-        for (var p in newObj) {

-            if (p === "prop") {

-                isEnumerable = true;

-            }

-        }

-        return hasProperty && !isEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Enumerable]] is set as false if it is absent in
+    accessor descriptor of one property in 'Properties' (8.12.9 step
+    4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var isEnumerable = false;
+        var newObj = Object.create({}, {
+            prop: {
+                set: function () { },
+                get: function () { },
+                configurable: true
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+        for (var p in newObj) {
+            if (p === "prop") {
+                isEnumerable = true;
+            }
+        }
+        return hasProperty && !isEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-313.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-313.js
index c9d0a0026..d21f49eeb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-313.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-313.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-313.js

- * @description Object.create - [[Configurable]] is set as false if it is absent in accessor descriptor of one property in 'Properties' (8.12.9 step 4.b)

- */

-

-

-function testcase() {       

-        var newObj = Object.create({}, {

-            prop: {

-                set: function () { },

-                get: function () { },

-                enumerable: true

-            }

-        });

-        var hasProperty = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var isNotConfigurable = newObj.hasOwnProperty("prop");

-        return hasProperty && isNotConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - [[Configurable]] is set as false if it is absent
+    in accessor descriptor of one property in 'Properties' (8.12.9
+    step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {       
+        var newObj = Object.create({}, {
+            prop: {
+                set: function () { },
+                get: function () { },
+                enumerable: true
+            }
+        });
+        var hasProperty = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var isNotConfigurable = newObj.hasOwnProperty("prop");
+        return hasProperty && isNotConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-314.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-314.js
index 5621b4a9b..02a77634f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-314.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-314.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-314.js

- * @description Object.create - some enumerable own property in 'Properties' is empty object (15.2.3.7 step 7)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            foo: {}

-        });

-        return newObj.hasOwnProperty("foo");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - some enumerable own property in 'Properties' is
+    empty object (15.2.3.7 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            foo: {}
+        });
+        return newObj.hasOwnProperty("foo");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-315.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-315.js
index da251845a..579d72348 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-315.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-315.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-315.js

- * @description Object.create - all properties in 'Properties' are enumerable (data property and accessor property) (15.2.3.7 step 7)

- */

-

-

-function testcase() {

-

-        var newObj = {};

-        function getFunc() {

-            return 10;

-        }

-        function setFunc(value) {

-            newObj.setVerifyHelpProp = value;

-        }

-

-        newObj = Object.create({}, {

-            foo1: {

-                value: 200,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            },

-            foo2: {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(newObj, "foo1", 200, true, true, true) &&

-            accessorPropertyAttributesAreCorrect(newObj, "foo2", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - all properties in 'Properties' are enumerable
+    (data property and accessor property) (15.2.3.7 step 7)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var newObj = {};
+        function getFunc() {
+            return 10;
+        }
+        function setFunc(value) {
+            newObj.setVerifyHelpProp = value;
+        }
+
+        newObj = Object.create({}, {
+            foo1: {
+                value: 200,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            },
+            foo2: {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(newObj, "foo1", 200, true, true, true) &&
+            accessorPropertyAttributesAreCorrect(newObj, "foo2", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-316.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-316.js
index 0601c1fa7..bfa14fcfe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-316.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-316.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-316.js

- * @description Object.create - enumerable properties of 'Properties' are given numerical names (15.2.3.7 step 7)

- */

-

-

-function testcase() {

-

-        function getFunc() {

-            return 20;

-        }

-        function setFunc() { }

-

-        var newObj = Object.create({}, {

-            0: {

-                value: 100,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            },

-            1: {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            },

-            2: {

-                value: 200,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            }

-        });

-        return newObj[0] === 100 && newObj[1] === 20 && newObj[2] === 200;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - enumerable properties of 'Properties' are given
+    numerical names (15.2.3.7 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function getFunc() {
+            return 20;
+        }
+        function setFunc() { }
+
+        var newObj = Object.create({}, {
+            0: {
+                value: 100,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            },
+            1: {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            },
+            2: {
+                value: 200,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            }
+        });
+        return newObj[0] === 100 && newObj[1] === 20 && newObj[2] === 200;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-32.js
index 5b3aa58a9..788888b28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-32.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-32.js

- * @description Object.create - 'Properties' is a Number object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new Number(-9);

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a Number object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Number(-9);
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-33.js
index 0a60b9f84..9f18eb385 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-33.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-33.js

- * @description Object.create - 'Properties' is the Math object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        try {

-            Math.prop = {

-                value: 12,

-                enumerable: true

-            };

-            var newObj = Object.create({}, Math);

-            return newObj.hasOwnProperty("prop");

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is the Math object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Math.prop = {
+                value: 12,
+                enumerable: true
+            };
+            var newObj = Object.create({}, Math);
+            return newObj.hasOwnProperty("prop");
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-34.js
index 8d6c037ab..445769bf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-34.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-34.js

- * @description Object.create - 'Properties' is a Date object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new Date();

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a Date object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Date();
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-35.js
index 766900370..4444418f4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-35.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-35.js

- * @description Object.create - 'Properties' is a RegExp object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new RegExp();

-        props.prop = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is a RegExp object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new RegExp();
+        props.prop = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-36.js
index e1a9b8288..cbd66097d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-36.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-36.js

- * @description Object.create - 'Properties' is the JSON object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        try {

-            JSON.prop = {

-                value: 12,

-                enumerable: true

-            };

-            var newObj = Object.create({}, JSON);

-            return newObj.hasOwnProperty("prop");

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is the JSON object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            JSON.prop = {
+                value: 12,
+                enumerable: true
+            };
+            var newObj = Object.create({}, JSON);
+            return newObj.hasOwnProperty("prop");
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
index 359ce95f9..ea47baf3d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-37.js

- * @description Object.create - 'Properties' is an Error object that uses Object's [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = new Error("test");

-

-        (Object.getOwnPropertyNames(props)).forEach(function(name){

-            props[name] = {value:11, configurable:true}

-        });

-

-        props.prop15_2_3_5_4_37 = {

-            value: 12,

-            enumerable: true

-        };

-        var newObj = Object.create({}, props);

-        return newObj.hasOwnProperty("prop15_2_3_5_4_37");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is an Error object that uses Object's
+    [[Get]] method to access own enumerable property (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Error("test");
+
+        (Object.getOwnPropertyNames(props)).forEach(function(name){
+            props[name] = {value:11, configurable:true}
+        });
+
+        props.prop15_2_3_5_4_37 = {
+            value: 12,
+            enumerable: true
+        };
+        var newObj = Object.create({}, props);
+        return newObj.hasOwnProperty("prop15_2_3_5_4_37");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-38.js
index 57eb1e4e8..6c8b16cc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-38.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-38.js

- * @description Object.create - 'Properties' is an Arguments object which implements its own [[Get]] method to access own enumerable property (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.prop = {

-            value: 12,

-            enumerable: true

-        };

-

-        var newObj = Object.create({}, argObj);

-

-        return newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'Properties' is an Arguments object which
+    implements its own [[Get]] method to access own enumerable
+    property (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.prop = {
+            value: 12,
+            enumerable: true
+        };
+
+        var newObj = Object.create({}, argObj);
+
+        return newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-39.js
index 8a3f2f2a2..0da05404d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-39.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-39.js

- * @description Object.create - ensure that side-effects of gets occur in the same order as they would for: for (P in props) props[P] (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var props = {};

-        props.prop1 = { value: 12, enumerable: true };

-        props.prop2 = { value: true, enumerable: true };

-

-        var tempArray = [];

-        for (var p in props) {

-            if (props.hasOwnProperty(p)) {

-                tempArray.push(p);

-            }

-        }

-

-        var newObj = Object.create({}, props);

-        var index = 0;

-        for (var q in newObj) {

-            if (tempArray[index++] !== q && newObj.hasOwnProperty(q)) {

-                return false;

-            }

-        }

-        return true;         

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - ensure that side-effects of gets occur in the same
+    order as they would for: for (P in props) props[P] (15.2.3.7 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+        props.prop1 = { value: 12, enumerable: true };
+        props.prop2 = { value: true, enumerable: true };
+
+        var tempArray = [];
+        for (var p in props) {
+            if (props.hasOwnProperty(p)) {
+                tempArray.push(p);
+            }
+        }
+
+        var newObj = Object.create({}, props);
+        var index = 0;
+        for (var q in newObj) {
+            if (tempArray[index++] !== q && newObj.hasOwnProperty(q)) {
+                return false;
+            }
+        }
+        return true;         
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-4.js
index 34a09e75a..e0cd6b9a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-4.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-4.js

- * @description Object.create - argument 'Properties' is an object (15.2.3.7 step 2).

- */

-

-

-function testcase() {

-

-        var props = {};

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Object;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is an object (15.2.3.7 step
+    2).
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = {};
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Object;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-40.js
index 3fd11b832..e38c7a1bd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-40.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-40.js

- * @description Object.create - ensure that if an exception is thrown it occurs in the correct order relative to prior and subsequent side-effects (15.2.3.7 step 5.a)

- */

-

-

-function testcase() {

-

-        var newObj = {};

-        var props = {};

-        var i = 0;

-

-        Object.defineProperty(props, "prop1", {

-            get: function () {

-                i++;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperty(props, "prop2", {

-            get: function () {

-                if (1 === i++) {

-                    throw new RangeError();

-                } else {

-                    return {};

-                }

-            },

-            enumerable: true

-        });

-

-        try {

-            newObj = Object.create({}, props);

-            return false;

-        } catch (e) {

-            return (e instanceof RangeError) && !newObj.hasOwnProperty("prop1") && i === 2;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - ensure that if an exception is thrown it occurs in
+    the correct order relative to prior and subsequent side-effects
+    (15.2.3.7 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = {};
+        var props = {};
+        var i = 0;
+
+        Object.defineProperty(props, "prop1", {
+            get: function () {
+                i++;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperty(props, "prop2", {
+            get: function () {
+                if (1 === i++) {
+                    throw new RangeError();
+                } else {
+                    return {};
+                }
+            },
+            enumerable: true
+        });
+
+        try {
+            newObj = Object.create({}, props);
+            return false;
+        } catch (e) {
+            return (e instanceof RangeError) && !newObj.hasOwnProperty("prop1") && i === 2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-41.js
index 26c89d6ff..0fc0ec65a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-41.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-41.js

- * @description Object.create - value of one property in 'Properties' is undefined (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: undefined 

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of one property in 'Properties' is undefined
+    (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: undefined 
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-42.js
index 9100eaadb..0149f5a35 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-42.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-42.js

- * @description Object.create - value of one property in 'Properties' is null (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: null 

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of one property in 'Properties' is null
+    (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: null 
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-43.js
index 4091d5b1c..317c9118a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-43.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-43.js

- * @description Object.create - value of one property in 'Properties' is false (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: false 

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of one property in 'Properties' is false
+    (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: false 
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-44.js
index e03eebe48..83d1d715c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-44.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-44.js

- * @description Object.create - value of one property in 'Properties' is a number primitive (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: 12 

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of one property in 'Properties' is a number
+    primitive (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: 12 
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-45.js
index 09f357110..545c8efdb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-45.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-45.js

- * @description Object.create - value of one property in 'Properties' is a string (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.create({}, {

-                prop: "abc" 

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of one property in 'Properties' is a string
+    (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.create({}, {
+                prop: "abc" 
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-46.js
index 7e0a83b8e..82caebf43 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-46.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-46.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is true (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: true

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is true (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: true
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-47.js
index 19c7ec676..9c9a1243e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-47.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-47.js

- * @description Object.create  - 'enumerable' property of one property in 'Properties' is not present (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {} 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create  - 'enumerable' property of one property in
+    'Properties' is not present (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {} 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-48.js
index b9fcfddbc..3632dc474 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-48.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-48.js

- * @description Object.create  - 'enumerable' property of one property in 'Properties' is own data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: true

-            } 

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create  - 'enumerable' property of one property in
+    'Properties' is own data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: true
+            } 
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-49.js
index 44a70fbad..8e997a9d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-49.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-49.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var proto = {

-            enumerable: true

-        };

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an inherited data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var proto = {
+            enumerable: true
+        };
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-5.js
index a8637ea33..29643aca4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-5.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-5.js

- * @description Object.create - argument 'Properties' is a Function object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var props = function () { };

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Function;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a Function object
+    (15.2.3.7 step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = function () { };
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Function;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-50.js
index 353ef477c..bd1b29315 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-50.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-50.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own data property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var proto = {

-            enumerable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "enumerable", {

-            value: false

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own data property that overrides an inherited data
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var proto = {
+            enumerable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "enumerable", {
+            value: false
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-51.js
index 167bbe3e5..5dc9f239c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-51.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-51.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own data property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "enumerable", {

-            value: false

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own data property that overrides an inherited
+    accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "enumerable", {
+            value: false
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-52.js
index 7eb16331d..e9343b86f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-52.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-52.js

- * @description Object.create - 'enumerable' property  of one property in 'Properties' is own accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var descObj = {};

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property  of one property in
+    'Properties' is own accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var descObj = {};
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-53.js
index 605245795..4870c77fd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-53.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-53.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-54.js
index 06271d024..b977963c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-54.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-54.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own accessor property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var proto = {

-            enumerable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var proto = {
+            enumerable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-55.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-55.js
index 8b7163da8..15a31acce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-55.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-55.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-55.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        var accessed = false;

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own accessor property that overrides an inherited
+    accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        var accessed = false;
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-56.js
index ddc9fe388..695396e44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-56.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-56.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = {};

-        Object.defineProperty(descObj, "enumerable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own accessor property without a get function
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = {};
+        Object.defineProperty(descObj, "enumerable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-57.js
index ca5f25e7f..e2a08b98e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-57.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-57.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is own accessor property without a get function, which overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var proto = {};

-        var accessed = false;

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        Object.defineProperty(descObj, "enumerable", {

-            set: function () { }

-        });

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is own accessor property without a get function,
+    which overrides an inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        var accessed = false;
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        Object.defineProperty(descObj, "enumerable", {
+            set: function () { }
+        });
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-58.js
index 3596695a7..d7da85d46 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-58.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-58.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an inherited accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var descObj = new ConstructFun();

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an inherited accessor property without a get
+    function (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var descObj = new ConstructFun();
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-59.js
index 230f15a69..605930650 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-59.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-59.js

- * @description Object.create - one property in 'Properties' is a Function object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = function () { };

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Function object
+    which implements its own [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = function () { };
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-6.js
index 718fc1102..46d803a16 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-6.js

- * @description Object.create - argument 'Properties' is an Array object (15.2.3.7 step 2).

- */

-

-

-function testcase() {

-

-        var props = [];

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Array;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is an Array object (15.2.3.7
+    step 2).
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = [];
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Array;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-60.js
index 2853006b0..9ad8a2692 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-60.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-60.js

- * @description Object.create - one property in 'Properties' is an Array object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-

-        var accessed = false;

-        var descObj = [];

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Array object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+
+        var accessed = false;
+        var descObj = [];
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-61.js
index 602c04d98..dc151ad74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-61.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-61.js

- * @description Object.create - one property in 'Properties' is a String object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new String();

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a String object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new String();
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-62.js
index 57a548ff2..d75e06d2a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-62.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-62.js

- * @description Object.create - one property in 'Properties' is a Boolean object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new Boolean(false);

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Boolean object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new Boolean(false);
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-63.js
index ec541193f..deca09685 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-63.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-63.js

- * @description Object.create - one property in 'Properties' is a Number object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new Number(-9);

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Number object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new Number(-9);
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-64.js
index 4f32bd625..c30775ef5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-64.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-64.js

- * @description Object.create - one property in 'Properties' is the Math object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        try {

-            Math.enumerable = true;

-

-            var newObj = Object.create({}, {

-                prop: Math 

-            });

-            for (var property in newObj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete Math.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the Math object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        try {
+            Math.enumerable = true;
+
+            var newObj = Object.create({}, {
+                prop: Math 
+            });
+            for (var property in newObj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete Math.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-65.js
index a2dd82fe8..ce18e3b98 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-65.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-65.js

- * @description Object.create - one property in 'Properties' is a Date object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new Date();

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a Date object that
+    uses Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new Date();
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-66.js
index 8a6541f15..906e372c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-66.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-66.js

- * @description Object.create - one property in 'Properties' is a RegExp object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new RegExp();

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is a RegExp object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new RegExp();
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-67.js
index 5bbd08d5c..49e17413f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-67.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-67.js

- * @description Object.create - one property in 'Properties' is the JSON object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        try {

-            JSON.enumerable = true;

-

-            var newObj = Object.create({}, {

-                prop: JSON

-            });

-            for (var property in newObj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete JSON.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the JSON object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        try {
+            JSON.enumerable = true;
+
+            var newObj = Object.create({}, {
+                prop: JSON
+            });
+            for (var property in newObj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete JSON.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-68.js
index badddaf53..5449b7b9d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-68.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-68.js

- * @description Object.create - one property in 'Properties' is an Error object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var descObj = new Error();

-

-        descObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Error object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var descObj = new Error();
+
+        descObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-69.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-69.js
index 46651bf00..7dcb4cdf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-69.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-69.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-69.js

- * @description Object.create - one property in 'Properties' is an Arguments object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-        var argObj = (function () { return arguments; })();

-

-        argObj.enumerable = true;

-

-        var newObj = Object.create({}, {

-            prop: argObj

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is an Arguments
+    object which implements its own [[Get]] method to access the
+    'enumerable' property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+        var argObj = (function () { return arguments; })();
+
+        argObj.enumerable = true;
+
+        var newObj = Object.create({}, {
+            prop: argObj
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-7.js
index b5a9792ca..f752c1f87 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-7.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-7.js

- * @description Object.create - argument 'Properties' is a String object (15.2.3.7 step 2)

- */

-

-

-function testcase() {

-

-        var props = new String();

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof String;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a String object (15.2.3.7
+    step 2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new String();
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof String;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-71.js
index 1e0347e1c..06bbbd371 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-71.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-71.js

- * @description Object.create - one property in 'Properties' is the global object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        try {

-            fnGlobalObject().enumerable = true;

-

-            var newObj = Object.create({}, {

-                prop: fnGlobalObject()

-            });

-            for (var property in newObj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete fnGlobalObject().enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - one property in 'Properties' is the global object
+    that uses Object's [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        try {
+            fnGlobalObject().enumerable = true;
+
+            var newObj = Object.create({}, {
+                prop: fnGlobalObject()
+            });
+            for (var property in newObj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete fnGlobalObject().enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-72.js
index 6afff2bdb..b4f75b4c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-72.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-72.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is undefined (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: undefined

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is undefined (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: undefined
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-73.js
index 13e38db80..11ca51da2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-73.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-73.js

- * @description Object.create - value of 'enumerable' property of one property in 'Properties' is null (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: null

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - value of 'enumerable' property of one property in
+    'Properties' is null (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: null
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-74.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-74.js
index 7124e965c..3541d0418 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-74.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-74.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-74.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is true (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: true

-            } 

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is true (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: true
+            } 
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-75.js
index 3fd3bc854..48ebe7bb2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-75.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-75.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is false (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-

-        var accessed = false;

-        var descObj = {

-            enumerable: false

-        };

-

-        var newObj = Object.create({}, {

-            prop: descObj

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is false (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+
+        var accessed = false;
+        var descObj = {
+            enumerable: false
+        };
+
+        var newObj = Object.create({}, {
+            prop: descObj
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-76.js
index 9fe510bbd..bb6c21de6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-76.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-76.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is 0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: 0

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is 0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: 0
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-77.js
index c5811a2c7..39063d6af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-77.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-77.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is +0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: +0

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is +0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: +0
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-78.js
index ee7a3f7ec..9b7827240 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-78.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-78.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is -0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: -0

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is -0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: -0
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-79.js
index 42b52143b..ff7491bea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-79.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-79.js

- * @description Object.create -  'enumerable' property of one property in 'Properties' is NaN (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-       

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: NaN

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create -  'enumerable' property of one property in
+    'Properties' is NaN (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+       
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: NaN
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-8.js
index e5474954c..1f00adfff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-8.js

- * @description Object.create - argument 'Properties' is a Boolean object whose primitive value is true (15.2.3.7 step 2).

- */

-

-

-function testcase() {

-

-        var props = new Boolean(true);

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Boolean;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a Boolean object whose
+    primitive value is true (15.2.3.7 step 2).
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Boolean(true);
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Boolean;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-80.js
index e03133dfb..0ebafe8e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-80.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-80.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a positive number primitive (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: 12

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a positive number primitive (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: 12
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-81.js
index 8dc8978b0..85fb9502a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-81.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-81.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a negative number primitive (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: -9

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a negative number primitive (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: -9
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-82.js
index d848796ff..0372b89c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-82.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-82.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: ""

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed && newObj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: ""
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed && newObj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-83.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-83.js
index a77811bd3..637070d10 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-83.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-83.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-83.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a non-empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: "AB\n\\cd"

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a non-empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: "AB\n\\cd"
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-84.js
index 0e460058d..a7718601e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-84.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-84.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a Function object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: function () { }

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a Function object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: function () { }
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-85.js
index e5ee34145..b26999338 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-85.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-85.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an Array object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: []

-            }

-        });

-

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an Array object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: []
+            }
+        });
+
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-86.js
index 997980119..b26d958e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-86.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-86.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a String object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new String()

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a String object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new String()
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-87.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-87.js
index e3d490612..28b67176a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-87.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-87.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-87.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a Boolean object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new Boolean(true)

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a Boolean object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new Boolean(true)
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-88.js
index 62914dd6b..2e74cf76d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-88.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-88.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a Number object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new Number(-9)

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a Number object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new Number(-9)
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-89.js
index 9d86598f1..e0e577884 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-89.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-89.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is the Math object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: Math

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is the Math object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: Math
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-9.js
index 4bffa31c2..c694800fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-9.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-9.js

- * @description Object.create - argument 'Properties' is a Number object whose primitive value is any interesting number (15.2.3.7 step 2).

- */

-

-

-function testcase() {

-

-        var props = new Number(12);

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Number;

-                return {};

-            },

-            enumerable: true

-        });

-        Object.create({}, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - argument 'Properties' is a Number object whose
+    primitive value is any interesting number (15.2.3.7 step 2).
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var props = new Number(12);
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Number;
+                return {};
+            },
+            enumerable: true
+        });
+        Object.create({}, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-90.js
index bc778b69f..f47fd9f2f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-90.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-90.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a Date object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new Date()

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a Date object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new Date()
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-91.js
index 21766aee0..af77cc162 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-91.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-91.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a RegExp object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new RegExp()

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a RegExp object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new RegExp()
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-92.js
index 9acf9abc5..297afb416 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-92.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-92.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is the JSON object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: JSON

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is the JSON object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: JSON
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-93.js
index 58bb770d2..4a068a2d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-93.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-93.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an Error object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new Error()

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an Error object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new Error()
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-94.js
index 19cf00808..edc449180 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-94.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-94.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is an Arguments object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var argObj = (function () { return arguments; })();

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: argObj

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is an Arguments object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var argObj = (function () { return arguments; })();
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: argObj
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-96.js
index d4f5aa133..cde1bf603 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-96.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-96.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is the global object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: fnGlobalObject()

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is the global object (8.10.5 step 3.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: fnGlobalObject()
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-97.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-97.js
index 02448d57d..d407ed87b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-97.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-97.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-97.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is a string (value is 'false'), which is treated as the value true (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: "false"

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is a string (value is 'false'), which is treated as
+    the value true (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: "false"
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-98.js
index f5a56793e..212837f77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-98.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-98.js

- * @description Object.create - 'enumerable' property of one property in 'Properties' is new Boolean(false), which is treated as the value true (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var newObj = Object.create({}, {

-            prop: {

-                enumerable: new Boolean(false)

-            }

-        });

-        for (var property in newObj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'enumerable' property of one property in
+    'Properties' is new Boolean(false), which is treated as the value
+    true (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var newObj = Object.create({}, {
+            prop: {
+                enumerable: new Boolean(false)
+            }
+        });
+        for (var property in newObj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-99.js
index e2e656f00..6e873bccb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-99.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.5/15.2.3.5-4-99.js

- * @description Object.create - 'configurable' property of one property in 'Properties' is true (8.10.5 step 4)

- */

-

-

-function testcase() {

-

-        var newObj = Object.create({}, {

-            prop: {

-                configurable: true

-            }

-        });

-

-        var result1 = newObj.hasOwnProperty("prop");

-        delete newObj.prop;

-        var result2 = newObj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.create - 'configurable' property of one property in
+    'Properties' is true (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newObj = Object.create({}, {
+            prop: {
+                configurable: true
+            }
+        });
+
+        var result1 = newObj.hasOwnProperty("prop");
+        delete newObj.prop;
+        var result2 = newObj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-1.js
index c9f48dc26..ed36d3527 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-1.js

- * @description Object.defineProperty must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.defineProperty;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.defineProperty;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-2.js
index 71d533903..d068cd7b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-0-2.js

- * @description Object.defineProperty must exist as a function taking 3 parameters

- */

-

-

-function testcase() {

-  if (Object.defineProperty.length === 3) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty must exist as a function taking 3 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.defineProperty.length === 3) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-1.js
index 2c596c6ca..712e0ea32 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-1.js

- * @description Object.defineProperty applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(undefined, "foo", {});

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(undefined, "foo", {});
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-2.js
index a155f823f..d45694ef9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-2.js

- * @description Object.defineProperty applied to null throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(null, "foo", {});

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(null, "foo", {});
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-3.js
index 4c029e3c2..30ebae21f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-3.js

- * @description Object.defineProperty applied to number primitive throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(5, "foo", {});

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty applied to number primitive throws a
+    TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(5, "foo", {});
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-4.js
index d79ebd929..3b46f379e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1-4.js

- * @description Object.defineProperty applied to string primitive throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty("hello\nworld\\!", "foo", {});

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty applied to string primitive throws a
+    TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty("hello\nworld\\!", "foo", {});
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1.js
index e51301056..9c1304726 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-1.js

- * @description Object.defineProperty throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.defineProperty(true, "foo", {});

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty throws TypeError if type of first param is
+    not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.defineProperty(true, "foo", {});
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-1.js
index 643e6f35a..509b13a2b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-1.js

- * @description Object.defineProperty - argument 'P' is undefined that converts to string 'undefined'

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, undefined, {});

-

-        return obj.hasOwnProperty("undefined");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is undefined that converts to
+    string 'undefined'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, undefined, {});
+
+        return obj.hasOwnProperty("undefined");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-10.js
index 83cea7e1a..339fd020f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-10.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-10.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is a negative number)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, -20, {});

-

-        return obj.hasOwnProperty("-20");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is a negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, -20, {});
+
+        return obj.hasOwnProperty("-20");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-11.js
index 7f634c3f6..ec52e96c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-11.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is Infinity)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, Infinity, {});

-

-        return obj.hasOwnProperty("Infinity");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, Infinity, {});
+
+        return obj.hasOwnProperty("Infinity");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-12.js
index 6f21c4d4e..0b03fdba6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-12.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-12.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is +Infinity)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, +Infinity, {});

-

-        return obj.hasOwnProperty("Infinity");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is +Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, +Infinity, {});
+
+        return obj.hasOwnProperty("Infinity");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-13.js
index 82eaa17a4..af9adf1e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-13.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-13.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is -Infinity)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, -Infinity, {});

-

-        return obj.hasOwnProperty("-Infinity");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, -Infinity, {});
+
+        return obj.hasOwnProperty("-Infinity");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-14.js
index 9daed0b1a..0c5388021 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-14.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-14.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 20 zeros))

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 100000000000000000000, {});

-

-        return obj.hasOwnProperty("100000000000000000000");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 20 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 100000000000000000000, {});
+
+        return obj.hasOwnProperty("100000000000000000000");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-15.js
index f5d5a2ddc..b808625d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-15.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-15.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 21 zeros))

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1000000000000000000000, {});

-

-        return obj.hasOwnProperty("1e+21");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 21 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1000000000000000000000, {});
+
+        return obj.hasOwnProperty("1e+21");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-16.js
index b7d58a383..7b8a66cf2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-16.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-16.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 22 zeros))

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 10000000000000000000000, {});

-

-        return obj.hasOwnProperty("1e+22");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 22 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 10000000000000000000000, {});
+
+        return obj.hasOwnProperty("1e+22");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17-1.js
index f4b416302..87c5a3aa3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17-1.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(trailing 5 zeros))

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 000001, {});

-

-        return obj.hasOwnProperty("1");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(trailing 5 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 000001, {});
+
+        return obj.hasOwnProperty("1");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17.js
index 956715ede..2e23aa56f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-17.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e+20)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e+20, {});

-

-        return obj.hasOwnProperty("100000000000000000000");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1e+20)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e+20, {});
+
+        return obj.hasOwnProperty("100000000000000000000");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-18.js
index 3afc34d76..31191c12a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-18.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-18.js

- * @description Object.defineProperty - argument 'P' is a number that converts to string (value is 1e+21)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e+21, {});

-

-        return obj.hasOwnProperty("1e+21");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    string (value is 1e+21)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e+21, {});
+
+        return obj.hasOwnProperty("1e+21");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-19.js
index 76ad5009c..b8dceda31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-19.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-19.js

- * @description Object.defineProperty - argument 'P' is a number that converts to string (value is 1e+22)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e+22, {});

-

-        return obj.hasOwnProperty("1e+22");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    string (value is 1e+22)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e+22, {});
+
+        return obj.hasOwnProperty("1e+22");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-2.js
index 934733239..aca3e1580 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-2.js

- * @description Object.defineProperty - argument 'P' is null that converts to string 'null'

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, null, {});

-

-        return obj.hasOwnProperty("null");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is null that converts to
+    string 'null'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, null, {});
+
+        return obj.hasOwnProperty("null");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-20.js
index 2f81e33ae..e69979c47 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-20.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-20.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.000001)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 0.000001, {});

-

-        return obj.hasOwnProperty("0.000001");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 0.000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 0.000001, {});
+
+        return obj.hasOwnProperty("0.000001");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-21.js
index 8197f6e67..e62e552a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-21.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-21.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.0000001)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 0.0000001, {});

-

-        return obj.hasOwnProperty("1e-7");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 0.0000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 0.0000001, {});
+
+        return obj.hasOwnProperty("1e-7");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-22.js
index 70a580c84..26b5e61e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-22.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-22.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 0.00000001)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 0.00000001, {});

-

-        return obj.hasOwnProperty("1e-8");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 0.00000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 0.00000001, {});
+
+        return obj.hasOwnProperty("1e-8");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-23.js
index edab30d3f..f3297f8ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-23.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-23.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-7)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e-7, {});

-

-        return obj.hasOwnProperty("1e-7");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1e-7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e-7, {});
+
+        return obj.hasOwnProperty("1e-7");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-24.js
index 69328f49a..54f99fc2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-24.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-24.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-6)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e-6, {});

-

-        return obj.hasOwnProperty("0.000001");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1e-6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e-6, {});
+
+        return obj.hasOwnProperty("0.000001");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-25.js
index e0eb145e1..33e57c9f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-25.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-25.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1e-5)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1e-5, {});

-

-        return obj.hasOwnProperty("0.00001");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1e-5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1e-5, {});
+
+        return obj.hasOwnProperty("0.00001");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-26.js
index 08b3ed3af..3ab748563 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-26.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-26.js

- * @description Object.defineProperty - argument 'P' is an integer that converts to a string (value is 123)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 123, {});

-

-        return obj.hasOwnProperty("123");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an integer that converts
+    to a string (value is 123)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 123, {});
+
+        return obj.hasOwnProperty("123");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-27.js
index 41f2b8195..abaa8c38d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-27.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-27.js

- * @description Object.defineProperty - argument 'P' is a decimal that converts to a string (value is 123.456)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 123.456, {});

-

-        return obj.hasOwnProperty("123.456");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a decimal that converts to
+    a string (value is 123.456)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 123.456, {});
+
+        return obj.hasOwnProperty("123.456");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-28.js
index 227ffaf85..95aa4b0c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-28.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-28.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 19 zeros).1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 10000000000000000000.1, {});

-

-        return obj.hasOwnProperty("10000000000000000000");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 19 zeros).1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 10000000000000000000.1, {});
+
+        return obj.hasOwnProperty("10000000000000000000");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-29.js
index da4a9ffd2..1d4509c9a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-29.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-29.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 20 zeros).1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 100000000000000000000.1, {});

-

-        return obj.hasOwnProperty("100000000000000000000");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 20 zeros).1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 100000000000000000000.1, {});
+
+        return obj.hasOwnProperty("100000000000000000000");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-3.js
index 2287ed50d..78415acb3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-3.js

- * @description Object.defineProperty - argument 'P' is a boolean whose value is false

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, false, {});

-

-        return obj.hasOwnProperty("false");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a boolean whose value is
+    false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, false, {});
+
+        return obj.hasOwnProperty("false");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-30.js
index ab74c52ad..40f9d1013 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-30.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-30.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 21 zeros).1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 1000000000000000000000.1, {});

-

-        return obj.hasOwnProperty("1e+21");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 21 zeros).1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 1000000000000000000000.1, {});
+
+        return obj.hasOwnProperty("1e+21");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-31.js
index 7593eba1a..9502ac4be 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-31.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-31.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 1(following 22 zeros).1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 10000000000000000000000.1, {});

-

-        return obj.hasOwnProperty("1e+22");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 1(following 22 zeros).1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 10000000000000000000000.1, {});
+
+        return obj.hasOwnProperty("1e+22");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-32.js
index 70f24d872..7806da03a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-32.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-32.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 123.1234567)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 123.1234567, {});

-

-        return obj.hasOwnProperty("123.1234567");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 123.1234567)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 123.1234567, {});
+
+        return obj.hasOwnProperty("123.1234567");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-33.js
index 1fe107f2f..4fdc49ef2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-33.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-33.js

- * @description Object.defineProperty - argument 'P' is applied to an empty string 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "", {});

-

-        return obj.hasOwnProperty("");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - argument 'P' is applied to an empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "", {});
+
+        return obj.hasOwnProperty("");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-34.js
index f736cc67c..26381dc8c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-34.js
@@ -1,20 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-34.js

- * @description Object.defineProperty - argument 'P' is applied to string 'AB

- * \cd' 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "AB\n\\cd", {});

-

-        return obj.hasOwnProperty("AB\n\\cd");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - argument 'P' is applied to string 'AB  \cd'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "AB\n\\cd", {});
+
+        return obj.hasOwnProperty("AB\n\\cd");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-35.js
index bbdd67f3a..56ec4af4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-35.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-35.js

- * @description Object.defineProperty - argument 'P' is applied to string 'undefined' 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "undefined", {});

-

-        return obj.hasOwnProperty("undefined");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is applied to string
+    'undefined'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "undefined", {});
+
+        return obj.hasOwnProperty("undefined");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-36.js
index 36e1ea812..39fdc47c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-36.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-36.js

- * @description Object.defineProperty - argument 'P' is applied to string 'null' 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "null", {});

-

-        return obj.hasOwnProperty("null");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - argument 'P' is applied to string 'null'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "null", {});
+
+        return obj.hasOwnProperty("null");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-37.js
index f80a52355..a05a144c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-37.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-37.js

- * @description Object.defineProperty - argument 'P' is applied to string '123αβπcd' 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "123αβπcd", {});

-

-        return obj.hasOwnProperty("123αβπcd");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is applied to string
+    '123αβπcd'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "123αβπcd", {});
+
+        return obj.hasOwnProperty("123αβπcd");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-38.js
index 134fc21b7..08f884573 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-38.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-38.js

- * @description Object.defineProperty - argument 'P' is applied to string '1' 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "1", {});

-

-        return obj.hasOwnProperty("1");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - argument 'P' is applied to string '1'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "1", {});
+
+        return obj.hasOwnProperty("1");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-39.js
index ffdfcd303..b05c23ced 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-39.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-39.js

- * @description Object.defineProperty - argument 'P' is an array that converts to a string

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, [1, 2], {});

-

-        return obj.hasOwnProperty("1,2");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an array that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, [1, 2], {});
+
+        return obj.hasOwnProperty("1,2");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-4.js
index ef5340718..3385dafc5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-4.js

- * @description Object.defineProperty - argument 'P' is a boolean whose value is true

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, true, {});

-

-        return obj.hasOwnProperty("true");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a boolean whose value is
+    true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, true, {});
+
+        return obj.hasOwnProperty("true");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-40.js
index 4fb5484b1..b81cb7bdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-40.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-40.js

- * @description Object.defineProperty - argument 'P' is a String Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, new String("Hello"), {});

-

-        return obj.hasOwnProperty("Hello");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a String Object that
+    converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, new String("Hello"), {});
+
+        return obj.hasOwnProperty("Hello");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-41.js
index 7dba4b58d..80382a337 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-41.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-41.js

- * @description Object.defineProperty - argument 'P' is a Boolean Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, new Boolean(false), {});

-

-        return obj.hasOwnProperty("false");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a Boolean Object that
+    converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, new Boolean(false), {});
+
+        return obj.hasOwnProperty("false");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-42.js
index 2f303245c..94fd9eaf3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-42.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-42.js

- * @description Object.defineProperty - argument 'P' is a Number Object that converts to a string

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, new Number(123), {});

-

-        return obj.hasOwnProperty("123");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a Number Object that
+    converts to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, new Number(123), {});
+
+        return obj.hasOwnProperty("123");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-43.js
index 685aa0212..ecf4ca2cc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-43.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-43.js

- * @description Object.defineProperty - argument 'P' is an object that has an own toString method

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var ownProp = {

-            toString: function () {

-                return "abc";

-            }

-        };

-

-        Object.defineProperty(obj, ownProp, {});

-

-        return obj.hasOwnProperty("abc");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an object that has an own
+    toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var ownProp = {
+            toString: function () {
+                return "abc";
+            }
+        };
+
+        Object.defineProperty(obj, ownProp, {});
+
+        return obj.hasOwnProperty("abc");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-44.js
index cfffabf60..1a8db7153 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-44.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-44.js

- * @description Object.defineProperty - argument 'P' is an object that has an own valueOf method

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var ownProp = {

-            valueOf: function () {

-                return "abc";

-            },

-            toString: undefined

-        };

-

-        Object.defineProperty(obj, ownProp, {});

-

-        return obj.hasOwnProperty("abc");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an object that has an own
+    valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var ownProp = {
+            valueOf: function () {
+                return "abc";
+            },
+            toString: undefined
+        };
+
+        Object.defineProperty(obj, ownProp, {});
+
+        return obj.hasOwnProperty("abc");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-45.js
index 71f6b7509..b813f4f61 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-45.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-45.js

- * @description Object.defineProperty - argument 'P' is an object whose toString method returns an object and whose valueOf method returns a primitive value

- */

-

-

-function testcase() {

-        var obj = {};

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "abc";

-            }

-        };

-

-        Object.defineProperty(obj, ownProp, {});

-

-        return obj.hasOwnProperty("abc") && valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an object whose toString
+    method returns an object and whose valueOf method returns a
+    primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "abc";
+            }
+        };
+
+        Object.defineProperty(obj, ownProp, {});
+
+        return obj.hasOwnProperty("abc") && valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-46.js
index 48145318e..82279bff6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-46.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-46.js

- * @description Object.defineProperty - argument 'P' is an object that has an own toString and valueOf method

- */

-

-

-function testcase() {

-        var obj = {};

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                toStringAccessed = true;

-                return "abc";

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "prop";

-            }

-        };

-        Object.defineProperty(obj, ownProp, {});

-

-        return obj.hasOwnProperty("abc") && !valueOfAccessed && toStringAccessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is an object that has an own
+    toString and valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                toStringAccessed = true;
+                return "abc";
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "prop";
+            }
+        };
+        Object.defineProperty(obj, ownProp, {});
+
+        return obj.hasOwnProperty("abc") && !valueOfAccessed && toStringAccessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-47.js
index 2a5620e6f..dc85ef971 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-47.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-47.js

- * @description Object.defineProperty - TypeError exception is thrown  when 'P' is an object that neither toString nor valueOf returns a primitive value

- */

-

-

-function testcase() {

-        var obj = {};

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var ownProp = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-

-        try {

-            Object.defineProperty(obj, ownProp, {});

-            return false;

-        } catch (e) {

-            return valueOfAccessed && toStringAccessed && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - TypeError exception is thrown  when 'P' is
+    an object that neither toString nor valueOf returns a primitive
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var ownProp = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+
+        try {
+            Object.defineProperty(obj, ownProp, {});
+            return false;
+        } catch (e) {
+            return valueOfAccessed && toStringAccessed && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-48.js
index 824c336de..50ca500d3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-48.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-48.js

- * @description Object.defineProperty - an inherited toString method  is invoked when 'P' is an object with an own valueOf and an inherited toString methods

- */

-

-

-function testcase() {

-        var obj = {};

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            toString: function () {

-                toStringAccessed = true;

-                return "test";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.valueOf = function () {

-            valueOfAccessed = true;

-            return "10";

-        };

-

-        Object.defineProperty(obj, child, {});

-

-        return obj.hasOwnProperty("test") && !valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - an inherited toString method  is invoked
+    when 'P' is an object with an own valueOf and an inherited
+    toString methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            toString: function () {
+                toStringAccessed = true;
+                return "test";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.valueOf = function () {
+            valueOfAccessed = true;
+            return "10";
+        };
+
+        Object.defineProperty(obj, child, {});
+
+        return obj.hasOwnProperty("test") && !valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-5.js
index 0f9128c49..f5ac377ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-5.js
@@ -1,18 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-5.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is NaN)

- */

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, NaN, {});

-

-        return obj.hasOwnProperty("NaN");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, NaN, {});
+
+        return obj.hasOwnProperty("NaN");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-6.js
index 7701ff460..f01131b18 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-6.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-6.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is 0)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 0, {});

-

-        return obj.hasOwnProperty("0");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 0, {});
+
+        return obj.hasOwnProperty("0");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-7.js
index 4dc96d02c..5ced883e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-7.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is +0)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, +0, {});

-

-        return obj.hasOwnProperty("0");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, +0, {});
+
+        return obj.hasOwnProperty("0");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-8.js
index 789cbce5e..4177f1cbc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-8.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-8.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is -0)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, -0, {});

-

-        return obj.hasOwnProperty("0");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, -0, {});
+
+        return obj.hasOwnProperty("0");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-9.js
index fa31d480e..c5dad51ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-9.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-2-9.js

- * @description Object.defineProperty - argument 'P' is a number that converts to a string (value is a positive number)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, 30, {});

-

-        return obj.hasOwnProperty("30");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - argument 'P' is a number that converts to
+    a string (value is a positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, 30, {});
+
+        return obj.hasOwnProperty("30");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-1.js
index d3e699338..2ce0ce184 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-1.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-1.js

- * @description Object.defineProperty throws TypeError if desc has 'get' and 'value' present(8.10.5 step 9.a)

- */

-

-

-function testcase() {

-    var o = {};

-

-    // dummy getter

-    var getter = function () { return 1; }

-    var desc = { get: getter, value: 101};

-  

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if desc has 'get' and
+    'value' present(8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+
+    // dummy getter
+    var getter = function () { return 1; }
+    var desc = { get: getter, value: 101};
+  
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-10.js
index 9cd1f631f..859ad8fa9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-10.js

- * @description Object.defineProperty throws TypeError if setter is not callable but not undefined (Number)(8.10.5 step 8.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy setter

-    var setter = 42;

-    var desc = { set: setter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if setter is not callable
+    but not undefined (Number)(8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy setter
+    var setter = 42;
+    var desc = { set: setter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-100.js
index f5078b932..6b6058b7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-100.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-100.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is null (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: null });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    null (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: null });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-101.js
index 653f5c31b..4bda6cf06 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-101.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-101.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is true (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: true });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    true (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: true });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-102.js
index 16776e027..9948d7187 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-102.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-102.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is false (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: false });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    false (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: false });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-103.js
index faf1675f5..288ecfa44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-103.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-103.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is 0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: 0 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: 0 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-104.js
index c751573e3..dbeaefd06 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-104.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-104.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is +0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: +0 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    +0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: +0 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-105.js
index 85a56f3ff..9c0fa9089 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-105.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-105.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is -0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: -0 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    -0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: -0 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-106.js
index 741a49695..736f456e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-106.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-106.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is NaN (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: NaN });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    NaN (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: NaN });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-107.js
index 82aafca72..ae869f50d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-107.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-107.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a positive number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: 12345 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a positive number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: 12345 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-108.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-108.js
index 19e24ee50..058500c93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-108.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-108.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-108.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a negative number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: -12345 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a negative number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: -12345 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-109.js
index 1e925d72a..d22aa6840 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-109.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-109.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is an empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: "" });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    an empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: "" });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-11.js
index 6a625e49e..7bae4f1d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-11.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-11.js

- * @description Object.defineProperty throws TypeError if setter is not callable but not undefined (Boolean)(8.10.5 step 8.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy setter

-    var setter = true;

-    var desc = { set: setter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if setter is not callable
+    but not undefined (Boolean)(8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy setter
+    var setter = true;
+    var desc = { set: setter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-110.js
index befba1ceb..a2e2ee96b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-110.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-110.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a non-empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: "       " });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a non-empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: "       " });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-111.js
index 978124b2b..615861e3c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-111.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-111.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a Function object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            configurable: function () { }

-        });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a Function object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            configurable: function () { }
+        });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-112.js
index dd9d99434..05145d458 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-112.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-112.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is an Array object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: [1, 2, 3] });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    an Array object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: [1, 2, 3] });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-113.js
index 44a2045d0..2dc65e2c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-113.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-113.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a String object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: new String("bbq") });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a String object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: new String("bbq") });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-114.js
index c346c627c..5eabc4729 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-114.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-114.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a Boolean object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: new Boolean(true) });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a Boolean object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: new Boolean(true) });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-115.js
index 8c5bcb0e2..10fcf7aad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-115.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-115.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a Number object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: new Number(0) });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a Number object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: new Number(0) });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-116.js
index 9d78d02a0..44955adf8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-116.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-116.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is the Math object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: Math });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    the Math object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: Math });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-117.js
index cc5475cec..51c75d199 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-117.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-117.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a Date object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { configurable: new Date() });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a Date object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { configurable: new Date() });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-118.js
index de72c62bd..4ecbd609d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-118.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-118.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a RegExp object  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: new RegExp()

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a RegExp object  (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: new RegExp()
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-119.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-119.js
index 7c8a08d2e..3f58d2597 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-119.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-119.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-119.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is the JSON object  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: JSON

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    the JSON object  (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: JSON
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-12.js
index cf3340623..e536a9138 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-12.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-12.js

- * @description Object.defineProperty throws TypeError if setter is not callable but not undefined (String)(8.10.5 step 8.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy setter

-    var setter = "abc";

-    var desc = { set: setter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if setter is not callable
+    but not undefined (String)(8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy setter
+    var setter = "abc";
+    var desc = { set: setter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-120.js
index 7356a5825..c80a36e1d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-120.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-120.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is a Error object  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: new SyntaxError()

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    a Error object  (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: new SyntaxError()
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-121.js
index d1985452d..d2b166f5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-121.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-121.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is the Argument object  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })(1, true, "a");

-

-        var attr = {

-            configurable: argObj

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    the Argument object  (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })(1, true, "a");
+
+        var attr = {
+            configurable: argObj
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-123.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-123.js
index 164b77efa..9bca80793 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-123.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-123.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-123.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is the global object  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: fnGlobalObject()

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    the global object  (8.10.5 step 4.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: fnGlobalObject()
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-124.js
index 2d9630280..4d42b82dd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-124.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-124.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is treated as true when it is a string (value is 'false')  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: "false"

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    treated as true when it is a string (value is 'false')  (8.10.5
+    step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: "false"
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-125.js
index c80b40fff..c9abbee75 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-125.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-125.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is treated as true when it is new Boolean(false)  (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            configurable: new Boolean(false)

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    treated as true when it is new Boolean(false)  (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            configurable: new Boolean(false)
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-126.js
index 93d54513d..ec60ea843 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-126.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-126.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is present  (8.10.5 step 5)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = { value: 100 };

-

-        Object.defineProperty(obj, "property", attr);

-

-        return obj.property === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is
+    present  (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = { value: 100 };
+
+        Object.defineProperty(obj, "property", attr);
+
+        return obj.property === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-127.js
index 8c11ff61a..bbfa08b7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-127.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-127.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is not present  (8.10.5 step 5)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = {

-            writable: true

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is not
+    present  (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = {
+            writable: true
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-129.js
index bc8cf1939..e94a0a99c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-129.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-129.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is an inherited data property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "inheritedDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is an
+    inherited data property  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "inheritedDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-13.js
index 5adcf3741..3422c24fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-13.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-13.js

- * @description Object.defineProperty throws TypeError if the setter in desc is not callable (Null)(8.10.5 step 8.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy setter

-    var setter = null;

-    var desc = { set: setter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if the setter in desc is
+    not callable (Null)(8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy setter
+    var setter = null;
+    var desc = { set: setter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-130.js
index c34ab1812..c7402ea63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-130.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-130.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own data property that overrides an inherited data property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = { value: "inheritedDataProperty" };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        child.value = "ownDataProperty";

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    data property that overrides an inherited data property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = { value: "inheritedDataProperty" };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        child.value = "ownDataProperty";
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-131.js
index 7a9b9d065..f625a3f79 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-131.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-131.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own data property that overrides an inherited accessor property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "value", {

-            value: "ownDataProperty"

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    data property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "value", {
+            value: "ownDataProperty"
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-132.js
index 1db8581a3..108d9ccb4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-132.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-132.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own accessor property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = {};

-        Object.defineProperty(attr, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    accessor property  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = {};
+        Object.defineProperty(attr, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-133.js
index 364bf467b..2cd8387c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-133.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-133.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is an inherited accessor property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {};

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is an
+    inherited accessor property  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {};
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-134.js
index 42af6c0ba..96b44584e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-134.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-134.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own accessor property that overrides an inherited data property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-135.js
index 6bd46c089..cea3fb902 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-135.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-135.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own accessor property that overrides an inherited accessor property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-136.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-136.js
index c3618dc98..1ef3edd1e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-136.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-136.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-136.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own accessor property without a get function  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {};

-        Object.defineProperty(attr, "value", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    accessor property without a get function  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {};
+        Object.defineProperty(attr, "value", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-137.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-137.js
index 00d33ec09..23e3370c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-137.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-137.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-137.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {};

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "value", {

-            set : function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is own
+    accessor property(without a get function) that overrides an
+    inherited accessor property  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {};
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "value", {
+            set : function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-138.js
index 8b836edf8..1ec652ec5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-138.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-138.js

- * @description Object.defineProperty - 'value' property in 'Attributes' is an inherited accessor property without a get function  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { property : 120 };

-

-        var proto = {};

-        Object.defineProperty(proto, "value", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'value' property in 'Attributes' is an
+    inherited accessor property without a get function  (8.10.5 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { property : 120 };
+
+        var proto = {};
+        Object.defineProperty(proto, "value", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139-1.js
index 154b7fdb5..a566ea3cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Function.prototype.value = "Function";

-            var funObj = function (a, b) {

-                return a + b;

-            };

-

-            Object.defineProperty(obj, "property", funObj);

-

-            return obj.property === "Function";

-        } finally {

-            delete Function.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'value' property
+    of prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Function.prototype.value = "Function";
+            var funObj = function (a, b) {
+                return a + b;
+            };
+
+            Object.defineProperty(obj, "property", funObj);
+
+            return obj.property === "Function";
+        } finally {
+            delete Function.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139.js
index 1423f1550..44a0c4c98 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-139.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var funObj = function (a, b) {

-            return a + b;

-        };

-

-        funObj.value = "Function";

-

-        Object.defineProperty(obj, "property", funObj);

-

-        return obj.property === "Function";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var funObj = function (a, b) {
+            return a + b;
+        };
+
+        funObj.value = "Function";
+
+        Object.defineProperty(obj, "property", funObj);
+
+        return obj.property === "Function";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-14.js
index 91fedfed6..c1025ec38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-14.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-14.js

- * @description Object.defineProperty throws TypeError if setter is not callable but not undefined (Object)(8.10.5 step 8.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var setter = { a: 1 };

-    var desc = { set: setter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if setter is not callable
+    but not undefined (Object)(8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var setter = { a: 1 };
+    var desc = { set: setter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140-1.js
index 9899cd3c3..01598a46f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Array.prototype.value = "Array";

-            var arrObj = [1, 2, 3];

-

-            Object.defineProperty(obj, "property", arrObj);

-

-            return obj.property === "Array";

-        } finally {

-            delete Array.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Array.prototype.value = "Array";
+            var arrObj = [1, 2, 3];
+
+            Object.defineProperty(obj, "property", arrObj);
+
+            return obj.property === "Array";
+        } finally {
+            delete Array.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140.js
index 977b0b3d9..aaa162e67 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-140.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var arrObj = [1, 2, 3];

-

-        arrObj.value = "Array";

-

-        Object.defineProperty(obj, "property", arrObj);

-

-        return obj.property === "Array";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var arrObj = [1, 2, 3];
+
+        arrObj.value = "Array";
+
+        Object.defineProperty(obj, "property", arrObj);
+
+        return obj.property === "Array";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141-1.js
index 99fba7b05..b5dda7186 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            String.prototype.value = "String";

-            var strObj = new String("abc");

-

-            Object.defineProperty(obj, "property", strObj);

-

-            return obj.property === "String";

-        } finally {

-            delete String.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            String.prototype.value = "String";
+            var strObj = new String("abc");
+
+            Object.defineProperty(obj, "property", strObj);
+
+            return obj.property === "String";
+        } finally {
+            delete String.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141.js
index 06bdac203..203524a4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-141.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var strObj = new String("abc");

-

-        strObj.value = "String";

-

-        Object.defineProperty(obj, "property", strObj);

-

-        return obj.property === "String";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var strObj = new String("abc");
+
+        strObj.value = "String";
+
+        Object.defineProperty(obj, "property", strObj);
+
+        return obj.property === "String";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142-1.js
index 8d6a6e19f..4b8755e62 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Boolean.prototype.value = "Boolean";

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-

-            return obj.property === "Boolean";

-        } finally {

-            delete Boolean.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Boolean.prototype.value = "Boolean";
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+
+            return obj.property === "Boolean";
+        } finally {
+            delete Boolean.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142.js
index 305fa18e8..c79900909 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-142.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var boolObj = new Boolean(true);

-

-        boolObj.value = "Boolean";

-

-        Object.defineProperty(obj, "property", boolObj);

-

-        return obj.property === "Boolean";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var boolObj = new Boolean(true);
+
+        boolObj.value = "Boolean";
+
+        Object.defineProperty(obj, "property", boolObj);
+
+        return obj.property === "Boolean";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143-1.js
index 4443e97da..2c24add4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Number.prototype.value = "Number";

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-

-            return obj.property === "Number";

-        } finally {

-            delete Number.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Number.prototype.value = "Number";
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+
+            return obj.property === "Number";
+        } finally {
+            delete Number.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143.js
index d499ffdfc..ab8c90a51 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-143.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var numObj = new Number(-2);

-

-        numObj.value = "Number";

-

-        Object.defineProperty(obj, "property", numObj);

-

-        return obj.property === "Number";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var numObj = new Number(-2);
+
+        numObj.value = "Number";
+
+        Object.defineProperty(obj, "property", numObj);
+
+        return obj.property === "Number";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144-1.js
index cb560bafc..f2820d886 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.value = "Math";

-

-            Object.defineProperty(obj, "property", Math);

-

-            return obj.property === "Math";

-        } finally {

-            delete Object.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.value = "Math";
+
+            Object.defineProperty(obj, "property", Math);
+
+            return obj.property === "Math";
+        } finally {
+            delete Object.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144.js
index 999fb99fd..07a6d079f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-144.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Math.value = "Math";

-

-            Object.defineProperty(obj, "property", Math);

-

-            return obj.property === "Math";

-        } finally {

-            delete Math.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Math.value = "Math";
+
+            Object.defineProperty(obj, "property", Math);
+
+            return obj.property === "Math";
+        } finally {
+            delete Math.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145-1.js
index e231405eb..5f5af8469 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Date.prototype.value = "Date";

-            var dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-

-            return obj.property === "Date";

-        } finally {

-            delete Date.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Date.prototype.value = "Date";
+            var dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+
+            return obj.property === "Date";
+        } finally {
+            delete Date.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145.js
index 4712d1573..afe52f031 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-145.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var dateObj = new Date();

-

-        dateObj.value = "Date";

-

-        Object.defineProperty(obj, "property", dateObj);

-

-        return obj.property === "Date";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var dateObj = new Date();
+
+        dateObj.value = "Date";
+
+        Object.defineProperty(obj, "property", dateObj);
+
+        return obj.property === "Date";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146-1.js
index 75a98b991..17abab35d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146-1.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            RegExp.prototype.value = "RegExp";

-            var regObj = new RegExp();

-

-            Object.defineProperty(obj, "property", regObj);

-

-            return obj.property === "RegExp";

-        } finally {

-            delete RegExp.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            RegExp.prototype.value = "RegExp";
+            var regObj = new RegExp();
+
+            Object.defineProperty(obj, "property", regObj);
+
+            return obj.property === "RegExp";
+        } finally {
+            delete RegExp.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146.js
index 4fe4d56a0..071e3e9b5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-146.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var regObj = new RegExp();

-

-        regObj.value = "RegExp";

-

-        Object.defineProperty(obj, "property", regObj);

-

-        return obj.property === "RegExp";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var regObj = new RegExp();
+
+        regObj.value = "RegExp";
+
+        Object.defineProperty(obj, "property", regObj);
+
+        return obj.property === "RegExp";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147-1.js
index 524de019e..35e9fdc75 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.value = "JSON";

-

-            Object.defineProperty(obj, "property", JSON);

-

-            return obj.property === "JSON";

-        } finally {

-            delete Object.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.value = "JSON";
+
+            Object.defineProperty(obj, "property", JSON);
+
+            return obj.property === "JSON";
+        } finally {
+            delete Object.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147.js
index 6a6a1e320..8fb39d154 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-147.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.value = "JSON";

-

-            Object.defineProperty(obj, "property", JSON);

-

-            return obj.property === "JSON";

-        } finally {

-            delete JSON.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.value = "JSON";
+
+            Object.defineProperty(obj, "property", JSON);
+
+            return obj.property === "JSON";
+        } finally {
+            delete JSON.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148-1.js
index 09320877f..137224bb9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148-1.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'value' property of prototype object  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Error.prototype.value = "Error";

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-

-            return obj.property === "Error";

-        } finally {

-            delete Error.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'value' property of
+    prototype object  (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Error.prototype.value = "Error";
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+
+            return obj.property === "Error";
+        } finally {
+            delete Error.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148.js
index 4a54162a6..ba2a17eae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-148.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var errObj = new Error();

-

-        errObj.value = "Error";

-

-        Object.defineProperty(obj, "property", errObj);

-

-        return obj.property === "Error";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'value' property  (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var errObj = new Error();
+
+        errObj.value = "Error";
+
+        Object.defineProperty(obj, "property", errObj);
+
+        return obj.property === "Error";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149-1.js
index b28a813f3..e705ed76e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149-1.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'value' property of prototype object (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Object.prototype.value = "arguments";

-            var argObj = (function () { return arguments; })();

-

-

-            Object.defineProperty(obj, "property", argObj);

-

-            return obj.property === "arguments";

-        } finally {

-            delete Object.prototype.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'value' property
+    of prototype object (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Object.prototype.value = "arguments";
+            var argObj = (function () { return arguments; })();
+
+
+            Object.defineProperty(obj, "property", argObj);
+
+            return obj.property === "arguments";
+        } finally {
+            delete Object.prototype.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149.js
index baefc9f46..8d4bad7ef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-149.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.value = "arguments";

-

-        Object.defineProperty(obj, "property", argObj);

-

-        return obj.property === "arguments";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.value = "arguments";
+
+        Object.defineProperty(obj, "property", argObj);
+
+        return obj.property === "arguments";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-15.js
index 2a034e99b..ef4379e5c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-15.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-15.js

- * @description Object.defineProperty - 'Attributes' is undefined  (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperty(obj, "property", undefined);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - 'Attributes' is undefined  (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperty(obj, "property", undefined);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-151.js
index ec9780f92..6983fa9a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-151.js
@@ -1,25 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-151.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'value' property  (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            fnGlobalObject().value = "global";

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-

-            return obj.property === "global";

-        } finally {

-            delete fnGlobalObject().value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'value' property
+    (8.10.5 step 5.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            fnGlobalObject().value = "global";
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+
+            return obj.property === "global";
+        } finally {
+            delete fnGlobalObject().value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-152.js
index 0d468c2a9..4719da628 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-152.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-152.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is present (8.10.5 step 6)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            writable: false

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    present (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            writable: false
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-153.js
index 72e7d6b2f..25c9116ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-153.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-153.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is not present  (8.10.5 step 6)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {

-            value: 100

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is not
+    present  (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {
+            value: 100
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-154.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-154.js
index 6790eb660..4eeeef3ca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-154.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-154.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-154.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own data property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = {

-            writable: true

-        };

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    data property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = {
+            writable: true
+        };
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-155.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-155.js
index b0ac8715e..5d97ab076 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-155.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-155.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-155.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is an inherited data property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {

-            writable: true

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is an
+    inherited data property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {
+            writable: true
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-156.js
index e859a2842..2d1984744 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-156.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-156.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own data property that overrides an inherited data property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {

-            writable: false 

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.writable = true;

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    data property that overrides an inherited data property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {
+            writable: false 
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.writable = true;
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-157.js
index f412b5974..71613295a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-157.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-157.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own data property that overrides an inherited accessor property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = { };

-        Object.defineProperty(proto, "writable", {

-            get : function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "writable", {

-            value: true

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    data property that overrides an inherited accessor property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = { };
+        Object.defineProperty(proto, "writable", {
+            get : function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "writable", {
+            value: true
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-158.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-158.js
index c8b1817a5..a0823437d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-158.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-158.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-158.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own accessor property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = { };

-        Object.defineProperty(attr, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    accessor property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = { };
+        Object.defineProperty(attr, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-159.js
index 85c67de2d..13dff9b38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-159.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-159.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is an inherited accessor property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is an
+    inherited accessor property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-16.js
index 088eec10b..6a32851c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-16.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-16.js

- * @description Object.defineProperty - 'Attributes' is null (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty({}, "property", null);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperty - 'Attributes' is null (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty({}, "property", null);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-160.js
index a42d5091d..b330024b0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-160.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-160.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own accessor property that overrides an inherited data property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            writable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            writable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-161.js
index abb690ad0..6360bbde7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-161.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-161.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own accessor property that overrides an inherited accessor property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-162.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-162.js
index f3f34991e..afedbec52 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-162.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-162.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-162.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own accessor property without a get function  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attr = {};

-        Object.defineProperty(attr, "writable", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    accessor property without a get function  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attr = {};
+        Object.defineProperty(attr, "writable", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-163.js
index 2fa958a07..05e3dbb72 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-163.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-163.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "writable", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is own
+    accessor property(without a get function) that overrides an
+    inherited accessor property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "writable", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-164.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-164.js
index d488c75e6..88162dae2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-164.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-164.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-164.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is an inherited accessor property without a get function  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "writable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is an
+    inherited accessor property without a get function  (8.10.5 step
+    6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "writable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165-1.js
index 73c56b0bf..eee7c6f1d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165-1.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Function.prototype.writable = true;

-            var funObj = function (a, b) {

-                return a + b;

-            };

-

-            Object.defineProperty(obj, "property", funObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Function.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'writable'
+    property of prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Function.prototype.writable = true;
+            var funObj = function (a, b) {
+                return a + b;
+            };
+
+            Object.defineProperty(obj, "property", funObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Function.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165.js
index 1fa727599..d98af1d28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-165.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var funObj = function (a, b) {

-            return a + b;

-        };

-

-        funObj.writable = true;

-

-        Object.defineProperty(obj, "property", funObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'writable'
+    property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var funObj = function (a, b) {
+            return a + b;
+        };
+
+        funObj.writable = true;
+
+        Object.defineProperty(obj, "property", funObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166-1.js
index a71f60ed4..e135a6e81 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Array.prototype.writable = true;

-            var arrObj = [1, 2, 3];

-

-            Object.defineProperty(obj, "property", arrObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Array.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Array.prototype.writable = true;
+            var arrObj = [1, 2, 3];
+
+            Object.defineProperty(obj, "property", arrObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Array.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166.js
index 04aeb0720..65ae4c8aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-166.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var arrObj = [1, 2, 3];

-

-        arrObj.writable = true;

-

-        Object.defineProperty(obj, "property", arrObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var arrObj = [1, 2, 3];
+
+        arrObj.writable = true;
+
+        Object.defineProperty(obj, "property", arrObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167-1.js
index 22d7991de..9e07c7a83 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            String.prototype.writable = true;

-            var strObj = new String("abc");

-

-            Object.defineProperty(obj, "property", strObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete String.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            String.prototype.writable = true;
+            var strObj = new String("abc");
+
+            Object.defineProperty(obj, "property", strObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete String.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167.js
index a8a48051a..94c5fab3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-167.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var strObj = new String("abc");

-

-        strObj.writable = true;

-

-        Object.defineProperty(obj, "property", strObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var strObj = new String("abc");
+
+        strObj.writable = true;
+
+        Object.defineProperty(obj, "property", strObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168-1.js
index 3ddd35487..75fedb607 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Boolean.prototype.writable = true;

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Boolean.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Boolean.prototype.writable = true;
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Boolean.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168.js
index 3f331a720..dbeb12efb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-168.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var boolObj = new Boolean(true);

-

-        boolObj.writable = true;

-

-        Object.defineProperty(obj, "property", boolObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var boolObj = new Boolean(true);
+
+        boolObj.writable = true;
+
+        Object.defineProperty(obj, "property", boolObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169-1.js
index ec860a7f8..e3ec9c1f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Number.prototype.writable = true;

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Number.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Number.prototype.writable = true;
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Number.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169.js
index a4952a071..3f5ff34c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-169.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var numObj = new Number(-2);

-

-        numObj.writable = true;

-

-        Object.defineProperty(obj, "property", numObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var numObj = new Number(-2);
+
+        numObj.writable = true;
+
+        Object.defineProperty(obj, "property", numObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-17.js
index 186557612..692cfaa34 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-17.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-17.js

- * @description Object.defineProperty - 'Attributes' is a boolean primitive (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty({}, "property", true);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a boolean primitive
+    (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty({}, "property", true);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170-1.js
index d919a4ea7..659fb8af5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.writable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Object.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.writable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Object.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170.js
index 253c2ad22..523e5eba4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-170.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Math.writable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Math.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Math.writable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Math.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171-1.js
index b08660c81..e5989f464 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Date.prototype.writable = true;

-

-            dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Date.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Date.prototype.writable = true;
+
+            dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Date.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171.js
index f498ab44c..e6ee33d69 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-171.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var dateObj = new Date();

-

-        dateObj.writable = true;

-

-        Object.defineProperty(obj, "property", dateObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var dateObj = new Date();
+
+        dateObj.writable = true;
+
+        Object.defineProperty(obj, "property", dateObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172-1.js
index dc877724b..2f60e8d6d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172-1.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            RegExp.prototype.writable = true;

-

-            var regObj = new RegExp();

-

-            Object.defineProperty(obj, "property", regObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete RegExp.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            RegExp.prototype.writable = true;
+
+            var regObj = new RegExp();
+
+            Object.defineProperty(obj, "property", regObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete RegExp.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172.js
index e6abbf435..cae0365e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-172.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var regObj = new RegExp();

-

-        regObj.writable = true;

-

-        Object.defineProperty(obj, "property", regObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var regObj = new RegExp();
+
+        regObj.writable = true;
+
+        Object.defineProperty(obj, "property", regObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173-1.js
index 25bf5b186..ddb22283c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.writable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Object.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.writable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Object.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173.js
index cc731e9f5..8b1b7dddb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-173.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.writable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete JSON.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.writable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete JSON.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174-1.js
index 3f2136029..f51321f5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Error.prototype.writable = true;

-

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Error.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'writable' property of
+    prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Error.prototype.writable = true;
+
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Error.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174.js
index dc4a24bd0..bd3f1d500 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-174.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var errObj = new Error();

-

-        errObj.writable = true;

-

-        Object.defineProperty(obj, "property", errObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'writable' property  (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var errObj = new Error();
+
+        errObj.writable = true;
+
+        Object.defineProperty(obj, "property", errObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175-1.js
index 548b1dfde..c9f09abd0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'writable' property of prototype object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Object.prototype.writable = true;

-

-            var argObj = (function () { return arguments; })();

-

-            Object.defineProperty(obj, "property", argObj);

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete Object.prototype.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'writable'
+    property of prototype object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Object.prototype.writable = true;
+
+            var argObj = (function () { return arguments; })();
+
+            Object.defineProperty(obj, "property", argObj);
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete Object.prototype.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175.js
index dcdd3af4d..31fe64eb4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-175.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.writable = true;

-

-        Object.defineProperty(obj, "property", argObj);

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'writable'
+    property  (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.writable = true;
+
+        Object.defineProperty(obj, "property", argObj);
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-177.js
index aa9e02095..baac4604e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-177.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-177.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'writable' property  (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            fnGlobalObject().writable = true;

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-

-            var beforeWrite = obj.hasOwnProperty("property");

-

-            obj.property = "isWritable";

-

-            var afterWrite = (obj.property === "isWritable");

-

-            return beforeWrite === true && afterWrite === true;

-        } finally {

-            delete fnGlobalObject().writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'writable' property
+    (8.10.5 step 6.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            fnGlobalObject().writable = true;
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+
+            var beforeWrite = obj.hasOwnProperty("property");
+
+            obj.property = "isWritable";
+
+            var afterWrite = (obj.property === "isWritable");
+
+            return beforeWrite === true && afterWrite === true;
+        } finally {
+            delete fnGlobalObject().writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-178.js
index e72ef3efb..c015b4135 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-178.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-178.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is undefined  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            writable: undefined

-        });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    undefined  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            writable: undefined
+        });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-179.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-179.js
index 964de16d0..bfffa007b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-179.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-179.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-179.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is null  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { writable: null });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    null  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { writable: null });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-18.js
index c1a21e1af..05133a016 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-18.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-18.js

- * @description Object.defineProperty - 'Attributes' is a number primitive (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty({}, "property", 12);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a number primitive (8.10.5
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty({}, "property", 12);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-180.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-180.js
index 0667b22b9..157836920 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-180.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-180.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-180.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is true  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: true });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    true  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: true });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-181.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-181.js
index 5ded528a9..140da1a39 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-181.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-181.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-181.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is false  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { writable: false });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    false  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { writable: false });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-182.js
index eef3c8f6e..e9f7d89d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-182.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-182.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is 0  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { writable: 0 });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is 0
+    (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { writable: 0 });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-183.js
index ed70af1df..f9c9ce962 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-183.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-183.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is +0  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: +0 });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is +0
+    (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: +0 });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-184.js
index 338d0836f..400aa97d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-184.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-184.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is -0  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { writable: -0 });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is -0
+    (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { writable: -0 });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-185.js
index 6260df554..71d61b4cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-185.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-185.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is NaN  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { writable:  NaN});

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    NaN  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { writable:  NaN});
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-186.js
index 2debfa016..4e10934e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-186.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-186.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a positive number  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: 12345 });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    positive number  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: 12345 });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-187.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-187.js
index cb030ea74..3a731ae82 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-187.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-187.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-187.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a negative number  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: -12345 });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    negative number  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: -12345 });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-188.js
index 22757b34a..c3925712e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-188.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-188.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is an empty string  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: "" });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (typeof (obj.property) === "undefined");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is an
+    empty string  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: "" });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (typeof (obj.property) === "undefined");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-189.js
index de71c7d57..d729777ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-189.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-189.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a non-empty string  (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: "      " });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    non-empty string  (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: "      " });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-19.js
index 01f27408e..7d1e7e163 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-19.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-19.js

- * @description Object.defineProperty - 'Attributes' is a string primitive (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty({}, "property", "abc");

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a string primitive (8.10.5
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty({}, "property", "abc");
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-190.js
index 86dabf73d..63dd66020 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-190.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-190.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a Function object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            writable: function () { }

-        });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    Function object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            writable: function () { }
+        });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-191.js
index 4a0928a7e..ed38db00a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-191.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-191.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is an Array object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: [1, 2, 3] });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is an
+    Array object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: [1, 2, 3] });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-192.js
index da1141b72..c2270f2ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-192.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-192.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a String object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new String("bbq") });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    String object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new String("bbq") });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-193.js
index 0a3846103..49d7533ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-193.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-193.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a Boolean object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new Boolean(true) });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    Boolean object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new Boolean(true) });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-194.js
index 73bfddb79..529aafdcb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-194.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-194.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a Number object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new Number(123) });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    Number object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new Number(123) });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-195.js
index d304daff5..1f74fdd9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-195.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-195.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is the Math object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: Math });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is the
+    Math object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: Math });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-196.js
index ec2cb278f..26772f36d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-196.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-196.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a Date object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new Date() });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    Date object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new Date() });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-197.js
index ff4376aff..953861b46 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-197.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-197.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a RegExp object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            writable: new RegExp()

-        });

-

-        var beforeWrite = obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite && afterWrite;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    RegExp object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            writable: new RegExp()
+        });
+
+        var beforeWrite = obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite && afterWrite;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-198.js
index 56700f498..e8a79ed01 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-198.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-198.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is the JSON object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: JSON });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is the
+    JSON object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: JSON });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-199.js
index b63b7cfed..b22cf212f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-199.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-199.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is a Error object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new SyntaxError() });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is a
+    Error object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new SyntaxError() });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-2.js
index 53a1b09ea..c006cd395 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-2.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-2.js

- * @description Object.defineProperty throws TypeError if desc has 'get' and 'writable' present(8.10.5 step 9.a)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = function () { return 1; }

-    var desc = { get: getter, writable: false };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if desc has 'get' and
+    'writable' present(8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = function () { return 1; }
+    var desc = { get: getter, writable: false };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-20.js
index f7ba28c60..8111b13e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-20.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-20.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is present (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var accessed = false;

-        Object.defineProperty(obj, "property", {

-            enumerable: false

-        });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed && obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    present (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var accessed = false;
+        Object.defineProperty(obj, "property", {
+            enumerable: false
+        });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed && obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-200.js
index c2dfe1e3b..f4b06fe35 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-200.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-200.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is the Argument object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })(1, true, "a");

-

-        Object.defineProperty(obj, "property", { writable: argObj });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is the
+    Argument object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })(1, true, "a");
+
+        Object.defineProperty(obj, "property", { writable: argObj });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-202.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-202.js
index 8a0090653..8d88962ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-202.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-202.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-202.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is the global object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            writable: fnGlobalObject()

-        });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is the
+    global object (8.10.5 step 6.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            writable: fnGlobalObject()
+        });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-203.js
index 9c06ba693..d9e8f2e2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-203.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-203.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is treated as true when it is a string(value is 'false') (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: "false" });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    treated as true when it is a string(value is 'false') (8.10.5 step
+    6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: "false" });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-204.js
index 71d641835..911ebed19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-204.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-204.js

- * @description Object.defineProperty - 'writable' property in 'Attributes' is treated as true when it is new Boolean(false) (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", { writable: new Boolean(false) });

-

-        var beforeWrite = obj.hasOwnProperty("property");

-

-        obj.property = "isWritable";

-

-        var afterWrite = (obj.property === "isWritable");

-

-        return beforeWrite === true && afterWrite === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'writable' property in 'Attributes' is
+    treated as true when it is new Boolean(false) (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", { writable: new Boolean(false) });
+
+        var beforeWrite = obj.hasOwnProperty("property");
+
+        obj.property = "isWritable";
+
+        var afterWrite = (obj.property === "isWritable");
+
+        return beforeWrite === true && afterWrite === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-205.js
index 94feb43bc..5fbadb3d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-205.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-205.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is present (8.10.5 step 7)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return "present";

-            }

-        });

-

-        return obj.property === "present";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is present
+    (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return "present";
+            }
+        });
+
+        return obj.property === "present";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-206.js
index ac90edbbc..34b2fabd4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-206.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-206.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is not present (8.10.5 step 7)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            set: function () {}

-        });

-

-        return typeof obj.property === "undefined" && obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is not
+    present (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            set: function () {}
+        });
+
+        return typeof obj.property === "undefined" && obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-207.js
index 1a290b65d..64b675a9b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-207.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-207.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var attributes = {

-            get: function () {

-                return "ownDataProperty";

-            }

-        };

-

-        Object.defineProperty(obj, "property", attributes);

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own data
+    property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var attributes = {
+            get: function () {
+                return "ownDataProperty";
+            }
+        };
+
+        Object.defineProperty(obj, "property", attributes);
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-208.js
index 03b742529..2e85819f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-208.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-208.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "inheritedDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is an
+    inherited data property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "inheritedDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-209.js
index bdaabaeb8..4fd8b8dbd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-209.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-209.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.get = function () {

-            return "ownDataProperty";

-        };

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own data
+    property that overrides an inherited data property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.get = function () {
+            return "ownDataProperty";
+        };
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-21.js
index 689f4bfea..80ae34c9b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-21.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-21.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is not present (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var attr = {};

-        var accessed = false;

-        Object.defineProperty(obj, "property", attr);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    not present (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var attr = {};
+        var accessed = false;
+        Object.defineProperty(obj, "property", attr);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-210.js
index 71ac691ca..b783291f7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-210.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-210.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        var fun = function () {

-            return "inheritedAccessorProperty";

-        };

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return fun;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "get", {

-            value: function () {

-                return "ownDataProperty";

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own data
+    property that overrides an inherited accessor property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        var fun = function () {
+            return "inheritedAccessorProperty";
+        };
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return fun;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "get", {
+            value: function () {
+                return "ownDataProperty";
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-211.js
index 5ef27cb36..8b60a7c6e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-211.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-211.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attributes = {};

-        Object.defineProperty(attributes, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", attributes);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own
+    accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attributes = {};
+        Object.defineProperty(attributes, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", attributes);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-212.js
index 550275f63..13f42afdd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-212.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-212.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is an
+    inherited accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-213.js
index 74ba2ab28..5d9002587 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-213.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-213.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-214.js
index ba3922808..b58a9176d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-214.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-214.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-215.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-215.js
index ddcf67651..6ca8e8ac7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-215.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-215.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-215.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attributes = {};

-        Object.defineProperty(attributes, "get", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", attributes);

-

-        return typeof obj.property === "undefined" && obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own
+    accessor property without a get function (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attributes = {};
+        Object.defineProperty(attributes, "get", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", attributes);
+
+        return typeof obj.property === "undefined" && obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-216.js
index 56e83aa08..6cbff0a95 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-216.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-216.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "get", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is own
+    accessor property(without a get function) that overrides an
+    inherited accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "get", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-217.js
index a0efd8401..c0e4d0a74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-217.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-217.js

- * @description Object.defineProperty - 'get' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "get", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'get' property in 'Attributes' is an
+    inherited accessor property without a get function (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "get", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218-1.js
index 625f7edad..cf9676753 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Function.prototype.get = function () {

-                return "functionGetProperty";

-            };

-            var funObj = function () { };

-

-            Object.defineProperty(obj, "property", funObj);

-

-            return obj.property === "functionGetProperty";

-        } finally {

-            delete Function.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'get' property of
+    prototype object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Function.prototype.get = function () {
+                return "functionGetProperty";
+            };
+            var funObj = function () { };
+
+            Object.defineProperty(obj, "property", funObj);
+
+            return obj.property === "functionGetProperty";
+        } finally {
+            delete Function.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218.js
index 5e5567c18..b057f423c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-218.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var funObj = function () { };

-

-        funObj.get = function () {

-            return "functionGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", funObj);

-

-        return obj.property === "functionGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var funObj = function () { };
+
+        funObj.get = function () {
+            return "functionGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", funObj);
+
+        return obj.property === "functionGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219-1.js
index 44f84c37b..3fdef4ecb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Array.prototype.get = function () {

-                return "arrayGetProperty";

-            };

-            var arrObj = [];

-

-            Object.defineProperty(obj, "property", arrObj);

-

-            return obj.property === "arrayGetProperty";

-        } finally {

-            delete Array.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Array.prototype.get = function () {
+                return "arrayGetProperty";
+            };
+            var arrObj = [];
+
+            Object.defineProperty(obj, "property", arrObj);
+
+            return obj.property === "arrayGetProperty";
+        } finally {
+            delete Array.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219.js
index 7c5b8ea27..2369626f6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-219.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var arrObj = [];

-

-        arrObj.get = function () {

-            return "arrayGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", arrObj);

-

-        return obj.property === "arrayGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var arrObj = [];
+
+        arrObj.get = function () {
+            return "arrayGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", arrObj);
+
+        return obj.property === "arrayGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-22.js
index a00177fe2..e0c02b7a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-22.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-22.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", {

-            enumerable: true

-        });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", {
+            enumerable: true
+        });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220-1.js
index 3cff0394c..73eb5aa40 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            String.prototype.get = function () {

-                return "stringGetProperty";

-            };

-            var strObj = new String();

-

-            Object.defineProperty(obj, "property", strObj);

-

-            return obj.property === "stringGetProperty";

-        } finally {

-            delete String.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            String.prototype.get = function () {
+                return "stringGetProperty";
+            };
+            var strObj = new String();
+
+            Object.defineProperty(obj, "property", strObj);
+
+            return obj.property === "stringGetProperty";
+        } finally {
+            delete String.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220.js
index 97c08e5e3..7ec85d3fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-220.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var strObj = new String();

-

-        strObj.get = function () {

-            return "stringGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", strObj);

-

-        return obj.property === "stringGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var strObj = new String();
+
+        strObj.get = function () {
+            return "stringGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", strObj);
+
+        return obj.property === "stringGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221-1.js
index 2e55c5af8..cc26b7fe0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Boolean.prototype.get = function () {

-                return "booleanGetProperty";

-            };

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-

-            return obj.property === "booleanGetProperty";

-        } finally {

-            delete Boolean.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Boolean.prototype.get = function () {
+                return "booleanGetProperty";
+            };
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+
+            return obj.property === "booleanGetProperty";
+        } finally {
+            delete Boolean.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221.js
index 9319508af..ccdf7df91 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-221.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var boolObj = new Boolean(true);

-

-        boolObj.get = function () {

-            return "booleanGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", boolObj);

-

-        return obj.property === "booleanGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var boolObj = new Boolean(true);
+
+        boolObj.get = function () {
+            return "booleanGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", boolObj);
+
+        return obj.property === "booleanGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222-1.js
index 71ec25e89..b43df51f0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Number.prototype.get = function () {

-                return "numberGetProperty";

-            };

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-

-            return obj.property === "numberGetProperty";

-        } finally {

-            delete Number.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Number.prototype.get = function () {
+                return "numberGetProperty";
+            };
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+
+            return obj.property === "numberGetProperty";
+        } finally {
+            delete Number.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222.js
index 9d5905998..abee553b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-222.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var numObj = new Number(-2);

-

-        numObj.get = function () {

-            return "numberGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", numObj);

-

-        return obj.property === "numberGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var numObj = new Number(-2);
+
+        numObj.get = function () {
+            return "numberGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", numObj);
+
+        return obj.property === "numberGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223-1.js
index a0de89638..675201f9e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.get = function () {

-                return "mathGetProperty";

-            };

-

-            Object.defineProperty(obj, "property", Math);

-

-            return obj.property === "mathGetProperty";

-        } finally {

-            delete Object.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.get = function () {
+                return "mathGetProperty";
+            };
+
+            Object.defineProperty(obj, "property", Math);
+
+            return obj.property === "mathGetProperty";
+        } finally {
+            delete Object.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223.js
index 59ca2b6d1..60e0091e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-223.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Math.get = function () {

-                return "mathGetProperty";

-            };

-

-            Object.defineProperty(obj, "property", Math);

-

-            return obj.property === "mathGetProperty";

-        } finally {

-            delete Math.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Math.get = function () {
+                return "mathGetProperty";
+            };
+
+            Object.defineProperty(obj, "property", Math);
+
+            return obj.property === "mathGetProperty";
+        } finally {
+            delete Math.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224-1.js
index 3ca48c6da..b0f69d048 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Date.prototype.get = function () {

-                return "dateGetProperty";

-            };

-            var dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-

-            return obj.property === "dateGetProperty";

-        } finally {

-            delete Date.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Date.prototype.get = function () {
+                return "dateGetProperty";
+            };
+            var dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+
+            return obj.property === "dateGetProperty";
+        } finally {
+            delete Date.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224.js
index 32f8ae62b..b72c393d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-224.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var dateObj = new Date();

-

-        dateObj.get = function () {

-            return "dateGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", dateObj);

-

-        return obj.property === "dateGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var dateObj = new Date();
+
+        dateObj.get = function () {
+            return "dateGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", dateObj);
+
+        return obj.property === "dateGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225-1.js
index 915b2d15f..2ddb49508 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225-1.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225-1.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            RegExp.prototype.get = function () {

-                return "regExpGetProperty";

-            };

-            var regObj = new RegExp();

-

-

-            Object.defineProperty(obj, "property", regObj);

-

-            return obj.property === "regExpGetProperty";

-        } finally {

-            delete RegExp.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            RegExp.prototype.get = function () {
+                return "regExpGetProperty";
+            };
+            var regObj = new RegExp();
+
+
+            Object.defineProperty(obj, "property", regObj);
+
+            return obj.property === "regExpGetProperty";
+        } finally {
+            delete RegExp.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225.js
index aff5c5713..95ad2a3cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-225.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var regObj = new RegExp();

-

-        regObj.get = function () {

-            return "regExpGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", regObj);

-

-        return obj.property === "regExpGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var regObj = new RegExp();
+
+        regObj.get = function () {
+            return "regExpGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", regObj);
+
+        return obj.property === "regExpGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226-1.js
index 3e106a3c9..e05859515 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.get = function () {

-                return "jsonGetProperty";

-            };

-

-            Object.defineProperty(obj, "property", JSON);

-

-            return obj.property === "jsonGetProperty";

-        } finally {

-            delete Object.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.get = function () {
+                return "jsonGetProperty";
+            };
+
+            Object.defineProperty(obj, "property", JSON);
+
+            return obj.property === "jsonGetProperty";
+        } finally {
+            delete Object.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226.js
index 855c4f5eb..cb21b44c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-226.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.get = function () {

-                return "jsonGetProperty";

-            };

-

-            Object.defineProperty(obj, "property", JSON);

-

-            return obj.property === "jsonGetProperty";

-        } finally {

-            delete JSON.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.get = function () {
+                return "jsonGetProperty";
+            };
+
+            Object.defineProperty(obj, "property", JSON);
+
+            return obj.property === "jsonGetProperty";
+        } finally {
+            delete JSON.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227-1.js
index 39738a3b2..9bc610916 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Error.prototype.get = function () {

-                return "errorGetProperty";

-            };

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-

-            return obj.property === "errorGetProperty";

-        } finally {

-            delete Error.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'get' property of prototype
+    object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Error.prototype.get = function () {
+                return "errorGetProperty";
+            };
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+
+            return obj.property === "errorGetProperty";
+        } finally {
+            delete Error.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227.js
index b6ca7f60d..aac6ec370 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-227.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var errObj = new Error();

-

-        errObj.get = function () {

-            return "errorGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", errObj);

-

-        return obj.property === "errorGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'get' property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var errObj = new Error();
+
+        errObj.get = function () {
+            return "errorGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", errObj);
+
+        return obj.property === "errorGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228-1.js
index 8acd1a79a..6394df3df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'get' property of prototype object (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Object.prototype.get = function () {

-                return "argumentGetProperty";

-            };

-            var argObj = (function () { return arguments; })();

-

-            Object.defineProperty(obj, "property", argObj);

-

-            return obj.property === "argumentGetProperty";

-        } finally {

-            delete Object.prototype.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'get' property of
+    prototype object (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Object.prototype.get = function () {
+                return "argumentGetProperty";
+            };
+            var argObj = (function () { return arguments; })();
+
+            Object.defineProperty(obj, "property", argObj);
+
+            return obj.property === "argumentGetProperty";
+        } finally {
+            delete Object.prototype.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228.js
index 55f601b6d..d968c3cda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-228.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })();

-

-        argObj.get = function () {

-            return "argumentGetProperty";

-        };

-

-        Object.defineProperty(obj, "property", argObj);

-

-        return obj.property === "argumentGetProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'get' property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })();
+
+        argObj.get = function () {
+            return "argumentGetProperty";
+        };
+
+        Object.defineProperty(obj, "property", argObj);
+
+        return obj.property === "argumentGetProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-23.js
index fb90a87c0..840a31ba1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-23.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-23.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var proto = {};

-        Object.defineProperty(proto, "enumerable", {

-            value: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    an inherited data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var proto = {};
+        Object.defineProperty(proto, "enumerable", {
+            value: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-230.js
index f362d6898..6b4153fe2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-230.js
@@ -1,27 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-230.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            fnGlobalObject().get = function () {

-                return "globalGetProperty";

-            };

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-

-            return obj.property === "globalGetProperty";

-        } finally {

-            delete fnGlobalObject().get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'get' property (8.10.5
+    step 7.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            fnGlobalObject().get = function () {
+                return "globalGetProperty";
+            };
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+
+            return obj.property === "globalGetProperty";
+        } finally {
+            delete fnGlobalObject().get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-231.js
index 7c033d081..f0edaea44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-231.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-231.js

- * @description Object.defineProperty - value of 'get' property in 'Attributes' is undefined (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: undefined

-        });

-

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'get' property in 'Attributes' is
+    undefined (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: undefined
+        });
+
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-232.js
index 448811af8..996f87713 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-232.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-232.js

- * @description Object.defineProperty - value of 'get' property in 'Attributes' is a function (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return "getFunction";

-            }

-        });

-

-        return obj.hasOwnProperty("property") && obj.property === "getFunction";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'get' property in 'Attributes' is
+    a function (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return "getFunction";
+            }
+        });
+
+        return obj.hasOwnProperty("property") && obj.property === "getFunction";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-235.js
index ebecd3c04..004a8f73f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-235.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-235.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        Object.defineProperty(obj, "property", {

-            set: function (value) {

-                data = value;

-            }

-        });

-

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is present
+    (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        Object.defineProperty(obj, "property", {
+            set: function (value) {
+                data = value;
+            }
+        });
+
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-236.js
index 92bb2997e..424a8e11e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-236.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-236.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is not present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 11;

-            }

-        });

-

-        obj.property = 14;

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        return obj.hasOwnProperty("property") && obj.property === 11 && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is not
+    present (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 11;
+            }
+        });
+
+        obj.property = 14;
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        return obj.hasOwnProperty("property") && obj.property === 11 && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-237.js
index c73d6ef86..3075b4c7b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-237.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-237.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        Object.defineProperty(obj, "property", {

-            set: function (value) {

-                data = value;

-            }

-        });

-

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own data
+    property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        Object.defineProperty(obj, "property", {
+            set: function (value) {
+                data = value;
+            }
+        });
+
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-238.js
index fa8b007f0..66c343a2b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-238.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-238.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var proto = {

-            set: function (value) {

-                data = value;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is an
+    inherited data property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var proto = {
+            set: function (value) {
+                data = value;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-239.js
index 7018a807c..a9d676278 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-239.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-239.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data1 = "data";

-        var data2 = "data";

-        var proto = {

-            set: function (value) {

-                data1 = value;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.set = function (value) {

-            data2 = value;

-        };

-

-        Object.defineProperty(obj, "property", child);

-

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own data
+    property that overrides an inherited data property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data1 = "data";
+        var data2 = "data";
+        var proto = {
+            set: function (value) {
+                data1 = value;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.set = function (value) {
+            data2 = value;
+        };
+
+        Object.defineProperty(obj, "property", child);
+
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-24.js
index 858ae62bc..5ad138378 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-24.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-24.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var proto = {};

-        Object.defineProperty(proto, "enumerable", {

-            value: false

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "enumerable", {

-            value: true

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var proto = {};
+        Object.defineProperty(proto, "enumerable", {
+            value: false
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "enumerable", {
+            value: true
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-240.js
index 8fe34665a..0844cfaa5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-240.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-240.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        var data1 = "data";

-        var data2 = "data";

-

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data1 = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            value: function (value) {

-                data2 = value;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own data
+    property that overrides an inherited accessor property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        var data1 = "data";
+        var data2 = "data";
+
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data1 = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            value: function (value) {
+                data2 = value;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-241.js
index a85be3a4d..7d6e0c415 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-241.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-241.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var attributes = {};

-        Object.defineProperty(attributes, "set", {

-            get: function () {

-                return function (value) {

-                    data = value;

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", attributes);

-        obj.property = "ownAccessorProperty";

-

-        return obj.hasOwnProperty("property") && data === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own
+    accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var attributes = {};
+        Object.defineProperty(attributes, "set", {
+            get: function () {
+                return function (value) {
+                    data = value;
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", attributes);
+        obj.property = "ownAccessorProperty";
+
+        return obj.hasOwnProperty("property") && data === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-242.js
index d173a4b4a..f48f4e915 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-242.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-242.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        var data = "data";

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-        obj.property = "inheritedAccessorProperty";

-

-        return obj.hasOwnProperty("property") && data === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is an
+    inherited accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        var data = "data";
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+        obj.property = "inheritedAccessorProperty";
+
+        return obj.hasOwnProperty("property") && data === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-243.js
index 151713f9d..4d121f95b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-243.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-243.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data1 = "data";

-        var data2 = "data";

-

-        var proto = {

-            set: function (value) {

-                data1 = value;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-        obj.property = "ownAccessorProperty";

-

-        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data1 = "data";
+        var data2 = "data";
+
+        var proto = {
+            set: function (value) {
+                data1 = value;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+        obj.property = "ownAccessorProperty";
+
+        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-244.js
index 33a32b486..2a372ca5f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-244.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-244.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        var data1 = "data";

-        var data2 = "data";

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data1 = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-        obj.property = "ownAccessorProperty";

-

-        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        var data1 = "data";
+        var data2 = "data";
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data1 = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+        obj.property = "ownAccessorProperty";
+
+        return obj.hasOwnProperty("property") && data1 === "data" && data2 === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-245.js
index 5ec76f912..7a2de53a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-245.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-245.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var attributes = {};

-        Object.defineProperty(attributes, "set", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", attributes);

-

-        obj.property = "overrideOwnData";

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" &&

-            typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own
+    accessor property without a get function (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var attributes = {};
+        Object.defineProperty(attributes, "set", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", attributes);
+
+        obj.property = "overrideOwnData";
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" &&
+            typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-246.js
index 6fd046ee3..e4abe6ec8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-246.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-246.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        var data = "data";

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data = value;

-                };

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "set", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        obj.property = "overrideData";

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" && data === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is own
+    accessor property(without a get function) that overrides an
+    inherited accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        var data = "data";
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data = value;
+                };
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "set", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        obj.property = "overrideData";
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" && data === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-247.js
index 822915fc5..3b9982bb4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-247.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-247.js

- * @description Object.defineProperty - 'set' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        obj.property = "overrideData";

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'set' property in 'Attributes' is an
+    inherited accessor property without a get function (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        obj.property = "overrideData";
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248-1.js
index e11f2af1b..3ee98218c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Function.prototype.set = function (value) {

-                data = value;

-            };

-            var funObj = function () { };

-

-            Object.defineProperty(obj, "property", funObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Function.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'set' property of
+    prototype object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Function.prototype.set = function (value) {
+                data = value;
+            };
+            var funObj = function () { };
+
+            Object.defineProperty(obj, "property", funObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Function.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248.js
index c526e0a7d..33b108828 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-248.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var funObj = function () { };

-

-        funObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", funObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var funObj = function () { };
+
+        funObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", funObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249-1.js
index 269335b6e..45c3e4cd6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Array.prototype.set = function (value) {

-                data = value;

-            };

-            var arrObj = [];

-

-            Object.defineProperty(obj, "property", arrObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Array.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Array.prototype.set = function (value) {
+                data = value;
+            };
+            var arrObj = [];
+
+            Object.defineProperty(obj, "property", arrObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Array.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249.js
index 644f03dcd..d91b0c00b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-249.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var arrObj = [];

-

-        arrObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", arrObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var arrObj = [];
+
+        arrObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", arrObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-25.js
index 7fabfbc93..a4af1ca97 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-25.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-25.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var proto = {};

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "enumerable", {

-            value:  true

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var proto = {};
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "enumerable", {
+            value:  true
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250-1.js
index ef9f8f89c..1091cd11c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            String.prototype.set = function (value) {

-                data = value;

-            };

-            var strObj = new String();

-            var data = "data";

-

-            Object.defineProperty(obj, "property", strObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete String.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            String.prototype.set = function (value) {
+                data = value;
+            };
+            var strObj = new String();
+            var data = "data";
+
+            Object.defineProperty(obj, "property", strObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete String.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250.js
index 103787346..45eece558 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-250.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var strObj = new String();

-        var data = "data";

-

-        strObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", strObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var strObj = new String();
+        var data = "data";
+
+        strObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", strObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251-1.js
index 32cc13dc9..08c04c56c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Boolean.prototype.set = function (value) {

-                data = value;

-            };

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Boolean.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Boolean.prototype.set = function (value) {
+                data = value;
+            };
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Boolean.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251.js
index a87cb25b3..3605839e2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-251.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var boolObj = new Boolean(true);

-

-        boolObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", boolObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var boolObj = new Boolean(true);
+
+        boolObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", boolObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252-1.js
index 63a4a3cb8..feabdb6c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Number.prototype.set = function (value) {

-                data = value;

-            };

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Number.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Number.prototype.set = function (value) {
+                data = value;
+            };
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Number.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252.js
index e558bff7d..cfda6a76a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-252.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var numObj = new Number(-2);

-

-        numObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", numObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var numObj = new Number(-2);
+
+        numObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", numObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253-1.js
index b71261cfb..553209320 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            Object.prototype.set = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(obj, "property", Math);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Object.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            Object.prototype.set = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(obj, "property", Math);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Object.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253.js
index d615e9bd3..8c75b2c3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-253.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            Math.set = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(obj, "property", Math);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Math.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            Math.set = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(obj, "property", Math);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Math.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254-1.js
index 2a1625024..95576137c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Date.prototype.set = function (value) {

-                data = value;

-            };

-            var dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Date.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Date.prototype.set = function (value) {
+                data = value;
+            };
+            var dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Date.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254.js
index 321587fca..83f5bc95b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-254.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var dateObj = new Date();

-

-        dateObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", dateObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var dateObj = new Date();
+
+        dateObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", dateObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255-1.js
index 1fb7df112..c7db01476 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255-1.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            RegExp.prototype.set = function (value) {

-                data = value;

-            };

-            var regObj = new RegExp();

-

-            Object.defineProperty(obj, "property", regObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete RegExp.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            RegExp.prototype.set = function (value) {
+                data = value;
+            };
+            var regObj = new RegExp();
+
+            Object.defineProperty(obj, "property", regObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete RegExp.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255.js
index 2a7bfc361..ca9a8d343 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-255.js

- * @description Object.defineProperty - 'Attributes' is a RegExp object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var regObj = new RegExp();

-

-        regObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", regObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a RegExp object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var regObj = new RegExp();
+
+        regObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", regObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256-1.js
index 0b4ab5b22..71c84005e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            Object.prototype.set = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(obj, "property", JSON);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Object.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            Object.prototype.set = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(obj, "property", JSON);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Object.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256.js
index 3678ddbce..a55d73f8e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-256.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            JSON.set = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(obj, "property", JSON);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete JSON.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            JSON.set = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(obj, "property", JSON);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete JSON.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257-1.js
index c394fbe61..0ccf1ed91 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257-1.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            Error.prototype.set = function (value) {

-                data = value;

-            };

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Error.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'set' property of prototype
+    object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            Error.prototype.set = function (value) {
+                data = value;
+            };
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Error.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257.js
index 233eca455..c9c75e18c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-257.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var errObj = new Error();

-

-        errObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", errObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'set' property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var errObj = new Error();
+
+        errObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", errObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258-1.js
index eff77365d..eea697b7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'set' property of prototype object (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        try {

-            Object.prototype.set = function (value) {

-                data = value;

-            };

-            var argObj = (function () { return arguments; })();

-

-            Object.defineProperty(obj, "property", argObj);

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete Object.prototype.set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'set' property of
+    prototype object (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        try {
+            Object.prototype.set = function (value) {
+                data = value;
+            };
+            var argObj = (function () { return arguments; })();
+
+            Object.defineProperty(obj, "property", argObj);
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete Object.prototype.set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258.js
index 69d50cce0..d2b31644b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-258.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-        var argObj = (function () { return arguments; })();

-        argObj.set = function (value) {

-            data = value;

-        };

-

-        Object.defineProperty(obj, "property", argObj);

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'set' property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+        var argObj = (function () { return arguments; })();
+        argObj.set = function (value) {
+            data = value;
+        };
+
+        Object.defineProperty(obj, "property", argObj);
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-26.js
index 2bd0c1995..a1f6f324c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-26.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-26.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var attr = {};

-        Object.defineProperty(attr, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var attr = {};
+        Object.defineProperty(attr, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-260.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-260.js
index 1617e468b..ccc35d88d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-260.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-260.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-260.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        try {

-            fnGlobalObject().set = function (value) {

-                data = value;

-            };

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-            obj.property = "overrideData";

-

-            return obj.hasOwnProperty("property") && data === "overrideData";

-        } finally {

-            delete fnGlobalObject().set;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'set' property (8.10.5
+    step 8.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        try {
+            fnGlobalObject().set = function (value) {
+                data = value;
+            };
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+            obj.property = "overrideData";
+
+            return obj.hasOwnProperty("property") && data === "overrideData";
+        } finally {
+            delete fnGlobalObject().set;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-261.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-261.js
index 87c1671d9..8376d5df2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-261.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-261.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-261.js

- * @description Object.defineProperty - value of 'set' property in 'Attributes' is undefined (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            set: undefined

-        });

-

-        obj.property = "overrideData";

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" &&

-            typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'set' property in 'Attributes' is
+    undefined (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            set: undefined
+        });
+
+        obj.property = "overrideData";
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined" &&
+            typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-262.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-262.js
index 07ff2f24c..5c5e55da4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-262.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-262.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-262.js

- * @description Object.defineProperty - value of 'set' property in 'Attributes' is a function (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var data = "data";

-

-        Object.defineProperty(obj, "property", {

-            set: function (value) {

-                data = value;

-            }

-        });

-        obj.property = "overrideData";

-

-        return obj.hasOwnProperty("property") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'set' property in 'Attributes' is
+    a function (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var data = "data";
+
+        Object.defineProperty(obj, "property", {
+            set: function (value) {
+                data = value;
+            }
+        });
+        obj.property = "overrideData";
+
+        return obj.hasOwnProperty("property") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-27.js
index 0fe3631cb..4c4078530 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-27.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-27.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var proto = {};

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    an inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var proto = {};
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-28.js
index 14afef136..d4c66c92d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-28.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-28.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var proto = { enumerable: false };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(child, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var proto = { enumerable: false };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(child, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-29.js
index cc8d5a26c..60b6e5771 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-29.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-29.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        var proto = {};

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(child, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        var proto = {};
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(child, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-3.js
index b16380866..8769f2574 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-3.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-3.js

- * @description Object.defineProperty throws TypeError if desc has 'set' and 'value' present(8.10.5 step 9.a)

- */

-

-

-function testcase() {

-    var o = {};

-

-    // dummy setter

-    var setter = function () { }

-    var desc = { set: setter, value: 101};

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if desc has 'set' and
+    'value' present(8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+
+    // dummy setter
+    var setter = function () { }
+    var desc = { set: setter, value: 101};
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-30.js
index 1543c1cb7..0099cb6aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-30.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-30.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var attr = {};

-        Object.defineProperty(attr, "enumerable", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own accessor property without a get function (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var attr = {};
+        Object.defineProperty(attr, "enumerable", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-31.js
index bc3065029..3b7a54a26 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-31.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-31.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        var proto = {};

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(child, "enumerable", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    own accessor property(without a get function) that overrides an
+    inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        var proto = {};
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(child, "enumerable", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-32.js
index 0867df59b..ea9727ae7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-32.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-32.js

- * @description Object.defineProperty - 'enumerable' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        var proto = {};

-

-        Object.defineProperty(proto, "enumerable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'enumerable' property in 'Attributes' is
+    an inherited accessor property without a get function (8.10.5 step
+    3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        var proto = {};
+
+        Object.defineProperty(proto, "enumerable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33-1.js
index a363f14bd..1b9741726 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Function.prototype.enumerable = true;

-            var fun = function () { };

-

-            Object.defineProperty(obj, "property", fun);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Function.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'enumerable'
+    property of prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Function.prototype.enumerable = true;
+            var fun = function () { };
+
+            Object.defineProperty(obj, "property", fun);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Function.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33.js
index f6aa32b17..dbbb4e6d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-33.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var fun = function () { };

-        fun.enumerable = true;

-

-        Object.defineProperty(obj, "property", fun);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var fun = function () { };
+        fun.enumerable = true;
+
+        Object.defineProperty(obj, "property", fun);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34-1.js
index 018eeedbd..a578afefd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Array.prototype.enumerable = true;

-            var arrObj = [];

-

-            Object.defineProperty(obj, "property", arrObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Array.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Array.prototype.enumerable = true;
+            var arrObj = [];
+
+            Object.defineProperty(obj, "property", arrObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Array.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34.js
index 2e580141e..6a63671f5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-34.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var arrObj = [];

-        arrObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", arrObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var arrObj = [];
+        arrObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", arrObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35-1.js
index 3c97c70f5..03654eda2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            String.prototype.enumerable = true;

-            var strObj = new String();

-

-            Object.defineProperty(obj, "property", strObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete String.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            String.prototype.enumerable = true;
+            var strObj = new String();
+
+            Object.defineProperty(obj, "property", strObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete String.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35.js
index e4c8e794b..ee0f2fa4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-35.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var strObj = new String();

-        strObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", strObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var strObj = new String();
+        strObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", strObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36-1.js
index e1ce707c4..f2a2695ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Boolean.prototype.enumerable = true;

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Boolean.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Boolean.prototype.enumerable = true;
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Boolean.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36.js
index 29b38d730..d117de23a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-36.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var boolObj = new Boolean(true);

-        boolObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", boolObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var boolObj = new Boolean(true);
+        boolObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", boolObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37-1.js
index de92b2abc..69d5b5522 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Number.prototype.enumerable = true;

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Number.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Number.prototype.enumerable = true;
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Number.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37.js
index 6007388b2..25bb9e576 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-37.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var numObj = new Number(-2);

-        numObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", numObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var numObj = new Number(-2);
+        numObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", numObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38-1.js
index eec223e6b..a8a33d9cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38-1.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Object.prototype.enumerable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete Object.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Object.prototype.enumerable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete Object.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38.js
index 7e5783e21..5b348fef9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-38.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        try {

-            Math.enumerable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete Math.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        try {
+            Math.enumerable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete Math.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39-1.js
index 90d762a50..2bd0cae69 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        try {

-            Date.prototype.enumerable = true;

-            var dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete Date.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        try {
+            Date.prototype.enumerable = true;
+            var dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete Date.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39.js
index af1983efa..f69b55734 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-39.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var dateObj = new Date();

-        dateObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", dateObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var dateObj = new Date();
+        dateObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", dateObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-4.js
index 30a200ec3..60fefa644 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-4.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-4.js

- * @description Object.defineProperty throws TypeError if desc has 'set' and 'writable' present(8.10.5 step 9.a)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var setter = function () { }

-    var desc = { set: setter, writable: false };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if desc has 'set' and
+    'writable' present(8.10.5 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var setter = function () { }
+    var desc = { set: setter, writable: false };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40-1.js
index b6839971d..c3c5e8f32 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40-1.js

- * @description Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            RegExp.prototype.enumerable = true;

-            var regObj = new RegExp();

-

-            Object.defineProperty(obj, "property", regObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete RegExp.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an RegExp object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            RegExp.prototype.enumerable = true;
+            var regObj = new RegExp();
+
+            Object.defineProperty(obj, "property", regObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete RegExp.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40.js
index 890591d86..60deebbe0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-40.js

- * @description Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var regObj = new RegExp();

-        regObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", regObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an RegExp object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var regObj = new RegExp();
+        regObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", regObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41-1.js
index 48f2b429d..5a9761c74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Object.prototype.enumerable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Object.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Object.prototype.enumerable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Object.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41.js
index 975fc998a..040e69a93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-41.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        try {

-            JSON.enumerable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete JSON.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        try {
+            JSON.enumerable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete JSON.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42-1.js
index f8941d772..bd65fc0b3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Error.prototype.enumerable = true;

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Error.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'enumerable' property of
+    prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Error.prototype.enumerable = true;
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Error.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42.js
index c5cecf28a..ab044c8d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-42.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var errObj = new Error();

-        errObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", errObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var errObj = new Error();
+        errObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", errObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43-1.js
index c7a419ed3..4ea312d14 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'enumerable' property of prototype object (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        try {

-            Object.prototype.enumerable = true;

-            var argObj = (function () { return arguments; })();

-

-            Object.defineProperty(obj, "property", argObj);

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete Object.prototype.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'enumerable'
+    property of prototype object (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        try {
+            Object.prototype.enumerable = true;
+            var argObj = (function () { return arguments; })();
+
+            Object.defineProperty(obj, "property", argObj);
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete Object.prototype.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43.js
index 1e32c97a4..7e6260729 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-43.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        var argObj = (function () { return arguments; })();

-        argObj.enumerable = true;

-

-        Object.defineProperty(obj, "property", argObj);

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'enumerable'
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        var argObj = (function () { return arguments; })();
+        argObj.enumerable = true;
+
+        Object.defineProperty(obj, "property", argObj);
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-45.js
index 9c03904b0..9a85d6512 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-45.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-45.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        try {

-            fnGlobalObject().enumerable = true;

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-

-            for (var prop in obj) {

-                if (prop === "property") {

-                    accessed = true;

-                }

-            }

-

-            return accessed;

-        } finally {

-            delete fnGlobalObject().enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'enumerable' property
+    (8.10.5 step 3.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        try {
+            fnGlobalObject().enumerable = true;
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+
+            for (var prop in obj) {
+                if (prop === "property") {
+                    accessed = true;
+                }
+            }
+
+            return accessed;
+        } finally {
+            delete fnGlobalObject().enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-46.js
index 5660ea763..12e99c9a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-46.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-46.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is undefined (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", {

-            enumerable: undefined

-        });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is undefined (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", {
+            enumerable: undefined
+        });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-47.js
index cd9c7d174..ece56f502 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-47.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-47.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is null (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: null });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is null (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: null });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-48.js
index 7b364dadb..ad4bf8cce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-48.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-48.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is true (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: true });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is true (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: true });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-49.js
index f8dd8f2c3..61bdc3937 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-49.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-49.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is false (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: false });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is false (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: false });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-5.js
index 3d42cf630..9044964e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-5.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-5.js

- * @description Object.defineProperty throws TypeError if getter is not callable but not undefined (Number)(8.10.5 step 7.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = 42;

-    var desc = { get: getter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if getter is not callable
+    but not undefined (Number)(8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = 42;
+    var desc = { get: getter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-50.js
index 559c425d2..fdc7dcdec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-50.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-50.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is 0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: 0 });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is 0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: 0 });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-51.js
index 57123624b..161db5415 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-51.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-51.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is +0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: +0 });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is +0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: +0 });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-52.js
index acd57ed07..1082d235c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-52.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-52.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is -0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: -0 });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is -0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: -0 });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-53.js
index 44fbcc1cf..47ffac470 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-53.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-53.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is NaN (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: NaN });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is NaN (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: NaN });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-54.js
index 89248e8cf..801409520 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-54.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-54.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a positive number (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: 12 });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a positive number (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: 12 });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-55.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-55.js
index 845995180..9574a86b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-55.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-55.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-55.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a negative number (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: -2 });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a negative number (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: -2 });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-56.js
index 5b906685a..549a404e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-56.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-56.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is an empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: "" });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is an empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: "" });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-57.js
index 50d0dd4c8..f4d90140d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-57.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-57.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a non-empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: "AB\n\\cd" });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a non-empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: "AB\n\\cd" });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-58.js
index 8b7de6bee..7f2cef94c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-58.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-58.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Function object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", {

-            enumerable: function () { }

-        });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a Function object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", {
+            enumerable: function () { }
+        });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-59.js
index f5eb483b9..db8113f3e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-59.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-59.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Array object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: [] });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is an Array object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: [] });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-6.js
index b2ac8c880..060480648 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-6.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-6.js

- * @description Object.defineProperty throws TypeError if getter is not callable but not undefined (Boolean)(8.10.5 step 7.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = true;

-    var desc = { get: getter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if getter is not callable
+    but not undefined (Boolean)(8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = true;
+    var desc = { get: getter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-60.js
index ec0295ebd..e9b640594 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-60.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-60.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a String Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new String() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a String Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new String() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-61.js
index 2a50ac60b..ceebd2faf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-61.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-61.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Boolean Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new Boolean() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a Boolean Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new Boolean() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-62.js
index 711a35a04..75606ef86 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-62.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-62.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Number Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new Number() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a Number Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new Number() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-63.js
index 4be8551e4..812c5a54b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-63.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-63.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is the Math Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: Math });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is the Math Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: Math });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-64.js
index da77c80fe..328bf6e2f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-64.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-64.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a Date Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new Date() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a Date Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new Date() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-65.js
index 1d30ad14a..4c7843798 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-65.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-65.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is a RegExp Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new RegExp() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is a RegExp Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new RegExp() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-66.js
index 3fa17944f..af63c9173 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-66.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-66.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is the JSON Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: JSON });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is the JSON Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: JSON });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-67.js
index d9e8cccd2..78473bbcd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-67.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-67.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Error Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new Error() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is an Error Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new Error() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-68.js
index 83724d073..ffdbb6499 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-68.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-68.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is an Arguments Object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-        var argObj = (function () { return arguments; })(0, 1, 2);

-

-        Object.defineProperty(obj, "property", { enumerable: argObj });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is an Arguments Object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+        var argObj = (function () { return arguments; })(0, 1, 2);
+
+        Object.defineProperty(obj, "property", { enumerable: argObj });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-7.js
index 396b86e04..9159df04b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-7.js

- * @description Object.defineProperty throws TypeError if getter is not callable but not undefined (String)(8.10.5 step 7.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = "abc";

-    var desc = { get: getter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if getter is not callable
+    but not undefined (String)(8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = "abc";
+    var desc = { get: getter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-70.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-70.js
index 2fbd98c12..c638ab71a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-70.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-70.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-70.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is the global object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: fnGlobalObject() });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is the global object (8.10.5 step 3.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: fnGlobalObject() });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-71.js
index 01f23a96a..83a6a7892 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-71.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-71.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is treated as true when it is a string (value is 'false') (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: "false" });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is treated as true when it is a string (value is
+    'false') (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: "false" });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-72.js
index 83c061229..dcb7b7a48 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-72.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-72.js

- * @description Object.defineProperty - value of 'enumerable' property in 'Attributes' is new Boolean(false) which is treated as true value (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "property", { enumerable: new Boolean(false) });

-

-        for (var prop in obj) {

-            if (prop === "property") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - value of 'enumerable' property in
+    'Attributes' is new Boolean(false) which is treated as true value
+    (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "property", { enumerable: new Boolean(false) });
+
+        for (var prop in obj) {
+            if (prop === "property") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-73.js
index 6adafd6bb..a54dc285b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-73.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-73.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is present (8.10.5 step 4)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            configurable: false

-        });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    present (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            configurable: false
+        });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-74.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-74.js
index 2fc02fe58..b313bfb28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-74.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-74.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-74.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is not present (8.10.5 step 4)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { value: 100 });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = (obj.property === 100);

-

-        return beforeDeleted === true && afterDeleted === true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    not present (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { value: 100 });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = (obj.property === 100);
+
+        return beforeDeleted === true && afterDeleted === true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-75.js
index 402d9a044..71cc96acb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-75.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-75.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", {

-            configurable: true

-        });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", {
+            configurable: true
+        });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-76.js
index de1315156..ef828ea56 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-76.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-76.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {

-            configurable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-        return beforeDeleted && afterDeleted && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    an inherited data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {
+            configurable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+        return beforeDeleted && afterDeleted && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-77.js
index 941bb92fe..b75f05bee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-77.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-77.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own data property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var proto = {

-            configurable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.configurable = true;

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var proto = {
+            configurable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.configurable = true;
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-78.js
index ce0a02d2b..a5d8aa8fa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-78.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-78.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own data property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = { };

-

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "configurable", {

-            value: true

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = { };
+
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "configurable", {
+            value: true
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-79.js
index 384faafe8..3d31d9d55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-79.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-79.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = {};

-        Object.defineProperty(attr, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = {};
+        Object.defineProperty(attr, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-8.js
index 93bb5a964..71f736c0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-8.js

- * @description Object.defineProperty throws TypeError if getter is not callable but not undefined (Null)(8.10.5 step 7.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = null;

-    var desc = { get: getter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if getter is not callable
+    but not undefined (Null)(8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = null;
+    var desc = { get: getter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-80.js
index 8e9d497e2..93fd2f5ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-80.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-80.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    an inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-81.js
index c66f4fd30..7e66dc2fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-81.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-81.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            configurable: false

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            configurable: false
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-82.js
index fd14e4b25..e576fdb0e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-82.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-82.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-83.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-83.js
index edf9d50f7..d7850d588 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-83.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-83.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-83.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var attr = {};

-        Object.defineProperty(attr, "configurable", {

-            set : function () { }

-        });

-

-        Object.defineProperty(obj, "property", attr);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own accessor property without a get function (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var attr = {};
+        Object.defineProperty(attr, "configurable", {
+            set : function () { }
+        });
+
+        Object.defineProperty(obj, "property", attr);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-84.js
index 95e0ebf2f..3a551eafb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-84.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-84.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is own accessor property(without a get function) that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "configurable", {

-            set: function () { }

-        });

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    own accessor property(without a get function) that overrides an
+    inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "configurable", {
+            set: function () { }
+        });
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-85.js
index 1cccfd1db..6c9e53f54 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-85.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-85.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is an inherited accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            set: function () { }

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(obj, "property", child);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    an inherited accessor property without a get function (8.10.5 step
+    4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            set: function () { }
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(obj, "property", child);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86-1.js
index e9dca71af..673707772 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86-1.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86-1.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'configurable' property of prototype object (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Function.prototype.configurable = true;

-            var funObj = function (a, b) {

-                return a + b;

-            };

-

-            Object.defineProperty(obj, "property", funObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Function.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'configurable'
+    property of prototype object (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Function.prototype.configurable = true;
+            var funObj = function (a, b) {
+                return a + b;
+            };
+
+            Object.defineProperty(obj, "property", funObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Function.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86.js
index cdd246800..9f952f0ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-86.js

- * @description Object.defineProperty - 'Attributes' is a Function object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var funObj = function (a, b) {

-            return a + b;

-        };

-

-        funObj.configurable = true;

-

-        Object.defineProperty(obj, "property", funObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Function object which
+    implements its own [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var funObj = function (a, b) {
+            return a + b;
+        };
+
+        funObj.configurable = true;
+
+        Object.defineProperty(obj, "property", funObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87-1.js
index d07f2529e..0d2745429 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87-1.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Array.prototype.configurable = true;

-            var arrObj = [1, 2, 3];

-

-            Object.defineProperty(obj, "property", arrObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Array.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Array.prototype.configurable = true;
+            var arrObj = [1, 2, 3];
+
+            Object.defineProperty(obj, "property", arrObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Array.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87.js
index d48f3cd0a..bbb4443dd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-87.js

- * @description Object.defineProperty - 'Attributes' is an Array object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var arrObj = [1, 2, 3];

-

-        arrObj.configurable = true;

-

-        Object.defineProperty(obj, "property", arrObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Array object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var arrObj = [1, 2, 3];
+
+        arrObj.configurable = true;
+
+        Object.defineProperty(obj, "property", arrObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88-1.js
index f7cc6f533..6a8f8e591 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88-1.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            String.prototype.configurable = true;

-            var strObj = new String("abc");

-

-            Object.defineProperty(obj, "property", strObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete String.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            String.prototype.configurable = true;
+            var strObj = new String("abc");
+
+            Object.defineProperty(obj, "property", strObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete String.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88.js
index 03270ccf4..f5cf216a2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-88.js

- * @description Object.defineProperty - 'Attributes' is a String object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var strObj = new String("abc");

-

-        strObj.configurable = true;

-

-        Object.defineProperty(obj, "property", strObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a String object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var strObj = new String("abc");
+
+        strObj.configurable = true;
+
+        Object.defineProperty(obj, "property", strObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89-1.js
index 5acb26c6b..866433910 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89-1.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Boolean.prototype.configurable = true;

-            var boolObj = new Boolean(true);

-

-            Object.defineProperty(obj, "property", boolObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Boolean.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Boolean.prototype.configurable = true;
+            var boolObj = new Boolean(true);
+
+            Object.defineProperty(obj, "property", boolObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Boolean.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89.js
index e0f2442f3..245ce9eac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-89.js

- * @description Object.defineProperty - 'Attributes' is a Boolean object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var boolObj = new Boolean(true);

-

-        boolObj.configurable = true;

-

-        Object.defineProperty(obj, "property", boolObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Boolean object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var boolObj = new Boolean(true);
+
+        boolObj.configurable = true;
+
+        Object.defineProperty(obj, "property", boolObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-9.js
index 1b37e2601..5f39b2eb2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * The abtract operation ToPropertyDescriptor  is used to package the

- * into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError

- * if the property desc ends up having a mix of accessor and data property elements.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-9.js

- * @description Object.defineProperty throws TypeError if getter is not callable but not undefined (Object)(8.10.5 step 7.b)

- */

-

-

-function testcase() {

-    var o = {};

-    

-    // dummy getter

-    var getter = { a: 1 };

-    var desc = { get: getter };

-    

-    try {

-      Object.defineProperty(o, "foo", desc);

-    }

-    catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    The abtract operation ToPropertyDescriptor  is used to package the
+    into a property desc. Step 10 of ToPropertyDescriptor throws a TypeError
+    if the property desc ends up having a mix of accessor and data property elements.
+description: >
+    Object.defineProperty throws TypeError if getter is not callable
+    but not undefined (Object)(8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    var o = {};
+    
+    // dummy getter
+    var getter = { a: 1 };
+    var desc = { get: getter };
+    
+    try {
+      Object.defineProperty(o, "foo", desc);
+    }
+    catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90-1.js
index fcb7bbda7..f1be0dc2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90-1.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Number.prototype.configurable = true;

-            var numObj = new Number(-2);

-

-            Object.defineProperty(obj, "property", numObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Number.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Number.prototype.configurable = true;
+            var numObj = new Number(-2);
+
+            Object.defineProperty(obj, "property", numObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Number.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90.js
index 038b4007f..e29a05464 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-90.js

- * @description Object.defineProperty - 'Attributes' is a Number object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var numObj = new Number(-2);

-

-        numObj.configurable = true;

-

-        Object.defineProperty(obj, "property", numObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Number object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var numObj = new Number(-2);
+
+        numObj.configurable = true;
+
+        Object.defineProperty(obj, "property", numObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91-1.js
index dab6f1eef..964814795 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91-1.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.configurable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Object.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.configurable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Object.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91.js
index 4976765c5..75f3e4f5d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-91.js

- * @description Object.defineProperty - 'Attributes' is the Math object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Math.configurable = true;

-

-            Object.defineProperty(obj, "property", Math);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Math.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the Math object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Math.configurable = true;
+
+            Object.defineProperty(obj, "property", Math);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Math.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92-1.js
index ab866d48d..2c0438b8a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92-1.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Date.prototype.configurable = true;

-            var dateObj = new Date();

-

-            Object.defineProperty(obj, "property", dateObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Date.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Date.prototype.configurable = true;
+            var dateObj = new Date();
+
+            Object.defineProperty(obj, "property", dateObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Date.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92.js
index 2bb1800e4..495d1a9a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-92.js

- * @description Object.defineProperty - 'Attributes' is a Date object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var dateObj = new Date();

-

-        dateObj.configurable = true;

-

-        Object.defineProperty(obj, "property", dateObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is a Date object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var dateObj = new Date();
+
+        dateObj.configurable = true;
+
+        Object.defineProperty(obj, "property", dateObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93-1.js
index 08777be8e..398ee7806 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93-1.js

- * @description Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            RegExp.prototype.configurable = true;

-            var regObj = new RegExp();

-

-            Object.defineProperty(obj, "property", regObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete RegExp.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an RegExp object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            RegExp.prototype.configurable = true;
+            var regObj = new RegExp();
+
+            Object.defineProperty(obj, "property", regObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete RegExp.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93.js
index 8721cbfad..81a1010ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-93.js

- * @description Object.defineProperty - 'Attributes' is an RegExp object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var regObj = new RegExp();

-

-        regObj.configurable = true;

-

-        Object.defineProperty(obj, "property", regObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an RegExp object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var regObj = new RegExp();
+
+        regObj.configurable = true;
+
+        Object.defineProperty(obj, "property", regObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94-1.js
index 13ae26509..78b397ca6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94-1.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.configurable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Object.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.configurable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Object.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94.js
index 754f81925..f1d6c3451 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-94.js

- * @description Object.defineProperty - 'Attributes' is the JSON object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.configurable = true;

-

-            Object.defineProperty(obj, "property", JSON);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete JSON.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the JSON object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.configurable = true;
+
+            Object.defineProperty(obj, "property", JSON);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete JSON.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95-1.js
index 388055eca..84b1dd97b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95-1.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95-1.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-        try {

-            Error.prototype.configurable = true;

-            var errObj = new Error();

-

-            Object.defineProperty(obj, "property", errObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Error.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        try {
+            Error.prototype.configurable = true;
+            var errObj = new Error();
+
+            Object.defineProperty(obj, "property", errObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Error.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95.js
index 8b437d687..23c7ab642 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-95.js

- * @description Object.defineProperty - 'Attributes' is an Error object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        var errObj = new Error();

-

-        errObj.configurable = true;

-

-        Object.defineProperty(obj, "property", errObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Error object that uses
+    Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        var errObj = new Error();
+
+        errObj.configurable = true;
+
+        Object.defineProperty(obj, "property", errObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96-1.js
index dc5583c8b..30997afdf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96-1.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96-1.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.prototype.configurable = true;

-            var argObj = (function () { return arguments; })();

-

-            Object.defineProperty(obj, "property", argObj);

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete Object.prototype.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.prototype.configurable = true;
+            var argObj = (function () { return arguments; })();
+
+            Object.defineProperty(obj, "property", argObj);
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete Object.prototype.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96.js
index 1bba519c7..8fbe20aa1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-96.js

- * @description Object.defineProperty - 'Attributes' is an Arguments object which implements its own [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var argObj = (function () { return arguments; })();

-        argObj.configurable = true;

-

-        Object.defineProperty(obj, "property", argObj);

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property");

-

-        return beforeDeleted === true && afterDeleted === false;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is an Arguments object which
+    implements its own [[Get]] method to access the 'configurable'
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var argObj = (function () { return arguments; })();
+        argObj.configurable = true;
+
+        Object.defineProperty(obj, "property", argObj);
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property");
+
+        return beforeDeleted === true && afterDeleted === false;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-98.js
index 693fa704b..853485b05 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-98.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-98.js

- * @description Object.defineProperty - 'Attributes' is the global object that uses Object's [[Get]] method to access the 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            fnGlobalObject().configurable = true;

-

-            Object.defineProperty(obj, "property", fnGlobalObject());

-

-            var beforeDeleted = obj.hasOwnProperty("property");

-

-            delete obj.property;

-

-            var afterDeleted = obj.hasOwnProperty("property");

-

-            return beforeDeleted === true && afterDeleted === false;

-        } finally {

-            delete fnGlobalObject().configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'Attributes' is the global object that
+    uses Object's [[Get]] method to access the 'configurable' property
+    (8.10.5 step 4.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            fnGlobalObject().configurable = true;
+
+            Object.defineProperty(obj, "property", fnGlobalObject());
+
+            var beforeDeleted = obj.hasOwnProperty("property");
+
+            delete obj.property;
+
+            var afterDeleted = obj.hasOwnProperty("property");
+
+            return beforeDeleted === true && afterDeleted === false;
+        } finally {
+            delete fnGlobalObject().configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-99.js
index 5ead44f1d..f3832b582 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-99.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-3-99.js

- * @description Object.defineProperty - 'configurable' property in 'Attributes' is undefined (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = { };

-

-        Object.defineProperty(obj, "property", { configurable: undefined });

-

-        var beforeDeleted = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-        return beforeDeleted === true && afterDeleted === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'configurable' property in 'Attributes' is
+    undefined (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+
+        Object.defineProperty(obj, "property", { configurable: undefined });
+
+        var beforeDeleted = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        var afterDeleted = obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+        return beforeDeleted === true && afterDeleted === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-1.js
index 090b0a8a2..a5ece30c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-1.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O passing 'true' for the Throw flag. In this case, step 3 of

- * [[DefineOwnProperty]] requires that it throw a TypeError exception when

- * current is undefined and extensible is false. The value of desc does not

- * matter.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-1.js

- * @description Object.defineProperty throws TypeError when adding properties to non-extensible objects(8.12.9 step 3)

- */

-

-

-function testcase() {

-  var o = {};

-  Object.preventExtensions(o);

-

-  try {

-    var desc = { value: 1 };

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-      if (e instanceof TypeError &&

-          (o.hasOwnProperty("foo") === false)) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O passing 'true' for the Throw flag. In this case, step 3 of
+    [[DefineOwnProperty]] requires that it throw a TypeError exception when
+    current is undefined and extensible is false. The value of desc does not
+    matter.
+description: >
+    Object.defineProperty throws TypeError when adding properties to
+    non-extensible objects(8.12.9 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+  Object.preventExtensions(o);
+
+  try {
+    var desc = { value: 1 };
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+      if (e instanceof TypeError &&
+          (o.hasOwnProperty("foo") === false)) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-10.js
index 05daa8c21..d6b8f0f4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-10.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if

- * current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations

- * of each other.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-10.js

- * @description Object.defineProperty throws TypeError when changing [[Enumerable]] from false to true on non-configurable accessor properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy getter

-  var getter = function () { return 1; }

-  var d1 = { get: getter, enumerable: false, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, setting enumerable to true should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { get: getter, enumerable: true };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.get === getter &&

-          d2.enumerable === false &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if
+    current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations
+    of each other.
+description: >
+    Object.defineProperty throws TypeError when changing
+    [[Enumerable]] from false to true on non-configurable accessor
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy getter
+  var getter = function () { return 1; }
+  var d1 = { get: getter, enumerable: false, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, setting enumerable to true should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { get: getter, enumerable: true };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.get === getter &&
+          d2.enumerable === false &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-100.js
index 53da96a36..98221d31d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-100.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-100.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, desc.value and name.value are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", {

-            value: 200

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    desc.value and name.value are two different values (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", {
+            value: 200
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-101.js
index 831fddabf..e55ffdb91 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-101.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-101.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, name.value is present and desc.value is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: undefined });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    name.value is present and desc.value is undefined (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: undefined });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-102.js
index a73307e83..5b31d0b86 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-102.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-102.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, desc.value is present and name.value is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = undefined; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: 100 });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    desc.value is present and name.value is undefined (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = undefined; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: 100 });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-103.js
index bc923d561..7b8fbf6a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-103.js
@@ -1,25 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-103.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, name.writable and desc.writable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            writable: false, configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            writable: true

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    name.writable and desc.writable are different values (8.12.9 step
+    12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            writable: false, configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            writable: true
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-104.js
index d8e53de95..15a696f7b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-104.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-104.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, name.enumerable and desc.enumerable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: true

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    name.enumerable and desc.enumerable are different values (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: true
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-105.js
index 2bfc4a283..3fb480427 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-105.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-105.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, name.configurable = true and desc.configurable = false (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 200,

-            enumerable: true,

-            writable: true,

-            configurable: true 

-        });

-

-        Object.defineProperty(obj, "foo", {

-            configurable: false

-        });

-        

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    name.configurable = true and desc.configurable = false (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 200,
+            enumerable: true,
+            writable: true,
+            configurable: true 
+        });
+
+        Object.defineProperty(obj, "foo", {
+            configurable: false
+        });
+        
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-106.js
index 5caba4135..1f2e83788 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-106.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-106.js

- * @description Object.defineProperty - 'name' and 'desc' are data properties, several attributes values of name and desc are different (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 100, 

-            writable: true, 

-            enumerable: true, 

-            configurable: true 

-        });

-        

-        Object.defineProperty(obj, "foo", { 

-            value: 200, 

-            writable: false, 

-            enumerable: false 

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are data properties,
+    several attributes values of name and desc are different (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 100, 
+            writable: true, 
+            enumerable: true, 
+            configurable: true 
+        });
+        
+        Object.defineProperty(obj, "foo", { 
+            value: 200, 
+            writable: false, 
+            enumerable: false 
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-107.js
index e126f9d78..24e4d6f59 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-107.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-107.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, both desc.[[Get]] and name.[[Get]] are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            configurable: true

-        });

-

-        function getFunc2() {

-            return 20;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc2

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    both desc.[[Get]] and name.[[Get]] are two different values
+    (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            configurable: true
+        });
+
+        function getFunc2() {
+            return 20;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc2
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-108.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-108.js
index ba3ce3643..351eddafa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-108.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-108.js
@@ -1,37 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-108.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties,  name.[[Get]] is present and desc.[[Get]] is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc,

-            get: undefined

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor
+    properties,  name.[[Get]] is present and desc.[[Get]] is undefined
+    (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc,
+            get: undefined
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-109.js
index 4f1990030..d90b03f7b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-109.js
@@ -1,35 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-109.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, name.[[Get]] is undefined and desc.[[Get]] is function (8.12.9 step 12)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-       

-        Object.defineProperty(obj, "foo", {

-            set: setFunc,

-            get: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        function getFunc() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    name.[[Get]] is undefined and desc.[[Get]] is function (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+       
+        Object.defineProperty(obj, "foo", {
+            set: setFunc,
+            get: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        function getFunc() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-11.js
index ec9f8cb4c..697b383b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-11.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if

- * current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations

- * of each other.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-11.js

- * @description Object.defineProperty throws TypeError when changing [[Enumerable]] from true to false on non-configurable accessor properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy getter

-  var getter = function () { return 1; }

-  var d1 = { get: getter, enumerable: true, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, setting enumerable to true should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { get: getter, enumerable: false };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.get === getter &&

-          d2.enumerable === true &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if
+    current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations
+    of each other.
+description: >
+    Object.defineProperty throws TypeError when changing
+    [[Enumerable]] from true to false on non-configurable accessor
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy getter
+  var getter = function () { return 1; }
+  var d1 = { get: getter, enumerable: true, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, setting enumerable to true should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { get: getter, enumerable: false };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.get === getter &&
+          d2.enumerable === true &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-110.js
index 71c6df7f3..571e523ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-110.js
@@ -1,35 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-110.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, both desc.[[Set]] and name.[[Set]] are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc1() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc1,

-            enumerable: true,

-            configurable: true

-        });

-

-        function setFunc2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc2

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc2, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    both desc.[[Set]] and name.[[Set]] are two different values
+    (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc1() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc1,
+            enumerable: true,
+            configurable: true
+        });
+
+        function setFunc2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc2
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc2, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-111.js
index 28818d63b..a2439d8c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-111.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-111.js

- * @description Object.defineProperty  - 'name' and 'desc' are accessor properties, name.[[Set]] is present and desc.[[Set]] is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            set: undefined,

-            get: getFunc

-        });

-

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-        return obj.hasOwnProperty("foo") && typeof (desc.set) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty  - 'name' and 'desc' are accessor
+    properties, name.[[Set]] is present and desc.[[Set]] is undefined
+    (8.12.9 step 12)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            set: undefined,
+            get: getFunc
+        });
+
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+        return obj.hasOwnProperty("foo") && typeof (desc.set) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-112.js
index c5d0dcca3..25ff28167 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-112.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-112.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, name.[[Set]] is undefined and desc.[[Set]] is function (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: undefined,

-            get: getFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    name.[[Set]] is undefined and desc.[[Set]] is function (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: undefined,
+            get: getFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-113.js
index 2ed5affe5..34df10007 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-113.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-113.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, name.enumerable and desc.enumerable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            enumerable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    name.enumerable and desc.enumerable are different values (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            enumerable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-114.js
index bb4fa578b..96e5b6fc2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-114.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-114.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, name.configurable = true and desc.configurable = false (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        function getFunc() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            configurable: false

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    name.configurable = true and desc.configurable = false (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        function getFunc() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            configurable: false
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-115.js
index db97764b7..edb5fd194 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-115.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-115.js

- * @description Object.defineProperty - 'name' and 'desc' are accessor properties, several attributes values of 'name' and 'desc' are different (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc1() {

-            return 10;

-        }

-        function setFunc1() {}

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc1,

-            set: setFunc1,

-            enumerable: true,

-            configurable: true

-        });

-

-        function getFunc2() {

-            return 20;

-        }

-        function setFunc2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(obj, "foo", {

-            get: getFunc2,

-            set: setFunc2,

-            enumerable: false

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc2, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' and 'desc' are accessor properties,
+    several attributes values of 'name' and 'desc' are different
+    (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc1() {
+            return 10;
+        }
+        function setFunc1() {}
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc1,
+            set: setFunc1,
+            enumerable: true,
+            configurable: true
+        });
+
+        function getFunc2() {
+            return 20;
+        }
+        function setFunc2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(obj, "foo", {
+            get: getFunc2,
+            set: setFunc2,
+            enumerable: false
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc2, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-116.js
index 2e3f5f1b5..6b2f72758 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-116.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-116.js

- * @description Object.defineProperty - 'O' is an Array, test the length property of 'O' is own data property (15.4.5.1 step 1)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        Object.defineProperty(arrObj, "1", {

-            value: 1,

-            configurable: false

-        });

-        try {

-            Object.defineProperty(arrObj, "length", { value: 1 });

-            return false;

-        } catch (e) {

-            var desc = Object.getOwnPropertyDescriptor(arrObj, "length");

-

-            return Object.hasOwnProperty.call(arrObj, "length") && desc.value === 2 &&

-                desc.writable === true && desc.configurable === false && desc.enumerable === false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, test the length property
+    of 'O' is own data property (15.4.5.1 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        Object.defineProperty(arrObj, "1", {
+            value: 1,
+            configurable: false
+        });
+        try {
+            Object.defineProperty(arrObj, "length", { value: 1 });
+            return false;
+        } catch (e) {
+            var desc = Object.getOwnPropertyDescriptor(arrObj, "length");
+
+            return Object.hasOwnProperty.call(arrObj, "length") && desc.value === 2 &&
+                desc.writable === true && desc.configurable === false && desc.enumerable === false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-117.js
index 7c0533191..bdfd00050 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-117.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-117.js

- * @description Object.defineProperty - 'O' is an Array, test the length property of 'O' is own data property that overrides an inherited data property (15.4.5.1 step 1)

- */

-

-

-function testcase() {

-        var arrObj = [0, 1, 2];

-        var arrProtoLen;

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-

-            

-            Object.defineProperty(arrObj, "2", {

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 3 && Array.prototype.length === 0;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, test the length property
+    of 'O' is own data property that overrides an inherited data
+    property (15.4.5.1 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [0, 1, 2];
+        var arrProtoLen;
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+
+            
+            Object.defineProperty(arrObj, "2", {
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 3 && Array.prototype.length === 0;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-118.js
index e7a327ad7..0e3c6150a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-118.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-118.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is absent (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {});

-

-        var verifyValue = false;

-        if (arrObj.length === 0) {

-            verifyValue = true;

-        }

-

-        arrObj.length = 2;

-        var verifyWritable = arrObj.length === 2;

-

-        var verifyEnumerable = false;

-        for (var p in arrObj) {

-            if (p === "length" && arrObj.hasOwnProperty(p)) {

-                verifyEnumerable = true;

-            }

-        }

-

-        delete arrObj.length;

-        var verifyConfigurable = arrObj.hasOwnProperty("length");

-

-        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    every field in 'desc' is absent (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {});
+
+        var verifyValue = false;
+        if (arrObj.length === 0) {
+            verifyValue = true;
+        }
+
+        arrObj.length = 2;
+        var verifyWritable = arrObj.length === 2;
+
+        var verifyEnumerable = false;
+        for (var p in arrObj) {
+            if (p === "length" && arrObj.hasOwnProperty(p)) {
+                verifyEnumerable = true;
+            }
+        }
+
+        delete arrObj.length;
+        var verifyConfigurable = arrObj.hasOwnProperty("length");
+
+        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-119.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-119.js
index 19e59dcb7..b30e42744 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-119.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-119.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-119.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is same with corresponding attribute value of the length property in 'O' (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        Object.defineProperty(arrObj, "length", {

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-

-        var verifyValue = false;

-        if (arrObj.length === 0) {

-            verifyValue = true;

-        }

-

-        arrObj.length = 2;

-        var verifyWritable = arrObj.length === 2 ? true : false;

-

-        var verifyEnumerable = false;

-        for (var p in arrObj) {

-            if (p === "length" && arrObj.hasOwnProperty(p)) {

-                verifyEnumerable = true;

-            }

-        }

-

-        delete arrObj.length;

-        var verifyConfigurable = arrObj.hasOwnProperty("length");

-

-        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    every field in 'desc' is same with corresponding attribute value
+    of the length property in 'O' (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        Object.defineProperty(arrObj, "length", {
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+
+        var verifyValue = false;
+        if (arrObj.length === 0) {
+            verifyValue = true;
+        }
+
+        arrObj.length = 2;
+        var verifyWritable = arrObj.length === 2 ? true : false;
+
+        var verifyEnumerable = false;
+        for (var p in arrObj) {
+            if (p === "length" && arrObj.hasOwnProperty(p)) {
+                verifyEnumerable = true;
+            }
+        }
+
+        delete arrObj.length;
+        var verifyConfigurable = arrObj.hasOwnProperty("length");
+
+        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-12.js
index 8fcdcd99c..fe688e0af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-12.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 9a of

- * [[DefineOwnProperty]] rejects changing the kind of a property.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-12.js

- * @description Object.defineProperty throws TypeError when changing non-configurable data properties to accessor properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property; all other attributes default to false.

-  var d1 = { value: 101, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // changing "foo" to be an accessor should fail, since [[Configurable]]

-  // on the original property will be false.

-

-  // dummy getter

-  var getter = function () { return 1; }

-

-  var desc = { get: getter };

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain a data valued property.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.value === 101 &&

-          d2.writable === false &&

-          d2.enumerable === false &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 9a of
+    [[DefineOwnProperty]] rejects changing the kind of a property.
+description: >
+    Object.defineProperty throws TypeError when changing
+    non-configurable data properties to accessor properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property; all other attributes default to false.
+  var d1 = { value: 101, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // changing "foo" to be an accessor should fail, since [[Configurable]]
+  // on the original property will be false.
+
+  // dummy getter
+  var getter = function () { return 1; }
+
+  var desc = { get: getter };
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain a data valued property.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.value === 101 &&
+          d2.writable === false &&
+          d2.enumerable === false &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-120.js
index c2e7a5f11..cbf6cbd31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-120.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-120.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Configurable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        try {

-            Object.defineProperty(arrObj, "length", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Configurable]] attribute
+    of the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        try {
+            Object.defineProperty(arrObj, "length", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-121.js
index 5672d0694..2a2f01a83 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-121.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-121.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Enumerable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        try {

-            Object.defineProperty(arrObj, "length", {

-                enumerable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Enumerable]] attribute of
+    the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        try {
+            Object.defineProperty(arrObj, "length", {
+                enumerable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-122.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-122.js
index 420473415..3251c6935 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-122.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-122.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-122.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test TypeError is thrown when 'desc' is accessor descriptor (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        try {

-            Object.defineProperty(arrObj, "length", {

-                get: function () {

-                    return 2;

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test TypeError is thrown when 'desc' is accessor
+    descriptor (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        try {
+            Object.defineProperty(arrObj, "length", {
+                get: function () {
+                    return 2;
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-123.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-123.js
index 8d6644765..7bb08b03c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-123.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-123.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-123.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Writable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        try {

-            Object.defineProperty(arrObj, "length", {

-                writable: false

-            });

-            Object.defineProperty(arrObj, "length", {

-                writable: true

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Writable]] attribute of
+    the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        try {
+            Object.defineProperty(arrObj, "length", {
+                writable: false
+            });
+            Object.defineProperty(arrObj, "length", {
+                writable: true
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-124.js
index 0fc7189ba..51ece404a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-124.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-124.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is absent, test updating the [[Writable]] attribute of the length property from true to false (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "length", 0, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    updating the [[Writable]] attribute of the length property from
+    true to false (15.4.5.1 step 3.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "length", 0, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-125.js
index cc26da9c0..37bd7fffb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-125.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-125.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test that RangeError exception is thrown when  [[Value]] field of 'desc' is undefined (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: undefined

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test that RangeError exception is thrown when
+    [[Value]] field of 'desc' is undefined (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: undefined
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-126.js
index 375400ff2..4b6c966a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-126.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-126.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is null (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: null

-        });

-        return arrObj.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is null
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: null
+        });
+        return arrObj.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-127.js
index 161425acd..9ffe6a909 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-127.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-127.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value false (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: false

-        });

-        return arrObj.length === 0 && !arrObj.hasOwnProperty("0") && !arrObj.hasOwnProperty("1");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a boolean
+    with value false (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: false
+        });
+        return arrObj.length === 0 && !arrObj.hasOwnProperty("0") && !arrObj.hasOwnProperty("1");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-128.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-128.js
index 02eae0118..405def788 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-128.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-128.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-128.js

- * @description Object.defineProperty -  'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value true (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: true

-        });

-        return arrObj.length === 1;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty -  'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a boolean
+    with value true (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: true
+        });
+        return arrObj.length === 1;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-129.js
index 12179b302..eee6a9ecd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-129.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-129.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is 0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 0

-        });

-        return arrObj.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is not thrown when the
+    [[Value]] field of 'desc' is 0 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 0
+        });
+        return arrObj.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-13.js
index e1e4ed945..f6a5201d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-13.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 9a of

- * [[DefineOwnProperty]] rejects changing the kind of a property.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-13.js

- * @description Object.defineProperty throws TypeError when changing non-configurable accessor properties to data properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

- 

-  // dummy getter

-  var getter = function () { return 1; }

-  var d1 = { get: getter, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // changing "foo" to be a data property should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { value: 101 };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain an accessor property.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.get === getter &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 9a of
+    [[DefineOwnProperty]] rejects changing the kind of a property.
+description: >
+    Object.defineProperty throws TypeError when changing
+    non-configurable accessor properties to data properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+ 
+  // dummy getter
+  var getter = function () { return 1; }
+  var d1 = { get: getter, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // changing "foo" to be a data property should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { value: 101 };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain an accessor property.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.get === getter &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-130.js
index 37f5a177c..0c1e89f0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-130.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-130.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is +0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: +0

-        });

-        return arrObj.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is not thrown when the
+    [[Value]] field of 'desc' is +0 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: +0
+        });
+        return arrObj.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-131.js
index 7978a452f..2e4132d8d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-131.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-131.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is -0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: -0

-        });

-        return arrObj.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is not thrown when the
+    [[Value]] field of 'desc' is -0 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: -0
+        });
+        return arrObj.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-132.js
index 8f4d5708e..4cb42dfbc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-132.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-132.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is a positive number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 12

-        });

-        return arrObj.length === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is not thrown when the
+    [[Value]] field of 'desc' is a positive number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 12
+        });
+        return arrObj.length === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-133.js
index f073bf08a..4288b6d90 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-133.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-133.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a negative number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: -9

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a negative number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: -9
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-134.js
index b20c788be..94a56be8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-134.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-134.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is +Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: +Infinity

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is +Infinity (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: +Infinity
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-135.js
index 2168209fb..5514e106f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-135.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-135.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is -Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: -Infinity

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is -Infinity (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: -Infinity
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-136.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-136.js
index 5cee918b1..19518c4f4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-136.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-136.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-136.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is NaN (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: NaN

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is NaN (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: NaN
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-137.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-137.js
index c5d1bb9e3..4ecffe355 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-137.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-137.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-137.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is not thrown when the [[Value]] field of 'desc' is a string containing a positive number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: "2"

-        });

-        return arrObj.length === 2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is not thrown when the
+    [[Value]] field of 'desc' is a string containing a positive number
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: "2"
+        });
+        return arrObj.length === 2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-138.js
index 1963ea22a..06a1dcaec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-138.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-138.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a string containing a negative number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: "-42"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a string containing a negative number
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: "-42"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-139.js
index ada6045d5..ccf290492 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-139.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-139.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a string containing a decimal number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: "200.59"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a string containing a decimal number
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: "200.59"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-14.js
index 1c1c17d92..ba0dd25ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-14.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For configurable properties, step 9b of

- * [[DefineOwnProperty]] permits changing the kind of a property.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-14.js

- * @description Object.defineProperty permits changing data property to accessor property for configurable properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data property. In this case,

-  // [[Enumerable]] and [[Configurable]] are true

-  o["foo"] = 101;

-

-  // changing "foo" to be an accessor should succeed, since [[Configurable]]

-  // on the original property will be true. Existing values of [[Configurable]]

-  // and [[Enumerable]] need to be preserved and the rest need to be set to

-  // their default values

-

-  // dummy getter

-  var getter = function () { return 1; }

-  var d1 = { get: getter };

-  Object.defineProperty(o, "foo", d1);

-

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-  if (d2.get === getter &&

-      d2.enumerable === true &&

-      d2.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For configurable properties, step 9b of
+    [[DefineOwnProperty]] permits changing the kind of a property.
+description: >
+    Object.defineProperty permits changing data property to accessor
+    property for configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data property. In this case,
+  // [[Enumerable]] and [[Configurable]] are true
+  o["foo"] = 101;
+
+  // changing "foo" to be an accessor should succeed, since [[Configurable]]
+  // on the original property will be true. Existing values of [[Configurable]]
+  // and [[Enumerable]] need to be preserved and the rest need to be set to
+  // their default values
+
+  // dummy getter
+  var getter = function () { return 1; }
+  var d1 = { get: getter };
+  Object.defineProperty(o, "foo", d1);
+
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+  if (d2.get === getter &&
+      d2.enumerable === true &&
+      d2.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-140.js
index 29ef4bc04..9982d7c48 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-140.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-140.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a string containing +Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: "+Infinity"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a string containing +Infinity
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: "+Infinity"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-141.js
index 8038fb6d1..ede79a6c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-141.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-141.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a string containing -Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: "-Infinity"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a string containing -Infinity
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: "-Infinity"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-142.js
index 87b4656eb..ae53726d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-142.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-142.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an exponential number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: "2E3"

-        });

-        return arrObj.length === 2E3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing an exponential number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: "2E3"
+        });
+        return arrObj.length === 2E3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-143.js
index 6b28a7ca5..4fcb99dfd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-143.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-143.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a hex number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: "0x00B"

-        });

-        return arrObj.length === 0x00B;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing a hex number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: "0x00B"
+        });
+        return arrObj.length === 0x00B;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-144.js
index 36e256cfe..6ec81e61d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-144.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-144.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a number with leading zeros (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: "0002.0"

-        });

-        return arrObj.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing a number with leading zeros (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: "0002.0"
+        });
+        return arrObj.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-145.js
index a2a9d61b6..8be5d77f6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-145.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-145.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError exception is thrown when the [[Value]] field of 'desc' is a string which doesn't convert to a number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: "two"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError exception is thrown when the
+    [[Value]] field of 'desc' is a string which doesn't convert to a
+    number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: "two"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-146.js
index 21f006195..632b55130 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-146.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-146.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an object which has an own toString method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: {

-                toString: function () {

-                    return '2';

-                } 

-            }

-        });

-        return arrObj.length === 2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an object
+    which has an own toString method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: {
+                toString: function () {
+                    return '2';
+                } 
+            }
+        });
+        return arrObj.length === 2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-147.js
index b843eb3ab..a9b524b5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-147.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-147.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        });

-        return arrObj.length === 2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own valueOf method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        });
+        return arrObj.length === 2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-148.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-148.js
index b4784be75..ad044d782 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-148.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-148.js
@@ -1,34 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-148.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method that returns an object and toString method that returns a string (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        Object.defineProperty(arrObj, "length", {

-            value: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                }

-            }

-        });

-        return arrObj.length === 2 && toStringAccessed && valueOfAccessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own valueOf method that returns an object and
+    toString method that returns a string (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        Object.defineProperty(arrObj, "length", {
+            value: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                }
+            }
+        });
+        return arrObj.length === 2 && toStringAccessed && valueOfAccessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-149.js
index 3d2070448..3119f0b7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-149.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-149.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own toString and valueOf method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        Object.defineProperty(arrObj, "length", {

-            value: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return 3;

-                }

-            }

-        });

-        return arrObj.length === 3 && !toStringAccessed && valueOfAccessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own toString and valueOf method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        Object.defineProperty(arrObj, "length", {
+            value: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return 3;
+                }
+            }
+        });
+        return arrObj.length === 3 && !toStringAccessed && valueOfAccessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-15.js
index 2fc369c50..766d7eb5b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For configurable properties, step 9c of

- * [[DefineOwnProperty]] permits changing the kind of a property.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-15.js

- * @description Object.defineProperty permits changing accessor property to data property for configurable properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // define an accessor property

-  // dummy getter

-  var getter = function () { return 1; }

-  var d1 = { get: getter, configurable: true };

-  Object.defineProperty(o, "foo", d1);

-

-  // changing "foo" to be a data valued property should succeed, since

-  // [[Configurable]] on the original property will be true. Existing

-  // values of [[Configurable]] and [[Enumerable]] need to be preserved

-  // and the rest need to be set to their default values.

-  var desc = { value: 101 };

-  Object.defineProperty(o, "foo", desc);

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-  if (d2.value === 101 &&

-      d2.writable === false &&

-      d2.enumerable === false &&

-      d2.configurable === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For configurable properties, step 9c of
+    [[DefineOwnProperty]] permits changing the kind of a property.
+description: >
+    Object.defineProperty permits changing accessor property to data
+    property for configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // define an accessor property
+  // dummy getter
+  var getter = function () { return 1; }
+  var d1 = { get: getter, configurable: true };
+  Object.defineProperty(o, "foo", d1);
+
+  // changing "foo" to be a data valued property should succeed, since
+  // [[Configurable]] on the original property will be true. Existing
+  // values of [[Configurable]] and [[Enumerable]] need to be preserved
+  // and the rest need to be set to their default values.
+  var desc = { value: 101 };
+  Object.defineProperty(o, "foo", desc);
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+  if (d2.value === 101 &&
+      d2.writable === false &&
+      d2.enumerable === false &&
+      d2.configurable === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-150.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-150.js
index 759bfa95c..bd293c76f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-150.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-150.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-150.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test TypeError is thrown when the [[Value]] field of 'desc' is an Object that both toString and valueOf wouldn't return primitive value (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: {

-                    toString: function () {

-                        toStringAccessed = true;

-                        return {};

-                    },

-

-                    valueOf: function () {

-                        valueOfAccessed = true;

-                        return {};

-                    }

-                }

-            });

-            return false;

-

-        } catch (e) {

-            return e instanceof TypeError && toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test TypeError is thrown when the [[Value]] field
+    of 'desc' is an Object that both toString and valueOf wouldn't
+    return primitive value (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: {
+                    toString: function () {
+                        toStringAccessed = true;
+                        return {};
+                    },
+
+                    valueOf: function () {
+                        valueOfAccessed = true;
+                        return {};
+                    }
+                }
+            });
+            return false;
+
+        } catch (e) {
+            return e instanceof TypeError && toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-151.js
index 9ea4035ee..24db0127e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-151.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-151.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', and the [[Value]] field of 'desc' is an Object with an own toString method and an inherited valueOf method (15.4.5.1 step 3.c), test that the inherited valueOf method is used

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        child.toString = function () {

-            toStringAccessed = true;

-            return 3;

-        };

-

-        Object.defineProperty(arrObj, "length", {

-            value: child

-        });

-        return arrObj.length === 2 && !toStringAccessed && valueOfAccessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', and the [[Value]] field of 'desc' is an Object
+    with an own toString method and an inherited valueOf method
+    (15.4.5.1 step 3.c), test that the inherited valueOf method is used
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        child.toString = function () {
+            toStringAccessed = true;
+            return 3;
+        };
+
+        Object.defineProperty(arrObj, "length", {
+            value: child
+        });
+        return arrObj.length === 2 && !toStringAccessed && valueOfAccessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-152.js
index 4f12e9d19..f5262825d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-152.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-152.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O',  test RangeError is thrown when the [[Value]] field of 'desc' is a positive non-integer values (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 123.5

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O',  test RangeError is thrown when the [[Value]]
+    field of 'desc' is a positive non-integer values (15.4.5.1 step
+    3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 123.5
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-153.js
index 18cf66cdc..4b0a4924e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-153.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-153.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O',  test RangeError is thrown when the [[Value]] field of 'desc' is a negative non-integer values (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: -4294967294.5

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O',  test RangeError is thrown when the [[Value]]
+    field of 'desc' is a negative non-integer values (15.4.5.1 step
+    3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: -4294967294.5
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-154.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-154.js
index 49a672ef6..ea5f0d51a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-154.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-154.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-154.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 2 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 4294967294 

-        });

-

-        return arrObj.length === 4294967294;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is boundary
+    value 2^32 - 2 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 4294967294 
+        });
+
+        return arrObj.length === 4294967294;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-155.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-155.js
index a4160921c..ec1d81012 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-155.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-155.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-155.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 1 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 4294967295

-        });

-

-        return arrObj.length === 4294967295;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is boundary
+    value 2^32 - 1 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 4294967295
+        });
+
+        return arrObj.length === 4294967295;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-156.js
index b565c16de..a5c80fd30 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-156.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-156.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError is thrown when the [[Value]] field of 'desc' is boundary value 2^32 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 4294967296

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError is thrown when the [[Value]]
+    field of 'desc' is boundary value 2^32 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 4294967296
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-157.js
index 1cba7dee5..a97f7dd45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-157.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-157.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', test RangeError is thrown when the [[Value]] field of 'desc' is boundary value 2^32 + 1 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 4294967297

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError is thrown when the [[Value]]
+    field of 'desc' is boundary value 2^32 + 1 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 4294967297
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-159.js
index cb0e6636b..a2a514be9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-159.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-159.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', set the [[Value]] field of 'desc' to a value greater than the existing value of length (15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, , 2];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 5

-        });

-

-        return arrObj.length === 5 && arrObj[0] === 0 &&

-            !arrObj.hasOwnProperty("1") && arrObj[2] === 2 &&

-            !arrObj.hasOwnProperty("4");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', set the [[Value]] field of 'desc' to a value
+    greater than the existing value of length (15.4.5.1 step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, , 2];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 5
+        });
+
+        return arrObj.length === 5 && arrObj[0] === 0 &&
+            !arrObj.hasOwnProperty("1") && arrObj[2] === 2 &&
+            !arrObj.hasOwnProperty("4");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-16.js
index 1c7de9b17..7cbdd9025 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-16.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 10.a.i

- * of [[DefineOwnProperty]] rejects if relaxing the [[Writable]] attribute.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-16.js

- * @description Object.defineProperty throws TypeError when relaxing [[Writable]] on non-configurable data properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property; all other attributes default to false.

-  var d1 = { value: 101 };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, relaxing [[Writable]] on "foo" should fail, since both

-  // [[Configurable]] and [[Writable]] on the original property will be false.

-  var desc = { value: 101, writable: true };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.value === 101 &&

-          d2.writable === false &&

-          d2.enumerable === false &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 10.a.i
+    of [[DefineOwnProperty]] rejects if relaxing the [[Writable]] attribute.
+description: >
+    Object.defineProperty throws TypeError when relaxing [[Writable]]
+    on non-configurable data properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property; all other attributes default to false.
+  var d1 = { value: 101 };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, relaxing [[Writable]] on "foo" should fail, since both
+  // [[Configurable]] and [[Writable]] on the original property will be false.
+  var desc = { value: 101, writable: true };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.value === 101 &&
+          d2.writable === false &&
+          d2.enumerable === false &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-160.js
index 09c7c1fe1..b0906914a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-160.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-160.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', set the [[Value]] field of 'desc' to a value equal to the existing value of length (15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, , 2];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 3

-        });

-

-        return arrObj.length === 3 && arrObj[0] === 0 && !arrObj.hasOwnProperty("1") && arrObj[2] === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', set the [[Value]] field of 'desc' to a value
+    equal to the existing value of length (15.4.5.1 step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, , 2];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 3
+        });
+
+        return arrObj.length === 3 && arrObj[0] === 0 && !arrObj.hasOwnProperty("1") && arrObj[2] === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-161.js
index 1cd46f225..ef76a4de2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-161.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-161.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', set the [[Value]] field of 'desc' to a value lesser than the existing value of length and test that indexes beyond the new length are deleted(15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        

-        Object.defineProperty(arrObj, "length", {

-            value: 1

-        });

-        return arrObj.length === 1 && !arrObj.hasOwnProperty("1");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', set the [[Value]] field of 'desc' to a value
+    lesser than the existing value of length and test that indexes
+    beyond the new length are deleted(15.4.5.1 step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        
+        Object.defineProperty(arrObj, "length", {
+            value: 1
+        });
+        return arrObj.length === 1 && !arrObj.hasOwnProperty("1");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-162.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-162.js
index e1300103c..3c5d7fb45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-162.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-162.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-162.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is greater than value of the length property, test TypeError is thrown when the length property is not writable (15.4.5.1 step 3.f.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 12

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is greater than
+    value of the length property, test TypeError is thrown when the
+    length property is not writable (15.4.5.1 step 3.f.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 12
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-163.js
index 9826a0fc3..9046c366d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-163.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-163.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' equals to value of the length property, test no TypeError is thrown when the length property is not writable (15.4.5.1 step 3.f.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 0

-            });

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' equals to value of
+    the length property, test no TypeError is thrown when the length
+    property is not writable (15.4.5.1 step 3.f.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 0
+            });
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-164.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-164.js
index 28be447c1..f0baf514d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-164.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-164.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-164.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test TypeError is thrown when the [[Writable]] attribute of the length property is false (15.4.5.1 step 3.g)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 0

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test TypeError is thrown when the
+    [[Writable]] attribute of the length property is false (15.4.5.1
+    step 3.g)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 0
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-165.js
index 908f9e16c..4f87c8f7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-165.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-165.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property,  test the [[Writable]] attribute of the length property is set to true after deleting properties with large index named if the [[Writable]] field of 'desc' is absent (15.4.5.1 step 3.h)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 1

-        });

-

-        var indexDeleted = !arrObj.hasOwnProperty("1");

-

-        arrObj.length = 10;

-

-        return indexDeleted && arrObj.length === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property,  test the [[Writable]] attribute of the
+    length property is set to true after deleting properties with
+    large index named if the [[Writable]] field of 'desc' is absent
+    (15.4.5.1 step 3.h)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 1
+        });
+
+        var indexDeleted = !arrObj.hasOwnProperty("1");
+
+        arrObj.length = 10;
+
+        return indexDeleted && arrObj.length === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-166.js
index 694739aa4..a511e3d04 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-166.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-166.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property,  test the [[Writable]] attribute of the length property is set to true after deleting properties with large index named if the [[Writable]] field of 'desc' is true (15.4.5.1 step 3.h)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 1,

-            writable: true

-        });

-

-        var indexDeleted = !arrObj.hasOwnProperty("1");

-

-        arrObj.length = 10;

-

-        return indexDeleted && arrObj.length === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property,  test the [[Writable]] attribute of the
+    length property is set to true after deleting properties with
+    large index named if the [[Writable]] field of 'desc' is true
+    (15.4.5.1 step 3.h)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 1,
+            writable: true
+        });
+
+        var indexDeleted = !arrObj.hasOwnProperty("1");
+
+        arrObj.length = 10;
+
+        return indexDeleted && arrObj.length === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-167.js
index b8910299b..62e5be0ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-167.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-167.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Writable]] attribute of the length property is set to false after deleting properties with large index named if the [[Writable]] field of 'desc' is false (15.4.5.1 step 3.i.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 1,

-            writable: false

-        });

-

-        var indexDeleted = !arrObj.hasOwnProperty("1");

-

-        arrObj.length = 10;

-

-        return indexDeleted && arrObj.length === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Writable]] attribute of the
+    length property is set to false after deleting properties with
+    large index named if the [[Writable]] field of 'desc' is false
+    (15.4.5.1 step 3.i.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 1,
+            writable: false
+        });
+
+        var indexDeleted = !arrObj.hasOwnProperty("1");
+
+        arrObj.length = 10;
+
+        return indexDeleted && arrObj.length === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-168.js
index a5d64cf43..e7e7b3c8b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-168.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-168.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', whose writable attribute is being changed to false and the [[Value]] field of 'desc' is less than value of  the length property and also lesser than an index of the array which is set to configurable:false, test that new length is set to a value greater than the non-deletable index by 1, writable attribute of length is set to false and TypeError exception is thrown (15.4.5.1 step 3.i.iii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1, 2];

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 0,

-                writable: false

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', whose writable attribute is being changed to
+    false and the [[Value]] field of 'desc' is less than value of  the
+    length property and also lesser than an index of the array which
+    is set to configurable:false, test that new length is set to a
+    value greater than the non-deletable index by 1, writable
+    attribute of length is set to false and TypeError exception is
+    thrown (15.4.5.1 step 3.i.iii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1, 2];
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 0,
+                writable: false
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-169.js
index ec22abbb6..33d5d602c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-169.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-169.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property and also lesser than an index of the array which is set to configurable: false, test that new length is set to a value greater than the non-deletable index by 1, and TypeError is thrown (15.4.5.1 step 3.l.i)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1, 2];

-

-        Object.defineProperty(arrObj, "1", {

-            configurable: false

-        });

-

-        Object.defineProperty(arrObj, "2", {

-            configurable: true

-        });

-

-        try {

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && !arrObj.hasOwnProperty("2");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property and also lesser than an index of the array
+    which is set to configurable: false, test that new length is set
+    to a value greater than the non-deletable index by 1, and
+    TypeError is thrown (15.4.5.1 step 3.l.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1, 2];
+
+        Object.defineProperty(arrObj, "1", {
+            configurable: false
+        });
+
+        Object.defineProperty(arrObj, "2", {
+            configurable: true
+        });
+
+        try {
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && !arrObj.hasOwnProperty("2");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-17.js
index 2cc43439d..3aa9ddcb9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-17.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 10.a.ii.1

- * of [[DefineOwnProperty]] rejects changing the value of non-writable properties.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-17.js

- * @description Object.defineProperty throws TypeError when changing value of non-writable non-configurable data properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property; all other attributes default to false.

-  var d1 = { value: 101 };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, trying to change the value of "foo" should fail, since both

-  // [[Configurable]] and [[Writable]] on the original property will be false.

-  var desc = { value: 102 };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-      if (d2.value === 101 &&

-          d2.writable === false &&

-          d2.enumerable === false &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 10.a.ii.1
+    of [[DefineOwnProperty]] rejects changing the value of non-writable properties.
+description: >
+    Object.defineProperty throws TypeError when changing value of
+    non-writable non-configurable data properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property; all other attributes default to false.
+  var d1 = { value: 101 };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, trying to change the value of "foo" should fail, since both
+  // [[Configurable]] and [[Writable]] on the original property will be false.
+  var desc = { value: 102 };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+      if (d2.value === 101 &&
+          d2.writable === false &&
+          d2.enumerable === false &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js
index 081192037..b679d5c23 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-170.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property and also lesser than an index of the array which is set to configurable: false, test that new length is set to a value greater than the non-deletable index by 1, writable attribute of length is set to false and TypeError exception is thrown (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property and also lesser than an index of the array
+    which is set to configurable: false, test that new length is set
+    to a value greater than the non-deletable index by 1, writable
+    attribute of length is set to false and TypeError exception is
+    thrown (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-171.js
index ed05a2c03..5dca25ac1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-171.js
@@ -1,25 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-171.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of an inherited data property with large index named in 'O' can't stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Array.prototype[1] = 2; // Not setting the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return arrObj.length === 1 && !arrObj.hasOwnProperty("1");

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of an
+    inherited data property with large index named in 'O' can't stop
+    deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Array.prototype[1] = 2; // Not setting the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return arrObj.length === 1 && !arrObj.hasOwnProperty("1");
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-172.js
index 8c597c867..22c464857 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-172.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-172.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own data property with large index named in 'O' that overrides an inherited data property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Object.defineProperty(arrObj, "1", {

-                configurable: false

-            });

-            

-            Array.prototype[1] = 2;

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own data property with large index named in 'O' that overrides an
+    inherited data property can stop deleting index named properties
+    (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Object.defineProperty(arrObj, "1", {
+                configurable: false
+            });
+            
+            Array.prototype[1] = 2;
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-173.js
index 5eb573acd..217dc2bb9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-173.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-173.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own data property with large index named in 'O' that overrides an inherited accessor property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Object.defineProperty(arrObj, "1", {

-                configurable: false

-            });

-

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own data property with large index named in 'O' that overrides an
+    inherited accessor property can stop deleting index named
+    properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Object.defineProperty(arrObj, "1", {
+                configurable: false
+            });
+
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-174.js
index bc961f324..a6d5cd8ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-174.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-174.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' can stop
+    deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-175.js
index 9f47e7ac7..b9ff68c65 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-175.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-175.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of an inherited accessor property with large index named in 'O' can't stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true // Not setting the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-

-            return arrObj.length === 1 && !arrObj.hasOwnProperty("1");

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of an
+    inherited accessor property with large index named in 'O' can't
+    stop deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true // Not setting the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+
+            return arrObj.length === 1 && !arrObj.hasOwnProperty("1");
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-176.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-176.js
index dea5c5f8f..490605a44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-176.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-176.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-176.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' that overrides an inherited data property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: false

-            });

-            

-            Array.prototype[1] = 2;

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' that overrides
+    an inherited data property can stop deleting index named
+    properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: false
+            });
+            
+            Array.prototype[1] = 2;
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-177.js
index 0aa030a91..13bc2687d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-177.js
@@ -1,40 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-177.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' that overrides an inherited accessor property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: false

-            });

-            

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arrObj, "length", {

-                value: 1

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' that overrides
+    an inherited accessor property can stop deleting index named
+    properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: false
+            });
+            
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arrObj, "length", {
+                value: 1
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.length === 2 && arrObj.hasOwnProperty("1"); 
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-178.js
index bfd9568e1..298d05314 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-178.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-178.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the configurable large index named property of 'O' is deleted (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 1

-        });

-

-        return !arrObj.hasOwnProperty("1");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the configurable large index named
+    property of 'O' is deleted (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 1
+        });
+
+        return !arrObj.hasOwnProperty("1");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-179-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-179-1.js
index d4c07fdc1..99ea64fd1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-179-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-179-1.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-179-1.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is greater than value of  the length property, test value of the length property is same as [[Value]] (15.4.5.1 step 3.l.iii.1)

- */

-

-

-function testcase() {

-        var arrObj = [0, 1, 2, 3];

-

-        Object.defineProperty(arrObj, "1", {

-            configurable: false

-        });

-

-        Object.defineProperty(arrObj, "length", {

-            value: 3

-        });          

-

-        return arrObj.length === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is greater than
+    value of  the length property, test value of the length property
+    is same as [[Value]] (15.4.5.1 step 3.l.iii.1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [0, 1, 2, 3];
+
+        Object.defineProperty(arrObj, "1", {
+            configurable: false
+        });
+
+        Object.defineProperty(arrObj, "length", {
+            value: 3
+        });          
+
+        return arrObj.length === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-18.js
index 594d44fae..66fe559d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-18.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 11.a.i

- * of [[DefineOwnProperty]] rejects changing the setter if present.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-18.js

- * @description Object.defineProperty throws TypeError when changing setter of non-configurable accessor properties(8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy getter

-  var getter = function () { return 1;}

-  var d1 = { get: getter };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, trying to change the setter should fail, since [[Configurable]]

-  // on the original property will be false.

-  var setter = function (x) {};

-  var desc = { set: setter };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.get === getter &&

-	      d2.configurable === false &&

-          d2.enumerable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 11.a.i
+    of [[DefineOwnProperty]] rejects changing the setter if present.
+description: >
+    Object.defineProperty throws TypeError when changing setter of
+    non-configurable accessor properties(8.12.9 step 11.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy getter
+  var getter = function () { return 1;}
+  var d1 = { get: getter };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, trying to change the setter should fail, since [[Configurable]]
+  // on the original property will be false.
+  var setter = function (x) {};
+  var desc = { set: setter };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.get === getter &&
+	      d2.configurable === false &&
+          d2.enumerable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-181.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-181.js
index 673f243f8..85a27686d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-181.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-181.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-181.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Writable]] attribute of the length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' doesn't contain non-configurable large index named property (15.4.5.1 step 3.m)

- */

-

-

-function testcase() {

-

-        var arrObj = [0, 1];

-

-        Object.defineProperty(arrObj, "length", {

-            value: 0,

-            writable: false

-        });

-            

-        arrObj.length = 10; //try to overwrite length value of arr

-        return !arrObj.hasOwnProperty("1") && arrObj.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Writable]] attribute of the
+    length property is set to false at last when the [[Writable]]
+    field of 'desc' is false and 'O' doesn't contain non-configurable
+    large index named property (15.4.5.1 step 3.m)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [0, 1];
+
+        Object.defineProperty(arrObj, "length", {
+            value: 0,
+            writable: false
+        });
+            
+        arrObj.length = 10; //try to overwrite length value of arr
+        return !arrObj.hasOwnProperty("1") && arrObj.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-182.js
index d93d9ee72..f3cc77abc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-182.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-182.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is available String values that convert to numbers (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 12

-        });

-

-        return arrObj[0] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is available String values that convert to
+    numbers (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 12
+        });
+
+        return arrObj[0] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-183.js
index caedf0ef7..a154fb339 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-183.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-183.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 - 2 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 4294967294, {

-            value: 100

-        });

-

-        return arrObj.hasOwnProperty("4294967294") && arrObj.length === 4294967295 && arrObj[4294967294] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is boundary value 2^32 - 2 (15.4.5.1 step
+    4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 4294967294, {
+            value: 100
+        });
+
+        return arrObj.hasOwnProperty("4294967294") && arrObj.length === 4294967295 && arrObj[4294967294] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-184.js
index 7b412fff2..230c42472 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-184.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-184.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 - 1 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 4294967295, {

-            value: 100

-        });

-

-        return arrObj.hasOwnProperty("4294967295") && arrObj.length === 0 && arrObj[4294967295] === 100; ;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is boundary value 2^32 - 1 (15.4.5.1 step
+    4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 4294967295, {
+            value: 100
+        });
+
+        return arrObj.hasOwnProperty("4294967295") && arrObj.length === 0 && arrObj[4294967295] === 100; ;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-185.js
index 3ef3d8254..f8f97f64d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-185.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-185.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 4294967296, {

-            value: 100

-        });

-

-        return arrObj.hasOwnProperty("4294967296") && arrObj.length === 0 && arrObj[4294967296] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is boundary value 2^32 (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 4294967296, {
+            value: 100
+        });
+
+        return arrObj.hasOwnProperty("4294967296") && arrObj.length === 0 && arrObj[4294967296] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-186.js
index 7a184b20d..7a07c3ec4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-186.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-186.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is boundary value 2^32 + 1 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 4294967297, {

-            value: 100

-        });

-

-        return arrObj.hasOwnProperty("4294967297") && arrObj.length === 0 && arrObj[4294967297] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is boundary value 2^32 + 1 (15.4.5.1 step
+    4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 4294967297, {
+            value: 100
+        });
+
+        return arrObj.hasOwnProperty("4294967297") && arrObj.length === 0 && arrObj[4294967297] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-187.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-187.js
index 18b798635..d9e5375f9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-187.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-187.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-187.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test TypeError is not thrown if the [[Writable]] attribute of the length property in 'O' is false and value of 'name' is less than value of the length property (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arrObj = [1, 2, 3];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, 1, {

-                value: "abc"

-            });

-

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test TypeError is not thrown if the [[Writable]]
+    attribute of the length property in 'O' is false and value of
+    'name' is less than value of the length property (15.4.5.1 step
+    4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [1, 2, 3];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, 1, {
+                value: "abc"
+            });
+
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-188.js
index 3e57e0499..2cb7352c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-188.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-188.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test TypeError is thrown if the [[Writable]] attribute of the length property in 'O' is false and value of 'name' equals to value of the length property (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arrObj = [1, 2, 3];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, 3, {

-                value: "abc"

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test TypeError is thrown if the [[Writable]]
+    attribute of the length property in 'O' is false and value of
+    'name' equals to value of the length property (15.4.5.1 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [1, 2, 3];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, 3, {
+                value: "abc"
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-189.js
index 97f56931b..79591cf59 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-189.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-189.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test TypeError is thrown if the [[Writable]] attribute of the length property in 'O' is false and value of 'name' is greater than value of the length property (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arrObj = [1, 2, 3];

-

-        Object.defineProperty(arrObj, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, 4, {

-                value: "abc"

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test TypeError is thrown if the [[Writable]]
+    attribute of the length property in 'O' is false and value of
+    'name' is greater than value of the length property (15.4.5.1 step
+    4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [1, 2, 3];
+
+        Object.defineProperty(arrObj, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, 4, {
+                value: "abc"
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-19.js
index e99a9696f..adede8405 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-19.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 11.a.i

- * of [[DefineOwnProperty]] permits setting a setter (if absent).

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-19.js

- * @description Object.defineProperty permits setting a setter (if absent) of non-configurable accessor properties(8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy getter

-  var getter = function () { return 1;}

-  var d1 = { get: getter };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, trying to set the setter should succeed even though [[Configurable]]

-  // on the original property will be false.

-  var desc = { set: undefined };

-  Object.defineProperty(o, "foo", desc);

-

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-  if (d2.get === getter &&

-	  d2.set === undefined &&

-	  d2.configurable === false &&

-	  d2.enumerable === false) {

-	return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 11.a.i
+    of [[DefineOwnProperty]] permits setting a setter (if absent).
+description: >
+    Object.defineProperty permits setting a setter (if absent) of
+    non-configurable accessor properties(8.12.9 step 10.a.ii.1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy getter
+  var getter = function () { return 1;}
+  var d1 = { get: getter };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, trying to set the setter should succeed even though [[Configurable]]
+  // on the original property will be false.
+  var desc = { set: undefined };
+  Object.defineProperty(o, "foo", desc);
+
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+  if (d2.get === getter &&
+	  d2.set === undefined &&
+	  d2.configurable === false &&
+	  d2.enumerable === false) {
+	return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-190.js
index d064d5129..6889055d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-190.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-190.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own data property, test TypeError is thrown on updating the configurable attribute from false to true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        Object.defineProperty(arrObj, 0, {

-            value: "ownDataProperty",

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, 0, {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(arrObj, "0", "ownDataProperty", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own data property, test TypeError is
+    thrown on updating the configurable attribute from false to true
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        Object.defineProperty(arrObj, 0, {
+            value: "ownDataProperty",
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, 0, {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(arrObj, "0", "ownDataProperty", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-191.js
index e8bc3671a..e5e3bd924 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-191.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-191.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is an inherited data property, test that defining own index named property is successful (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arrObj = [];

-

-            Object.defineProperty(arrObj, "0", {

-                configurable: false

-            });

-            return arrObj.hasOwnProperty("0") && Array.prototype[0] === 11 && typeof arrObj[0] === "undefined";

-        } finally {

-            delete Array.prototype[0];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is an inherited data property, test that
+    defining own index named property is successful (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arrObj = [];
+
+            Object.defineProperty(arrObj, "0", {
+                configurable: false
+            });
+            return arrObj.hasOwnProperty("0") && Array.prototype[0] === 11 && typeof arrObj[0] === "undefined";
+        } finally {
+            delete Array.prototype[0];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-192.js
index cf055da6f..ea7245c94 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-192.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-192.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own data property that overrides an inherited data property, test TypeError is thrown on updating the [[Configurable]] attribute from false to true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arrObj = [];

-            Object.defineProperty(arrObj, "0", {

-                value: 12,

-                configurable: false

-            });

-       

-            Object.defineProperty(arrObj, "0", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && Array.prototype[0] === 11 && arrObj[0] === 12;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own data property that overrides an
+    inherited data property, test TypeError is thrown on updating the
+    [[Configurable]] attribute from false to true (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arrObj = [];
+            Object.defineProperty(arrObj, "0", {
+                value: 12,
+                configurable: false
+            });
+       
+            Object.defineProperty(arrObj, "0", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && Array.prototype[0] === 11 && arrObj[0] === 12;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-193.js
index 5164b0cbb..81e796646 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-193.js
@@ -1,37 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-193.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own data property that overrides an inherited accessor property, test TypeError is thrown when update the [[Configurable]] attribute to true and value of [[Configurable]] attribute of original is false  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arrObj = [];

-            Object.defineProperty(arrObj, "0", {

-                value: 12,

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "0", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && Array.prototype[0] === 11 && arrObj[0] === 12;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own data property that overrides an
+    inherited accessor property, test TypeError is thrown when update
+    the [[Configurable]] attribute to true and value of
+    [[Configurable]] attribute of original is false  (15.4.5.1 step
+    4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arrObj = [];
+            Object.defineProperty(arrObj, "0", {
+                value: 12,
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "0", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && Array.prototype[0] === 11 && arrObj[0] === 12;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-194.js
index 6f1be2fad..11eb45572 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-194.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-194.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own accessor property, test TypeError is thrown on updating the configurable attribute from false to true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var getFunc = function () {

-            return 11;

-        };

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "0", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own accessor property, test TypeError is
+    thrown on updating the configurable attribute from false to true
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var getFunc = function () {
+            return 11;
+        };
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "0", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-195.js
index 68090c288..14d0f42bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-195.js
@@ -1,43 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-195.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is an inherited accessor property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arrObj = [];

-

-            function getFunc() {

-                return arrObj.helpVerifySet;

-            }

-            function setFunc(value) {

-                arrObj.helpVerifySet = value;

-            }

-

-            Object.defineProperty(arrObj, "0", {

-                get: getFunc,

-                set: setFunc,

-                configurable: false

-            });

-

-            arrObj[0] = 13;

-

-            return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "helpVerifySet", false, false);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is an inherited accessor property (15.4.5.1
+    step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arrObj = [];
+
+            function getFunc() {
+                return arrObj.helpVerifySet;
+            }
+            function setFunc(value) {
+                arrObj.helpVerifySet = value;
+            }
+
+            Object.defineProperty(arrObj, "0", {
+                get: getFunc,
+                set: setFunc,
+                configurable: false
+            });
+
+            arrObj[0] = 13;
+
+            return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "helpVerifySet", false, false);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-196.js
index 46bb3d694..4d0131eec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-196.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-196.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own accessor property that overrides an inherited data property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arrObj = [];

-            Object.defineProperty(arrObj, "0", {

-                get: function () { },

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "0", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own accessor property that overrides an
+    inherited data property (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arrObj = [];
+            Object.defineProperty(arrObj, "0", {
+                get: function () { },
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "0", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-197.js
index 7a7e8052b..a19b81b39 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-197.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-197.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is own accessor property that overrides an inherited accessor property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () { },

-                configurable: true

-            });

-

-            var arrObj = [];

-            Object.defineProperty(arrObj, "0", {

-                get: function () { },

-                configurable: false

-            });

-

-            Object.defineProperty(arrObj, "0", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is own accessor property that overrides an
+    inherited accessor property (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () { },
+                configurable: true
+            });
+
+            var arrObj = [];
+            Object.defineProperty(arrObj, "0", {
+                get: function () { },
+                configurable: false
+            });
+
+            Object.defineProperty(arrObj, "0", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-198.js
index 0b084a852..806ee66ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-198.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-198.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O', test TypeError is thrown when 'O' is not extensible (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        Object.preventExtensions(arrObj);

-

-        try {

-            var desc = { value: 1 };

-            Object.defineProperty(arrObj, "0", desc);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && (arrObj.hasOwnProperty("0") === false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O', test
+    TypeError is thrown when 'O' is not extensible (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        Object.preventExtensions(arrObj);
+
+        try {
+            var desc = { value: 1 };
+            Object.defineProperty(arrObj, "0", desc);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && (arrObj.hasOwnProperty("0") === false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-199.js
index 27e367f62..b4706e71b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-199.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-199.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O', test 'name' is defined as data property when 'desc' is generic descriptor (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            enumerable: true

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O', test 'name'
+    is defined as data property when 'desc' is generic descriptor
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            enumerable: true
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-2.js
index 93c27d4ca..03a544ffc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-2.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For newly defined data properties, attributes

- * missing from desc should have values set to the defaults from 8.6.1.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-2.js

- * @description Object.defineProperty sets missing attributes to their default values (data properties)(8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-  var o = {};

-

-  var desc = { value: 1 };

-  Object.defineProperty(o, "foo", desc);

-  

-  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");

-  

-  if (propDesc.value        === 1 &&          // this is the value that was set

-      propDesc.writable     === false &&      // false by default

-      propDesc.enumerable   === false &&      // false by default

-      propDesc.configurable === false) {      // false by default

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For newly defined data properties, attributes
+    missing from desc should have values set to the defaults from 8.6.1.
+description: >
+    Object.defineProperty sets missing attributes to their default
+    values (data properties)(8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  var desc = { value: 1 };
+  Object.defineProperty(o, "foo", desc);
+  
+  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");
+  
+  if (propDesc.value        === 1 &&          // this is the value that was set
+      propDesc.writable     === false &&      // false by default
+      propDesc.enumerable   === false &&      // false by default
+      propDesc.configurable === false) {      // false by default
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-20.js
index 3629b6975..70f615398 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-20.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 11.a.ii

- * of [[DefineOwnProperty]] rejects changing the getter if present.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-20.js

- * @description Object.defineProperty throws TypeError when changing getter (if present) of non-configurable accessor properties(8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy getter/setter

-  var getter = function () { return 1;}

-  var d1 = { get: getter, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, trying to change the setter should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { get: undefined };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-      if (d2.get === getter &&

-	      d2.configurable === false &&

-          d2.enumerable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 11.a.ii
+    of [[DefineOwnProperty]] rejects changing the getter if present.
+description: >
+    Object.defineProperty throws TypeError when changing getter (if
+    present) of non-configurable accessor properties(8.12.9 step
+    11.a.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy getter/setter
+  var getter = function () { return 1;}
+  var d1 = { get: getter, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, trying to change the setter should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { get: undefined };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+      if (d2.get === getter &&
+	      d2.configurable === false &&
+          d2.enumerable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-200.js
index 31a71ea86..9e65f6cb5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-200.js
@@ -1,23 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-200.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O', test [[Value]] of 'name' property of 'Attributes' is set as undefined if [[Value]] is absent in data descriptor 'desc' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O', test
+    [[Value]] of 'name' property of 'Attributes' is set as undefined
+    if [[Value]] is absent in data descriptor 'desc' (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-201.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-201.js
index 736b8595a..040e0d070 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-201.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-201.js
@@ -1,22 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-201.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Writable]] is absent in data descriptor 'desc', test [[Writable]] attribute of  property 'name' is set to false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 1001,

-            enumerable: true,

-            configurable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and
+    [[Writable]] is absent in data descriptor 'desc', test
+    [[Writable]] attribute of  property 'name' is set to false
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 1001,
+            enumerable: true,
+            configurable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-202.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-202.js
index 6f0ef7904..3db929a3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-202.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-202.js
@@ -1,22 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-202.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Enumerable]] is absent in data descriptor 'desc', test [[Enumerable]] of property 'name' is set to false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 1001,

-            writable: true,

-            configurable: true

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and
+    [[Enumerable]] is absent in data descriptor 'desc', test
+    [[Enumerable]] of property 'name' is set to false (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 1001,
+            writable: true,
+            configurable: true
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-203.js
index e685e4fb0..a175287de 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-203.js
@@ -1,22 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-203.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Configurable]] is absent in data descriptor 'desc', test [[Configurable]] of property 'name' is set to false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and
+    [[Configurable]] is absent in data descriptor 'desc', test
+    [[Configurable]] of property 'name' is set to false (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-204.js
index 02dd9fcfb..49dcdf5d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-204.js
@@ -1,24 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-204.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'desc' is data descriptor, test updating all attribute values of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [1]; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(arrObj, "0", {

-            value: 1001,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'desc' is data descriptor, test updating all
+    attribute values of 'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [1]; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(arrObj, "0", {
+            value: 1001,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-205.js
index 39b6827c0..fa2218369 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-205.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-205.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Get]] is absent in accessor descriptor 'desc', test [[Get]] attribute of property 'name' is set to undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var setFunc = function (value) {

-            arrObj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and [[Get]]
+    is absent in accessor descriptor 'desc', test [[Get]] attribute of
+    property 'name' is set to undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var setFunc = function (value) {
+            arrObj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-206.js
index 866022f02..ebfb93ec6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-206.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-206.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O', test [[Set]] of 'name' property in 'Attributes' is set as undefined if [[Set]] is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var getFunc = function () { };

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(arrObj, "0");

-

-        return arrObj.hasOwnProperty("0") && desc.hasOwnProperty("set") && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O', test [[Set]]
+    of 'name' property in 'Attributes' is set as undefined if [[Set]]
+    is absent in accessor descriptor 'desc' (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var getFunc = function () { };
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(arrObj, "0");
+
+        return arrObj.hasOwnProperty("0") && desc.hasOwnProperty("set") && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-207.js
index 6e53b7131..17f0bffde 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-207.js
@@ -1,27 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-207.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Enumerable]] is absent in accessor descriptor 'desc', test [[Enumerable]] attribute of property 'name' is set to false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        var setFunc = function (value) {

-            arrObj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () { };

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc,

-            get: getFunc,

-            configurable: true

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and
+    [[Enumerable]] is absent in accessor descriptor 'desc', test
+    [[Enumerable]] attribute of property 'name' is set to false
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        var setFunc = function (value) {
+            arrObj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () { };
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc,
+            get: getFunc,
+            configurable: true
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-208.js
index 3d700f5c1..1f095fab2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-208.js
@@ -1,26 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-208.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' property doesn't exist in 'O' and [[Configurable]] is absent in accessor descriptor 'desc', test [[Configurable]] attribute of property 'name' is set to false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var setFunc = function (value) {

-            arrObj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () { };

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc,

-            get: getFunc,

-            enumerable: true

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' property doesn't exist in 'O' and
+    [[Configurable]] is absent in accessor descriptor 'desc', test
+    [[Configurable]] attribute of property 'name' is set to false
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var setFunc = function (value) {
+            arrObj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () { };
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc,
+            get: getFunc,
+            enumerable: true
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-209.js
index b856e43da..218b9b8c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-209.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-209.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'desc' is accessor descriptor, test updating all attribute values of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var setFunc = function (value) {

-            arrObj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () {

-            return 14;

-        };

-

-        Object.defineProperty(arrObj, "0", {

-            get: function () {

-                return 11;

-            },

-            set: function () { },

-            configurable: true,

-            enumerable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false,

-            enumerable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'desc' is accessor descriptor, test updating all
+    attribute values of 'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var setFunc = function (value) {
+            arrObj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () {
+            return 14;
+        };
+
+        Object.defineProperty(arrObj, "0", {
+            get: function () {
+                return 11;
+            },
+            set: function () { },
+            configurable: true,
+            enumerable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false,
+            enumerable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-21.js
index 9d56306d9..64196d0dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-21.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For non-configurable properties, step 11.a.ii

- * of [[DefineOwnProperty]] permits setting a getter if absent.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-21.js

- * @description Object.defineProperty permits setting a getter (if absent) of non-configurable accessor properties(8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create an accessor property; all other attributes default to false.

-  // dummy setter

-  var setter = function (x) {}

-  var d1 = { set: setter };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, trying to set the getter should succeed even though [[Configurable]]

-  // on the original property will be false. Existing values of need to be preserved.

-  var getter = undefined;

-  var desc = { get: getter };

-

-  Object.defineProperty(o, "foo", desc);

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-

-  if (d2.get === getter &&

-      d2.set === setter &&

-      d2.configurable === false &&

-      d2.enumerable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For non-configurable properties, step 11.a.ii
+    of [[DefineOwnProperty]] permits setting a getter if absent.
+description: >
+    Object.defineProperty permits setting a getter (if absent) of
+    non-configurable accessor properties(8.12.9 step 11.a.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create an accessor property; all other attributes default to false.
+  // dummy setter
+  var setter = function (x) {}
+  var d1 = { set: setter };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, trying to set the getter should succeed even though [[Configurable]]
+  // on the original property will be false. Existing values of need to be preserved.
+  var getter = undefined;
+  var desc = { get: getter };
+
+  Object.defineProperty(o, "foo", desc);
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+
+  if (d2.get === getter &&
+      d2.set === setter &&
+      d2.configurable === false &&
+      d2.enumerable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-210.js
index d58394226..5995a0dc9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-210.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-210.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' makes no change if every field in 'desc' is absent (name is data property) (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        arrObj[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(arrObj, "0", {});

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 101, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' makes no change if every field in 'desc' is
+    absent (name is data property) (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        arrObj[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(arrObj, "0", {});
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 101, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-211.js
index 40b8047ba..5473e866f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-211.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-211.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' makes no change if every field in 'desc' is absent(name is accessor property) (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        function getFunc() {

-            return 11;

-        }

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {});

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' makes no change if every field in 'desc' is
+    absent(name is accessor property) (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        function getFunc() {
+            return 11;
+        }
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {});
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-212.js
index 14edc2d02..a486c243c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-212.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-212.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' makes no change if the value of every field in 'desc' is the same value as the corresponding field in 'name'(desc is data property) (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        arrObj[0] = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(arrObj, "0", {

-            value: 100,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' makes no change if the value of every field
+    in 'desc' is the same value as the corresponding field in
+    'name'(desc is data property) (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        arrObj[0] = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(arrObj, "0", {
+            value: 100,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-213.js
index 67e6b97e0..625664f66 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-213.js
@@ -1,39 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-213.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' makes no change if the value of every field in 'desc' is the same value as the corresponding field in 'name'(desc is accessor property) (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var getFunc = function () {

-            return "100";

-        };

-        var setFunc = function (value) {

-            arrObj.setVerifyHelpProp = value;

-        };

-

-        var desc = {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        };

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", desc);

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' makes no change if the value of every field
+    in 'desc' is the same value as the corresponding field in
+    'name'(desc is accessor property) (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var getFunc = function () {
+            return "100";
+        };
+        var setFunc = function (value) {
+            arrObj.setVerifyHelpProp = value;
+        };
+
+        var desc = {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        };
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", desc);
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-214.js
index db78e51da..630103b89 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-214.js
@@ -1,28 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-214.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property and its configurable and writable attributes are set to false, test TypeError is thrown when the type of the [[Value]] field of 'desc' is different from the type of the [[Value]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 0, {

-            value: 101,

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: "abc" });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property and its configurable and writable attributes are set to
+    false, test TypeError is thrown when the type of the [[Value]]
+    field of 'desc' is different from the type of the [[Value]]
+    attribute value of 'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 0, {
+            value: 101,
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: "abc" });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-215.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-215.js
index 7d18b00f6..66c949806 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-215.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-215.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-215.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: undefined });

-

-        Object.defineProperty(arrObj, "0", { value: undefined });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, both the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: undefined });
+
+        Object.defineProperty(arrObj, "0", { value: undefined });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-216.js
index 2bd041728..aa337785b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-216.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-216.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are null  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: null });

-

-        Object.defineProperty(arrObj, "0", { value: null });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", null, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, both the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are null  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: null });
+
+        Object.defineProperty(arrObj, "0", { value: null });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", null, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-217.js
index fb7727b49..d4966b132 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-217.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-217.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are NaN  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: NaN });

-

-        Object.defineProperty(arrObj, "0", { value: NaN });

-

-        var hasProperty = arrObj.hasOwnProperty("0");

-        var verifyValue = (arrObj[0] !== arrObj[0]);

-

-        var verifyWritable = false;

-        arrObj[0] = 1001;

-        verifyWritable = arrObj[0] !== 1001 && arrObj[0] !== arrObj[0];

-

-        var verifyEnumerable = false;

-        for (var p in arrObj) {

-            if (p === "0") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyConfigurable = false;

-        delete arrObj[0];

-        verifyConfigurable = arrObj.hasOwnProperty("0");

-

-        return hasProperty && verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, both the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are NaN  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: NaN });
+
+        Object.defineProperty(arrObj, "0", { value: NaN });
+
+        var hasProperty = arrObj.hasOwnProperty("0");
+        var verifyValue = (arrObj[0] !== arrObj[0]);
+
+        var verifyWritable = false;
+        arrObj[0] = 1001;
+        verifyWritable = arrObj[0] !== 1001 && arrObj[0] !== arrObj[0];
+
+        var verifyEnumerable = false;
+        for (var p in arrObj) {
+            if (p === "0") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyConfigurable = false;
+        delete arrObj[0];
+        verifyConfigurable = arrObj.hasOwnProperty("0");
+
+        return hasProperty && verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-218.js
index f6631ded5..9e7ba4887 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-218.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-218.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown when the [[Value]] field of 'desc' is +0, and the [[Value]] attribute value of 'name' is -0 (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: -0 });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: +0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown when the [[Value]] field of
+    'desc' is +0, and the [[Value]] attribute value of 'name' is -0
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: -0 });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: +0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-219.js
index 8c1d58621..cbbd99c8c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-219.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-219.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown when the [[Value]] field of 'desc' is -0, and the [[Value]] attribute value of 'name' is +0 (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: +0 });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: -0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown when the [[Value]] field of
+    'desc' is -0, and the [[Value]] attribute value of 'name' is +0
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: +0 });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: -0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-22.js
index 4aff046aa..41b6052cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-22.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-22.js

- * @description Object.defineProperty - 'name' is existing own data property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                value: 12,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.foo === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is existing own data property
+    (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                value: 12,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.foo === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-220.js
index 5974072f8..a9d2f92c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-220.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-220.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two numbers with same vaule (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: 101 });

-

-        Object.defineProperty(arrObj, "0", { value: 101 });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two numbers with same vaule
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: 101 });
+
+        Object.defineProperty(arrObj, "0", { value: 101 });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-221.js
index ffaf27c9d..0ce808436 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-221.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-221.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown  when the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two numbers with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 0, {

-            value: 101,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: 123 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown  when the [[Value]] field of
+    'desc' and the [[Value]] attribute value of 'name' are two numbers
+    with different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 0, {
+            value: 101,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: 123 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", 101, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-222.js
index 02e4278f7..8d4a33c74 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-222.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-222.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two strings which have same length and same characters in corresponding positions (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: "abcd" });

-

-        Object.defineProperty(arrObj, "0", { value: "abcd" });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", "abcd", false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two strings which have same length
+    and same characters in corresponding positions (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: "abcd" });
+
+        Object.defineProperty(arrObj, "0", { value: "abcd" });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", "abcd", false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-223.js
index c83165e04..6b79570b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-223.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-223.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown  when the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two strings with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 0, {

-            value: "abcd",

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: "fghj" });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", "abcd", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown  when the [[Value]] field of
+    'desc' and the [[Value]] attribute value of 'name' are two strings
+    with different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 0, {
+            value: "abcd",
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: "fghj" });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", "abcd", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-224.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-224.js
index 432f25b5c..acc415880 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-224.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-224.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-224.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two booleans with same value (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { value: true });

-

-        Object.defineProperty(arrObj, "0", { value: true });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", true, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two booleans with same value
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { value: true });
+
+        Object.defineProperty(arrObj, "0", { value: true });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", true, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-225.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-225.js
index d42b071a1..597fa6d15 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-225.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-225.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-225.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown when the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, 0, {

-            value: true,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: false });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", true, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown when the [[Value]] field of
+    'desc' and the [[Value]] attribute value of 'name' are two
+    booleans with different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, 0, {
+            value: true,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: false });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", true, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-226.js
index c56e8ac97..069337a69 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-226.js
@@ -1,22 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-226.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two objects which refer to the same object (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(arrObj, "0", { value: obj1 });

-

-        Object.defineProperty(arrObj, "0", { value: obj1 });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", obj1, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two objects which refer to the same
+    object (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(arrObj, "0", { value: obj1 });
+
+        Object.defineProperty(arrObj, "0", { value: obj1 });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", obj1, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-227.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-227.js
index 5012295e7..170c4747a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-227.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-227.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-227.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, test TypeError is thrown when the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two objects which refer to two different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        var obj1 = { length: 10 };

-        Object.defineProperty(arrObj, 0, {

-            value: obj1,

-            writable: false,

-            configurable: false

-        });

-

-        var obj2 = { length: 20 };

-

-        try {

-            Object.defineProperty(arrObj, "0", { value: obj2 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", obj1, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, test TypeError is thrown when the [[Value]] field of
+    'desc' and the [[Value]] attribute value of 'name' are two objects
+    which refer to two different objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        var obj1 = { length: 10 };
+        Object.defineProperty(arrObj, 0, {
+            value: obj1,
+            writable: false,
+            configurable: false
+        });
+
+        var obj2 = { length: 20 };
+
+        try {
+            Object.defineProperty(arrObj, "0", { value: obj2 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "0", obj1, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-228.js
index f56872439..715f5c98f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-228.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-228.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Writable]] field of 'desc' and the [[Writable]] attribute value of 'name' are two booleans with same value (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { writable: false });

-

-        Object.defineProperty(arrObj, "0", { writable: false });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Writable]] field of 'desc' and the [[Writable]]
+    attribute value of 'name' are two booleans with same value
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { writable: false });
+
+        Object.defineProperty(arrObj, "0", { writable: false });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-229.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-229.js
index 288da39b7..1a183663b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-229.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-229.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-229.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Writable]] field of 'desc' and the [[Writable]] attribute value of 'name' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { writable: false, configurable: true });

-

-        Object.defineProperty(arrObj, "0", { writable: true });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Writable]] field of 'desc' and the [[Writable]]
+    attribute value of 'name' are two booleans with different values
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { writable: false, configurable: true });
+
+        Object.defineProperty(arrObj, "0", { writable: true });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-23.js
index 1d809bb53..a7791c41d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-23.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-23.js

- * @description Object.defineProperty - 'name' is existing an inherited data property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            value: 11,

-            configurable: false

-        });

-

-        var ConstructFun = function () {};

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-

-        Object.defineProperty(obj, "foo", {

-            configurable: true

-        });

-        return obj.hasOwnProperty("foo") && (typeof obj.foo) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is existing an inherited data
+    property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            value: 11,
+            configurable: false
+        });
+
+        var ConstructFun = function () {};
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+
+        Object.defineProperty(obj, "foo", {
+            configurable: true
+        });
+        return obj.hasOwnProperty("foo") && (typeof obj.foo) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-230.js
index d438f63ba..7d48cb810 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-230.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-230.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Get]] field of 'desc' and the [[Get]] attribute value of 'name' are two objects which refer to the same object (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        arrObj.helpVerifySet = 10;

-

-        function getFunc() {

-            return arrObj.helpVerifySet;

-        }

-        function setFunc(value) {

-            arrObj.helpVerifySet = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "helpVerifySet", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Get]] field of 'desc' and the [[Get]] attribute
+    value of 'name' are two objects which refer to the same object
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        arrObj.helpVerifySet = 10;
+
+        function getFunc() {
+            return arrObj.helpVerifySet;
+        }
+        function setFunc(value) {
+            arrObj.helpVerifySet = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, setFunc, "helpVerifySet", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-231.js
index f839f6027..9ccae2087 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-231.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-231.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Get]] field of 'desc' and the [[Get]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        arrObj.helpVerifySet = 10;

-

-        function getFunc1() {

-            return 20;

-        }

-        function getFunc2() {

-            return arrObj.helpVerifySet;

-        }

-        function setFunc(value) {

-            arrObj.helpVerifySet = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc1,

-            set: setFunc,

-            configurable: true

-        });

-        

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc2

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc2, setFunc, "helpVerifySet", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Get]] field of 'desc' and the [[Get]] attribute
+    value of 'name' are two objects which refer to the different
+    objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        arrObj.helpVerifySet = 10;
+
+        function getFunc1() {
+            return 20;
+        }
+        function getFunc2() {
+            return arrObj.helpVerifySet;
+        }
+        function setFunc(value) {
+            arrObj.helpVerifySet = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc1,
+            set: setFunc,
+            configurable: true
+        });
+        
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc2
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc2, setFunc, "helpVerifySet", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-232.js
index c7bc010fe..b044cf79c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-232.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-232.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Set]] field of 'desc' and the [[Set]] attribute value of 'name' are two objects which refer to the same object (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", { set: setFunc });

-

-        Object.defineProperty(arrObj, "0", { set: setFunc });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Set]] field of 'desc' and the [[Set]] attribute
+    value of 'name' are two objects which refer to the same object
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", { set: setFunc });
+
+        Object.defineProperty(arrObj, "0", { set: setFunc });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-233.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-233.js
index 7ebc8fe1e..ca64fd3a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-233.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-233.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-233.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Set]] field of 'desc' and the [[Set]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        function setFunc1() { }

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc1,

-            configurable: true

-        });

-

-        function setFunc2(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", { set: setFunc2 });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc2, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Set]] field of 'desc' and the [[Set]] attribute
+    value of 'name' are two objects which refer to the different
+    objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        function setFunc1() { }
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc1,
+            configurable: true
+        });
+
+        function setFunc2(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", { set: setFunc2 });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc2, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-234.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-234.js
index f37e10fad..e03026046 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-234.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-234.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-234.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Enumerable]] field of 'desc' and the [[Enumerable]] attribute value of 'name' are two booleans with same value (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { enumerable: false });

-

-        Object.defineProperty(arrObj, "0", { enumerable: false });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Enumerable]] field of 'desc' and the
+    [[Enumerable]] attribute value of 'name' are two booleans with
+    same value (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { enumerable: false });
+
+        Object.defineProperty(arrObj, "0", { enumerable: false });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-235.js
index 30202fc27..21a8f36d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-235.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-235.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Enumerable]] field of 'desc' and the [[Enumerable]] attribute value of 'name' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { enumerable: false, configurable: true });

-

-        Object.defineProperty(arrObj, "0", { enumerable: true });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Enumerable]] field of 'desc' and the
+    [[Enumerable]] attribute value of 'name' are two booleans with
+    different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { enumerable: false, configurable: true });
+
+        Object.defineProperty(arrObj, "0", { enumerable: true });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-236.js
index 645bc9f1a..9ef759c7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-236.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-236.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Configurable]] field of 'desc' and the [[Configurable]] attribute value of 'name' are two booleans with same value  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { configurable: false });

-

-        Object.defineProperty(arrObj, "0", { configurable: false });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Configurable]] field of 'desc' and the
+    [[Configurable]] attribute value of 'name' are two booleans with
+    same value  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { configurable: false });
+
+        Object.defineProperty(arrObj, "0", { configurable: false });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-237.js
index ff465e8ab..829d76f6e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-237.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-237.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index property, the [[Configurable]] field of 'desc' and the [[Configurable]] attribute value of 'name' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", { configurable: true });

-

-        Object.defineProperty(arrObj, "0", { configurable: false });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    property, the [[Configurable]] field of 'desc' and the
+    [[Configurable]] attribute value of 'name' are two booleans with
+    different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", { configurable: true });
+
+        Object.defineProperty(arrObj, "0", { configurable: false });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-238.js
index 81d000a5d..2225057d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-238.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-238.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, TypeError is thrown if the [[Configurable]] attribute value of 'name' is false  and the [[Configurable]] field of 'desc' is true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: 3,

-            writable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: 13,

-                writable: true,

-                configurable: true

-            });

-            return false;

-

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, true, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, TypeError is thrown if the [[Configurable]]
+    attribute value of 'name' is false  and the [[Configurable]] field
+    of 'desc' is true (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: 3,
+            writable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: 13,
+                writable: true,
+                configurable: true
+            });
+            return false;
+
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, true, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-239.js
index f5be801a3..a3f7f4f2c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-239.js
@@ -1,35 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-239.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, TypeError is thrown if the [[Configurable]] attribute value of 'name' is false, and [[Enumerable]] of 'desc' is present and its value is different from the [[Enumerable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: 3,

-            writable: true,

-            configurable: false,

-            enumerable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: 13,

-                writable: true,

-                enumerable: true

-            });

-            return false;

-

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, true, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, TypeError is thrown if the [[Configurable]]
+    attribute value of 'name' is false, and [[Enumerable]] of 'desc'
+    is present and its value is different from the [[Enumerable]]
+    attribute value of 'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: 3,
+            writable: true,
+            configurable: false,
+            enumerable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: 13,
+                writable: true,
+                enumerable: true
+            });
+            return false;
+
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, true, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-24.js
index 6b7fac060..852d8b9e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-24.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-24.js

- * @description Object.defineProperty - 'name' is own data property that overrides an inherited data property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            value: 12,

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-        Object.defineProperty(obj, "foo", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.foo === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own data property that overrides
+    an inherited data property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            value: 12,
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+        Object.defineProperty(obj, "foo", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.foo === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-240.js
index 1cd43a7df..9f564b5e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-240.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-240.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, TypeError is thrown if 'name' is accessor property, and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "1", {

-            set: setFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: 13

-            });

-            return false;

-

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, TypeError is thrown if 'name' is accessor
+    property, and 'desc' is data descriptor, and the [[Configurable]]
+    attribute value of 'name' is false (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "1", {
+            set: setFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: 13
+            });
+            return false;
+
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-241.js
index 667f0e16e..d79911614 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-241.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-241.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, TypeError is thrown if  'name' is data property, and'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: 3,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                set: function () { }

-            });

-            return false;

-

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, TypeError is thrown if  'name' is data property,
+    and'desc' is accessor descriptor, and the [[Configurable]]
+    attribute value of 'name' is false (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: 3,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                set: function () { }
+            });
+            return false;
+
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242-1.js
index 304493dae..0a665f79e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242-1.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242-1.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property,  'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is true, test 'name' is updated successfully (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [3];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 1001,

-            writable: false,

-            enumerable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property,  'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    true, test 'name' is updated successfully (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [3];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 1001,
+            writable: false,
+            enumerable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 1001, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242.js
index 264ea9aaf..723dc7dba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242.js
@@ -1,25 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-242.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property,  'name' is data property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is true, test 'name' is converted from data property to accessor property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [3];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property,  'name' is data property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    true, test 'name' is converted from data property to accessor
+    property (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [3];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243-1.js
index ff3d56e73..8e68bb4c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243-1.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243-1.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property,  'name' is accessor property and  assignment to the accessor property, fails to convert accessor property from accessor property to data property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 3;

-        }

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc,

-            configurable: true

-        });

-

-        arrObj[1] = 4;

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property,  'name' is accessor property and  assignment to
+    the accessor property, fails to convert accessor property from
+    accessor property to data property (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 3;
+        }
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc,
+            configurable: true
+        });
+
+        arrObj[1] = 4;
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243.js
index f1eed2709..e26a91b68 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-243.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property,  'name' is accessor property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is true, test 'name' is converted from accessor property to data property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 3;

-        }

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "1", {

-            value: 12

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "1", 12, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property,  'name' is accessor property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    true, test 'name' is converted from accessor property to data
+    property (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 3;
+        }
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "1", {
+            value: 12
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "1", 12, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-244.js
index 375a1240f..1ead703f2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-244.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-244.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false and the [[Writable]] field of 'desc' is true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            writable: false,

-            configurable: false

-        });

-

-        try {

-

-            Object.defineProperty(arrObj, "1", {

-                writable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false and the [[Writable]] field of 'desc' is
+    true (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            writable: false,
+            configurable: false
+        });
+
+        try {
+
+            Object.defineProperty(arrObj, "1", {
+                writable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-245.js
index a1630f3c4..481717869 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-245.js
@@ -1,32 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-245.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the type of the [[Value]] field of 'desc' is different from the type of the [[Value]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: 3,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-

-            Object.defineProperty(arrObj, "1", {

-                value: "abc"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the type of the [[Value]] field of
+    'desc' is different from the type of the [[Value]] attribute value
+    of 'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: 3,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+
+            Object.defineProperty(arrObj, "1", {
+                value: "abc"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-246.js
index 266e61673..50b08153c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-246.js
@@ -1,30 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-246.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' is +0, and the [[Value]] attribute value of 'name' is -0 (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: -0

-

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: +0

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' is +0,
+    and the [[Value]] attribute value of 'name' is -0 (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: -0
+
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: +0
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-247.js
index 2bb414a3e..05ae70c17 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-247.js
@@ -1,29 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-247.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' is -0, and the [[Value]] attribute value of 'name' is +0 (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: +0

-        });

-

-        try {

-

-            Object.defineProperty(arrObj, "1", {

-                value: -0

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' is -0,
+    and the [[Value]] attribute value of 'name' is +0 (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: +0
+        });
+
+        try {
+
+            Object.defineProperty(arrObj, "1", {
+                value: -0
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-248.js
index 0fdb58eb9..bf42ccebf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-248.js
@@ -1,28 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-248.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two numbers with different vaules (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: 12

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: 15

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' and
+    the [[Value]] attribute value of 'name' are two numbers with
+    different vaules (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: 12
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: 15
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-249.js
index e08e831f1..77494b112 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-249.js
@@ -1,29 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-249.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two strings with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: "abc"

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: "fgh"

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", "abc", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' and
+    the [[Value]] attribute value of 'name' are two strings with
+    different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: "abc"
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: "fgh"
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", "abc", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-25.js
index dd46905b9..c454b3c70 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-25.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-25.js

- * @description Object.defineProperty - 'data' is own data property that overrides an inherited accessor property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            get: function () { },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-        Object.defineProperty(obj, "foo", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.foo === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'data' is own data property that overrides
+    an inherited accessor property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            get: function () { },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+        Object.defineProperty(obj, "foo", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.foo === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-250.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-250.js
index 3a8597948..cd6eb9983 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-250.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-250.js
@@ -1,29 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-250.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            value: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                value: true

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", false, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' and
+    the [[Value]] attribute value of 'name' are two booleans with
+    different values (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            value: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                value: true
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", false, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-251.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-251.js
index 236792688..871decdfd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-251.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-251.js
@@ -1,28 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-251.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Writable]] attribute value of 'name' is false, and the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        var obj = { length: 10 };

-

-        Object.defineProperty(arrObj, "1", {

-            value: obj

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", { value: {} });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", obj, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is data property and 'desc' is data
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Writable]] attribute
+    value of 'name' is false, and the [[Value]] field of 'desc' and
+    the [[Value]] attribute value of 'name' are two objects which
+    refer to the different objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        var obj = { length: 10 };
+
+        Object.defineProperty(arrObj, "1", {
+            value: obj
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", { value: {} });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "1", obj, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-252.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-252.js
index ae29f699a..9c55d9247 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-252.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-252.js
@@ -1,32 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-252.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' and the [[Set]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "1", {

-            set: setFunc

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                set: function () { }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Set]] field of 'desc' is
+    present, and the [[Set]] field of 'desc' and the [[Set]] attribute
+    value of 'name' are two objects which refer to the different
+    objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "1", {
+            set: setFunc
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                set: function () { }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-253.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-253.js
index df9d37de8..6133a074d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-253.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-253.js
@@ -1,32 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-253.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' is an object and the [[Set]] attribute value of 'name' is undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        function getFunc() {

-            return 12;

-        }

-

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc,

-            set: undefined

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                set: function () { }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Set]] field of 'desc' is
+    present, and the [[Set]] field of 'desc' is an object and the
+    [[Set]] attribute value of 'name' is undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        function getFunc() {
+            return 12;
+        }
+
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc,
+            set: undefined
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                set: function () { }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-254.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-254.js
index 33e5415d1..c91145ea2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-254.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-254.js
@@ -1,43 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-254.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is not thrown if the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' and the [[Set]] attribute value of 'name' are undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "1", {

-            set: undefined

-        });

-        var hasProperty = arrObj.hasOwnProperty("1");

-

-        Object.defineProperty(arrObj, "1", {

-            set: undefined

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(arrObj, "1");

-

-        var verifyGet = desc.hasOwnProperty("get") && typeof desc.get === "undefined";

-

-        var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";

-

-        var verifyEnumerable = false;

-        for (var p in arrObj) {

-            if (p === "1") {

-                verifyEnumerable = true

-            }

-        }

-

-        var verifyConfigurable = false;

-        delete arrObj[1];

-        verifyConfigurable = arrObj.hasOwnProperty("1");

-

-        return hasProperty && verifyGet && verifySet && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is not thrown if the [[Set]] field of 'desc'
+    is present, and the [[Set]] field of 'desc' and the [[Set]]
+    attribute value of 'name' are undefined (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "1", {
+            set: undefined
+        });
+        var hasProperty = arrObj.hasOwnProperty("1");
+
+        Object.defineProperty(arrObj, "1", {
+            set: undefined
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(arrObj, "1");
+
+        var verifyGet = desc.hasOwnProperty("get") && typeof desc.get === "undefined";
+
+        var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";
+
+        var verifyEnumerable = false;
+        for (var p in arrObj) {
+            if (p === "1") {
+                verifyEnumerable = true
+            }
+        }
+
+        var verifyConfigurable = false;
+        delete arrObj[1];
+        verifyConfigurable = arrObj.hasOwnProperty("1");
+
+        return hasProperty && verifyGet && verifySet && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-255.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-255.js
index 80cdfc966..9b3bf308b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-255.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-255.js
@@ -1,53 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-255.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' and the [[Get]] attribute value of 'name' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        function getFunc() {

-            return 12;

-        }

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: function () {

-                    return 14;

-                }

-            });

-

-            return false;

-        } catch (e) {

-            var hasProperty = arrObj.hasOwnProperty("1");

-            var desc = Object.getOwnPropertyDescriptor(arrObj, "1");

-

-            var verifyGet = arrObj[1] === getFunc();

-

-            var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";

-

-            var verifyEnumerable = false;

-            for (var p in arrObj) {

-                if (p === "1") {

-                    verifyEnumerable = true

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete arrObj[1];

-            verifyConfigurable = arrObj.hasOwnProperty("1");

-

-            return e instanceof TypeError && hasProperty && verifyGet &&

-                verifySet && !verifyEnumerable && verifyConfigurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Get]] field of 'desc' is
+    present, and the [[Get]] field of 'desc' and the [[Get]] attribute
+    value of 'name' are two objects which refer to the different
+    objects (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        function getFunc() {
+            return 12;
+        }
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: function () {
+                    return 14;
+                }
+            });
+
+            return false;
+        } catch (e) {
+            var hasProperty = arrObj.hasOwnProperty("1");
+            var desc = Object.getOwnPropertyDescriptor(arrObj, "1");
+
+            var verifyGet = arrObj[1] === getFunc();
+
+            var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";
+
+            var verifyEnumerable = false;
+            for (var p in arrObj) {
+                if (p === "1") {
+                    verifyEnumerable = true
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete arrObj[1];
+            verifyConfigurable = arrObj.hasOwnProperty("1");
+
+            return e instanceof TypeError && hasProperty && verifyGet &&
+                verifySet && !verifyEnumerable && verifyConfigurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-256.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-256.js
index caa7c1142..14aaeef5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-256.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-256.js
@@ -1,50 +1,56 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-256.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is thrown if the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' is an object and the [[Get]] attribute value of 'name' is undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        function getFunc() {

-            return 12;

-        }

-

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: undefined

-            });

-            return false;

-        } catch (e) {

-            var hasProperty = arrObj.hasOwnProperty("1");

-            var desc = Object.getOwnPropertyDescriptor(arrObj, "1");

-

-            var verifyGet = arrObj[1] === getFunc();

-

-            var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";

-

-            var verifyEnumerable = false;

-            for (var p in arrObj) {

-                if (p === "1") {

-                    verifyEnumerable = true

-                }

-            }

-

-            var verifyConfigurable = false;

-            delete arrObj[1];

-            verifyConfigurable = arrObj.hasOwnProperty("1");

-

-            return e instanceof TypeError && hasProperty && verifyGet &&

-                verifySet && !verifyEnumerable && verifyConfigurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is thrown if the [[Get]] field of 'desc' is
+    present, and the [[Get]] field of 'desc' is an object and the
+    [[Get]] attribute value of 'name' is undefined (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+        function getFunc() {
+            return 12;
+        }
+
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: undefined
+            });
+            return false;
+        } catch (e) {
+            var hasProperty = arrObj.hasOwnProperty("1");
+            var desc = Object.getOwnPropertyDescriptor(arrObj, "1");
+
+            var verifyGet = arrObj[1] === getFunc();
+
+            var verifySet = desc.hasOwnProperty("set") && typeof desc.set === "undefined";
+
+            var verifyEnumerable = false;
+            for (var p in arrObj) {
+                if (p === "1") {
+                    verifyEnumerable = true
+                }
+            }
+
+            var verifyConfigurable = false;
+            delete arrObj[1];
+            verifyConfigurable = arrObj.hasOwnProperty("1");
+
+            return e instanceof TypeError && hasProperty && verifyGet &&
+                verifySet && !verifyEnumerable && verifyConfigurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-257.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-257.js
index 430f39203..4247146a2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-257.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-257.js
@@ -1,34 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-257.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, 'name' is accessor property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'name' is false, test TypeError is not thrown if the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' and the [[Get]] attribute value of 'name' are undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arrObj = [];

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "1", {

-            get: undefined,

-            set: setFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "1", {

-                get: undefined

-            });

-

-            return accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, 'name' is accessor property and 'desc' is accessor
+    descriptor, and the [[Configurable]] attribute value of 'name' is
+    false, test TypeError is not thrown if the [[Get]] field of 'desc'
+    is present, and the [[Get]] field of 'desc' and the [[Get]]
+    attribute value of 'name' are undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "1", {
+            get: undefined,
+            set: setFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "1", {
+                get: undefined
+            });
+
+            return accessorPropertyAttributesAreCorrect(arrObj, "1", undefined, setFunc, "setVerifyHelpProp", false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-258.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-258.js
index 7de8e96d4..629517592 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-258.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-258.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-258.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test updating the [[Value]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-

-        Object.defineProperty(arrObj, "0", {

-            value: 200

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 200, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test updating the [[Value]] attribute value of 'name'
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+
+        Object.defineProperty(arrObj, "0", {
+            value: 200
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 200, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-259.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-259.js
index 49e0c9f0c..361641d90 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-259.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-259.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-259.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test setting the [[Value]] attribute value of 'name' as undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-

-        Object.defineProperty(arrObj, "0", {

-            value: undefined

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test setting the [[Value]] attribute value of 'name'
+    as undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+
+        Object.defineProperty(arrObj, "0", {
+            value: undefined
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", undefined, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-26.js
index 24df07582..e09466315 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-26.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-26.js

- * @description Object.defineProperty - 'name' is own accessor property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 11;

-            },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 12;

-                },

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.property === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own accessor property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 11;
+            },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 12;
+                },
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.property === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-260.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-260.js
index 10bad6fbb..6153fc396 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-260.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-260.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-260.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test setting the [[Value]] attribute value of 'name' from undefined to number (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [undefined];

-        Object.defineProperty(arrObj, "0", {

-            value: 100

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test setting the [[Value]] attribute value of 'name'
+    from undefined to number (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [undefined];
+        Object.defineProperty(arrObj, "0", {
+            value: 100
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-261.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-261.js
index dd2b6bee3..4fc7e14bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-261.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-261.js
@@ -1,20 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-261.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test updating the [[Writable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-        Object.defineProperty(arrObj, "0", {

-            writable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test updating the [[Writable]] attribute value of
+    'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+        Object.defineProperty(arrObj, "0", {
+            writable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-262.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-262.js
index 7802175d8..32ebd1286 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-262.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-262.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-262.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test updating the [[Enumerable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-

-        Object.defineProperty(arrObj, "0", {

-            enumerable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test updating the [[Enumerable]] attribute value of
+    'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+
+        Object.defineProperty(arrObj, "0", {
+            enumerable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-263.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-263.js
index 074e2d50c..faefcc12b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-263.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-263.js
@@ -1,21 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-263.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test updating the [[Configurable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-

-        Object.defineProperty(arrObj, "0", {

-            configurable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test updating the [[Configurable]] attribute value of
+    'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+
+        Object.defineProperty(arrObj, "0", {
+            configurable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-264.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-264.js
index a6ecf82d6..83cb9939b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-264.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-264.js
@@ -1,22 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-264.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is data property and 'desc' is data descriptor, test updating multiple attribute values of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [100];

-        Object.defineProperty(arrObj, "0", {

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is data property and 'desc' is data
+    descriptor, test updating multiple attribute values of 'name'
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [100];
+        Object.defineProperty(arrObj, "0", {
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        return dataPropertyAttributesAreCorrect(arrObj, "0", 100, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-265.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-265.js
index 7da778fbf..74bb49280 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-265.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-265.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-265.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Get]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 100;

-        }

-        Object.defineProperty(arrObj, "0", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Get]] attribute value of 'name'
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 100;
+        }
+        Object.defineProperty(arrObj, "0", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-266.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-266.js
index 1c6d52019..ec803925f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-266.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-266.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-266.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test setting the [[Get]] attribute value of 'name' as undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        function getFunc() {

-            return 12;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            get: undefined

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test setting the [[Get]] attribute value of 'name' as
+    undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        function getFunc() {
+            return 12;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            get: undefined
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-267.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-267.js
index 1ecd7a867..d4f84bc88 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-267.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-267.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-267.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Get]] attribute value of 'name' from undefined to function object (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 12;

-        }

-        Object.defineProperty(arrObj, "0", {

-            get: undefined,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            get: getFunc

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Get]] attribute value of 'name'
+    from undefined to function object (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 12;
+        }
+        Object.defineProperty(arrObj, "0", {
+            get: undefined,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            get: getFunc
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", getFunc, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-268.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-268.js
index 78ce446ad..6f15ff997 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-268.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-268.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-268.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Set]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Set]] attribute value of 'name'
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-269.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-269.js
index 5dab710c2..8f3565bab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-269.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-269.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-269.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test setting the [[Set]] attribute value of 'name' as undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            set: undefined

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test setting the [[Set]] attribute value of 'name' as
+    undefined (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            set: undefined
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-27.js
index b3fcd69f8..ab82ae91d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-27.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-27.js

- * @description Object.defineProperty - 'name' is an inherited accessor property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "property", {

-            get: function () {

-                return 11;

-            },

-            configurable: false

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-        return obj.hasOwnProperty("property") && obj.property === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is an inherited accessor property
+    (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "property", {
+            get: function () {
+                return 11;
+            },
+            configurable: false
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+        return obj.hasOwnProperty("property") && obj.property === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-270.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-270.js
index 2686a2862..2e04b627b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-270.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-270.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-270.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Set]] attribute value of 'name' from undefined to function object (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            set: undefined,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Set]] attribute value of 'name'
+    from undefined to function object (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            set: undefined,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-271.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-271.js
index becd87c1a..2da4e5887 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-271.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-271.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-271.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Enumerable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            enumerable: false

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Enumerable]] attribute value of
+    'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            enumerable: false
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-272.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-272.js
index 21a63aafa..25f9a86f8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-272.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-272.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-272.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating the [[Configurable]] attribute value of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "0", {

-            set: setFunc,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "0", {

-            configurable: false

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating the [[Configurable]] attribute value of
+    'name' (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "0", {
+            set: setFunc,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "0", {
+            configurable: false
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "0", undefined, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-273.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-273.js
index 6839d8a22..e6defe51b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-273.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-273.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-273.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, name is accessor property and 'desc' is accessor descriptor, test updating multiple attribute values of 'name' (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        function getFunc() {

-            return 12;

-        }

-        Object.defineProperty(arrObj, "1", {

-            get: function () {

-                return 6;

-            },

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(arrObj, "1", {

-            get: getFunc,

-            enumerable: false,

-            configurable: false

-        });

-        return accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, name is accessor property and 'desc' is accessor
+    descriptor, test updating multiple attribute values of 'name'
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        function getFunc() {
+            return 12;
+        }
+        Object.defineProperty(arrObj, "1", {
+            get: function () {
+                return 6;
+            },
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(arrObj, "1", {
+            get: getFunc,
+            enumerable: false,
+            configurable: false
+        });
+        return accessorPropertyAttributesAreCorrect(arrObj, "1", getFunc, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-274.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-274.js
index f16bb321b..9a12423ed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-274.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-274.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-274.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test the length property of 'O' is not changed if ToUint32('name') is less than value of the length property in 'O' (15.4.5.1 step 4.e)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false

-

-        Object.defineProperty(arrObj, "1", {

-            value: 14

-        });

-

-        return arrObj.length === 3 && arrObj[1] === 14;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test the length property of 'O' is not changed if
+    ToUint32('name') is less than value of the length property in 'O'
+    (15.4.5.1 step 4.e)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false
+
+        Object.defineProperty(arrObj, "1", {
+            value: 14
+        });
+
+        return arrObj.length === 3 && arrObj[1] === 14;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-275.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-275.js
index 705e20f7d..3e04c9fb5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-275.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-275.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-275.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test the length property of 'O' is set as ToUint32('name') + 1 if ToUint32('name') equals to value of the length property in 'O' (15.4.5.1 step 4.e.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-        arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false

-

-        Object.defineProperty(arrObj, "3", {

-            value: 3

-        });

-

-        return arrObj.length === 4 && arrObj[3] === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test the length property of 'O' is set as
+    ToUint32('name') + 1 if ToUint32('name') equals to value of the
+    length property in 'O' (15.4.5.1 step 4.e.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+        arrObj.length = 3; // default value of length: writable: true, configurable: false, enumerable: false
+
+        Object.defineProperty(arrObj, "3", {
+            value: 3
+        });
+
+        return arrObj.length === 4 && arrObj[3] === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-276.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-276.js
index 9f7eabc02..b6469a3a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-276.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-276.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-276.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is an array index named property, test the length property of 'O' is set as ToUint32('name') + 1 if ToUint32('name') is greater than value of the length property in 'O' (15.4.5.1 step 4.e.ii)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "5", {

-            value: 3

-        });

-

-        return arrObj.length === 6 && arrObj[5] === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is an array index
+    named property, test the length property of 'O' is set as
+    ToUint32('name') + 1 if ToUint32('name') is greater than value of
+    the length property in 'O' (15.4.5.1 step 4.e.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "5", {
+            value: 3
+        });
+
+        return arrObj.length === 6 && arrObj[5] === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-277.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-277.js
index 77e6fcd32..ebd89d388 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-277.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-277.js
@@ -1,25 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-277.js

- * @description Object.defineProperty -  'O' is an Array, 'name' is generic property that won't exist on 'O', and 'desc' is data descriptor, test 'name' is defined in 'O' with all correct attribute values (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "property", {

-            value: 12,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "property", 12, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty -  'O' is an Array, 'name' is generic
+    property that won't exist on 'O', and 'desc' is data descriptor,
+    test 'name' is defined in 'O' with all correct attribute values
+    (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "property", {
+            value: 12,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "property", 12, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-278.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-278.js
index 439838dbf..bb2b0eb7d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-278.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-278.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-278.js

- * @description Object.defineProperty - 'name' is generic property that won't exist on 'O', and 'desc' is accessor descriptor, test 'name' is defined in 'O' with all correct attribute values (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 12;

-        }

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arrObj, "property", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is generic property that won't
+    exist on 'O', and 'desc' is accessor descriptor, test 'name' is
+    defined in 'O' with all correct attribute values (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 12;
+        }
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arrObj, "property", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-279.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-279.js
index 12d173725..a1989dee4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-279.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-279.js
@@ -1,38 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-279.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'name' (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 12;

-        }

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "property", {

-            get: function () {

-                return 24;

-            },

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(arrObj, "property", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    accessor property of 'O', and 'desc' is accessor descriptor, test
+    updating multiple attribute values of 'name' (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 12;
+        }
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "property", {
+            get: function () {
+                return 24;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(arrObj, "property", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-28.js
index ed637d750..6c7f7c1d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-28.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-28.js

- * @description Object.defineProperty - 'name' is own accessor property that overrides an inherited data property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            value: 11,

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-        Object.defineProperty(obj, "foo", {

-            get: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own accessor property that
+    overrides an inherited data property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            value: 11,
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+        Object.defineProperty(obj, "foo", {
+            get: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-280.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-280.js
index 7efb40e5c..73f8e1911 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-280.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-280.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-280.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'name' (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        arrObj.property = 12; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(arrObj, "property", {

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    data property of 'O', and 'desc' is data descriptor, test updating
+    multiple attribute values of 'name' (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        arrObj.property = 12; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(arrObj, "property", {
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-281.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-281.js
index 86a44cd23..698eafbc7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-281.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-281.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-281.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'name' which is defined as non-writable and non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "property", {

-            value: 12

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                value: 36

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Value]] attribute value of 'name' which is defined as
+    non-writable and non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "property", {
+            value: 12
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                value: 36
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-282.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-282.js
index c8f30edf6..7b06e937a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-282.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-282.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-282.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "property", {

-            writable: false

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                writable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Writable]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "property", {
+            writable: false
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                writable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-283.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-283.js
index 2bd4e2f5e..5ebfef2b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-283.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-283.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-283.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "property", {

-            value: 12,

-            enumerable: false

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                enumerable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Enumerable]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "property", {
+            value: 12,
+            enumerable: false
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                enumerable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-284.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-284.js
index 3c36062ab..e82660a2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-284.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-284.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-284.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "property", {

-            value: 12

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Configurable]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "property", {
+            value: 12
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arrObj, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-285.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-285.js
index b803f4b36..e3d9acfad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-285.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-285.js
@@ -1,37 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-285.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function getFunc() {

-            return 12;

-        }

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "property", {

-            get: getFunc,

-            set: setFunc

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                get: function () {

-                    return 36;

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function getFunc() {
+            return 12;
+        }
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "property", {
+            get: getFunc,
+            set: setFunc
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                get: function () {
+                    return 36;
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-286.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-286.js
index c1946b5df..c0b2bf489 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-286.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-286.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-286.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own accessor property of 'O', and 'desc' is accessor descriptor, test TypeError is thrown when updating the [[Set]] attribute value of 'name' (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "property", {

-            set: setFunc

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                set: function () {}

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    accessor property of 'O', and 'desc' is accessor descriptor, test
+    TypeError is thrown when updating the [[Set]] attribute value of
+    'name' (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "property", {
+            set: setFunc
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                set: function () {}
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-287.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-287.js
index cb022e6b9..5541d3244 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-287.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-287.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-287.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "property", {

-            set: setFunc,

-            enumerable: false

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                enumerable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "property", {
+            set: setFunc,
+            enumerable: false
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                enumerable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-288.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-288.js
index 1194ff32a..0294c34d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-288.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-288.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-288.js

- * @description Object.defineProperty - 'O' is an Array, 'name' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arrObj = [];

-

-        function setFunc(value) {

-            arrObj.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arrObj, "property", {

-            set: setFunc,

-            configurable: false

-        });

-        try {

-            Object.defineProperty(arrObj, "property", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array, 'name' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'name' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arrObj = [];
+
+        function setFunc(value) {
+            arrObj.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arrObj, "property", {
+            set: setFunc,
+            configurable: false
+        });
+        try {
+            Object.defineProperty(arrObj, "property", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arrObj, "property", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289-1.js
index dca8d24d2..f1fa33417 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289-1.js
@@ -1,25 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own property which is defined in both [[ParameterMap]] of 'O' and 'O', and is deleted afterwards, and 'desc' is data descriptor, test 'name' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            delete arguments[0];

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var verifyFormal = a === 0;

-            return dataPropertyAttributesAreCorrect(arguments, "0", 10, true, true, true) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own property which is
+    defined in both [[ParameterMap]] of 'O' and 'O', and is deleted
+    afterwards, and 'desc' is data descriptor, test 'name' is
+    redefined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            delete arguments[0];
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var verifyFormal = a === 0;
+            return dataPropertyAttributesAreCorrect(arguments, "0", 10, true, true, true) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289.js
index dd725721d..5a40f81c3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-289.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own property of 'O', and is deleted afterwards, and 'desc' is data descriptor, test 'name' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () { 

-            delete arguments[0];

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "0", 10, true, true, true);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    property of 'O', and is deleted afterwards, and 'desc' is data
+    descriptor, test 'name' is redefined in 'O' with all correct
+    attribute values (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () { 
+            delete arguments[0];
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "0", 10, true, true, true);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-29.js
index 6984de947..accfca0b5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-29.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-29.js

- * @description Object.defineProperty - 'name' is own accessor property that overrides an inherited accessor property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            get: function () { },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-        Object.defineProperty(obj, "foo", {

-            get: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own accessor property that
+    overrides an inherited accessor property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            get: function () { },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+        Object.defineProperty(obj, "foo", {
+            get: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290-1.js
index f321f3d93..b86d376b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290-1.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own property which is defined in both [[ParameterMap]] of 'O' and 'O', is deleted afterwards, and 'desc' is accessor descriptor, test 'name' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) { 

-            delete arguments[0];

-            function getFunc() {

-                return 10;

-            }

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            var verifyFormal = a === 0;

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", true, true) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own property which is
+    defined in both [[ParameterMap]] of 'O' and 'O', is deleted
+    afterwards, and 'desc' is accessor descriptor, test 'name' is
+    redefined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) { 
+            delete arguments[0];
+            function getFunc() {
+                return 10;
+            }
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            var verifyFormal = a === 0;
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", true, true) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290.js
index ba56a742d..26d9bfeb2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-290.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own property of 'O', and is deleted afterwards, and 'desc' is accessor descriptor, test 'name' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () { 

-            delete arguments[0];

-            function getFunc() {

-                return 10;

-            }

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);

-        }(0, 1, 2));    

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    property of 'O', and is deleted afterwards, and 'desc' is accessor
+    descriptor, test 'name' is redefined in 'O' with all correct
+    attribute values (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () { 
+            delete arguments[0];
+            function getFunc() {
+                return 10;
+            }
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", true, true);
+        }(0, 1, 2));    
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291-1.js
index 581be432f..eb31fd1dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291-1.js
@@ -1,34 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3 and 5.a.i)

- */

-

-

-function testcase() {

-        return (function (a, b, c) { 

-            function getFunc1() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: true,

-                configurable: true

-            });

-            function getFunc2() {

-                return 20;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc2,

-                enumerable: false,

-                configurable: false

-            });

-            var verifyFormal = a === 0;

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own accessor property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', and 'desc' is
+    accessor descriptor, test updating multiple attribute values of
+    'name' (10.6 [[DefineOwnProperty]] step 3 and 5.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) { 
+            function getFunc1() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: true,
+                configurable: true
+            });
+            function getFunc2() {
+                return 20;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc2,
+                enumerable: false,
+                configurable: false
+            });
+            var verifyFormal = a === 0;
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291.js
index 54623731e..31e5d2db3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-291.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc1() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: true,

-                configurable: true

-            });

-            function getFunc2() {

-                return 20;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc2,

-                enumerable: false,

-                configurable: false

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    accessor property of 'O', and 'desc' is accessor descriptor, test
+    updating multiple attribute values of 'name' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc1() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: true,
+                configurable: true
+            });
+            function getFunc2() {
+                return 20;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc2,
+                enumerable: false,
+                configurable: false
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292-1.js
index de8a05d21..091291bb1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292-1.js
@@ -1,24 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own property of 'O' which is also defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3 and 5.b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) { 

-            Object.defineProperty(arguments, "0", {

-                value: 20,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            var verifyFormal = a === 20;

-            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own property of 'O' which is
+    also defined in [[ParameterMap]] of 'O', and 'desc' is data
+    descriptor, test updating multiple attribute values of 'name'
+    (10.6 [[DefineOwnProperty]] step 3 and 5.b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) { 
+            Object.defineProperty(arguments, "0", {
+                value: 20,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            var verifyFormal = a === 20;
+            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292.js
index 66154e72c..60dc82b2c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292.js
@@ -1,23 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-292.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 20,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', and 'desc' is data descriptor, test updating
+    multiple attribute values of 'name' (10.6 [[DefineOwnProperty]]
+    step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 20,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-1.js
index 35c4e7da2..9cd23bc6c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-1.js
@@ -1,24 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-1.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', test TypeError is not thrown when updating the [[Value]] attribute value of 'name' which is defined as non-writable and configurable (10.6 [[DefineOwnProperty]] step 3 and 5b)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false

-            });

-            Object.defineProperty(arguments, "0", {

-                value: 20

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, true, true);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', test TypeError is not thrown when updating
+    the [[Value]] attribute value of 'name' which is defined as
+    non-writable and configurable (10.6 [[DefineOwnProperty]] step 3
+    and 5b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false
+            });
+            Object.defineProperty(arguments, "0", {
+                value: 20
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, true, true);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-2.js
index f7e821482..f523f05c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-2.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-2.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'name' which is defined as unwritable and non-configurable (10.6 [[DefineOwnProperty]] step 4 and step 5b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    value: 20

-                });

-            } catch (e) {

-                var verifyFormal = a === 10;

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Value]] attribute value of 'name'
+    which is defined as unwritable and non-configurable (10.6
+    [[DefineOwnProperty]] step 4 and step 5b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    value: 20
+                });
+            } catch (e) {
+                var verifyFormal = a === 10;
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-3.js
index ace83c39b..518413c5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-3.js
@@ -1,25 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293-3.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is not thrown when updating the [[Value]] attribute value of 'name' which is defined as non-writable and configurable (10.6 [[DefineOwnProperty]] step 3 and step 5.b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-        Object.defineProperty(arguments, "0", {

-            value: 10,

-            writable: false,

-        });

-        Object.defineProperty(arguments, "0", {

-            value: 20

-        });

-        var verifyFormal = a === 10;        

-        return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, true, true) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is not thrown when updating the [[Value]] attribute value of
+    'name' which is defined as non-writable and configurable (10.6
+    [[DefineOwnProperty]] step 3 and step 5.b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+        Object.defineProperty(arguments, "0", {
+            value: 10,
+            writable: false,
+        });
+        Object.defineProperty(arguments, "0", {
+            value: 20
+        });
+        var verifyFormal = a === 10;        
+        return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, true, true) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293.js
index 4adaae351..40ea69dae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-293.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'name' which is defined as non-writable and non-configurable (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    value: 20

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Value]] attribute value of 'name' which is defined as
+    non-writable and non-configurable (10.6 [[DefineOwnProperty]] step
+    3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    value: 20
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294-1.js
index 87498685f..782a28b69 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294-1.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4 and 5b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    writable: true

-                });

-            } catch (e) {

-                var verifyFormal = a === 10;

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Writable]] attribute value of 'name'
+    which is defined as non-configurable (10.6 [[DefineOwnProperty]]
+    step 4 and 5b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    writable: true
+                });
+            } catch (e) {
+                var verifyFormal = a === 10;
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294.js
index 9cb73fd90..d60fbadc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-294.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    writable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Writable]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    writable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295-1.js
index 56a7ac89b..e04c9a62e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295-1.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4 and step 5b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                var verifyFormal = a === 10;

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, true, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Enumerable]] attribute value of
+    'name' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4 and step 5b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                var verifyFormal = a === 10;
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, true, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295.js
index 8193c4c09..4d72e1714 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-295.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, true, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Enumerable]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, true, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296-1.js
index 69334b52b..c06e67013 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296-1.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4 and step 5b)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                var verifyFormal = a === 10;

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Configurable]] attribute value of
+    'name' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4 and step 5b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                var verifyFormal = a === 10;
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296.js
index 97feb1a3d..2a98c0c4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-296.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Configurable]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297-1.js
index c68ce6763..97e735b8b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297-1.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4 and step 5a)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc1() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: false,

-                configurable: false

-            });

-            function getFunc2() {

-                return 20;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    get: getFunc2

-                });

-            } catch (e) {

-                var verifyFormal = a === 0;

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own accessor property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Get]] attribute value of 'name'
+    which is defined as non-configurable (10.6 [[DefineOwnProperty]]
+    step 4 and step 5a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc1() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: false,
+                configurable: false
+            });
+            function getFunc2() {
+                return 20;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    get: getFunc2
+                });
+            } catch (e) {
+                var verifyFormal = a === 0;
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297.js
index ec1d3f519..c25536343 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-297.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc1() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: false,

-                configurable: false

-            });

-            function getFunc2() {

-                return 20;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    get: getFunc2

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc1() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: false,
+                configurable: false
+            });
+            function getFunc2() {
+                return 20;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    get: getFunc2
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298-1.js
index d862edfe5..38e295094 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298-1.js
@@ -1,38 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] steps 4 and 5a)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: undefined,

-                enumerable: false,

-                configurable: false

-            });

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    set: setFunc

-                });

-            } catch (e) {

-                var verifyFormal = a === 0;

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own accessor property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Set]] attribute value of 'name'
+    which is defined as non-configurable (10.6 [[DefineOwnProperty]]
+    steps 4 and 5a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: undefined,
+                enumerable: false,
+                configurable: false
+            });
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    set: setFunc
+                });
+            } catch (e) {
+                var verifyFormal = a === 0;
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298.js
index da8cebac2..e6f5f4b54 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298.js
@@ -1,36 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-298.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own accessor property of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: undefined,

-                enumerable: false,

-                configurable: false

-            });

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    set: setFunc

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Set]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: undefined,
+                enumerable: false,
+                configurable: false
+            });
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    set: setFunc
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299-1.js
index 6bda361dc..dff143d56 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299-1.js
@@ -1,34 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] steps 4 and 5a)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                var verifyFormal = a === 0;

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own accessor property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Enumerable]] attribute value of
+    'name' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] steps 4 and 5a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                var verifyFormal = a === 0;
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299.js
index af8330f6c..b62f9fdd5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-299.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-3.js
index f180df9a2..55722555f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-3.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For newly defined accessor properties, attributes

- * missing from desc should have values set to the defaults from 8.6.1.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-3.js

- * @description Object.defineProperty sets missing attributes to their default values (accessor)(8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-  var o = {};

-

-  var getter = function () { return 1; };

-  var desc = { get: getter };

-

-  Object.defineProperty(o, "foo", desc);

-

-  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");

-

-  if (typeof(propDesc.get) === "function" &&  // the getter must be the function that was provided

-      propDesc.get === getter &&

-      propDesc.enumerable   === false &&      // false by default

-      propDesc.configurable === false) {      // false by default

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For newly defined accessor properties, attributes
+    missing from desc should have values set to the defaults from 8.6.1.
+description: >
+    Object.defineProperty sets missing attributes to their default
+    values (accessor)(8.12.9 step 4.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  var getter = function () { return 1; };
+  var desc = { get: getter };
+
+  Object.defineProperty(o, "foo", desc);
+
+  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");
+
+  if (typeof(propDesc.get) === "function" &&  // the getter must be the function that was provided
+      propDesc.get === getter &&
+      propDesc.enumerable   === false &&      // false by default
+      propDesc.configurable === false) {      // false by default
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-30.js
index 035fe3470..1b34d1f58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-30.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-30.js

- * @description Object.defineProperty - 'name' is own accessor property without a get function (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "foo", {

-            set: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own accessor property without a
+    get function (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "foo", {
+            set: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300-1.js
index 7b6a19ed3..eff27e41f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300-1.js
@@ -1,34 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4 and step 5a)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc() {

-                return 0;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                var verifyFormal = a === 0;

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false) && verifyFormal;

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own accessor property of 'O'
+    which is also defined in [[ParameterMap]] of 'O', test TypeError
+    is thrown when updating the [[Configurable]] attribute value of
+    'name' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4 and step 5a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc() {
+                return 0;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                var verifyFormal = a === 0;
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false) && verifyFormal;
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300.js
index 8a8c988ae..580bea8d3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-300.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);

-            }

-            return false;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'name' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);
+            }
+            return false;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301-1.js
index 94437edad..344fd6a82 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301-1.js
@@ -1,25 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is an index named property of 'O', and 'desc' is data descriptor, test 'name' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            delete arguments[0];

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            var verifyFormal = a === 0;

-            return dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is an index named property of
+    'O', and 'desc' is data descriptor, test 'name' is defined in 'O'
+    with all correct attribute values (10.6 [[DefineOwnProperty]] step
+    3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            delete arguments[0];
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            var verifyFormal = a === 0;
+            return dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301.js
index b8b2c7216..47292ce8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301.js
@@ -1,24 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-301.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an array index named property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test 'name' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () { 

-            delete arguments[0];

-            Object.defineProperty(arguments, "0", {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    array index named property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is data descriptor, test
+    'name' is defined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () { 
+            delete arguments[0];
+            Object.defineProperty(arguments, "0", {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "0", 10, false, false, false);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302-1.js
index abd315bdb..12a2370d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302-1.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is an index named property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test 'name' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3 and step 5a)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            delete arguments[0];

-            function getFunc() {

-                return 10;

-            }

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: false,

-                configurable: false

-            });

-            var verifyFormal = a === 0;

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", false, false) && verifyFormal;

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is an index named property of
+    'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is
+    accessor descriptor, test 'name' is defined in 'O' with all
+    correct attribute values (10.6 [[DefineOwnProperty]] step 3 and
+    step 5a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            delete arguments[0];
+            function getFunc() {
+                return 10;
+            }
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: false,
+                configurable: false
+            });
+            var verifyFormal = a === 0;
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", false, false) && verifyFormal;
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302.js
index c7974f840..b505f342e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-302.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test 'name' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            delete arguments[0];

-            function getFunc() {

-                return 10;

-            }

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: false,

-                configurable: false

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", false, false);

-        }(0, 1, 2));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named property of 'O' but not defined in [[ParameterMap]] of
+    'O', and 'desc' is accessor descriptor, test 'name' is defined in
+    'O' with all correct attribute values (10.6 [[DefineOwnProperty]]
+    step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            delete arguments[0];
+            function getFunc() {
+                return 10;
+            }
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: false,
+                configurable: false
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, setFunc, "setVerifyHelpProp", false, false);
+        }(0, 1, 2));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-303.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-303.js
index 37e9a795b..5850b689b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-303.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-303.js
@@ -1,33 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-303.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc1() {

-                return 10;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: true,

-                configurable: true

-            });

-            function getFunc2() {

-                return 20;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc2,

-                enumerable: false,

-                configurable: false

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false);

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test
+    updating multiple attribute values of 'name' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc1() {
+                return 10;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: true,
+                configurable: true
+            });
+            function getFunc2() {
+                return 20;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc2,
+                enumerable: false,
+                configurable: false
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "0", getFunc2, undefined, undefined, false, false);
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-304.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-304.js
index f081c248e..9399edbf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-304.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-304.js
@@ -1,23 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-304.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named data property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'name' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 20,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false);

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is data descriptor, test
+    updating multiple attribute values of 'name' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 20,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "0", 20, false, false, false);
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-305.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-305.js
index db3bc6a4a..82d0a5a5d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-305.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-305.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-305.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'name' which is not writable and not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 0,

-                writable: false,

-                configurable: false

-            });

-

-            try {

-                Object.defineProperty(arguments, "0", {

-                    value: 10

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Value]] attribute value of 'name' which is not writable and
+    not configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 0,
+                writable: false,
+                configurable: false
+            });
+
+            try {
+                Object.defineProperty(arguments, "0", {
+                    value: 10
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-306.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-306.js
index 4ee9f83ef..cf8aa78c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-306.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-306.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-306.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 0,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    writable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Writable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 0,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    writable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-307.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-307.js
index 4efa25a10..2d294b1cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-307.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-307.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-307.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 0,

-                writable: false,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, true, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 0,
+                writable: false,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, true, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-308.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-308.js
index 2c7544b78..5f4d046d4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-308.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-308.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-308.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "0", {

-                value: 0,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "0", {
+                value: 0,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && dataPropertyAttributesAreCorrect(arguments, "0", 0, false, false, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-309.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-309.js
index 457b3b191..faef520b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-309.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-309.js
@@ -1,35 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-309.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc1() {

-                return 0;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc1,

-                enumerable: false,

-                configurable: false

-            });

-            function getFunc2() {

-                return 10;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    get: getFunc2

-                });

-                return false;

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false);

-            }

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'name' which is not configurable
+    (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc1() {
+                return 0;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc1,
+                enumerable: false,
+                configurable: false
+            });
+            function getFunc2() {
+                return 10;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    get: getFunc2
+                });
+                return false;
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc1, undefined, undefined, false, false);
+            }
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-31.js
index 8b483c4ed..9d232b2fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-31.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-31.js

- * @description Object.defineProperty - 'name' is own accessor property without a get function that overrides an inherited accessor property(8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            get: function () { },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-        Object.defineProperty(obj, "foo", {

-            set: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is own accessor property without a
+    get function that overrides an inherited accessor property(8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            get: function () { },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+        Object.defineProperty(obj, "foo", {
+            set: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-310.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-310.js
index bc091eed1..88db4aa76 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-310.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-310.js
@@ -1,36 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-310.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 0;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                set: undefined,

-                enumerable: false,

-                configurable: false

-            });

-            function setFunc(value) {

-                this.setVerifyHelpProp = value;

-            }

-            try {

-                Object.defineProperty(arguments, "0", {

-                    set: setFunc

-                });            

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Set]] attribute value of 'name' which is not configurable
+    (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 0;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                set: undefined,
+                enumerable: false,
+                configurable: false
+            });
+            function setFunc(value) {
+                this.setVerifyHelpProp = value;
+            }
+            try {
+                Object.defineProperty(arguments, "0", {
+                    set: setFunc
+                });            
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, false, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-311.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-311.js
index 996c38d98..bbe35a7fe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-311.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-311.js
@@ -1,32 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-311.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 0;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 0;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-312.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-312.js
index 783aa11ba..00455aa7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-312.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-312.js
@@ -1,32 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-312.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is an index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return 0;

-            }

-            Object.defineProperty(arguments, "0", {

-                get: getFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "0", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);

-            }

-            return false;

-        }());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is an
+    index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return 0;
+            }
+            Object.defineProperty(arguments, "0", {
+                get: getFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "0", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError && accessorPropertyAttributesAreCorrect(arguments, "0", getFunc, undefined, undefined, true, false);
+            }
+            return false;
+        }());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313-1.js
index 0f5ded557..7e4e614e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313-1.js
@@ -1,23 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own property, and 'desc' is data descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, true, true, true);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own property, and 'desc' is
+    data descriptor, test 'P' is defined in 'O' with all correct
+    attribute values (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, true, true, true);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313.js
index 3d7e3a648..4d49be41c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313.js
@@ -1,23 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-313.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is generic property, and 'desc' is data descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, true, true, true);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is generic
+    property, and 'desc' is data descriptor, test 'P' is defined in
+    'O' with all correct attribute values (10.6 [[DefineOwnProperty]]
+    step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, true, true, true);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314-1.js
index cdfe740d4..78c61842e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314-1.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is property, and 'desc' is accessor descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc() {

-                return "getFunctionString";

-            }

-            function setFunc(value) {

-                this.testgetFunction = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", true, true);

-            }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is property, and 'desc' is
+    accessor descriptor, test 'P' is defined in 'O' with all correct
+    attribute values (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc() {
+                return "getFunctionString";
+            }
+            function setFunc(value) {
+                this.testgetFunction = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", true, true);
+            }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314.js
index 2e908fe8f..48e38245b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-314.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is generic property, and 'desc' is accessor descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return "getFunctionString";

-            }

-            function setFunc(value) {

-                this.testgetFunction = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", true, true);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is generic
+    property, and 'desc' is accessor descriptor, test 'P' is defined
+    in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return "getFunctionString";
+            }
+            function setFunc(value) {
+                this.testgetFunction = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", true, true);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315-1.js
index 0372ead5c..b11f9bc14 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315-1.js
@@ -1,40 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                get: function () {

-                    return 1001;

-                },

-                set: function (value) {

-                    this.testgetFunction1 = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            function getFunc() {

-                return "getFunctionString";

-            }

-            function setFunc(value) {

-                this.testgetFunction = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: false,

-                configurable: false

-            });

-            var verifyFormal = c === 3;

-            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", false, false) && verifyFormal;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own accessor property of 'O',
+    and 'desc' is accessor descriptor, test updating multiple
+    attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                get: function () {
+                    return 1001;
+                },
+                set: function (value) {
+                    this.testgetFunction1 = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            function getFunc() {
+                return "getFunctionString";
+            }
+            function setFunc(value) {
+                this.testgetFunction = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: false,
+                configurable: false
+            });
+            var verifyFormal = c === 3;
+            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", false, false) && verifyFormal;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315.js
index 1111a3dc7..d66106e55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315.js
@@ -1,39 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-315.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                get: function () {

-                    return 1001;

-                },

-                set: function (value) {

-                    this.testgetFunction1 = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            function getFunc() {

-                return "getFunctionString";

-            }

-            function setFunc(value) {

-                this.testgetFunction = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: false,

-                configurable: false

-            });

-            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", false, false);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is generic
+    own accessor property of 'O', and 'desc' is accessor descriptor,
+    test updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                get: function () {
+                    return 1001;
+                },
+                set: function (value) {
+                    this.testgetFunction1 = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            function getFunc() {
+                return "getFunctionString";
+            }
+            function setFunc(value) {
+                this.testgetFunction = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: false,
+                configurable: false
+            });
+            return accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "testgetFunction", false, false);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316-1.js
index ad6280865..efc2e01e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316-1.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1002,

-                enumerable: false,

-                configurable: false

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1002, true, false, false);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own data property of 'O', and
+    'desc' is data descriptor, test updating multiple attribute values
+    of 'P' (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1002,
+                enumerable: false,
+                configurable: false
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1002, true, false, false);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316.js
index 053bf7ee6..7f71de0b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-316.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is generic own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1002,

-                enumerable: false,

-                configurable: false

-            });

-            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1002, true, false, false);

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is generic
+    own data property of 'O', and 'desc' is data descriptor, test
+    updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1002,
+                enumerable: false,
+                configurable: false
+            });
+            return dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1002, true, false, false);
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317-1.js
index a3d0f171e..3090c2e61 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317-1.js
@@ -1,31 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' which is not writable and not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    value: 1002

-                });

-            } catch (e) {

-                var verifyFormal = b === 2;

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, false, false, false) && verifyFormal;

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own data property of 'O', test
+    TypeError is thrown when updating the [[Value]] attribute value of
+    'P' which is not writable and not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    value: 1002
+                });
+            } catch (e) {
+                var verifyFormal = b === 2;
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, false, false, false) && verifyFormal;
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317.js
index 52eba6389..cd27c471d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-317.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' which is not writable and not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                value: 1001,

-                writable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    value: 1002

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is generic
+    own data property of 'O', test TypeError is thrown when updating
+    the [[Value]] attribute value of 'P' which is not writable and not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                value: 1001,
+                writable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    value: 1002
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", 1001, false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318-1.js
index 243b44b1d..cb42327af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318-1.js
@@ -1,29 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'name' is own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                writable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    writable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'name' is own data property of 'O',
+    test TypeError is thrown when updating the [[Writable]] attribute
+    value of 'name' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                writable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    writable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318.js
index eecedbf9c..c4be13b99 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-318.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is generic own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'name' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                writable: false,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    writable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is
+    generic own data property of 'O', test TypeError is thrown when
+    updating the [[Writable]] attribute value of 'name' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                writable: false,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    writable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319-1.js
index aa227169d..9f8e7d848 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319-1.js
@@ -1,29 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, true, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own data property of 'O', test
+    TypeError is thrown when updating the [[Enumerable]] attribute
+    value of 'P' which is not configurable (10.6 [[DefineOwnProperty]]
+    step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, true, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319.js
index f61da8784..307a9a100 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-319.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, true, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Enumerable]] attribute value of 'P' which is not configurable
+    (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, true, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-32.js
index ae44cfbb8..817f8d5c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-32.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-32.js

- * @description Object.defineProperty - 'name' is an inherited accessor property without a get function (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "foo", {

-            set: function () { },

-            configurable: false

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-        var obj = new ConstructFun();

-

-        Object.defineProperty(obj, "foo", {

-            configurable: true

-        });

-        return obj.hasOwnProperty("foo") && typeof obj.foo === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is an inherited accessor property
+    without a get function (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "foo", {
+            set: function () { },
+            configurable: false
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+        var obj = new ConstructFun();
+
+        Object.defineProperty(obj, "foo", {
+            configurable: true
+        });
+        return obj.hasOwnProperty("foo") && typeof obj.foo === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320-1.js
index dcdfb3dca..839b9bf42 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320-1.js
@@ -1,28 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            Object.defineProperty(arguments, "genericProperty", {

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own data property of 'O', test
+    TypeError is thrown when updating the [[Configurable]] attribute
+    value of 'P' which is not configurable (10.6 [[DefineOwnProperty]]
+    step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            Object.defineProperty(arguments, "genericProperty", {
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320.js
index 087e47b5d..34751fc45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-320.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            Object.defineProperty(arguments, "genericProperty", {

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is own
+    data property of 'O', test TypeError is thrown when updating the
+    [[Configurable]] attribute value of 'P' which is not configurable
+    (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            Object.defineProperty(arguments, "genericProperty", {
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    dataPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321-1.js
index 33dfeb678..40b3edb9d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321-1.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function getFunc() {

-                return "genericPropertyString";

-            }

-            function setFunc(value) {

-                this.helpVerifyGet = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    get: function () {

-                        return "overideGenericPropertyString";

-                    }

-                });

-            } catch (e) {

-                var verifyFormal = a === 1;

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "helpVerifyGet", false, false, false) && verifyFormal;

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own accessor property of 'O',
+    test TypeError is thrown when updating the [[Get]] attribute value
+    of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step
+    4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function getFunc() {
+                return "genericPropertyString";
+            }
+            function setFunc(value) {
+                this.helpVerifyGet = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    get: function () {
+                        return "overideGenericPropertyString";
+                    }
+                });
+            } catch (e) {
+                var verifyFormal = a === 1;
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "helpVerifyGet", false, false, false) && verifyFormal;
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321.js
index 5e4bb609e..2d21355c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-321.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function getFunc() {

-                return "genericPropertyString";

-            }

-            function setFunc(value) {

-                this.helpVerifyGet = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                get: getFunc,

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    get: function () {

-                        return "overideGenericPropertyString";

-                    }

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "helpVerifyGet", false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function getFunc() {
+                return "genericPropertyString";
+            }
+            function setFunc(value) {
+                this.helpVerifyGet = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                get: getFunc,
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    get: function () {
+                        return "overideGenericPropertyString";
+                    }
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", getFunc, setFunc, "helpVerifyGet", false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322-1.js
index e17fb4008..a5da96d63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322-1.js
@@ -1,34 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    set: function (value) {

-                        this.genericPropertyString1 = value;

-                    }

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own accessor property of 'O',
+    test TypeError is thrown when updating the [[Set]] attribute value
+    of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step
+    4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    set: function (value) {
+                        this.genericPropertyString1 = value;
+                    }
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322.js
index 61e8254e3..eb2f20d2b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-322.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    set: function (value) {

-                        this.genericPropertyString1 = value;

-                    }

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Set]] attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    set: function (value) {
+                        this.genericPropertyString1 = value;
+                    }
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323-1.js
index 248c8424d..12553b2fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323-1.js
@@ -1,34 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323-1.js

- * @description Object.defineProperty - ''O' is an Arguments object of a function that has formal parameters, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    enumerable: false

-                });

-            } catch (e) {

-                verifyFormal = c === 3;

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", true, false) && verifyFormal;

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - ''O' is an Arguments object of a function
+    that has formal parameters, 'P' is own accessor property of 'O',
+    test TypeError is thrown when updating the [[Enumerable]]
+    attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    enumerable: false
+                });
+            } catch (e) {
+                verifyFormal = c === 3;
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", true, false) && verifyFormal;
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323.js
index 4460ba4f4..1c293ffec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-323.js

- * @description Object.defineProperty - ''O' is an Arguments object, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                enumerable: true,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    enumerable: false

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", true, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - ''O' is an Arguments object, 'P' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                enumerable: true,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    enumerable: false
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", true, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324-1.js
index 40a2ba391..e2c92e883 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324-1.js
@@ -1,32 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324-1.js

- * @description Object.defineProperty - 'O' is an Arguments object of a function that has formal parameters, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function (a, b, c) {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object of a function
+    that has formal parameters, 'P' is own accessor property of 'O',
+    test TypeError is thrown when updating the [[Configurable]]
+    attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function (a, b, c) {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324.js
index ace0cc359..5369fa94e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-324.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'P' is own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        return (function () {

-            function setFunc(value) {

-                this.genericPropertyString = value;

-            }

-            Object.defineProperty(arguments, "genericProperty", {

-                set: setFunc,

-                configurable: false

-            });

-            try {

-                Object.defineProperty(arguments, "genericProperty", {

-                    configurable: true

-                });

-            } catch (e) {

-                return e instanceof TypeError &&

-                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);

-            }

-            return false;

-        }(1, 2, 3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        return (function () {
+            function setFunc(value) {
+                this.genericPropertyString = value;
+            }
+            Object.defineProperty(arguments, "genericProperty", {
+                set: setFunc,
+                configurable: false
+            });
+            try {
+                Object.defineProperty(arguments, "genericProperty", {
+                    configurable: true
+                });
+            } catch (e) {
+                return e instanceof TypeError &&
+                    accessorPropertyAttributesAreCorrect(arguments, "genericProperty", undefined, setFunc, "genericPropertyString", false, false, false);
+            }
+            return false;
+        }(1, 2, 3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325-1.js
index 51903691d..a5a23671a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325-1.js
@@ -1,25 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325-1.js

- * @description Object.defineProperty - 'O' is an Arguments object which created with function take formal parameters, 'name' is own property of [[ParameterMap]] of 'O', test 'name' is deleted if 'name' is configurable and 'desc' is accessor descriptor (10.6 [[DefineOwnProperty]] step 5.a.i)

- */

-

-

-function testcase() {

-        var argObj = (function (a, b, c) { return arguments; })(1, 2, 3);

-        var accessed = false;

-

-        Object.defineProperty(argObj, 0, {

-            get: function () {

-                accessed = true;

-                return 12;

-            }

-        });

-

-        return argObj[0] === 12 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object which created
+    with function take formal parameters, 'name' is own property of
+    [[ParameterMap]] of 'O', test 'name' is deleted if 'name' is
+    configurable and 'desc' is accessor descriptor (10.6
+    [[DefineOwnProperty]] step 5.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function (a, b, c) { return arguments; })(1, 2, 3);
+        var accessed = false;
+
+        Object.defineProperty(argObj, 0, {
+            get: function () {
+                accessed = true;
+                return 12;
+            }
+        });
+
+        return argObj[0] === 12 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325.js
index 1344a6de0..fd818f8ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-325.js

- * @description Object.defineProperty - 'O' is an Arguments object, 'name' is own property of [[ParameterMap]] of 'O', test 'name' is deleted if 'name' is configurable and 'desc' is accessor descriptor (10.6 [[DefineOwnProperty]] step 5.a.i)

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; })(1, 2, 3);

-        var accessed = false;

-

-        Object.defineProperty(argObj, 0, {

-            get: function () {

-                accessed = true;

-                return 12;

-            }

-        });

-

-        return argObj[0] === 12 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object, 'name' is own
+    property of [[ParameterMap]] of 'O', test 'name' is deleted if
+    'name' is configurable and 'desc' is accessor descriptor (10.6
+    [[DefineOwnProperty]] step 5.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; })(1, 2, 3);
+        var accessed = false;
+
+        Object.defineProperty(argObj, 0, {
+            get: function () {
+                accessed = true;
+                return 12;
+            }
+        });
+
+        return argObj[0] === 12 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-326.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-326.js
index 58f34d27e..1d1411a61 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-326.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-326.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-326.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is writable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is true) is writable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-327.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-327.js
index 9744d363b..905248074 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-327.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-327.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-327.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var property in obj) {

-            if (property === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is true) is enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var property in obj) {
+            if (property === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-328.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-328.js
index b35c10923..bdb60b1ee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-328.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-328.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-328.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && !afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is true) is deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && !afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-329.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-329.js
index 1f69125fc..3d7f5c0c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-329.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-329.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-329.js

- * @description ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Writable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-33.js
index abf1f33b9..6cc764181 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-33.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-33.js

- * @description Object.defineProperty - 'O' is a Function object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var fun = function () { };

-

-        Object.defineProperty(fun, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(fun, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && fun.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a Function object that uses
+    Object's [[GetOwnProperty]] method to access the 'name' property
+    (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var fun = function () { };
+
+        Object.defineProperty(fun, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(fun, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && fun.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-330.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-330.js
index a39bafb51..a9c0fb626 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-330.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-330.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-330.js

- * @description ES5 Attributes - success to update [[enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[enumerable]] attribute of
+    data property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-331.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-331.js
index 13e3d120e..246011e82 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-331.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-331.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-331.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    data property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-332.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-332.js
index 2ad2a0e0a..9dcd55d7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-332.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-332.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-332.js

- * @description ES5 Attributes - success to update the data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is true) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the data property ([[Writable]]
+    is true, [[Enumerable]] is true, [[Configurable]] is true) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-1.js
index 536e5ffad..73eec8fb8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-1.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-1.js

- * @description Object.defineProperty will update [[Value]] attribute of named property 'P' successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'O' is an Object object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "property", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of named
+    property 'P' successfully when [[Configurable]] attribute is
+    false, [[Writable]] attribute is true and 'O' is an Object object
+    (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "property", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-10.js
index 22dd9bb40..5160343df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-10.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-10.js

- * @description ES5 Attributes - indexed data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var verifyValue = (obj[0] === 2010);

-        obj[0] = 1001;

-

-        return verifyValue && obj[0] === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - indexed data property 'P' with attributes
+    [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false
+    is writable using simple assignment, 'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var verifyValue = (obj[0] === 2010);
+        obj[0] = 1001;
+
+        return verifyValue && obj[0] === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-11.js
index b06989f7e..d5d8a175c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-11.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-11.js

- * @description ES5 Attributes - indexed property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function (x) {

-            return arguments;

-        }(1001));

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var verifyValue = (obj[0] === 2010);

-

-        return verifyValue;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - indexed property 'P' with attributes
+    [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false
+    is writable using simple assignment, 'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function (x) {
+            return arguments;
+        }(1001));
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var verifyValue = (obj[0] === 2010);
+
+        return verifyValue;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-2.js
index 516b2b075..4a2977475 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-2.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-2.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property 'P' successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'A' is an Array object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property 'P' successfully when [[Configurable]] attribute is
+    false, [[Writable]] attribute is true and 'A' is an Array object
+    (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-3.js
index 333904687..390d42ef3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-3.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-3.js

- * @description Object.defineProperty will update [[Value]] attribute of named property 'P' successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'O' is an Arguments object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "property", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of named
+    property 'P' successfully when [[Configurable]] attribute is
+    false, [[Writable]] attribute is true and 'O' is an Arguments
+    object (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "property", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-4.js
index 636de4017..067cb35d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-4.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-4.js

- * @description Indexed property 'P' with attributes [[Writable]]: true, [[Enumerable]]:true, [[Configurable]]:false is writable using simple assignment, 'A' is an Array Object

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var verifyValue = (obj[0] === 2010);

-        obj[0] = 1001;

-

-        return verifyValue && obj[0] === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Indexed property 'P' with attributes [[Writable]]: true,
+    [[Enumerable]]:true, [[Configurable]]:false is writable using
+    simple assignment, 'A' is an Array Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var verifyValue = (obj[0] === 2010);
+        obj[0] = 1001;
+
+        return verifyValue && obj[0] === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-5.js
index 6423d07b2..fcd4f14cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-5.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-5.js

- * @description ES5 Attributes - named data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false is writable using simple assignment, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var verifyValue = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return verifyValue && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - named data property 'P' with attributes
+    [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false
+    is writable using simple assignment, 'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var verifyValue = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return verifyValue && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-6.js
index 53eb04657..c81692eb1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-6.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-6.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property 'P' successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'O' is an Object object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property 'P' successfully when [[Configurable]] attribute is
+    false, [[Writable]] attribute is true and 'O' is an Object object
+    (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-7.js
index eb2601b50..f53da4129 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-7.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-7.js

- * @description Object.defineProperty will update [[Value]] attribute of named property 'P' successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'A' is an Array object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "prop", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of named
+    property 'P' successfully when [[Configurable]] attribute is
+    false, [[Writable]] attribute is true and 'A' is an Array object
+    (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "prop", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-8.js
index cf0108a0f..d63e2f22e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-8.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-8.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property 'P'successfully when [[Configurable]] attribute is false, [[Writable]] attribute is true and 'O' is an Arguments object (8.12.9 - step 10)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property 'P'successfully when [[Configurable]] attribute is false,
+    [[Writable]] attribute is true and 'O' is an Arguments object
+    (8.12.9 - step 10)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-9.js
index b75499917..8a51d908b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-9.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333-9.js

- * @description Object.defineProperty - Named property 'P' with attributes [[Writable]]: true, [[Enumerable]]:true, [[Configurable]]:false is writable using simple assignment, 'A' is an Array Object

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var verifyValue = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return verifyValue && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Named property 'P' with attributes
+    [[Writable]]: true, [[Enumerable]]:true, [[Configurable]]:false is
+    writable using simple assignment, 'A' is an Array Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var verifyValue = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return verifyValue && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333.js
index e71c0b5a4..fe138e2cd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-333.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is writable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is false) is writable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-334.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-334.js
index 8ea03a547..6d1983353 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-334.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-334.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-334.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is false) is enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-335.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-335.js
index a3ce649ff..4f140fb71 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-335.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-335.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-335.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && obj.prop === 2010 && afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    true, [[Configurable]] is false) is undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && obj.prop === 2010 && afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-336.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-336.js
index 3f97068a5..4848014e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-336.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-336.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-336.js

- * @description ES5 Attributes - Success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Success to update [[Writable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-337.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-337.js
index c15047650..d8390152d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-337.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-337.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-337.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-338.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-338.js
index 65966ce54..6dece105f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-338.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-338.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-338.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-1.js
index 2b5e0248e..da7ad464f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-1.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-1.js

- * @description Object.defineProperty - Updating indexed data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false to an accessor property does not succeed, 'A' is an Array object (8.12.9 - step 9.a)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "0", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-            return propertyDefineCorrect && desc1.value === 2010 && obj[0] === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Updating indexed data property 'P' with
+    attributes [[Writable]]: true, [[Enumerable]]: true,
+    [[Configurable]]: false to an accessor property does not succeed,
+    'A' is an Array object (8.12.9 - step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "0", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+            return propertyDefineCorrect && desc1.value === 2010 && obj[0] === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-2.js
index af39eeb95..9dc9c5221 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-2.js
@@ -1,39 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-2.js

- * @description Object.defineProperty - Updating named data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false to an accessor property does not succeed, 'O' is an Arguments object (8.12.9 - step 9.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Updating named data property 'P' with
+    attributes [[Writable]]: true, [[Enumerable]]: true,
+    [[Configurable]]: false to an accessor property does not succeed,
+    'O' is an Arguments object (8.12.9 - step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-3.js
index cb69eb5c6..5a8e8c1a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-3.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-3.js

- * @description Object.defineProperty - Updating named data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false to an accessor property does not succeed, 'A' is an Array object (8.12.9 - step 9.a)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 &&

-                typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Updating named data property 'P' with
+    attributes [[Writable]]: true, [[Enumerable]]: true,
+    [[Configurable]]: false to an accessor property does not succeed,
+    'A' is an Array object (8.12.9 - step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 &&
+                typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-4.js
index e1da377ac..14e470910 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-4.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339-4.js

- * @description Object.defineProperty - Updating indexed data property 'P' with attributes [[Writable]]: true, [[Enumerable]]: true, [[Configurable]]: false to an accessor property does not succeed, 'O' is an Arguments object (8.12.9 - step 9.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "0", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-            return propertyDefineCorrect && desc1.value === 2010 && obj[0] === 2010 &&

-                typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Updating indexed data property 'P' with
+    attributes [[Writable]]: true, [[Enumerable]]: true,
+    [[Configurable]]: false to an accessor property does not succeed,
+    'O' is an Arguments object (8.12.9 - step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "0", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+            return propertyDefineCorrect && desc1.value === 2010 && obj[0] === 2010 &&
+                typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339.js
index c0ef34045..1ec8f4a8c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-339.js

- * @description ES5 Attributes - fail to update the data property ([[Writable]] is true, [[Enumerable]] is true, [[Configurable]] is false) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the data property ([[Writable]] is
+    true, [[Enumerable]] is true, [[Configurable]] is false) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-34.js
index f4fadb92d..7f2f4e49f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-34.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-34.js

- * @description Object.defineProperty - 'O' is an Array object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        Object.defineProperty(arrObj, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(arrObj, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arrObj.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Array object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        Object.defineProperty(arrObj, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(arrObj, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arrObj.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-340.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-340.js
index ac7d57c89..9e1eb9c99 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-340.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-340.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-340.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is writable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is true) is writable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-341.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-341.js
index a7445fe7e..f80f461e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-341.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-341.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-341.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is true) is non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-342.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-342.js
index c2a330147..06b692b7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-342.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-342.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-342.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && !afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is true) is deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && !afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-343.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-343.js
index b3225b1d7..c47e932ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-343.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-343.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-343.js

- * @description ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Writable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-344.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-344.js
index 47166a236..b2d712ca7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-344.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-344.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-344.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    data property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-345.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-345.js
index ae7e977df..2e4830697 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-345.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-345.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-345.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    data property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-346.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-346.js
index 99f4d2147..aa2f69dd2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-346.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-346.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-346.js

- * @description ES5 Attributes - success to update the data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is true) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the data property ([[Writable]]
+    is true, [[Enumerable]] is false, [[Configurable]] is true) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-347.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-347.js
index 8fba4b6aa..74e8c3776 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-347.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-347.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-347.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is writable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is false) is writable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-348.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-348.js
index aabfe152f..c0776646a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-348.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-348.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-348.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is false) is non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-349.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-349.js
index d8371797d..57f3b621f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-349.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-349.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-349.js

- * @description ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && obj.prop === 2010 && afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is true, [[Enumerable]] is
+    false, [[Configurable]] is false) is undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && obj.prop === 2010 && afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-35.js
index 03dcaee63..e6293d71e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-35.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-35.js

- * @description Object.defineProperty - 'O' is a String object which implements its own [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var str = new String("abc");

-

-        Object.defineProperty(str, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(str, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && str.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a String object which implements
+    its own [[GetOwnProperty]] method to access the 'name' property
+    (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = new String("abc");
+
+        Object.defineProperty(str, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(str, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && str.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-350.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-350.js
index 81ef7f509..1a200b8eb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-350.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-350.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-350.js

- * @description ES5 Attributes - fail to update [[Writable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Writable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === true && obj.prop === 2010 && desc2.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-351.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-351.js
index 201db8d9b..68da11cc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-351.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-351.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-351.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-352.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-352.js
index 65055f44b..91db10bc9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-352.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-352.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-352.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of data
+    property ([[Writable]] is true, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-353.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-353.js
index cb519c559..c37ea3aee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-353.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-353.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-353.js

- * @description ES5 Attributes - fail to update the data property ([[Writable]] is true, [[Enumerable]] is false, [[Configurable]] is false) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the data property ([[Writable]] is
+    true, [[Enumerable]] is false, [[Configurable]] is false) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-1.js
index 35f0f92b0..6b497b003 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-1.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-1.js

- * @description Object.defineProperty will update [[Value]] attribute of named property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is an Object object (8.12.9 step - Note)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "property", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of named
+    property 'P' successfully when [[Configurable]] attribute is true
+    and [[Writable]] attribute is false, 'O' is an Object object
+    (8.12.9 step - Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "property", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-10.js
index 7e122baaf..ff5f79070 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-10.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-10.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is an Object object (8.12.9 step - Note)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property 'P' successfully when [[Configurable]] attribute is true
+    and [[Writable]] attribute is false, 'O' is an Object object
+    (8.12.9 step - Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-11.js
index d12a2fdad..9ec653795 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-11.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-11.js

- * @description Object.defineProperty will update [[Value]] attribute of named property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'A' is an Array object (8.12.9 step - Note)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "prop", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of named
+    property 'P' successfully when [[Configurable]] attribute is true
+    and [[Writable]] attribute is false, 'A' is an Array object
+    (8.12.9 step - Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "prop", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-12.js
index 59ccc3446..6c497fdae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-12.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-12.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is an Arguments object (8.12.9 - step Note)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property successfully when [[Configurable]] attribute is true and
+    [[Writable]] attribute is false, 'O' is an Arguments object
+    (8.12.9 - step Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-13.js
index ee2857e8e..10bca4e68 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-13.js
@@ -1,32 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-13.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is the global object (8.12.9 - step Note)

- */

-

-

-function testcase() {

-

-        var obj = fnGlobalObject();

-

-        try {

-            Object.defineProperty(obj, "0", {

-                value: 1001,

-                writable: false,

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "0", {

-                value: 1002

-            });

-

-            return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);

-        } finally {

-            delete obj[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property successfully when [[Configurable]] attribute is true and
+    [[Writable]] attribute is false, 'O' is the global object (8.12.9
+    - step Note)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = fnGlobalObject();
+
+        try {
+            Object.defineProperty(obj, "0", {
+                value: 1001,
+                writable: false,
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "0", {
+                value: 1002
+            });
+
+            return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);
+        } finally {
+            delete obj[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-15.js
index 8282ab37d..3f0e94fad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-15.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-15.js

- * @description Object.defineProperty - Named property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'A' is an Array object

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var verifyValue = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return verifyValue && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Named property 'P' with attributes
+    [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true
+    is non-writable using simple assignment, 'A' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var verifyValue = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return verifyValue && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-16.js
index fccecd3f2..50401f134 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-16.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-16.js

- * @description ES5 Attributes - property 'P' is an indexed data property with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]] : true) is non-writable using simple assignment, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var valueVerify = (obj[0] === 2010);

-        obj[0] = 1001;

-

-        return valueVerify && obj[0] === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property 'P' is an indexed data property with
+    attributes [[Writable]]: false, [[Enumerable]]: true,
+    [[Configurable]] : true) is non-writable using simple assignment,
+    'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var valueVerify = (obj[0] === 2010);
+        obj[0] = 1001;
+
+        return valueVerify && obj[0] === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-2.js
index 3b0f07a32..e53b6128e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-2.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-2.js

- * @description Object.defineProperty will update [[Value]] attribute of indexed property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'A' is an Array object (8.12.9 step - Note)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute of indexed
+    property 'P' successfully when [[Configurable]] attribute is true
+    and [[Writable]] attribute is false, 'A' is an Array object
+    (8.12.9 step - Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-3.js
index d58fe5130..80830429c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-3.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-3.js

- * @description Object.defineProperty will update [[Value]] attribute successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is an Arguments object (8.12.9 - step Note)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "property", {

-            value: 1002

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute successfully
+    when [[Configurable]] attribute is true and [[Writable]] attribute
+    is false, 'O' is an Arguments object (8.12.9 - step Note)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "property", {
+            value: 1002
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-4.js
index 0c85c0e3a..c972d3ba9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-4.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-4.js

- * @description Object.defineProperty will update [[Value]] attribute successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false, 'O' is the global object (8.12.9 - step Note)

- */

-

-

-function testcase() {

-

-        var obj = fnGlobalObject();

-

-        try {

-            Object.defineProperty(obj, "property", {

-                value: 1001,

-                writable: false,

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "property", {

-                value: 1002

-            });

-

-            return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);

-        } finally {

-            delete obj.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Value]] attribute successfully
+    when [[Configurable]] attribute is true and [[Writable]] attribute
+    is false, 'O' is the global object (8.12.9 - step Note)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = fnGlobalObject();
+
+        try {
+            Object.defineProperty(obj, "property", {
+                value: 1001,
+                writable: false,
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "property", {
+                value: 1002
+            });
+
+            return dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true);
+        } finally {
+            delete obj.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-6.js
index 5d5d53a26..1f5ae74b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-6.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-6.js

- * @description Object.defineProperty - Indexed property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'A' is an Array object

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var verifyValue = (obj[0] === 2010);

-        obj[0] = 1001;

-

-        return verifyValue && obj[0] === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Indexed property 'P' with attributes
+    [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true
+    is non-writable using simple assignment, 'A' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var verifyValue = (obj[0] === 2010);
+        obj[0] = 1001;
+
+        return verifyValue && obj[0] === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-7.js
index 79bb324df..39fa38a0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-7.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-7.js

- * @description ES5 Attributes - property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]] : true) is non-writable using simple assignment, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var valueVerify = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return valueVerify && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property 'P' with attributes [[Writable]]: false,
+    [[Enumerable]]: true, [[Configurable]] : true) is non-writable
+    using simple assignment, 'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var valueVerify = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return valueVerify && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-8.js
index 26b64becd..3254ab63f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-8.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354-8.js

- * @description ES5 Attributes - property 'P' with attributes [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true is non-writable using simple assignment, 'O' is the global object

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 2010,

-                writable: false,

-                enumerable: true,

-                configurable: true

-            });

-            var valueVerify = (obj.prop === 2010);

-            obj.prop = 1001;

-

-            return valueVerify && obj.prop === 2010;

-        } finally {

-            delete obj.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property 'P' with attributes [[Writable]]: false,
+    [[Enumerable]]: true, [[Configurable]]: true is non-writable using
+    simple assignment, 'O' is the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 2010,
+                writable: false,
+                enumerable: true,
+                configurable: true
+            });
+            var valueVerify = (obj.prop === 2010);
+            obj.prop = 1001;
+
+            return valueVerify && obj.prop === 2010;
+        } finally {
+            delete obj.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354.js
index 066b53dda..4638b8c6a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-354.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is unwritable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is true) is unwritable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-355.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-355.js
index 49651751b..fd1251072 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-355.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-355.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-355.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var property in obj) {

-            if (property === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is true) is enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var property in obj) {
+            if (property === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-356.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-356.js
index aeab7d056..326ad3e58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-356.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-356.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-356.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && !afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is true) is deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && !afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-357.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-357.js
index 314041db0..803fbe020 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-357.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-357.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-357.js

- * @description ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: true

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Writable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: true
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-358.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-358.js
index f9c9476f4..cadb747ba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-358.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-358.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-358.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    data property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-359.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-359.js
index abbeafe1a..6eb73b31a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-359.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-359.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-359.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    data property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-36.js
index 79e13efc5..dfe8a46c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-36.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-36.js

- * @description Object.defineProperty - 'O' is a Boolean object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var obj = new Boolean(true);

-

-        Object.defineProperty(obj, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a Boolean object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Boolean(true);
+
+        Object.defineProperty(obj, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-1.js
index cab503bd1..20ee2e3a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-1.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-1.js

- * @description ES5 Attributes - Updating indexed data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'A' is an Array object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "0", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-            desc2.enumerable === true && desc2.configurable === true &&

-            obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating indexed data property 'P' whose
+    attributes are [[Writable]]: false, [[Enumerable]]: true,
+    [[Configurable]]: true to an accessor property, 'A' is an Array
+    object (8.12.9 - step 9.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "0", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+            desc2.enumerable === true && desc2.configurable === true &&
+            obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-2.js
index b224166b9..e3a5469ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-2.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-2.js

- * @description ES5 Attributes - Updating data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is an Arguments object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-            desc2.enumerable === true && desc2.configurable === true &&

-            obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating data property 'P' whose attributes are
+    [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true
+    to an accessor property, 'O' is an Arguments object (8.12.9 - step
+    9.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+            desc2.enumerable === true && desc2.configurable === true &&
+            obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-3.js
index f13a84ab7..c859a8aa5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-3.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-3.js

- * @description ES5 Attributes - Updating data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is the global object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 2010,

-                writable: false,

-                enumerable: true,

-                configurable: true

-            });

-            var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            function getFunc() {

-                return 20;

-            }

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-                desc2.enumerable === true && desc2.configurable === true &&

-                obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-        } finally {

-            delete obj.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating data property 'P' whose attributes are
+    [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true
+    to an accessor property, 'O' is the global object (8.12.9 - step
+    9.b.i)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 2010,
+                writable: false,
+                enumerable: true,
+                configurable: true
+            });
+            var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            function getFunc() {
+                return 20;
+            }
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+                desc2.enumerable === true && desc2.configurable === true &&
+                obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+        } finally {
+            delete obj.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-5.js
index d471e6681..cf60f0f00 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-5.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-5.js

- * @description ES5 Attributes - Updating named data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'A' is an Array object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-            desc2.enumerable === true && desc2.configurable === true &&

-            obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating named data property 'P' whose attributes
+    are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]:
+    true to an accessor property, 'A' is an Array object (8.12.9 -
+    step 9.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+            desc2.enumerable === true && desc2.configurable === true &&
+            obj.prop === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-6.js
index d07f80b7c..d80270aed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-6.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-6.js

- * @description ES5 Attributes - Updating indexed data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is an Arguments object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        Object.defineProperty(obj, "0", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "0", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-            desc2.enumerable === true && desc2.configurable === true &&

-            obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating indexed data property 'P' whose
+    attributes are [[Writable]]: false, [[Enumerable]]: true,
+    [[Configurable]]: true to an accessor property, 'O' is an
+    Arguments object (8.12.9 - step 9.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        Object.defineProperty(obj, "0", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "0", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+            desc2.enumerable === true && desc2.configurable === true &&
+            obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-7.js
index f2b2e47c7..9e5517ad5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-7.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360-7.js

- * @description ES5 Attributes - Updating indexed data property 'P' whose attributes are [[Writable]]: false, [[Enumerable]]: true, [[Configurable]]: true to an accessor property, 'O' is the global object (8.12.9 - step 9.b.i)

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-        try {

-            Object.defineProperty(obj, "0", {

-                value: 2010,

-                writable: false,

-                enumerable: true,

-                configurable: true

-            });

-            var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            function getFunc() {

-                return 20;

-            }

-            Object.defineProperty(obj, "0", {

-                get: getFunc

-            });

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&

-                desc2.enumerable === true && desc2.configurable === true &&

-                obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;

-        } finally {

-            delete obj[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating indexed data property 'P' whose
+    attributes are [[Writable]]: false, [[Enumerable]]: true,
+    [[Configurable]]: true to an accessor property, 'O' is the global
+    object (8.12.9 - step 9.b.i)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+        try {
+            Object.defineProperty(obj, "0", {
+                value: 2010,
+                writable: false,
+                enumerable: true,
+                configurable: true
+            });
+            var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            function getFunc() {
+                return 20;
+            }
+            Object.defineProperty(obj, "0", {
+                get: getFunc
+            });
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get") &&
+                desc2.enumerable === true && desc2.configurable === true &&
+                obj[0] === 20 && typeof desc2.set === "undefined" && desc2.get === getFunc;
+        } finally {
+            delete obj[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360.js
index 8d9f9d784..7a8bd9d89 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-360.js

- * @description ES5 Attributes - success to update the data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is true) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the data property ([[Writable]]
+    is false, [[Enumerable]] is true, [[Configurable]] is true) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.hasOwnProperty("get");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-361.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-361.js
index 92aaa0d49..4c966e4ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-361.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-361.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-361.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is unwritable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is false) is unwritable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-362.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-362.js
index 6eac0123a..8149d1ad8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-362.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-362.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-362.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var property in obj) {

-            if (property === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is false) is enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var property in obj) {
+            if (property === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-363.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-363.js
index d4f049f11..a5da8178d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-363.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-363.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-363.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && obj.prop === 2010 && afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is true, [[Configurable]] is false) is undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && obj.prop === 2010 && afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-364.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-364.js
index f0825b889..429f38901 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-364.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-364.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-364.js

- * @description ES5 Attributes - fail to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        try {

-            Object.defineProperty(obj, "prop", {

-                writable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Writable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        try {
+            Object.defineProperty(obj, "prop", {
+                writable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-365.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-365.js
index 215bbb35c..8e1b8a15f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-365.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-365.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-365.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.enumerable === true && obj.prop === 2010 && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-366.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-366.js
index b873194ea..b1b548c70 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-366.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-366.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-366.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is true,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-367.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-367.js
index 13a5407a9..f9f40747b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-367.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-367.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-367.js

- * @description ES5 Attributes - fail to update the data property ([[Writable]] is false, [[Enumerable]] is true, [[Configurable]] is false) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the data property ([[Writable]] is
+    false, [[Enumerable]] is true, [[Configurable]] is false) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-368.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-368.js
index 915d69680..3f9a89aa0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-368.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-368.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-368.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is unwritable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is true) is unwritable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-369.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-369.js
index 908a64805..0460444c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-369.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-369.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-369.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is true) is non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-37.js
index ad5dc7e3a..3e681bb19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-37.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-37.js

- * @description Object.defineProperty - 'O' is a Number object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var obj = new Number(-2);

-

-        Object.defineProperty(obj, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && obj.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a Number object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = new Number(-2);
+
+        Object.defineProperty(obj, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && obj.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-370.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-370.js
index 7a12af537..6bfdec69f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-370.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-370.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-370.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && !afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is true) is deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && !afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-371.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-371.js
index dc4cb0939..51c7074ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-371.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-371.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-371.js

- * @description ES5 Attributes - success to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            writable: true

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Writable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            writable: true
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-372.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-372.js
index a711791fd..1d597945e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-372.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-372.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-372.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    data property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-373.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-373.js
index 8a4345a2e..142a81244 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-373.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-373.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-373.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    data property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is true) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc1.configurable === true && obj.prop === 2010 && desc2.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-374.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-374.js
index 4fb313be2..45605eb6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-374.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-374.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-374.js

- * @description ES5 Attributes - success to update the data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is true) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        function getFunc() {

-            return 20;

-        }

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("value") && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the data property ([[Writable]]
+    is false, [[Enumerable]] is false, [[Configurable]] is true) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        function getFunc() {
+            return 20;
+        }
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("value") && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-375.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-375.js
index 1fcfd727d..c2955885f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-375.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-375.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-375.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is unwritable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = (obj.prop === 2010);

-        obj.prop = 1001;

-

-        return propertyDefineCorrect && obj.prop === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is false) is unwritable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = (obj.prop === 2010);
+        obj.prop = 1001;
+
+        return propertyDefineCorrect && obj.prop === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-376.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-376.js
index 82869f60c..dd471ee28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-376.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-376.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-376.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is false) is non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-377.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-377.js
index 1c0687842..fcf16bc23 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-377.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-377.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-377.js

- * @description ES5 Attributes - property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var beforeDelete = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var afterDelete = obj.hasOwnProperty("prop");

-        return beforeDelete && obj.prop === 2010 && afterDelete;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Writable]] is false, [[Enumerable]]
+    is false, [[Configurable]] is false) is undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var beforeDelete = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var afterDelete = obj.hasOwnProperty("prop");
+        return beforeDelete && obj.prop === 2010 && afterDelete;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-378.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-378.js
index 17f98a01a..3c28fd4ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-378.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-378.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-378.js

- * @description ES5 Attributes - fail to update [[Writable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                writable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Writable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                writable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.writable === false && obj.prop === 2010 && desc2.writable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-379.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-379.js
index 0a70a8b9f..4adefcf93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-379.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-379.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-379.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.enumerable === false && obj.prop === 2010 && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-38.js
index 7cb361fbd..72a6ecea2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-38.js
@@ -1,24 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-38.js

- * @description Object.defineProperty - 'O' is the Math object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Math, "foo", {

-                value: 12,

-                configurable: true

-            });

-        

-            return dataPropertyAttributesAreCorrect(Math, "foo", 12, false, false, true);

-        } finally {

-            delete Math.foo;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is the Math object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Math, "foo", {
+                value: 12,
+                configurable: true
+            });
+        
+            return dataPropertyAttributesAreCorrect(Math, "foo", 12, false, false, true);
+        } finally {
+            delete Math.foo;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-380.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-380.js
index 07835493b..f61ae0f75 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-380.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-380.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-380.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of data
+    property ([[Writable]] is false, [[Enumerable]] is false,
+    [[Configurable]] is false) to different value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && desc1.configurable === false && obj.prop === 2010 && desc2.configurable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-381.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-381.js
index 70b476f95..c184f4b90 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-381.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-381.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-381.js

- * @description ES5 Attributes - fail to update the data property ([[Writable]] is false, [[Enumerable]] is false, [[Configurable]] is false) to an accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 2010,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        function getFunc() {

-            return 20;

-        }

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the data property ([[Writable]] is
+    false, [[Enumerable]] is false, [[Configurable]] is false) to an
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 2010,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        function getFunc() {
+            return 20;
+        }
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return propertyDefineCorrect && desc1.value === 2010 && obj.prop === 2010 && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-382.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-382.js
index 8952dff6e..48e3bc5bd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-382.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-382.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-382.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a number

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === 1001 && desc.value === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === 1001 && desc.value === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-383.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-383.js
index 5df8b370c..57963aaad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-383.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-383.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-383.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a string

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: "ThisIsAString"

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === "ThisIsAString" && desc.value === "ThisIsAString";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: "ThisIsAString"
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === "ThisIsAString" && desc.value === "ThisIsAString";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-384.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-384.js
index d74669eb4..683110d0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-384.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-384.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-384.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a boolean

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: false

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === false && desc.value === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: false
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === false && desc.value === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-385.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-385.js
index 806d331b7..758add5be 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-385.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-385.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-385.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a generic object

- */

-

-

-function testcase() {

-        var obj = {};

-        var tempObj = { testproperty: 100 };

-

-        Object.defineProperty(obj, "prop", {

-            value: tempObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === tempObj && desc.value === tempObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a generic
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var tempObj = { testproperty: 100 };
+
+        Object.defineProperty(obj, "prop", {
+            value: tempObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === tempObj && desc.value === tempObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-386.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-386.js
index 5c096afc3..72857cee8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-386.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-386.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-386.js

- * @description ES5 Attributes - [[Value]] attribute of data property is an Array object

- */

-

-

-function testcase() {

-        var obj = {};

-        var arrObj = [];

-

-        Object.defineProperty(obj, "prop", {

-            value: arrObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === arrObj && desc.value === arrObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is an Array
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var arrObj = [];
+
+        Object.defineProperty(obj, "prop", {
+            value: arrObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === arrObj && desc.value === arrObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-387.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-387.js
index cb084446c..73bd00079 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-387.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-387.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-387.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a String object

- */

-

-

-function testcase() {

-        var obj = {};

-        var strObj = new String();

-

-        Object.defineProperty(obj, "prop", {

-            value: strObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === strObj && desc.value === strObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a String
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var strObj = new String();
+
+        Object.defineProperty(obj, "prop", {
+            value: strObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === strObj && desc.value === strObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-388.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-388.js
index 411f92857..f73fd5468 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-388.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-388.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-388.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a Number object

- */

-

-

-function testcase() {

-        var obj = {};

-        var numObj = new Number();

-

-        Object.defineProperty(obj, "prop", {

-            value: numObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === numObj && desc.value === numObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a Number
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var numObj = new Number();
+
+        Object.defineProperty(obj, "prop", {
+            value: numObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === numObj && desc.value === numObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-389.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-389.js
index d80d3c389..9e6020861 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-389.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-389.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-389.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a Boolean Object

- */

-

-

-function testcase() {

-        var obj = {};

-        var boolObj = new Boolean();

-

-        Object.defineProperty(obj, "prop", {

-            value: boolObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === boolObj && desc.value === boolObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a Boolean
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var boolObj = new Boolean();
+
+        Object.defineProperty(obj, "prop", {
+            value: boolObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === boolObj && desc.value === boolObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-39.js
index 5f2042f09..3012effd2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-39.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-39.js

- * @description Object.defineProperty - 'O' is a Date object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var desc = new Date();

-

-        Object.defineProperty(desc, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(desc, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && desc.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a Date object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = new Date();
+
+        Object.defineProperty(desc, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(desc, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && desc.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-390.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-390.js
index 8b2e01a40..639ac56bd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-390.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-390.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-390.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a Function object

- */

-

-

-function testcase() {

-        var obj = {};

-        var funObj = function () { };

-

-        Object.defineProperty(obj, "prop", {

-            value: funObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === funObj && desc.value === funObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a
+    Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var funObj = function () { };
+
+        Object.defineProperty(obj, "prop", {
+            value: funObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === funObj && desc.value === funObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-391.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-391.js
index 1500ba074..a170f8e9f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-391.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-391.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-391.js

- * @description ES5 Attributes - [[Value]] attribute of data property is an Error object

- */

-

-

-function testcase() {

-        var obj = {};

-        var errObj = new Error();

-

-        Object.defineProperty(obj, "prop", {

-            value: errObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === errObj && desc.value === errObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is an Error
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var errObj = new Error();
+
+        Object.defineProperty(obj, "prop", {
+            value: errObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === errObj && desc.value === errObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-392.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-392.js
index f0c90c3f5..3fec1915c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-392.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-392.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-392.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a Date object

- */

-

-

-function testcase() {

-        var obj = {};

-        var dateObj = new Date();

-

-        Object.defineProperty(obj, "prop", {

-            value: dateObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === dateObj && desc.value === dateObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a Date
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var dateObj = new Date();
+
+        Object.defineProperty(obj, "prop", {
+            value: dateObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === dateObj && desc.value === dateObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-393.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-393.js
index 0d0ef208d..10bfdc0ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-393.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-393.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-393.js

- * @description ES5 Attributes - [[Value]] attribute of data property is a RegExp object

- */

-

-

-function testcase() {

-        var obj = {};

-        var regObj = new RegExp();

-

-        Object.defineProperty(obj, "prop", {

-            value: regObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === regObj && desc.value === regObj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is a RegExp
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var regObj = new RegExp();
+
+        Object.defineProperty(obj, "prop", {
+            value: regObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === regObj && desc.value === regObj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-394.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-394.js
index 90f3a7ad4..10ea31315 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-394.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-394.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-394.js

- * @description ES5 Attributes - [[Value]] attribute of data property is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: undefined

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined" && typeof desc.value === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: undefined
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined" && typeof desc.value === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-395.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-395.js
index e855891a5..3471cb0da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-395.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-395.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-395.js

- * @description ES5 Attributes - [[Value]] attribute of data property is null

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: null

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === null && desc.value === null;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: null
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === null && desc.value === null;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-396.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-396.js
index 7205ccfeb..09c1dc652 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-396.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-396.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-396.js

- * @description ES5 Attributes - [[Value]] attribute of data property is NaN

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: NaN

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop !== obj.prop && desc.value !== desc.value;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: NaN
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop !== obj.prop && desc.value !== desc.value;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-397.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-397.js
index 825824c37..eec97c568 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-397.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-397.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-397.js

- * @description ES5 Attributes - [[Value]] attribute of data property is Infinity

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: Infinity

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === Infinity && desc.value === Infinity;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: Infinity
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === Infinity && desc.value === Infinity;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-398.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-398.js
index 580e8e650..782efee26 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-398.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-398.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-398.js

- * @description ES5 Attributes - [[Value]] attribute of data property is -Infinity

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: -Infinity

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === -Infinity && desc.value === -Infinity;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - [[Value]] attribute of data property is -Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: -Infinity
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === -Infinity && desc.value === -Infinity;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-399.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-399.js
index 0fc50d5d7..81f1ead78 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-399.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-399.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-399.js

- * @description ES5 Attributes - [[Value]] attribute of data property is the global object

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            value: fnGlobalObject()

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.prop === fnGlobalObject() && desc.value === fnGlobalObject();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of data property is the
+    global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            value: fnGlobalObject()
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.prop === fnGlobalObject() && desc.value === fnGlobalObject();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-4.js
index 93cb5c6bf..1ca1cf5cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. For newly defined properties, step 4.a.1 of

- * [[DefineOwnProperty]] creates a data property if handed a generic desc.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-4.js

- * @description Object.defineProperty defines a data property if given a generic desc(8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-  var o = {};

-  

-  var desc = {};

-  Object.defineProperty(o, "foo", desc);

-

-  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");

-  if (propDesc.value        === undefined &&  // this is the value that was set

-      propDesc.writable     === false &&      // false by default

-      propDesc.enumerable   === false &&      // false by default

-      propDesc.configurable === false) {      // false by default

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. For newly defined properties, step 4.a.1 of
+    [[DefineOwnProperty]] creates a data property if handed a generic desc.
+description: >
+    Object.defineProperty defines a data property if given a generic
+    desc(8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+  
+  var desc = {};
+  Object.defineProperty(o, "foo", desc);
+
+  var propDesc = Object.getOwnPropertyDescriptor(o, "foo");
+  if (propDesc.value        === undefined &&  // this is the value that was set
+      propDesc.writable     === false &&      // false by default
+      propDesc.enumerable   === false &&      // false by default
+      propDesc.configurable === false) {      // false by default
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-40.js
index e2d80368d..c446a1e67 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-40.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-40.js

- * @description Object.defineProperty - 'O' is a RegExp object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var desc = new RegExp();

-

-        Object.defineProperty(desc, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(desc, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && desc.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is a RegExp object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = new RegExp();
+
+        Object.defineProperty(desc, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(desc, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && desc.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-402.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-402.js
index 126cff39f..610d220f5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-402.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-402.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-402.js

- * @description ES5 Attributes - [[Value]] attribute of inherited property of [[Prototype]] internal property is correct (String instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(String.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var strObj = new String();

-

-            return !strObj.hasOwnProperty("prop") && strObj.prop === 1001;

-        } finally {

-            delete String.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of inherited property of
+    [[Prototype]] internal property is correct (String instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(String.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var strObj = new String();
+
+            return !strObj.hasOwnProperty("prop") && strObj.prop === 1001;
+        } finally {
+            delete String.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-403.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-403.js
index f188b3e94..8e5042e47 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-403.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-403.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-403.js

- * @description ES5 Attributes - Successfully add a property to an object when the object's prototype has a property with same name and [[Writable]] attribute is set to true (Array instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var arrObj = [];

-            arrObj.prop = 1002;

-

-            return arrObj.hasOwnProperty("prop") && arrObj.prop === 1002;

-        } finally {

-            delete Array.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Successfully add a property to an object when the
+    object's prototype has a property with same name and [[Writable]]
+    attribute is set to true (Array instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var arrObj = [];
+            arrObj.prop = 1002;
+
+            return arrObj.hasOwnProperty("prop") && arrObj.prop === 1002;
+        } finally {
+            delete Array.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-404.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-404.js
index 0935b2e0c..064c1fe4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-404.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-404.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-404.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to true is enumerable (Boolean instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Boolean.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var boolObj = new Boolean();

-

-            var verifyEnumerable = false;

-            for (var p in boolObj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !boolObj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete Boolean.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to true is enumerable (Boolean instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Boolean.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var boolObj = new Boolean();
+
+            var verifyEnumerable = false;
+            for (var p in boolObj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !boolObj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete Boolean.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-405.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-405.js
index a74de9acc..54501d7b2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-405.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-405.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-405.js

- * @description ES5 Attributes - Failed to add a property to an object when the object's object has a property with same name and [[Writable]] attribute is set to false (Number instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Number.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-            var numObj = new Number();

-            numObj.prop = 1002;

-

-            return !numObj.hasOwnProperty("prop") && numObj.prop === 1001;

-        } finally {

-            delete Number.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Failed to add a property to an object when the
+    object's object has a property with same name and [[Writable]]
+    attribute is set to false (Number instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Number.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+            var numObj = new Number();
+            numObj.prop = 1002;
+
+            return !numObj.hasOwnProperty("prop") && numObj.prop === 1001;
+        } finally {
+            delete Number.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-406.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-406.js
index 382b49791..a0c387d72 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-406.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-406.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-406.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to false is non-enumerable (Function instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-            var funObj = function () { };

-

-            var verifyEnumerable = false;

-            for (var p in funObj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !funObj.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to false is non-enumerable (Function instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+            var funObj = function () { };
+
+            var verifyEnumerable = false;
+            for (var p in funObj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !funObj.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-407.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-407.js
index cd5fe23d1..22820abc9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-407.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-407.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-407.js

- * @description ES5 Attributes - [[Value]] attribute of inherited property of [[Prototype]] internal property is correct (Error Instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Error.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var errObj = new Error();

-

-            return !errObj.hasOwnProperty("prop") && errObj.prop === 1001;

-        } finally {

-            delete Error.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of inherited property of
+    [[Prototype]] internal property is correct (Error Instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Error.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var errObj = new Error();
+
+            return !errObj.hasOwnProperty("prop") && errObj.prop === 1001;
+        } finally {
+            delete Error.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-408.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-408.js
index 9ec1c8b6d..071af5f89 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-408.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-408.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-408.js

- * @description ES5 Attributes - Successfully add a property to an object when the object's prototype has a property with same name and [[Writable]] attribute is set to true (Date instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Date.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var dateObj = new Date();

-            dateObj.prop = 1002;

-

-            return dateObj.hasOwnProperty("prop") && dateObj.prop === 1002;

-        } finally {

-            delete Date.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Successfully add a property to an object when the
+    object's prototype has a property with same name and [[Writable]]
+    attribute is set to true (Date instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Date.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var dateObj = new Date();
+            dateObj.prop = 1002;
+
+            return dateObj.hasOwnProperty("prop") && dateObj.prop === 1002;
+        } finally {
+            delete Date.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-409.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-409.js
index 6540b96a9..0d4d1757c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-409.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-409.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-409.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to false is enumerable (RegExp instance)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(RegExp.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-            var regObj = new RegExp();

-

-            var verifyEnumerable = false;

-            for (var p in regObj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !regObj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete RegExp.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to false is enumerable (RegExp instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(RegExp.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+            var regObj = new RegExp();
+
+            var verifyEnumerable = false;
+            for (var p in regObj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !regObj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete RegExp.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-41.js
index 5697ed634..9e88129c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-41.js
@@ -1,25 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-41.js

- * @description Object.defineProperty - 'O' is the JSON object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(JSON, "foo", {

-                value: 12,

-                configurable: true

-            });

-

-            return dataPropertyAttributesAreCorrect(JSON, "foo", 12, false, false, true);

-        } finally {

-            delete JSON.foo;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is the JSON object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(JSON, "foo", {
+                value: 12,
+                configurable: true
+            });
+
+            return dataPropertyAttributesAreCorrect(JSON, "foo", 12, false, false, true);
+        } finally {
+            delete JSON.foo;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-410.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-410.js
index d2de5c1cf..3677cba36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-410.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-410.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-410.js

- * @description ES5 Attributes - Failed to add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to false (JSON)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-            JSON.prop = 1002;

-

-            return !JSON.hasOwnProperty("prop") && JSON.prop === 1001;

-        } finally {

-            delete Object.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Failed to add a property to an object when the
+    object's prototype has a property with the same name and
+    [[Writable]] set to false (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+            JSON.prop = 1002;
+
+            return !JSON.hasOwnProperty("prop") && JSON.prop === 1001;
+        } finally {
+            delete Object.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-411.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-411.js
index 4ad89a067..840a9ab9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-411.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-411.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-411.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to false is non-enumerable (Math)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-

-            var verifyEnumerable = false;

-            for (var p in Math) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !Math.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Object.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to false is non-enumerable (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+
+            var verifyEnumerable = false;
+            for (var p in Math) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !Math.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Object.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-412.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-412.js
index 1a1307332..13ac4a709 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-412.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-412.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-412.js

- * @description ES5 Attributes - [[Value]] field of inherited property of [[Prototype]] internal property is correct(Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        Object.defineProperty(appointment, "startTime", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(appointment, "name", {

-            value: "NAME",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        Object.defineProperty(meeting, "conferenceCall", {

-            value: "In-person meeting",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "NAME" &&

-            teamMeeting.startTime === 1001 &&

-            teamMeeting.conferenceCall === "In-person meeting";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] field of inherited property of
+    [[Prototype]] internal property is correct(Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        Object.defineProperty(appointment, "startTime", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(appointment, "name", {
+            value: "NAME",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        Object.defineProperty(meeting, "conferenceCall", {
+            value: "In-person meeting",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "NAME" &&
+            teamMeeting.startTime === 1001 &&
+            teamMeeting.conferenceCall === "In-person meeting";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-413.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-413.js
index 78f1d55aa..db5f4b7f1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-413.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-413.js
@@ -1,50 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-413.js

- * @description ES5 Attributes - Successfully add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to true (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        Object.defineProperty(appointment, "startTime", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(appointment, "name", {

-            value: "NAME",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        Object.defineProperty(meeting, "conferenceCall", {

-            value: "In-person meeting",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-        teamMeeting.name = "Team Meeting";

-        var dateObj = new Date("10/31/2010 08:00");

-        teamMeeting.startTime = dateObj;

-        teamMeeting.conferenceCall = "4255551212";

-

-        var hasOwnProperty = teamMeeting.hasOwnProperty("name") &&

-            teamMeeting.hasOwnProperty("startTime") &&

-            teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "Team Meeting" &&

-            teamMeeting.startTime === dateObj &&

-            teamMeeting.conferenceCall === "4255551212";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Successfully add a property to an object when the
+    object's prototype has a property with the same name and
+    [[Writable]] set to true (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        Object.defineProperty(appointment, "startTime", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(appointment, "name", {
+            value: "NAME",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        Object.defineProperty(meeting, "conferenceCall", {
+            value: "In-person meeting",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+        teamMeeting.name = "Team Meeting";
+        var dateObj = new Date("10/31/2010 08:00");
+        teamMeeting.startTime = dateObj;
+        teamMeeting.conferenceCall = "4255551212";
+
+        var hasOwnProperty = teamMeeting.hasOwnProperty("name") &&
+            teamMeeting.hasOwnProperty("startTime") &&
+            teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "Team Meeting" &&
+            teamMeeting.startTime === dateObj &&
+            teamMeeting.conferenceCall === "4255551212";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-414.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-414.js
index 88e052e2b..6ec82f052 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-414.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-414.js
@@ -1,59 +1,61 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-414.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to true is enumerable (Object.create)

- */

-

-

-function testcase() {

-        var appointment = new Object();

-

-        Object.defineProperty(appointment, "startTime", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        Object.defineProperty(appointment, "name", {

-            value: "NAME",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        Object.defineProperty(meeting, "conferenceCall", {

-            value: "In-person meeting",

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var verifyTimeProp = false;

-        var verifyNameProp = false;

-        var verifyCallProp = false;

-        for (var p in teamMeeting) {

-            if (p === "startTime") {

-                verifyTimeProp = true;

-            }

-            if (p === "name") {

-                verifyNameProp = true;

-            }

-            if (p === "conferenceCall") {

-                verifyCallProp = true;

-            }

-        }

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty("conferenceCall");

-

-        return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to true is enumerable (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = new Object();
+
+        Object.defineProperty(appointment, "startTime", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        Object.defineProperty(appointment, "name", {
+            value: "NAME",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        Object.defineProperty(meeting, "conferenceCall", {
+            value: "In-person meeting",
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var verifyTimeProp = false;
+        var verifyNameProp = false;
+        var verifyCallProp = false;
+        for (var p in teamMeeting) {
+            if (p === "startTime") {
+                verifyTimeProp = true;
+            }
+            if (p === "name") {
+                verifyNameProp = true;
+            }
+            if (p === "conferenceCall") {
+                verifyCallProp = true;
+            }
+        }
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty("conferenceCall");
+
+        return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-415.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-415.js
index 003a776c3..50269b054 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-415.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-415.js
@@ -1,50 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-415.js

- * @description ES5 Attributes - Failed to add properties to an object when the object's prototype has properties with the same name and [[Writable]] set to false (Object.create)

- */

-

-

-function testcase() {

-        var appointment = new Object();

-

-        Object.defineProperty(appointment, "startTime", {

-            value: 1001,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        Object.defineProperty(appointment, "name", {

-            value: "NAME",

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        Object.defineProperty(meeting, "conferenceCall", {

-            value: "In-person meeting",

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-        teamMeeting.name = "Team Meeting";

-        var dateObj = new Date("10/31/2010 08:00");

-        teamMeeting.startTime = dateObj;

-        teamMeeting.conferenceCall = "4255551212";

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "NAME" &&

-            teamMeeting.startTime === 1001 &&

-            teamMeeting.conferenceCall === "In-person meeting";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Failed to add properties to an object when the
+    object's prototype has properties with the same name and
+    [[Writable]] set to false (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = new Object();
+
+        Object.defineProperty(appointment, "startTime", {
+            value: 1001,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(appointment, "name", {
+            value: "NAME",
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        Object.defineProperty(meeting, "conferenceCall", {
+            value: "In-person meeting",
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+        teamMeeting.name = "Team Meeting";
+        var dateObj = new Date("10/31/2010 08:00");
+        teamMeeting.startTime = dateObj;
+        teamMeeting.conferenceCall = "4255551212";
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "NAME" &&
+            teamMeeting.startTime === 1001 &&
+            teamMeeting.conferenceCall === "In-person meeting";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-416.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-416.js
index 08faa0616..513f607b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-416.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-416.js
@@ -1,59 +1,61 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-416.js

- * @description ES5 Attributes - Inherited properties whose [[Enumerable]] attribute is set to false is non-enumerable (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        Object.defineProperty(appointment, "startTime", {

-            value: 1001,

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-        Object.defineProperty(appointment, "name", {

-            value: "NAME",

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        Object.defineProperty(meeting, "conferenceCall", {

-            value: "In-person meeting",

-            writable: false,

-            enumerable: false,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var verifyTimeProp = false;

-        var verifyNameProp = false;

-        var verifyCallProp = false;

-        for (var p in teamMeeting) {

-            if (p === "startTime") {

-                verifyTimeProp = true;

-            }

-            if (p === "name") {

-                verifyNameProp = true;

-            }

-            if (p === "conferenceCall") {

-                verifyCallProp = true;

-            }

-        }

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty("conferenceCall");

-

-        return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited properties whose [[Enumerable]]
+    attribute is set to false is non-enumerable (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        Object.defineProperty(appointment, "startTime", {
+            value: 1001,
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(appointment, "name", {
+            value: "NAME",
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        Object.defineProperty(meeting, "conferenceCall", {
+            value: "In-person meeting",
+            writable: false,
+            enumerable: false,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var verifyTimeProp = false;
+        var verifyNameProp = false;
+        var verifyCallProp = false;
+        for (var p in teamMeeting) {
+            if (p === "startTime") {
+                verifyTimeProp = true;
+            }
+            if (p === "name") {
+                verifyNameProp = true;
+            }
+            if (p === "conferenceCall") {
+                verifyCallProp = true;
+            }
+        }
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty("conferenceCall");
+
+        return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-417.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-417.js
index 10815e9e9..58642052e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-417.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-417.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-417.js

- * @description ES5 Attributes - [[Value]] attribute of inherited property of [[Prototype]] internal property is correct(Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-

-            return !obj.hasOwnProperty("prop") && obj.prop === 1001;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Value]] attribute of inherited property of
+    [[Prototype]] internal property is correct(Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+
+            return !obj.hasOwnProperty("prop") && obj.prop === 1001;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-418.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-418.js
index f33b6ac99..fd9ed5119 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-418.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-418.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-418.js

- * @description ES5 Attributes - Successfully add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to true (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            obj.prop = 1002;

-

-            return obj.hasOwnProperty("prop") && obj.prop === 1002;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Successfully add a property to an object when the
+    object's prototype has a property with the same name and
+    [[Writable]] set to true (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            obj.prop = 1002;
+
+            return obj.hasOwnProperty("prop") && obj.prop === 1002;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-419.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-419.js
index 0d74a363b..1b065e7ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-419.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-419.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-419.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to true is enumerable (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !obj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to true is enumerable (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !obj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-42.js
index ccbdab2de..a42949e8b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-42.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-42.js

- * @description Object.defineProperty - 'O' is an Error object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var desc = new Error();

-

-        Object.defineProperty(desc, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(desc, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && desc.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Error object that uses Object's
+    [[GetOwnProperty]] method to access the 'name' property (8.12.9
+    step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = new Error();
+
+        Object.defineProperty(desc, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(desc, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && desc.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-420.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-420.js
index 59310a772..08169eada 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-420.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-420.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-420.js

- * @description ES5 Attributes - Failed to add a property to an object when the object's prototype has a property with the same name and [[Writable]] set to false(Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            obj.prop = 1002;

-

-            return !obj.hasOwnProperty("prop") && obj.prop === 1001;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Failed to add a property to an object when the
+    object's prototype has a property with the same name and
+    [[Writable]] set to false(Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            obj.prop = 1002;
+
+            return !obj.hasOwnProperty("prop") && obj.prop === 1001;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-421.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-421.js
index 054fc5c9e..d3cb2f77d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-421.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-421.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-421.js

- * @description ES5 Attributes - Inherited property whose [[Enumerable]] attribute is set to false is non-enumerable (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !obj.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property whose [[Enumerable]] attribute
+    is set to false is non-enumerable (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !obj.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-422.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-422.js
index 92656260c..901d5e231 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-422.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-422.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-422.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-423.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-423.js
index a2f3408c2..74d15a58a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-423.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-423.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-423.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-424.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-424.js
index 107e1ea86..306c67b7b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-424.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-424.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-424.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is true) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-425.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-425.js
index 92fc1591f..70098d2db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-425.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-425.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-425.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-426.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-426.js
index bb6702b82..c16c7840e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-426.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-426.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-426.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var result2 = obj.prop === 1001;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var result2 = obj.prop === 1001;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-427.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-427.js
index 2db532720..026b106dd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-427.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-427.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-427.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-428.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-428.js
index 577444c04..c78dab519 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-428.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-428.js
@@ -1,42 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-428.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-429.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-429.js
index 030a399f3..fa20979f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-429.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-429.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-429.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-43.js
index fe43091a4..9084c3274 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-43.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-43.js

- * @description Object.defineProperty - 'O' is an Arguments object which implements its own [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; })();

-

-        Object.defineProperty(argObj, "foo", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(argObj, "foo", {

-                value: 11,

-                configurable: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && argObj.foo === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is an Arguments object which
+    implements its own [[GetOwnProperty]] method to access the 'name'
+    property (8.12.9 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; })();
+
+        Object.defineProperty(argObj, "foo", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(argObj, "foo", {
+                value: 11,
+                configurable: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && argObj.foo === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-430.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-430.js
index 33047c0e3..0e3f6afa6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-430.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-430.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-430.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-431.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-431.js
index ed465d2f7..8fea2b897 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-431.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-431.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-431.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-432.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-432.js
index fda0fe3e2..5d068fe64 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-432.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-432.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-432.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-433.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-433.js
index 0faad7336..648de9cc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-433.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-433.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-433.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is false) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-434.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-434.js
index 016dbb730..790dc4682 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-434.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-434.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-434.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-435.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-435.js
index 64c622484..00e2f4b66 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-435.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-435.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-435.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = typeof obj.prop === "undefined";

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = typeof obj.prop === "undefined";
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-436.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-436.js
index 69fcce8ab..91ca6bdda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-436.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-436.js
@@ -1,39 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-436.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: setFunc

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: setFunc
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-437.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-437.js
index f1bf325f9..48903d6a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-437.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-437.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-437.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-438.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-438.js
index 67ae26d55..66738b377 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-438.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-438.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-438.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-439.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-439.js
index f38346525..8fb0085b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-439.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-439.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-439.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    undefined, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-440.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-440.js
index 6b1ac1e90..f70c241fb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-440.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-440.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-440.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-441.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-441.js
index 706260105..d95c9aee4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-441.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-441.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-441.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-442.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-442.js
index bf4318b6f..ecf6b6898 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-442.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-442.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-442.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is true) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-443.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-443.js
index 583573ab6..2cfd2948a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-443.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-443.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-443.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-444.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-444.js
index 4b6df57a6..cb1bd6426 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-444.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-444.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-444.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var result2 = obj.prop === 1001;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var result2 = obj.prop === 1001;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-445.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-445.js
index 3e504fdcc..19a39a101 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-445.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-445.js
@@ -1,39 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-445.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        obj.prop = "overrideData";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        obj.prop = "overrideData";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-446.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-446.js
index 5f8570b91..c5a46a07c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-446.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-446.js
@@ -1,42 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-446.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-447.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-447.js
index 7b5d9349d..7e6374b31 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-447.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-447.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-447.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-448.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-448.js
index 784d6c2b5..f55cb219b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-448.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-448.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-448.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-449.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-449.js
index 7489315ca..d128e0010 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-449.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-449.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-449.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-45.js
index 9b8096e1b..99c5d1693 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-45.js
@@ -1,24 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-45.js

- * @description Object.defineProperty - 'O' is the global object that uses Object's [[GetOwnProperty]] method to access the 'name' property (8.12.9 step 1)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(fnGlobalObject(), "foo", {

-                value: 12,

-                configurable: true

-            });

-

-            return dataPropertyAttributesAreCorrect(fnGlobalObject(), "foo", 12, false, false, true);

-        } finally {

-            delete fnGlobalObject().foo;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'O' is the global object that uses
+    Object's [[GetOwnProperty]] method to access the 'name' property
+    (8.12.9 step 1)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(fnGlobalObject(), "foo", {
+                value: 12,
+                configurable: true
+            });
+
+            return dataPropertyAttributesAreCorrect(fnGlobalObject(), "foo", 12, false, false, true);
+        } finally {
+            delete fnGlobalObject().foo;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-450.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-450.js
index 47fd6cfc3..4c74aef86 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-450.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-450.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-450.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-451.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-451.js
index 1a3b63ef6..7451d65b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-451.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-451.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-451.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is false) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-452.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-452.js
index bbaa8cd03..0f54b0f2d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-452.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-452.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-452.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-453.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-453.js
index 4f5600983..82c9f7841 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-453.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-453.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-453.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = typeof obj.prop === "undefined";

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = typeof obj.prop === "undefined";
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-454.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-454.js
index b9f2767cf..026f6fbf1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-454.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-454.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-454.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: setFunc

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: setFunc
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-455.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-455.js
index 79061d60d..f3815c919 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-455.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-455.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-455.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-456.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-456.js
index bcc2bfeff..faaf56b6b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-456.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-456.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-456.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-457.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-457.js
index 0524ed6d6..4d1774200 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-457.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-457.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-457.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is undefined, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    undefined, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-458.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-458.js
index 3b024034b..1f1eef99f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-458.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-458.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-458.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-459.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-459.js
index 88005bd76..de507c330 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-459.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-459.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-459.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-46.js
index 0ea526f54..9ebbf72b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-46.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-46.js

- * @description Object.defineProperty - 'name' is defined as data property if 'name' property doesn't exist in 'O' and 'desc' is generic descriptor (8.12.9 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            enumerable: true

-        });

-

-        var isEnumerable = false;

-        for (var item in obj) {

-            if (obj.hasOwnProperty(item) && item === "property") {

-                isEnumerable = true;

-            }

-        }

-

-        return obj.hasOwnProperty("property") && isEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is defined as data property if
+    'name' property doesn't exist in 'O' and 'desc' is generic
+    descriptor (8.12.9 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            enumerable: true
+        });
+
+        var isEnumerable = false;
+        for (var item in obj) {
+            if (obj.hasOwnProperty(item) && item === "property") {
+                isEnumerable = true;
+            }
+        }
+
+        return obj.hasOwnProperty("property") && isEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-460.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-460.js
index 88a1a8f82..a4e6ba5b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-460.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-460.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-460.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is true) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-461.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-461.js
index 32b1ede40..901bd83b3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-461.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-461.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-461.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-462.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-462.js
index 4c3309c28..5a227f879 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-462.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-462.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-462.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var result2 = obj.prop === 1001;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var result2 = obj.prop === 1001;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-463.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-463.js
index 810c3aa88..9ce9b5585 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-463.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-463.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-463.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: undefined

-        });

-

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.set === setFunc && typeof desc2.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: undefined
+        });
+
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.set === setFunc && typeof desc2.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-464.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-464.js
index 3784cfc4f..6c838a934 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-464.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-464.js
@@ -1,48 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-464.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-465.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-465.js
index f7323c580..db5e34db5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-465.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-465.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-465.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-466.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-466.js
index c70803774..90808e3fe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-466.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-466.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-466.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-467.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-467.js
index ce527252e..593687901 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-467.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-467.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-467.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-468.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-468.js
index baa9e9bf3..6b8c97292 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-468.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-468.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-468.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-469.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-469.js
index e859414bc..701cd5fb9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-469.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-469.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-469.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is false) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-47.js
index de6f2cfed..d9f01439d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-47.js
@@ -1,23 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-47.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', [[Value]] of 'name' property is set as undefined if it is absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", undefined, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O',
+    [[Value]] of 'name' property is set as undefined if it is absent
+    in data descriptor 'desc' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", undefined, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-470.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-470.js
index 6fce9a016..56e3c355f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-470.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-470.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-470.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-471.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-471.js
index cdcb3c907..f35920542 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-471.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-471.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-471.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = typeof obj.prop === "undefined";

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = typeof obj.prop === "undefined";
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-472.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-472.js
index 712a79cc8..74c5ef64c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-472.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-472.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-472.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-473.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-473.js
index 84de2d33c..b14164708 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-473.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-473.js
@@ -1,53 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-473.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-474.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-474.js
index 5bbde850e..894c40326 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-474.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-474.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-474.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-475.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-475.js
index 3ef0886c4..d3c417385 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-475.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-475.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-475.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    undefined, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-476.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-476.js
index 2d12297b1..56ac6fe01 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-476.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-476.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-476.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-477.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-477.js
index cd9025880..4721f8fcc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-477.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-477.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-477.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-478.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-478.js
index 84b1dd103..67a3eac6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-478.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-478.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-478.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is true) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-479.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-479.js
index 777fe406a..086fbe7da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-479.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-479.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-479.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-48.js
index d4d9c69bb..f43acd4c9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-48.js
@@ -1,23 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-48.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Writable]] of 'name' property of 'Attributes' is set as false value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            enumerable: true,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1001, false, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Writable]] of 'name' property of 'Attributes' is set as false
+    value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            enumerable: true,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1001, false, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-480.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-480.js
index 1d6b3d65c..96c40dd98 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-480.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-480.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-480.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var result2 = obj.prop === 1001;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var result2 = obj.prop === 1001;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && typeof desc1.get === "undefined" && desc2.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-481.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-481.js
index 87f9b2a42..f41978ba0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-481.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-481.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-481.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: undefined

-        });

-

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.set === setFunc && typeof desc2.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: undefined
+        });
+
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.set === setFunc && typeof desc2.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-482.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-482.js
index ff99ea1f4..c1411bead 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-482.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-482.js
@@ -1,48 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-482.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-483.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-483.js
index e2e958eeb..232a3d24a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-483.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-483.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-483.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-484.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-484.js
index a1b96d8ce..8ba24645f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-484.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-484.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-484.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-485.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-485.js
index 5fbd6e522..88e0c53c0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-485.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-485.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-485.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-486.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-486.js
index 4a6467517..43a1e76f2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-486.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-486.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-486.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-487.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-487.js
index 5c5b50f27..ac4bfbb62 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-487.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-487.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-487.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is false) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-488.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-488.js
index d72d5ad62..0443ed9c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-488.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-488.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-488.js

- * @description ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is undefined, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-489.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-489.js
index 57970b739..b826efec1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-489.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-489.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-489.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var result1 = typeof obj.prop === "undefined";

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = typeof obj.prop === "undefined";

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var result1 = typeof obj.prop === "undefined";
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = typeof obj.prop === "undefined";
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && typeof desc1.get === "undefined" && typeof desc2.get === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-49.js
index ea500bcc4..bebf97b04 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-49.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-49.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Enumerable]] of 'name' property of 'Attributes' is set as false value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: true,

-            configurable: true

-        });

-        return dataPropertyAttributesAreCorrect(obj, "property", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Enumerable]] of 'name' property of 'Attributes' is set as false
+    value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: true,
+            configurable: true
+        });
+        return dataPropertyAttributesAreCorrect(obj, "property", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-490.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-490.js
index 87a76d27d..8a61aec5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-490.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-490.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-490.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-491.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-491.js
index fc94b3528..c3c0282f1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-491.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-491.js
@@ -1,53 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-491.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-492.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-492.js
index 8c1ce7770..afda00455 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-492.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-492.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-492.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is undefined, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-493.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-493.js
index daf1ca9b8..a1a302d36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-493.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-493.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-493.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is undefined, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    undefined, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-494.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-494.js
index dd9861d69..20b171d15 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-494.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-494.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-494.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-495.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-495.js
index c131d98b1..a4ead7b8d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-495.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-495.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-495.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-496.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-496.js
index 8054ed35b..7489dba03 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-496.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-496.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-496.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is true) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-497.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-497.js
index f93885e7c..126f6c283 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-497.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-497.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-497.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-498.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-498.js
index 9578a2c1f..9f608b196 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-498.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-498.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-498.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined

-        });

-

-        var result2 = typeof obj.prop === "undefined";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined
+        });
+
+        var result2 = typeof obj.prop === "undefined";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-499.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-499.js
index 005cc4b5c..efe698b07 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-499.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-499.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-499.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        obj.prop = "overrideData";

-        return typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        obj.prop = "overrideData";
+        return typeof desc1.set === "undefined" && desc2.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-5.js
index e84e1aefb..b18c9aeb0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-5.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 6 of [[DefineOwnProperty]] returns if

- * every field of desc also occurs in current and every field in desc has

- * the same value as current.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-5.js

- * @description Object.defineProperty is no-op if current and desc are the same data desc

- */

-

-

-function testcase() {

-  function sameDataDescriptorValues(d1, d2) {

-    return (d1.value === d2.value &&

-            d1.enumerable === d2.enumerable &&

-            d1.writable === d2.writable &&

-            d1.configurable === d2.configurable);

-  }

-

-  var o = {};

-

-  // create a data valued property with the following attributes:

-  // value: 101, enumerable: true, writable: true, configurable: true

-  o["foo"] = 101;

-

-  // query for, and save, the desc. A subsequent call to defineProperty

-  // with the same desc should not disturb the property definition.

-  var d1 = Object.getOwnPropertyDescriptor(o, "foo");  

-

-  // now, redefine the property with the same descriptor

-  // the property defintion should not get disturbed.

-  var desc = { value: 101, enumerable: true, writable: true, configurable: true };

-  Object.defineProperty(o, "foo", desc);

-

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo"); 

-

-  if (sameDataDescriptorValues(d1, d2) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 6 of [[DefineOwnProperty]] returns if
+    every field of desc also occurs in current and every field in desc has
+    the same value as current.
+description: >
+    Object.defineProperty is no-op if current and desc are the same
+    data desc
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function sameDataDescriptorValues(d1, d2) {
+    return (d1.value === d2.value &&
+            d1.enumerable === d2.enumerable &&
+            d1.writable === d2.writable &&
+            d1.configurable === d2.configurable);
+  }
+
+  var o = {};
+
+  // create a data valued property with the following attributes:
+  // value: 101, enumerable: true, writable: true, configurable: true
+  o["foo"] = 101;
+
+  // query for, and save, the desc. A subsequent call to defineProperty
+  // with the same desc should not disturb the property definition.
+  var d1 = Object.getOwnPropertyDescriptor(o, "foo");  
+
+  // now, redefine the property with the same descriptor
+  // the property defintion should not get disturbed.
+  var desc = { value: 101, enumerable: true, writable: true, configurable: true };
+  Object.defineProperty(o, "foo", desc);
+
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo"); 
+
+  if (sameDataDescriptorValues(d1, d2) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-50.js
index b081e4d1b..5bcdbc306 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-50.js
@@ -1,22 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-50.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Configurable]] of 'name' property is set as false if it is absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: true,

-            enumerable: true

-        });

-        return dataPropertyAttributesAreCorrect(obj, "property", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Configurable]] of 'name' property is set as false if it is
+    absent in data descriptor 'desc' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: true,
+            enumerable: true
+        });
+        return dataPropertyAttributesAreCorrect(obj, "property", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-500.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-500.js
index 50a4a0b94..77a7f7783 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-500.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-500.js
@@ -1,46 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-500.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is  Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is  Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-501.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-501.js
index 9c07f3250..ba6c400a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-501.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-501.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-501.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-502.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-502.js
index d2154cb88..22e00f3c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-502.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-502.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-502.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-503.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-503.js
index 3205f5055..ae7c126df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-503.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-503.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-503.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-504.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-504.js
index 950057aef..381067f32 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-504.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-504.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-504.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-505.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-505.js
index c8f6cb1a7..59f16887f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-505.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-505.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-505.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is false) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-506.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-506.js
index 766ffb472..5a1538701 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-506.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-506.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-506.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is true, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-507.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-507.js
index 8e58baa64..ccf0ae148 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-507.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-507.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-507.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = obj.prop === 1001;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = obj.prop === 1001;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-508.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-508.js
index d483e4735..58e287675 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-508.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-508.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-508.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: setFunc

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: setFunc
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-509.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-509.js
index 7ce3e6b47..2b6d83845 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-509.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-509.js
@@ -1,51 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-509.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-51.js
index 2bd649c06..56d9b9066 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-51.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-51.js

- * @description Object.defineProperty - desc is data descriptor, test updating all attribute values of 'name' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = { "property": 1 }; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "property", 1001, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc is data descriptor, test updating all
+    attribute values of 'name' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = { "property": 1 }; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "property", 1001, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-510.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-510.js
index 79592757d..1aabdcc85 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-510.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-510.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-510.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-511.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-511.js
index f315246d4..525f04b34 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-511.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-511.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-511.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is true, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    a Function, [[Set]] is undefined, [[Enumerable]] is true,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-512.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-512.js
index cb808a6d0..6ab39eb5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-512.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-512.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-512.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-513.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-513.js
index 754d573d2..75741bc6e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-513.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-513.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-513.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-514.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-514.js
index da7249b47..46eaa0d2a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-514.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-514.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-514.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is true) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-515.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-515.js
index 579c3d72b..d7d595189 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-515.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-515.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-515.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-516.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-516.js
index f22effbc5..6efac51a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-516.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-516.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-516.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined

-        });

-

-        var result2 = typeof obj.prop === "undefined";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined
+        });
+
+        var result2 = typeof obj.prop === "undefined";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-517.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-517.js
index 27b8eb429..a79d1b333 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-517.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-517.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-517.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        obj.prop = "overrideData";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        obj.prop = "overrideData";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return typeof desc1.set === "undefined" && propertyDefineCorrect && desc2.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-518.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-518.js
index 3933856c4..a4fe779e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-518.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-518.js
@@ -1,46 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-518.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-519.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-519.js
index ce2b456f8..d66f1cf19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-519.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-519.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-519.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-52.js
index 54fa3cb04..3aaf4ec7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-52.js
@@ -1,19 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-52.js

- * @description Object.defineProperty - 'desc' is generic descriptor without any attribute, test 'name' is defined in 'obj' with all default attribute values (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {});

-

-        return dataPropertyAttributesAreCorrect(obj, "property", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'desc' is generic descriptor without any
+    attribute, test 'name' is defined in 'obj' with all default
+    attribute values (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {});
+
+        return dataPropertyAttributesAreCorrect(obj, "property", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-520.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-520.js
index 71e247324..361343661 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-520.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-520.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-520.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-521.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-521.js
index ab451beea..8d0bb96b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-521.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-521.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-521.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-522.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-522.js
index 55dfea506..7ee37fc8b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-522.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-522.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-522.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undefined

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-523.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-523.js
index 229537c2f..c31ef83fd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-523.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-523.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-523.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is false) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-524.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-524.js
index 47481e645..041acd4a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-524.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-524.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-524.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is
+    undefined, [[Enumerable]] is false, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-525.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-525.js
index fdcec6edd..a0f95e073 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-525.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-525.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-525.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = obj.prop === 1001;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = obj.prop === 1001;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-526.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-526.js
index 4960e6c1c..9e41d2554 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-526.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-526.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-526.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: setFunc

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: setFunc
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return typeof desc1.set === "undefined" && typeof desc2.set === "undefined" && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-527.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-527.js
index d23c21427..8035b9e8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-527.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-527.js
@@ -1,51 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-527.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-528.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-528.js
index 42c165f90..64d3f915f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-528.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-528.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-528.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is undefined,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-529.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-529.js
index ff2b1c237..050650e5d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-529.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-529.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-529.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is a Function, [[Set]] is undefined, [[Enumerable]] is false, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    a Function, [[Set]] is undefined, [[Enumerable]] is false,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-53.js
index 688c9087b..3447c6d39 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-53.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-53.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Get]] of 'name' property is set as undefined if it is absent in accessor descriptor 'desc' (8.12.9 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var setFunc = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperty(obj, "property", {

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "property", undefined, setFunc, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Get]] of 'name' property is set as undefined if it is absent in
+    accessor descriptor 'desc' (8.12.9 step 4.b)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var setFunc = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperty(obj, "property", {
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "property", undefined, setFunc, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-530.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-530.js
index 7314432f0..691a35abb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-530.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-530.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-530.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-1.js
index cc6e005ca..54194092d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-1.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-1.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of named accessor property 'P' successfully when [[Configurable]] attribute is true, 'O' is an Object object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of named accessor property 'P' successfully when [[Configurable]]
+    attribute is true, 'O' is an Object object (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-10.js
index a27dcb05f..7d09e798a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-10.js
@@ -1,42 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-10.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of indexed accessor property 'P' successfully when [[Configurable]] attribute is true, 'O' is an Object object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of indexed accessor property 'P' successfully when
+    [[Configurable]] attribute is true, 'O' is an Object object
+    (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-11.js
index 6fe1e299b..320c4b814 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-11.js
@@ -1,42 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-11.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of named accessor property 'P' successfully when [[Configurable]] attribute is true, 'A' is an Array object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of named accessor property 'P' successfully when [[Configurable]]
+    attribute is true, 'A' is an Array object (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-12.js
index c14577213..9c6acc3e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-12.js
@@ -1,44 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-12.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of indexed accessor property successfully when [[Configurable]] attribute is true, 'O' is an Arguments object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of indexed accessor property successfully when [[Configurable]]
+    attribute is true, 'O' is an Arguments object (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-13.js
index acd25aa4a..07d935ad1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-13.js
@@ -1,47 +1,54 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-13.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of indexed accessor property 'P' successfully when [[Configurable]] attribute is true, 'O' is the global object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = fnGlobalObject();

-        try {

-            obj.verifySetFunction = "data";

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return obj.verifySetFunction;

-                },

-                set: function (value) {

-                    obj.verifySetFunction = value;

-                },

-                configurable: true

-            });

-

-            obj.verifySetFunction1 = "data1";

-            var getFunc = function () {

-                return obj.verifySetFunction1;

-            };

-            var setFunc = function (value) {

-                obj.verifySetFunction1 = value;

-            };

-

-            Object.defineProperty(obj, "0", {

-                get: getFunc,

-                set: setFunc

-            });

-

-            return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);

-        } finally {

-            delete obj[0];

-            delete obj.verifySetFunction;

-            delete obj.verifySetFunction1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of indexed accessor property 'P' successfully when
+    [[Configurable]] attribute is true, 'O' is the global object
+    (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = fnGlobalObject();
+        try {
+            obj.verifySetFunction = "data";
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return obj.verifySetFunction;
+                },
+                set: function (value) {
+                    obj.verifySetFunction = value;
+                },
+                configurable: true
+            });
+
+            obj.verifySetFunction1 = "data1";
+            var getFunc = function () {
+                return obj.verifySetFunction1;
+            };
+            var setFunc = function (value) {
+                obj.verifySetFunction1 = value;
+            };
+
+            Object.defineProperty(obj, "0", {
+                get: getFunc,
+                set: setFunc
+            });
+
+            return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);
+        } finally {
+            delete obj[0];
+            delete obj.verifySetFunction;
+            delete obj.verifySetFunction1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-15.js
index 5e8d837ce..f2a0d588a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-15.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-15.js

- * @description ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-        var getFunc = function () {

-            return verifySetFunc;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj.prop === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' using
+    simple assignment is successful, 'A' is an Array object (8.12.5
+    step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+        var getFunc = function () {
+            return verifySetFunc;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj.prop === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-16.js
index 9d2d3cdf6..cb366bc1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-16.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-16.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment, 'O' is an Arguments object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-        var getFunc = function () {

-            return verifySetFunc;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj[0] = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj[0] === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' using
+    simple assignment, 'O' is an Arguments object (8.12.5 step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+        var getFunc = function () {
+            return verifySetFunc;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj[0] = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj[0] === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-17.js
index c415046d7..9bbd258a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-17.js
@@ -1,40 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-17.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment is successful, 'O' is the global object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-        try {

-            obj.verifySetFunc = "data";

-            var setFunc = function (value) {

-                obj.verifySetFunc = value;

-            };

-            var getFunc = function () {

-                return obj.verifySetFunc;

-            };

-

-            Object.defineProperty(obj, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-

-            obj[0] = "overrideData";

-            var propertyDefineCorrect = obj.hasOwnProperty("0");

-            var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-            return propertyDefineCorrect && desc.set === setFunc && obj[0] === "overrideData";

-        } finally {

-            delete obj[0];

-            delete obj.verifySetFunc;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' using
+    simple assignment is successful, 'O' is the global object (8.12.5
+    step 5.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+        try {
+            obj.verifySetFunc = "data";
+            var setFunc = function (value) {
+                obj.verifySetFunc = value;
+            };
+            var getFunc = function () {
+                return obj.verifySetFunc;
+            };
+
+            Object.defineProperty(obj, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+
+            obj[0] = "overrideData";
+            var propertyDefineCorrect = obj.hasOwnProperty("0");
+            var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+            return propertyDefineCorrect && desc.set === setFunc && obj[0] === "overrideData";
+        } finally {
+            delete obj[0];
+            delete obj.verifySetFunc;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-2.js
index bb6b9f5b1..1bd79d201 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-2.js
@@ -1,42 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-2.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of indexed accessor property 'P' successfully when [[Configurable]] attribute is true, 'A' is an Array object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = [];

-

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of indexed accessor property 'P' successfully when
+    [[Configurable]] attribute is true, 'A' is an Array object (8.12.9
+    step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = [];
+
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-3.js
index 284e11b8a..3cecbd31a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-3.js
@@ -1,44 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-3.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of named accessor property successfully when [[Configurable]] attribute is true, 'O' is an Arguments object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunction = "data";

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return obj.verifySetFunction;

-            },

-            set: function (value) {

-                obj.verifySetFunction = value;

-            },

-            configurable: true

-        });

-

-        obj.verifySetFunction1 = "data1";

-        var getFunc = function () {

-            return obj.verifySetFunction1;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction1 = value;

-        };

-

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of named accessor property successfully when [[Configurable]]
+    attribute is true, 'O' is an Arguments object (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunction = "data";
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return obj.verifySetFunction;
+            },
+            set: function (value) {
+                obj.verifySetFunction = value;
+            },
+            configurable: true
+        });
+
+        obj.verifySetFunction1 = "data1";
+        var getFunc = function () {
+            return obj.verifySetFunction1;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction1 = value;
+        };
+
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-4.js
index 29f4fa9a3..c76d08340 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-4.js
@@ -1,47 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-4.js

- * @description Object.defineProperty will update [[Get]] and [[Set]] attributes of named accessor property 'P' successfully when [[Configurable]] attribute is true, 'O' is the global object (8.12.9 step 11)

- */

-

-

-function testcase() {

-

-        var obj = fnGlobalObject();

-        try {

-            obj.verifySetFunction = "data";

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return obj.verifySetFunction;

-                },

-                set: function (value) {

-                    obj.verifySetFunction = value;

-                },

-                configurable: true

-            });

-

-            obj.verifySetFunction1 = "data1";

-            var getFunc = function () {

-                return obj.verifySetFunction1;

-            };

-            var setFunc = function (value) {

-                obj.verifySetFunction1 = value;

-            };

-

-            Object.defineProperty(obj, "property", {

-                get: getFunc,

-                set: setFunc

-            });

-

-            return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);

-        } finally {

-            delete obj.property;

-            delete obj.verifySetFunction;

-            delete obj.verifySetFunction1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will update [[Get]] and [[Set]] attributes
+    of named accessor property 'P' successfully when [[Configurable]]
+    attribute is true, 'O' is the global object (8.12.9 step 11)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = fnGlobalObject();
+        try {
+            obj.verifySetFunction = "data";
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return obj.verifySetFunction;
+                },
+                set: function (value) {
+                    obj.verifySetFunction = value;
+                },
+                configurable: true
+            });
+
+            obj.verifySetFunction1 = "data1";
+            var getFunc = function () {
+                return obj.verifySetFunction1;
+            };
+            var setFunc = function (value) {
+                obj.verifySetFunction1 = value;
+            };
+
+            Object.defineProperty(obj, "property", {
+                get: getFunc,
+                set: setFunc
+            });
+
+            return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction1", false, true);
+        } finally {
+            delete obj.property;
+            delete obj.verifySetFunction;
+            delete obj.verifySetFunction1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-6.js
index 4746a9a23..304f92bf3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-6.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-6.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' without [[Set]] using simple assignment is failed, 'A' is an Array object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        var verifySetFunc = "data";

-        var getFunc = function () {

-            return verifySetFunc;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj[0] = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined" && obj[0] === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' without
+    [[Set]] using simple assignment is failed, 'A' is an Array object
+    (8.12.5 step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        var verifySetFunc = "data";
+        var getFunc = function () {
+            return verifySetFunc;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj[0] = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined" && obj[0] === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-7.js
index 4305c12bd..44085cd4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-7.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-7.js

- * @description ES5 Attributes - Updating a named accessor property 'P' without [[Set]] using simple assignment is failed, 'O' is an Arguments object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        var verifySetFunc = "data";

-        var getFunc = function () {

-            return verifySetFunc;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && typeof desc.set === "undefined" && obj.prop === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' without
+    [[Set]] using simple assignment is failed, 'O' is an Arguments
+    object (8.12.5 step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        var verifySetFunc = "data";
+        var getFunc = function () {
+            return verifySetFunc;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && typeof desc.set === "undefined" && obj.prop === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-8.js
index 8a107af0a..d2b5e3c19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-8.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531-8.js

- * @description ES5 Attributes - Updating a named accessor property 'P' without [[Set]] using simple assignment is failed, 'O' is the global object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-        try {

-            obj.verifySetFunc = "data";

-            var getFunc = function () {

-                return obj.verifySetFunc;

-            };

-

-            Object.defineProperty(obj, "prop", {

-                get: getFunc,

-                enumerable: true,

-                configurable: true

-            });

-

-            obj.prop = "overrideData";

-            var propertyDefineCorrect = obj.hasOwnProperty("prop");

-            var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return propertyDefineCorrect && typeof desc.set === "undefined" && obj.prop === "data";

-        } finally {

-            delete obj.prop;

-            delete obj.verifySetFunc;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' without
+    [[Set]] using simple assignment is failed, 'O' is the global
+    object (8.12.5 step 5.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+        try {
+            obj.verifySetFunc = "data";
+            var getFunc = function () {
+                return obj.verifySetFunc;
+            };
+
+            Object.defineProperty(obj, "prop", {
+                get: getFunc,
+                enumerable: true,
+                configurable: true
+            });
+
+            obj.prop = "overrideData";
+            var propertyDefineCorrect = obj.hasOwnProperty("prop");
+            var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return propertyDefineCorrect && typeof desc.set === "undefined" && obj.prop === "data";
+        } finally {
+            delete obj.prop;
+            delete obj.verifySetFunc;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531.js
index a84ff16cb..2e0d4b6ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-531.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-532.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-532.js
index 5414db28c..b6200363a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-532.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-532.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-532.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is true) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-533.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-533.js
index aeecf2285..b881035a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-533.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-533.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-533.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-534.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-534.js
index b8e7a0888..81f9a9112 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-534.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-534.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-534.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined

-        });

-

-        var result2 = typeof obj.prop === "undefined";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined
+        });
+
+        var result2 = typeof obj.prop === "undefined";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-535.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-535.js
index 5101eedd6..39db780d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-535.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-535.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-535.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: undefined

-        });

-

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.set === setFunc && typeof desc2.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: undefined
+        });
+
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.set === setFunc && typeof desc2.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-536.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-536.js
index 41852bab0..027af44cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-536.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-536.js
@@ -1,51 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-536.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: false

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: false
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return result1 && !result2 && desc1.enumerable === true && desc2.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-537.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-537.js
index d0085eb2b..8339f1e46 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-537.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-537.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-537.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-1.js
index 4f18a51c1..f3459789f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-1.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-1.js

- * @description ES5 Attributes - Updating an indexed 'P' whose [[Configurable]] attribute is true to a data property is successful, 'A' is an Array object (8.12.9 - step 9.c.i)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        Object.defineProperty(obj, "0", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-            dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed 'P' whose [[Configurable]]
+    attribute is true to a data property is successful, 'A' is an
+    Array object (8.12.9 - step 9.c.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        Object.defineProperty(obj, "0", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+            dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-2.js
index 05e9fd788..273e21c5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-2.js
@@ -1,43 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-2.js

- * @description ES5 Attributes - Updating a named accessor property 'P' whose [[Configurable]] attribute is true to a data property is successful, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' whose
+    [[Configurable]] attribute is true to a data property is
+    successful, 'O' is an Arguments object
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-3.js
index 98c390c46..c4101ae2a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-3.js
@@ -1,45 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-3.js

- * @description ES5 Attributes - Updating a named accessor property 'P' whose [[Configurable]] attribute is true to a data property is successful, 'O' is the global object

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-                typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-                dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);

-        } finally {

-            delete obj.prop;

-            delete obj.verifySetFunc;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' whose
+    [[Configurable]] attribute is true to a data property is
+    successful, 'O' is the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+                typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+                dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);
+        } finally {
+            delete obj.prop;
+            delete obj.verifySetFunc;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-5.js
index 5a9e07260..722086e9c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-5.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-5.js

- * @description ES5 Attributes - Updating a named accessor property 'P' whose [[Configurable]] attribute is true to a data property is successful, 'A' is an Array object (8.12.9 - step 9.c.i)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); 

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' whose
+    [[Configurable]] attribute is true to a data property is
+    successful, 'A' is an Array object (8.12.9 - step 9.c.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop"); 
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-6.js
index 680a00f10..cdaa30c07 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-6.js
@@ -1,43 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-6.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' whose [[Configurable]] attribute is true to a data property is successful, 'O' is an Arguments object

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        Object.defineProperty(obj, "0", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-            dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' whose
+    [[Configurable]] attribute is true to a data property is
+    successful, 'O' is an Arguments object
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        Object.defineProperty(obj, "0", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+            dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-7.js
index f12ffa2cd..b4d09a2b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-7.js
@@ -1,45 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538-7.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' whose [[Configurable]] attribute is true to a data property is successful, 'O' is the global object

- */

-

-

-function testcase() {

-        var obj = fnGlobalObject();

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-        try {

-            Object.defineProperty(obj, "0", {

-                get: getFunc,

-                set: setFunc,

-                enumerable: true,

-                configurable: true

-            });

-            var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            Object.defineProperty(obj, "0", {

-                value: 1001

-            });

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-                typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-                dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);

-        } finally {

-            delete obj[0];

-            delete obj.verifySetFunc;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' whose
+    [[Configurable]] attribute is true to a data property is
+    successful, 'O' is the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = fnGlobalObject();
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+        try {
+            Object.defineProperty(obj, "0", {
+                get: getFunc,
+                set: setFunc,
+                enumerable: true,
+                configurable: true
+            });
+            var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            Object.defineProperty(obj, "0", {
+                value: 1001
+            });
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+                typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+                dataPropertyAttributesAreCorrect(obj, "0", 1001, false, true, true);
+        } finally {
+            delete obj[0];
+            delete obj.verifySetFunc;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538.js
index b1ea0ff93..4c66e089b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-538.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&

-            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&

-            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is true) to a data property
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value") &&
+            typeof desc2.get === "undefined" && typeof desc2.get === "undefined" &&
+            dataPropertyAttributesAreCorrect(obj, "prop", 1001, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-539.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-539.js
index ee682019b..c9865cb8f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-539.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-539.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-539.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-54.js
index 02e5ac2a1..f07d5b888 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-54.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-54.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Set]] of 'name' property of 'Attributes' is set as undefined value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return "property";

-            },

-            enumerable: false,

-            configurable: false

-        });

-

-

-        if (obj.property !== "property") {

-            return false;

-        }

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        if (typeof desc.set !== "undefined") {

-            return false;

-        }

-        for (var p in obj) {

-            if (p === "property") {

-                return false;

-            }

-        }

-        delete obj.property;

-        if (!obj.hasOwnProperty("property")) {

-            return false;

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Set]] of 'name' property of 'Attributes' is set as undefined
+    value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return "property";
+            },
+            enumerable: false,
+            configurable: false
+        });
+
+
+        if (obj.property !== "property") {
+            return false;
+        }
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        if (typeof desc.set !== "undefined") {
+            return false;
+        }
+        for (var p in obj) {
+            if (p === "property") {
+                return false;
+            }
+        }
+        delete obj.property;
+        if (!obj.hasOwnProperty("property")) {
+            return false;
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-1.js
index 5626e010e..091d3c711 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-1.js
@@ -1,51 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-1.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of a named accessor property 'P' whose [[Configurable]] attribute is false and throws TypeError exception, 'O' is an Object object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "property", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of a named accessor property 'P' whose [[Configurable]]
+    attribute is false and throws TypeError exception, 'O' is an
+    Object object (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "property", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-10.js
index 71d928f8f..c41f2f6fe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-10.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-10.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment is successful, 'O' is an Arguments object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj[0] = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' using
+    simple assignment is successful, 'O' is an Arguments object
+    (8.12.5 step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj[0] = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-2.js
index 0a8f2c485..4d5337dad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-2.js
@@ -1,51 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-2.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of an indexed property 'P' whose [[Configurable]] attribute is false and throws TypeError exception, 'A' is an Array object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "0", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of an indexed property 'P' whose [[Configurable]]
+    attribute is false and throws TypeError exception, 'A' is an Array
+    object (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "0", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-3.js
index 12812946b..f69922ab9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-3.js
@@ -1,53 +1,58 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-3.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of a named accessor property 'P' whose [[Configurable]] attribute is false, 'O' is an Arguments object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "property", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of a named accessor property 'P' whose [[Configurable]]
+    attribute is false, 'O' is an Arguments object (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "property", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-4.js
index abfe7bee9..32678c4b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-4.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-4.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj[0] = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("0");

-        var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' using
+    simple assignment is successful, 'A' is an Array object (8.12.5
+    step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj[0] = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("0");
+        var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-5.js
index 001e9a3c2..612598df1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-5.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-5.js

- * @description ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'O' is an Arguments object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' using
+    simple assignment is successful, 'O' is an Arguments object
+    (8.12.5 step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-6.js
index 7dc675fec..c121b7313 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-6.js
@@ -1,51 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-6.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of an indexed accessor property 'P' whose [[Configurable]] attribute is false and throws TypeError exception, 'O' is an Object object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "0", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of an indexed accessor property 'P' whose
+    [[Configurable]] attribute is false and throws TypeError
+    exception, 'O' is an Object object (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "0", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-7.js
index 135be307f..3a86b441f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-7.js
@@ -1,51 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-7.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of a named property 'P' whose [[Configurable]] attribute is false and throws TypeError exception, 'A' is an Array object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of a named property 'P' whose [[Configurable]]
+    attribute is false and throws TypeError exception, 'A' is an Array
+    object (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-8.js
index 19a3d3956..bcbb008d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-8.js
@@ -1,53 +1,59 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-8.js

- * @description Object.defineProperty fails to update [[Get]] and [[Set]] attributes of an indexed accessor property 'P' whose [[Configurable]] attribute is false, 'O' is an Arguments object (8.12.9 step 11.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunction = "data";

-        var getFunc = function () {

-            return obj.verifySetFunction;

-        };

-        var setFunc = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        var result = false;

-        try {

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return 100;

-                }

-            });

-        } catch (e) {

-            result = e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-

-        try {

-            Object.defineProperty(obj, "0", {

-                set: function (value) {

-                    obj.verifySetFunction1 = value;

-                }

-            });

-        } catch (e1) {

-            return result && e1 instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty fails to update [[Get]] and [[Set]]
+    attributes of an indexed accessor property 'P' whose
+    [[Configurable]] attribute is false, 'O' is an Arguments object
+    (8.12.9 step 11.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunction = "data";
+        var getFunc = function () {
+            return obj.verifySetFunction;
+        };
+        var setFunc = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        var result = false;
+        try {
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return 100;
+                }
+            });
+        } catch (e) {
+            result = e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+
+        try {
+            Object.defineProperty(obj, "0", {
+                set: function (value) {
+                    obj.verifySetFunction1 = value;
+                }
+            });
+        } catch (e1) {
+            return result && e1 instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunction", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-9.js
index f50732dbd..17fe6d146 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-9.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540-9.js

- * @description ES5 Attributes - Updating a named accessor property 'P' using simple assignment is successful, 'A' is an Array object (8.12.5 step 5.b)

- */

-

-

-function testcase() {

-        var obj = [];

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' using
+    simple assignment is successful, 'A' is an Array object (8.12.5
+    step 5.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = [];
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && obj.verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540.js
index 6709f809e..cbf974d81 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-540.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-541.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-541.js
index eb8166bd8..38b411744 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-541.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-541.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-541.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return propertyDefineCorrect && desc.enumerable === true;

-            }

-        }

-

-        return false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is false) is
+    enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return propertyDefineCorrect && desc.enumerable === true;
+            }
+        }
+
+        return false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-542.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-542.js
index e7a8fff15..08baf29e6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-542.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-542.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-542.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is true, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-543.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-543.js
index 353a38a38..e7aba6923 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-543.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-543.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-543.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = obj.prop === 1001;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = obj.prop === 1001;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-544.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-544.js
index 0a714716f..ed26cba3b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-544.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-544.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-544.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-545.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-545.js
index 4a7f30fdb..cd936734a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-545.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-545.js
@@ -1,56 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-545.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: false

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: false
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return result1 && result2 && desc1.enumerable === true && desc2.enumerable === true && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-546.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-546.js
index 8947e4a41..ca29eb7db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-546.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-546.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-546.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is true, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-1.js
index 4bd771275..e3d569f15 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-1.js
@@ -1,45 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-1.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' whose [[Configurable]] attribute is false to a data property does not succeed, 'A' is an Array object (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-        var obj = [];

-        

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        try {

-            Object.defineProperty(obj, "0", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunc", true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' whose
+    [[Configurable]] attribute is false to a data property does not
+    succeed, 'A' is an Array object (8.12.9 step 9.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+        
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        try {
+            Object.defineProperty(obj, "0", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunc", true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-2.js
index 9f9a3bd68..2fecf2e23 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-2.js
@@ -1,47 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-2.js

- * @description ES5 Attributes - Updating a named accessor property 'P' whose [[Configurable]] attribute is false to a data property does not succeed, 'A' is an Arguments object (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunc", true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' whose
+    [[Configurable]] attribute is false to a data property does not
+    succeed, 'A' is an Arguments object (8.12.9 step 9.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunc", true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-3.js
index c4b1230c1..2fc26b6f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-3.js
@@ -1,45 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-3.js

- * @description ES5 Attributes - Updating a named accessor property 'P' whose [[Configurable]] attribute is false to a data property does not succeed, 'A' is an Array object (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-        var obj = [];

-        

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunc", true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating a named accessor property 'P' whose
+    [[Configurable]] attribute is false to a data property does not
+    succeed, 'A' is an Array object (8.12.9 step 9.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = [];
+        
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, setFunc, "verifySetFunc", true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-4.js
index 3bb8eade7..e93f31b4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-4.js
@@ -1,47 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547-4.js

- * @description ES5 Attributes - Updating an indexed accessor property 'P' whose [[Configurable]] attribute is false to a data property does not succeed, 'A' is an Arguments object (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-        var obj = (function () {

-            return arguments;

-        }());

-

-        obj.verifySetFunc = "data";

-        var getFunc = function () {

-            return obj.verifySetFunc;

-        };

-

-        var setFunc = function (value) {

-            obj.verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "0", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");

-

-        try {

-            Object.defineProperty(obj, "0", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunc", true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Updating an indexed accessor property 'P' whose
+    [[Configurable]] attribute is false to a data property does not
+    succeed, 'A' is an Arguments object (8.12.9 step 9.a)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = (function () {
+            return arguments;
+        }());
+
+        obj.verifySetFunc = "data";
+        var getFunc = function () {
+            return obj.verifySetFunc;
+        };
+
+        var setFunc = function (value) {
+            obj.verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "0", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "0");
+
+        try {
+            Object.defineProperty(obj, "0", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "0");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "0", getFunc, setFunc, "verifySetFunc", true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547.js
index c9cdb7007..94bb0672e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-547.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is true, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    a Function, [[Set]] is a Function, [[Enumerable]] is true,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-548.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-548.js
index cb37e02aa..76e780ebc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-548.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-548.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-548.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-549.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-549.js
index 68774f754..60d5ffcbe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-549.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-549.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-549.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-55.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-55.js
index 83c12fb92..8d0dd1992 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-55.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-55.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-55.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Enumerable]] of 'name' property of 'Attributes' is set as false value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var setFunc = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () {

-            return 10;

-        };

-

-        Object.defineProperty(obj, "property", {

-            set: setFunc,

-            get: getFunc,

-            configurable: true

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Enumerable]] of 'name' property of 'Attributes' is set as false
+    value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var setFunc = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () {
+            return 10;
+        };
+
+        Object.defineProperty(obj, "property", {
+            set: setFunc,
+            get: getFunc,
+            configurable: true
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-550.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-550.js
index 0faf9153a..f7e67279a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-550.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-550.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-550.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is true) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-551.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-551.js
index 7ee5963d8..11425a63b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-551.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-551.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-551.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) is deletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is true) is
+    deletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === true && !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-552.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-552.js
index f0bf34e2e..7f74b3307 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-552.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-552.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-552.js

- * @description ES5 Attributes - success to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            get: undefined

-        });

-

-        var result2 = typeof obj.prop === "undefined";

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            get: undefined
+        });
+
+        var result2 = typeof obj.prop === "undefined";
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return result1 && result2 && desc1.get === getFunc && typeof desc2.get === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-553.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-553.js
index b10c8f925..b49bce68b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-553.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-553.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-553.js

- * @description ES5 Attributes - success to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            set: undefined

-        });

-

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.set === setFunc && typeof desc2.set === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            set: undefined
+        });
+
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.set === setFunc && typeof desc2.set === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-554.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-554.js
index 77b26ae9c..36b224950 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-554.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-554.js
@@ -1,52 +1,56 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-554.js

- * @description ES5 Attributes - success to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        Object.defineProperty(obj, "prop", {

-            enumerable: true

-        });

-        var result2 = false;

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p2 in obj) {

-            if (p2 === "prop") {

-                result2 = true;

-            }

-        }

-

-        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        Object.defineProperty(obj, "prop", {
+            enumerable: true
+        });
+        var result2 = false;
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p2 in obj) {
+            if (p2 === "prop") {
+                result2 = true;
+            }
+        }
+
+        return !result1 && result2 && desc1.enumerable === false && desc2.enumerable === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-555.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-555.js
index e25a6a3f4..1b8788e46 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-555.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-555.js
@@ -1,41 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-555.js

- * @description ES5 Attributes - success to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            configurable: false

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-        delete obj.prop;

-

-        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is true) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            configurable: false
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+        delete obj.prop;
+
+        return desc1.configurable === true && desc2.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-556.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-556.js
index d47ba39c0..687eae4a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-556.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-556.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-556.js

- * @description ES5 Attributes - success to update the accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is true) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: true

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        Object.defineProperty(obj, "prop", {

-            value: 1001

-        });

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - success to update the accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is true) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: true
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        Object.defineProperty(obj, "prop", {
+            value: 1001
+        });
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc1.hasOwnProperty("get") && desc2.hasOwnProperty("value");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-557.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-557.js
index 39a46bb9b..3a3a69bf4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-557.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-557.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-557.js

- * @description ES5 Attributes - [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.get === getFunc && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-558.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-558.js
index 27413ebea..7580e220e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-558.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-558.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-558.js

- * @description ES5 Attributes - [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is the expected function

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        obj.prop = "overrideData";

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute of accessor property ([[Get]]
+    is a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) is the expected function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        obj.prop = "overrideData";
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return propertyDefineCorrect && desc.set === setFunc && verifySetFunc === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-559.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-559.js
index e7d93cc7d..6ae7baf00 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-559.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-559.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-559.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is non-enumerable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        for (var p in obj) {

-            if (p === "prop") {

-                return false;

-            }

-        }

-

-        return propertyDefineCorrect && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is false) is
+    non-enumerable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        for (var p in obj) {
+            if (p === "prop") {
+                return false;
+            }
+        }
+
+        return propertyDefineCorrect && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-56.js
index 2c9199ebb..8925c4423 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-56.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-56.js

- * @description Object.defineProperty - 'name' property doesn't exist in 'O', test [[Configurable]] of 'name' property is set as false if it is absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var setFunc = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () {

-            return 10;

-        };

-

-        Object.defineProperty(obj, "property", {

-            set: setFunc,

-            get: getFunc,

-            enumerable: true

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' property doesn't exist in 'O', test
+    [[Configurable]] of 'name' property is set as false if it is
+    absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var setFunc = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () {
+            return 10;
+        };
+
+        Object.defineProperty(obj, "property", {
+            set: setFunc,
+            get: getFunc,
+            enumerable: true
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-560.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-560.js
index ee6bbe1ae..145ea73ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-560.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-560.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-560.js

- * @description ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) is undeletable

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var propertyDefineCorrect = obj.hasOwnProperty("prop");

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        delete obj.prop;

-

-        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - property ([[Get]] is a Function, [[Set]] is a
+    Function, [[Enumerable]] is false, [[Configurable]] is false) is
+    undeletable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var propertyDefineCorrect = obj.hasOwnProperty("prop");
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        delete obj.prop;
+
+        return propertyDefineCorrect && desc.configurable === false && obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-561.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-561.js
index 7c1dec1c4..1fedd5714 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-561.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-561.js
@@ -1,47 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-561.js

- * @description ES5 Attributes - fail to update [[Get]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var result1 = obj.prop === 1001;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                get: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = obj.prop === 1001;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Get]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var result1 = obj.prop === 1001;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                get: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = obj.prop === 1001;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return result1 && result2 && desc1.get === getFunc && desc2.get === getFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-562.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-562.js
index b5a83cee2..b6ffa88e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-562.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-562.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-562.js

- * @description ES5 Attributes - fail to update [[Set]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                set: undefined

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Set]] attribute of accessor
+    property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                set: undefined
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.set === setFunc && desc2.set === setFunc && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-563.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-563.js
index 8f3b37cf2..e24c227af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-563.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-563.js
@@ -1,56 +1,60 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-563.js

- * @description ES5 Attributes - fail to update [[Enumerable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-        var result1 = false;

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-        for (var p1 in obj) {

-            if (p1 === "prop") {

-                result1 = true;

-            }

-        }

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                enumerable: true

-            });

-

-            return false;

-        } catch (e) {

-            var result2 = false;

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            for (var p2 in obj) {

-                if (p2 === "prop") {

-                    result2 = true;

-                }

-            }

-

-            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Enumerable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+        var result1 = false;
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+        for (var p1 in obj) {
+            if (p1 === "prop") {
+                result1 = true;
+            }
+        }
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                enumerable: true
+            });
+
+            return false;
+        } catch (e) {
+            var result2 = false;
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            for (var p2 in obj) {
+                if (p2 === "prop") {
+                    result2 = true;
+                }
+            }
+
+            return !result1 && !result2 && desc1.enumerable === false && desc2.enumerable === false && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-564.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-564.js
index d788a6593..8fbd17e29 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-564.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-564.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-564.js

- * @description ES5 Attributes - fail to update [[Configurable]] attribute of accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to different value

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                configurable: true

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-            delete obj.prop;

-

-            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update [[Configurable]] attribute of
+    accessor property ([[Get]] is a Function, [[Set]] is a Function,
+    [[Enumerable]] is false, [[Configurable]] is false) to different
+    value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                configurable: true
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+            delete obj.prop;
+
+            return desc1.configurable === false && desc2.configurable === false && obj.hasOwnProperty("prop") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-565.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-565.js
index 996f3c821..e68d6276c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-565.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-565.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-565.js

- * @description ES5 Attributes - fail to update the accessor property ([[Get]] is a Function, [[Set]] is a Function, [[Enumerable]] is false, [[Configurable]] is false) to a data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getFunc = function () {

-            return 1001;

-        };

-

-        var verifySetFunc = "data";

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: false,

-            configurable: false

-        });

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        try {

-            Object.defineProperty(obj, "prop", {

-                value: 1001

-            });

-

-            return false;

-        } catch (e) {

-            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");

-

-            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - fail to update the accessor property ([[Get]] is
+    a Function, [[Set]] is a Function, [[Enumerable]] is false,
+    [[Configurable]] is false) to a data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getFunc = function () {
+            return 1001;
+        };
+
+        var verifySetFunc = "data";
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: false,
+            configurable: false
+        });
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        try {
+            Object.defineProperty(obj, "prop", {
+                value: 1001
+            });
+
+            return false;
+        } catch (e) {
+            var desc2 = Object.getOwnPropertyDescriptor(obj, "prop");
+
+            return desc1.hasOwnProperty("get") && !desc2.hasOwnProperty("value") && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-566.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-566.js
index 1882016b2..aec861a67 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-566.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-566.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-566.js

- * @description ES5 Attributes - [[Get]] attribute is a function which has zero argument

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 2010;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which has zero
+    argument
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 2010;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-567.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-567.js
index 640d891a4..95ae1fb73 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-567.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-567.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-567.js

- * @description ES5 Attributes - [[Get]] attribute is a function which has one argument

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function (arg1) {

-            return 2010;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which has one
+    argument
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function (arg1) {
+            return 2010;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-568.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-568.js
index 1e265a6c7..cbcf5e723 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-568.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-568.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-568.js

- * @description ES5 Attributes - [[Get]] attribute is a function which has two arguments

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function (arg1, arg2) {

-            return 2010;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which has two
+    arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function (arg1, arg2) {
+            return 2010;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && obj.prop === 2010 && desc.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-569.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-569.js
index 5433189e6..4c5146686 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-569.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-569.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-569.js

- * @description ES5 Attributes - [[Get]] attribute is a function which contains global variable

- */

-

-

-function testcase() {

-        var obj = {};

-        var globalVariable = 20;

-        var getFunc = function () {

-            globalVariable = 2010;

-            return globalVariable;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.get === getFunc && obj.prop === 2010 && globalVariable === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which contains
+    global variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var globalVariable = 20;
+        var getFunc = function () {
+            globalVariable = 2010;
+            return globalVariable;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.get === getFunc && obj.prop === 2010 && globalVariable === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-57.js
index 0986bba90..4ee865592 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-57.js
@@ -1,39 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-57.js

- * @description Object.defineProperty - 'desc' is accessor descriptor, test updating all attribute values of 'name' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var setFunc = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-        var getFunc = function () {

-            return 14;

-        };

-

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 11;

-            },

-            set: function (value) { },

-            configurable: true,

-            enumerable: true

-        });

-

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false,

-            enumerable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'desc' is accessor descriptor, test
+    updating all attribute values of 'name' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var setFunc = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+        var getFunc = function () {
+            return 14;
+        };
+
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 11;
+            },
+            set: function (value) { },
+            configurable: true,
+            enumerable: true
+        });
+
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false,
+            enumerable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "property", getFunc, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-570.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-570.js
index 3a328da09..cb9b88243 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-570.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-570.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-570.js

- * @description ES5 Attributes - [[Get]] attribute is a function which doesn't contains return statement

- */

-

-

-function testcase() {

-        var obj = {};

-        var verifyExecute = false;

-        var getFunc = function () {

-            verifyExecute = true;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.get === getFunc && typeof obj.prop === "undefined" && verifyExecute;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which doesn't
+    contains return statement
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var verifyExecute = false;
+        var getFunc = function () {
+            verifyExecute = true;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.get === getFunc && typeof obj.prop === "undefined" && verifyExecute;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-571.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-571.js
index 34d4deeef..9cfe682a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-571.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-571.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-571.js

- * @description ES5 Attributes - [[Get]] attribute is a function which involves 'this' object into statement(s)

- */

-

-

-function testcase() {

-        var obj = {

-            len: 2010

-        };

-        var getFunc = function () {

-            return this;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && obj.prop === obj && desc.get === getFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] attribute is a function which involves
+    'this' object into statement(s)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {
+            len: 2010
+        };
+        var getFunc = function () {
+            return this;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && obj.prop === obj && desc.get === getFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-572.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-572.js
index e220c0bce..27f79b7fd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-572.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-572.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-572.js

- * @description ES5 Attributes - [[Set]] attribute is a function which has zero argument

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var setFunc = function () { };

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which has zero
+    argument
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var setFunc = function () { };
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-573.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-573.js
index 6f02c91b6..b1119f7aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-573.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-573.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-573.js

- * @description ES5 Attributes - [[Set]] attribute is a function which has one argument

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var verifySetFunc = 20;

-        var setFunc = function (value) {

-            verifySetFunc = value;

-        };

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-        obj.prop = 2010;

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc && verifySetFunc === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which has one
+    argument
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var verifySetFunc = 20;
+        var setFunc = function (value) {
+            verifySetFunc = value;
+        };
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+        obj.prop = 2010;
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc && verifySetFunc === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-574.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-574.js
index 13bac13fd..1270c1c4b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-574.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-574.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-574.js

- * @description ES5 Attributes - [[Set]] attribute is a function which has two arguments

- */

-

-

-function testcase() {

-        var obj = {};

-        var firstArg = 12;

-        var secondArg = 12;

-

-        var setFunc = function (a, b) {

-            firstArg = a;

-            secondArg = b;

-        };

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-        obj.prop = 100;

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc && firstArg === 100 && typeof secondArg === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which has two
+    arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var firstArg = 12;
+        var secondArg = 12;
+
+        var setFunc = function (a, b) {
+            firstArg = a;
+            secondArg = b;
+        };
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+        obj.prop = 100;
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc && firstArg === 100 && typeof secondArg === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-575.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-575.js
index 1a694d0a2..986c78b51 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-575.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-575.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-575.js

- * @description ES5 Attributes - [[Set]] attribute is a function which contains global variable

- */

-

-

-function testcase() {

-        var obj = {};

-        var globalVariable = 20;

-        var setFunc = function () {

-            globalVariable = 2010;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-        obj.prop = 10;

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc && globalVariable === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which contains
+    global variable
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var globalVariable = 20;
+        var setFunc = function () {
+            globalVariable = 2010;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+        obj.prop = 10;
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc && globalVariable === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-576.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-576.js
index 616a39222..947451ab4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-576.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-576.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-576.js

- * @description ES5 Attributes - [[Set]] attribute is a function which contains return statement

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var setFunc = function () {

-            return 2010;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which contains
+    return statement
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var setFunc = function () {
+            return 2010;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-577.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-577.js
index 637b92771..1298a0185 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-577.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-577.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-577.js

- * @description ES5 Attributes - [[Set]] attribute is a function which involves 'this' object into statement(s)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var setFunc = function (value) {

-            this.len = value;

-        };

-

-        Object.defineProperty(obj, "prop", {

-            set: setFunc

-        });

-        obj.prop = 2010;

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && desc.set === setFunc && obj.len === 2010;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Set]] attribute is a function which involves
+    'this' object into statement(s)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var setFunc = function (value) {
+            this.len = value;
+        };
+
+        Object.defineProperty(obj, "prop", {
+            set: setFunc
+        });
+        obj.prop = 2010;
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && desc.set === setFunc && obj.len === 2010;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-578.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-578.js
index 203627997..3110bfa48 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-578.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-578.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-578.js

- * @description ES5 Attributes - [[Get]] field of inherited property of [[Prototype]] internal property is correct (String instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(String.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var strObj = new String();

-

-            return !strObj.hasOwnProperty("prop") && strObj.prop === "data";

-        } finally {

-            delete String.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] field of inherited property of
+    [[Prototype]] internal property is correct (String instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(String.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var strObj = new String();
+
+            return !strObj.hasOwnProperty("prop") && strObj.prop === "data";
+        } finally {
+            delete String.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-579.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-579.js
index 5ec7355f0..1d678ca0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-579.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-579.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-579.js

- * @description ES5 Attributes - Success to add property into object (Array instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Array.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var arrObj = [];

-            arrObj.prop = "myOwnProperty";

-

-            return !arrObj.hasOwnProperty("prop") && arrObj.prop === "myOwnProperty" && data === "myOwnProperty";

-        } finally {

-            delete Array.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Success to add property into object (Array
+    instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Array.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var arrObj = [];
+            arrObj.prop = "myOwnProperty";
+
+            return !arrObj.hasOwnProperty("prop") && arrObj.prop === "myOwnProperty" && data === "myOwnProperty";
+        } finally {
+            delete Array.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-58.js
index 940502705..753ac0c37 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-58.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-58.js

- * @description Object.defineProperty - 'name' is data descriptor and every fields in 'desc' is absent (8.12.9 step 5)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", {});

-        return dataPropertyAttributesAreCorrect(obj, "foo", 101, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is data descriptor and every fields
+    in 'desc' is absent (8.12.9 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", {});
+        return dataPropertyAttributesAreCorrect(obj, "foo", 101, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-580.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-580.js
index 7f1f3dbf3..73bcddb17 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-580.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-580.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-580.js

- * @description ES5 Attributes - Inherited property is enumerable (Boolean instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Boolean.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var boolObj = new Boolean();

-            var verifyEnumerable = false;

-            for (var p in boolObj) {

-                if(p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !boolObj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete Boolean.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property is enumerable (Boolean
+    instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Boolean.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var boolObj = new Boolean();
+            var verifyEnumerable = false;
+            for (var p in boolObj) {
+                if(p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !boolObj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete Boolean.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-581.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-581.js
index fbfdd41a8..196a4afba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-581.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-581.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-581.js

- * @description ES5 Attributes - Fail to add property into object (Number instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Number.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-            var numObj = new Number();

-            numObj.prop = "myOwnProperty";

-

-            return !numObj.hasOwnProperty("prop") && numObj.prop === "data" && data === "data";

-        } finally {

-            delete Number.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - Fail to add property into object (Number instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Number.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            var numObj = new Number();
+            numObj.prop = "myOwnProperty";
+
+            return !numObj.hasOwnProperty("prop") && numObj.prop === "data" && data === "data";
+        } finally {
+            delete Number.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-582.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-582.js
index 0921eb47f..28c1faafd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-582.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-582.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-582.js

- * @description ES5 Attributes - Inherited property is non-enumerable (Function instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-            var funObj = function () { };

-            var verifyEnumerable = false;

-            for (var p in funObj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !funObj.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property is non-enumerable (Function
+    instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            var funObj = function () { };
+            var verifyEnumerable = false;
+            for (var p in funObj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !funObj.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-583.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-583.js
index eaa760b39..6f2964604 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-583.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-583.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-583.js

- * @description ES5 Attributes - [[Get]] field of inherited property of [[Prototype]] internal property is correct (Error Instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Error.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var errObj = new Error();

-

-            return !errObj.hasOwnProperty("prop") && errObj.prop === "data";

-        } finally {

-            delete Error.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] field of inherited property of
+    [[Prototype]] internal property is correct (Error Instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Error.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var errObj = new Error();
+
+            return !errObj.hasOwnProperty("prop") && errObj.prop === "data";
+        } finally {
+            delete Error.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-584.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-584.js
index 53fd9d923..dea200d63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-584.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-584.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-584.js

- * @description ES5 Attributes - Failed to add property into object (Date instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Date.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var dateObj = new Date();

-            dateObj.prop = "myOwnProperty";

-

-            return !dateObj.hasOwnProperty("prop") && dateObj.prop === "myOwnProperty" && data === "myOwnProperty";

-        } finally {

-            delete Date.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - Failed to add property into object (Date instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Date.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var dateObj = new Date();
+            dateObj.prop = "myOwnProperty";
+
+            return !dateObj.hasOwnProperty("prop") && dateObj.prop === "myOwnProperty" && data === "myOwnProperty";
+        } finally {
+            delete Date.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-585.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-585.js
index 8bacb1806..8df26d92c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-585.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-585.js
@@ -1,38 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-585.js

- * @description ES5 Attributes - Inherited property is enumerable (RegExp instance)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(RegExp.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-            var regObj = new RegExp();

-            var verifyEnumerable = false;

-            for (var p in regObj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !regObj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete RegExp.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - Inherited property is enumerable (RegExp instance)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(RegExp.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+            var regObj = new RegExp();
+            var verifyEnumerable = false;
+            for (var p in regObj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !regObj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete RegExp.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-586.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-586.js
index 76f5408ac..9f1eb65cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-586.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-586.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-586.js

- * @description ES5 Attributes - Fail to update value of property into of [[Proptotype]] internal property  (JSON)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Object.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-            JSON.prop = "myOwnProperty";

-

-            return !JSON.hasOwnProperty("prop") && JSON.prop === "data" && data === "data";

-        } finally {

-            delete Object.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Fail to update value of property into of
+    [[Proptotype]] internal property  (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Object.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            JSON.prop = "myOwnProperty";
+
+            return !JSON.hasOwnProperty("prop") && JSON.prop === "data" && data === "data";
+        } finally {
+            delete Object.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-587.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-587.js
index 59de6bbd1..c094a5902 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-587.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-587.js
@@ -1,34 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-587.js

- * @description ES5 Attributes - Inherited property is non-enumerable (Math)

- */

-

-

-function testcase() {

-        var data = "data";

-        try {

-            Object.defineProperty(Object.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-            var verifyEnumerable = false;

-            for (var p in Math) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !Math.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Object.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - Inherited property is non-enumerable (Math)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        try {
+            Object.defineProperty(Object.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+            var verifyEnumerable = false;
+            for (var p in Math) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !Math.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Object.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-588.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-588.js
index 0ca8b745d..8047e3df8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-588.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-588.js
@@ -1,55 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-588.js

- * @description ES5 Attributes - [[Get]] field of inherited property of [[Prototype]] internal property is correct (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        var data1 = 1001;

-        Object.defineProperty(appointment, "startTime", {

-            get: function () {

-                return data1;

-            },

-            enumerable: true,

-            configurable: false

-        });

-        var data2 = "NAME";

-        Object.defineProperty(appointment, "name", {

-            get: function () {

-                return data2;

-            },

-            set: function (value) {

-                data2 = value;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        var data3 = "In-person meeting";

-        Object.defineProperty(meeting, "conferenceCall", {

-            get: function () {

-                return data3;

-            },

-            enumerable: true,

-            configurable: false

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "NAME" &&

-            teamMeeting.startTime === 1001 &&

-            teamMeeting.conferenceCall === "In-person meeting";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] field of inherited property of
+    [[Prototype]] internal property is correct (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        var data1 = 1001;
+        Object.defineProperty(appointment, "startTime", {
+            get: function () {
+                return data1;
+            },
+            enumerable: true,
+            configurable: false
+        });
+        var data2 = "NAME";
+        Object.defineProperty(appointment, "name", {
+            get: function () {
+                return data2;
+            },
+            set: function (value) {
+                data2 = value;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        var data3 = "In-person meeting";
+        Object.defineProperty(meeting, "conferenceCall", {
+            get: function () {
+                return data3;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "NAME" &&
+            teamMeeting.startTime === 1001 &&
+            teamMeeting.conferenceCall === "In-person meeting";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-589.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-589.js
index 1ae6e4812..6b7659e65 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-589.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-589.js
@@ -1,65 +1,67 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-589.js

- * @description ES5 Attributes - Success to update value of property into of [[Proptotype]] internal property (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        var data1 = 1001;

-        Object.defineProperty(appointment, "startTime", {

-            get: function () {

-                return data1;

-            },

-            set: function (value) {

-                data1 = value;

-            },

-            enumerable: true,

-            configurable: true

-        });

-        var data2 = "NAME";

-        Object.defineProperty(appointment, "name", {

-            get: function () {

-                return data2;

-            },

-            set: function (value) {

-                data2 = value;

-            },

-            enumerable: true,

-            configurable: false

-        });

-

-        var meeting = Object.create(appointment);

-        var data3 = "In-person meeting";

-        Object.defineProperty(meeting, "conferenceCall", {

-            get: function () {

-                return data3;

-            },

-            set: function (value) {

-                data3 = value;

-            },

-            enumerable: true,

-            configurable: false

-        });

-

-        var teamMeeting = Object.create(meeting);

-        teamMeeting.name = "Team Meeting";

-        var dateObj = new Date("10/31/2010 08:00");

-        teamMeeting.startTime = dateObj;

-        teamMeeting.conferenceCall = "4255551212";

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "Team Meeting" &&

-            teamMeeting.startTime === dateObj &&

-            teamMeeting.conferenceCall === "4255551212";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Success to update value of property into of
+    [[Proptotype]] internal property (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        var data1 = 1001;
+        Object.defineProperty(appointment, "startTime", {
+            get: function () {
+                return data1;
+            },
+            set: function (value) {
+                data1 = value;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        var data2 = "NAME";
+        Object.defineProperty(appointment, "name", {
+            get: function () {
+                return data2;
+            },
+            set: function (value) {
+                data2 = value;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        var meeting = Object.create(appointment);
+        var data3 = "In-person meeting";
+        Object.defineProperty(meeting, "conferenceCall", {
+            get: function () {
+                return data3;
+            },
+            set: function (value) {
+                data3 = value;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        var teamMeeting = Object.create(meeting);
+        teamMeeting.name = "Team Meeting";
+        var dateObj = new Date("10/31/2010 08:00");
+        teamMeeting.startTime = dateObj;
+        teamMeeting.conferenceCall = "4255551212";
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "Team Meeting" &&
+            teamMeeting.startTime === dateObj &&
+            teamMeeting.conferenceCall === "4255551212";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-59.js
index f22db8b83..c42088b76 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-59.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-59.js

- * @description Object.defineProperty - 'name' is accessor descriptor and every fields in 'desc' is absent (8.12.9 step 5)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 0;

-        }

-        function setFunc(value) {

-            obj.helpVerifySet = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        Object.defineProperty(obj, "foo", {});

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "helpVerifySet", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - 'name' is accessor descriptor and every
+    fields in 'desc' is absent (8.12.9 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 0;
+        }
+        function setFunc(value) {
+            obj.helpVerifySet = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        Object.defineProperty(obj, "foo", {});
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "helpVerifySet", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-590.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-590.js
index 90e38e864..33086b845 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-590.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-590.js
@@ -1,74 +1,74 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-590.js

- * @description ES5 Attributes - Inherited property is enumerable (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        var data1 = 1001;

-        Object.defineProperty(appointment, "startTime", {

-            get: function () {

-                return data1;

-            },

-            set: function (value) {

-                data1 = value;

-            },

-            enumerable: true,

-            configurable: true

-        });

-        var data2 = "NAME";

-        Object.defineProperty(appointment, "name", {

-            get: function () {

-                return data2;

-            },

-            set: function (value) {

-                data2 = value;

-            },

-            enumerable: true,

-            configurable: false

-        });

-

-        var meeting = Object.create(appointment);

-        var data3 = "In-person meeting";

-        Object.defineProperty(meeting, "conferenceCall", {

-            get: function () {

-                return data3;

-            },

-            set: function (value) {

-                data3 = value;

-            },

-            enumerable: true,

-            configurable: false

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var verifyTimeProp = false;

-        var verifyNameProp = false;

-        var verifyCallProp = false;

-        for (var p in teamMeeting) {

-            if (p === "startTime") {

-                verifyTimeProp = true;

-            }

-            if (p === "name") {

-                verifyNameProp = true;

-            }

-            if (p === "conferenceCall") {

-                verifyCallProp = true;

-            }

-        }

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - Inherited property is enumerable (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        var data1 = 1001;
+        Object.defineProperty(appointment, "startTime", {
+            get: function () {
+                return data1;
+            },
+            set: function (value) {
+                data1 = value;
+            },
+            enumerable: true,
+            configurable: true
+        });
+        var data2 = "NAME";
+        Object.defineProperty(appointment, "name", {
+            get: function () {
+                return data2;
+            },
+            set: function (value) {
+                data2 = value;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        var meeting = Object.create(appointment);
+        var data3 = "In-person meeting";
+        Object.defineProperty(meeting, "conferenceCall", {
+            get: function () {
+                return data3;
+            },
+            set: function (value) {
+                data3 = value;
+            },
+            enumerable: true,
+            configurable: false
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var verifyTimeProp = false;
+        var verifyNameProp = false;
+        var verifyCallProp = false;
+        for (var p in teamMeeting) {
+            if (p === "startTime") {
+                verifyTimeProp = true;
+            }
+            if (p === "name") {
+                verifyNameProp = true;
+            }
+            if (p === "conferenceCall") {
+                verifyCallProp = true;
+            }
+        }
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && verifyTimeProp && verifyNameProp && verifyCallProp;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-591.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-591.js
index 79ed15687..a16c498a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-591.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-591.js
@@ -1,56 +1,58 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-591.js

- * @description ES5 Attributes - Fail to update value of property of [[Proptotype]] internal property (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        var data1 = 1001;

-        Object.defineProperty(appointment, "startTime", {

-            get: function () {

-                return data1;

-            },

-            enumerable: false,

-            configurable: false

-        });

-        var data2 = "NAME";

-        Object.defineProperty(appointment, "name", {

-            get: function () {

-                return data2;

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        var meeting = Object.create(appointment);

-        var data3 = "In-person meeting";

-        Object.defineProperty(meeting, "conferenceCall", {

-            get: function () {

-                return data3;

-            },

-            enumerable: false,

-            configurable: false

-        });

-

-        var teamMeeting = Object.create(meeting);

-        teamMeeting.name = "IE Team Meeting";

-        var dateObj = new Date("10/31/2010 08:00");

-        teamMeeting.startTime = dateObj;

-        teamMeeting.conferenceCall = "4255551212";

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && teamMeeting.name === "NAME" &&

-            teamMeeting.startTime === 1001 &&

-            teamMeeting.conferenceCall === "In-person meeting";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Fail to update value of property of
+    [[Proptotype]] internal property (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        var data1 = 1001;
+        Object.defineProperty(appointment, "startTime", {
+            get: function () {
+                return data1;
+            },
+            enumerable: false,
+            configurable: false
+        });
+        var data2 = "NAME";
+        Object.defineProperty(appointment, "name", {
+            get: function () {
+                return data2;
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        var meeting = Object.create(appointment);
+        var data3 = "In-person meeting";
+        Object.defineProperty(meeting, "conferenceCall", {
+            get: function () {
+                return data3;
+            },
+            enumerable: false,
+            configurable: false
+        });
+
+        var teamMeeting = Object.create(meeting);
+        teamMeeting.name = "IE Team Meeting";
+        var dateObj = new Date("10/31/2010 08:00");
+        teamMeeting.startTime = dateObj;
+        teamMeeting.conferenceCall = "4255551212";
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && teamMeeting.name === "NAME" &&
+            teamMeeting.startTime === 1001 &&
+            teamMeeting.conferenceCall === "In-person meeting";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-592.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-592.js
index 768c6e82e..4779187e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-592.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-592.js
@@ -1,65 +1,67 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-592.js

- * @description ES5 Attributes - Inherited property is non-enumerable (Object.create)

- */

-

-

-function testcase() {

-        var appointment = {};

-

-        var data1 = 1001;

-        Object.defineProperty(appointment, "startTime", {

-            get: function () {

-                return data1;

-            },

-            enumerable: false,

-            configurable: true

-        });

-        var data2 = "NAME";

-        Object.defineProperty(appointment, "name", {

-            get: function () {

-                return data2;

-            },

-            enumerable: false,

-            configurable: false

-        });

-

-        var meeting = Object.create(appointment);

-        var data3 = "In-person meeting";

-        Object.defineProperty(meeting, "conferenceCall", {

-            get: function () {

-                return data3;

-            },

-            enumerable: false,

-            configurable: true

-        });

-

-        var teamMeeting = Object.create(meeting);

-

-        var verifyTimeProp = false;

-        var verifyNameProp = false;

-        var verifyCallProp = false;

-        for (var p in teamMeeting) {

-            if (p === "startTime") {

-                verifyTimeProp = true;

-            }

-            if (p === "name") {

-                verifyNameProp = true;

-            }

-            if (p === "conferenceCall") {

-                verifyCallProp = true;

-            }

-        }

-

-        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&

-            !teamMeeting.hasOwnProperty("startTime") &&

-            !teamMeeting.hasOwnProperty('conferenceCall');

-

-        return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property is non-enumerable
+    (Object.create)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var appointment = {};
+
+        var data1 = 1001;
+        Object.defineProperty(appointment, "startTime", {
+            get: function () {
+                return data1;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        var data2 = "NAME";
+        Object.defineProperty(appointment, "name", {
+            get: function () {
+                return data2;
+            },
+            enumerable: false,
+            configurable: false
+        });
+
+        var meeting = Object.create(appointment);
+        var data3 = "In-person meeting";
+        Object.defineProperty(meeting, "conferenceCall", {
+            get: function () {
+                return data3;
+            },
+            enumerable: false,
+            configurable: true
+        });
+
+        var teamMeeting = Object.create(meeting);
+
+        var verifyTimeProp = false;
+        var verifyNameProp = false;
+        var verifyCallProp = false;
+        for (var p in teamMeeting) {
+            if (p === "startTime") {
+                verifyTimeProp = true;
+            }
+            if (p === "name") {
+                verifyNameProp = true;
+            }
+            if (p === "conferenceCall") {
+                verifyCallProp = true;
+            }
+        }
+
+        var hasOwnProperty = !teamMeeting.hasOwnProperty("name") &&
+            !teamMeeting.hasOwnProperty("startTime") &&
+            !teamMeeting.hasOwnProperty('conferenceCall');
+
+        return hasOwnProperty && !verifyTimeProp && !verifyNameProp && !verifyCallProp;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-593.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-593.js
index 8cdc6efd5..60e14d5a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-593.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-593.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-593.js

- * @description ES5 Attributes - [[Get]] field of inherited property of [[Prototype]] internal property is correct (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-

-            return !obj.hasOwnProperty("prop") && obj.prop === data;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - [[Get]] field of inherited property of
+    [[Prototype]] internal property is correct
+    (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+
+            return !obj.hasOwnProperty("prop") && obj.prop === data;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-594.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-594.js
index ee25ffe10..bef13d73d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-594.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-594.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-594.js

- * @description ES5 Attributes - Success to update value of property into of [[Proptotype]] internal property (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            obj.prop = "overrideData";

-

-            return !obj.hasOwnProperty("prop") && obj.prop === "overrideData";

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Success to update value of property into of
+    [[Proptotype]] internal property (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            obj.prop = "overrideData";
+
+            return !obj.hasOwnProperty("prop") && obj.prop === "overrideData";
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-595.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-595.js
index ab1824e31..c765d4f12 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-595.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-595.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-595.js

- * @description ES5 Attributes - Inherited property is enumerable (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                set: function (value) {

-                    data = value;

-                },

-                enumerable: true,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !obj.hasOwnProperty("prop") && verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property is enumerable
+    (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                set: function (value) {
+                    data = value;
+                },
+                enumerable: true,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !obj.hasOwnProperty("prop") && verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-596.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-596.js
index ece37b866..126b5a034 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-596.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-596.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-596.js

- * @description ES5 Attributes - Fail to update value of property into of [[Proptotype]] internal property (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-            obj.prop = "overrideData";

-

-            return !obj.hasOwnProperty("prop") && obj.prop === "data";

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Fail to update value of property into of
+    [[Proptotype]] internal property (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+            obj.prop = "overrideData";
+
+            return !obj.hasOwnProperty("prop") && obj.prop === "data";
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-597.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-597.js
index b867c929a..3dc61e75a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-597.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-597.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-597.js

- * @description ES5 Attributes - Inherited property is non-enumerable (Function.prototype.bind)

- */

-

-

-function testcase() {

-        var foo = function () { };

-        var data = "data";

-        try {

-            Object.defineProperty(Function.prototype, "prop", {

-                get: function () {

-                    return data;

-                },

-                enumerable: false,

-                configurable: true

-            });

-

-            var obj = foo.bind({});

-

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "prop") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            return !obj.hasOwnProperty("prop") && !verifyEnumerable;

-        } finally {

-            delete Function.prototype.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - Inherited property is non-enumerable
+    (Function.prototype.bind)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var foo = function () { };
+        var data = "data";
+        try {
+            Object.defineProperty(Function.prototype, "prop", {
+                get: function () {
+                    return data;
+                },
+                enumerable: false,
+                configurable: true
+            });
+
+            var obj = foo.bind({});
+
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "prop") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            return !obj.hasOwnProperty("prop") && !verifyEnumerable;
+        } finally {
+            delete Function.prototype.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-598.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-598.js
index 8b3fe016f..b565eb175 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-598.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-598.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-598.js

- * @description ES5 Attributes - all attributes in Object.getPrototypeOf are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "getPrototypeOf");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.getPrototypeOf;

-

-        try {

-            Object.getPrototypeOf = "2010";

-

-            var isWritable = (Object.getPrototypeOf === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "getPrototypeOf") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.getPrototypeOf;

-

-            var isConfigurable = !Object.hasOwnProperty("getPrototypeOf");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "getPrototypeOf", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.getPrototypeOf are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "getPrototypeOf");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.getPrototypeOf;
+
+        try {
+            Object.getPrototypeOf = "2010";
+
+            var isWritable = (Object.getPrototypeOf === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "getPrototypeOf") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.getPrototypeOf;
+
+            var isConfigurable = !Object.hasOwnProperty("getPrototypeOf");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "getPrototypeOf", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-599.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-599.js
index b29e86826..55d167797 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-599.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-599.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-599.js

- * @description ES5 Attributes - all attributes in Object.getOwnPropertyDescriptor are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyDescriptor");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.getOwnPropertyDescriptor;

-

-        try {

-            Object.getOwnPropertyDescriptor = "2010";

-

-            var isWritable = (Object.getOwnPropertyDescriptor === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "getOwnPropertyDescriptor") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Object.getOwnPropertyDescriptor;

-

-            var isConfigurable = !Object.hasOwnProperty("getOwnPropertyDescriptor");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "getOwnPropertyDescriptor", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.getOwnPropertyDescriptor
+    are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyDescriptor");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.getOwnPropertyDescriptor;
+
+        try {
+            Object.getOwnPropertyDescriptor = "2010";
+
+            var isWritable = (Object.getOwnPropertyDescriptor === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "getOwnPropertyDescriptor") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Object.getOwnPropertyDescriptor;
+
+            var isConfigurable = !Object.hasOwnProperty("getOwnPropertyDescriptor");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "getOwnPropertyDescriptor", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-6.js
index b1724509d..9a2347fc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-6.js
@@ -1,50 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 6 of [[DefineOwnProperty]] returns if

- * every field of desc also occurs in current and every field in desc has

- * the same value as current.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-6.js

- * @description Object.defineProperty is no-op if current and desc are the same accessor desc

- */

-

-

-function testcase() {

-  function sameAccessorDescriptorValues(d1, d2) {

-    return (d1.get == d2.get &&

-            d1.enumerable == d2.enumerable &&

-            d1.configurable == d2.configurable);

-  }

-

-  var o = {};

-

-  // create an accessor property with the following attributes:

-  // enumerable: true, configurable: true

-  var desc = {

-               get: function () {},

-               enumerable: true,

-               configurable: true

-             };

-

-  Object.defineProperty(o, "foo", desc);

-

-  // query for, and save, the desc. A subsequent call to defineProperty

-  // with the same desc should not disturb the property definition.

-  var d1 = Object.getOwnPropertyDescriptor(o, "foo");  

-

-  // now, redefine the property with the same descriptor

-  // the property defintion should not get disturbed.

-  Object.defineProperty(o, "foo", desc);

-

-  var d2 = Object.getOwnPropertyDescriptor(o, "foo"); 

-

-  if (sameAccessorDescriptorValues(d1, d2) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 6 of [[DefineOwnProperty]] returns if
+    every field of desc also occurs in current and every field in desc has
+    the same value as current.
+description: >
+    Object.defineProperty is no-op if current and desc are the same
+    accessor desc
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function sameAccessorDescriptorValues(d1, d2) {
+    return (d1.get == d2.get &&
+            d1.enumerable == d2.enumerable &&
+            d1.configurable == d2.configurable);
+  }
+
+  var o = {};
+
+  // create an accessor property with the following attributes:
+  // enumerable: true, configurable: true
+  var desc = {
+               get: function () {},
+               enumerable: true,
+               configurable: true
+             };
+
+  Object.defineProperty(o, "foo", desc);
+
+  // query for, and save, the desc. A subsequent call to defineProperty
+  // with the same desc should not disturb the property definition.
+  var d1 = Object.getOwnPropertyDescriptor(o, "foo");  
+
+  // now, redefine the property with the same descriptor
+  // the property defintion should not get disturbed.
+  Object.defineProperty(o, "foo", desc);
+
+  var d2 = Object.getOwnPropertyDescriptor(o, "foo"); 
+
+  if (sameAccessorDescriptorValues(d1, d2) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-60.js
index bb92e157e..b6e1cf267 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-60.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-60.js

- * @description Object.defineProperty - type of desc.value is different from type of name.value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: "abc" });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "abc", true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - type of desc.value is different from type
+    of name.value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: "abc" });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "abc", true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-600.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-600.js
index 7cb441839..5554af1da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-600.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-600.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-600.js

- * @description ES5 Attributes - all attributes in Object.getOwnPropertyNames are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyNames");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.getOwnPropertyNames;

-

-        try {

-            Object.getOwnPropertyNames = "2010";

-

-            var isWritable = (Object.getOwnPropertyNames === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "getOwnPropertyNames") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.getOwnPropertyNames;

-

-            var isConfigurable = !Object.hasOwnProperty("getOwnPropertyNames");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "getOwnPropertyNames", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.getOwnPropertyNames are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "getOwnPropertyNames");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.getOwnPropertyNames;
+
+        try {
+            Object.getOwnPropertyNames = "2010";
+
+            var isWritable = (Object.getOwnPropertyNames === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "getOwnPropertyNames") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.getOwnPropertyNames;
+
+            var isConfigurable = !Object.hasOwnProperty("getOwnPropertyNames");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "getOwnPropertyNames", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-601.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-601.js
index cbe186e3a..870903da2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-601.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-601.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-601.js

- * @description ES5 Attributes - all attributes in Object.create are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "create");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.create;

-

-        try {

-            Object.create = "2010";

-

-            var isWritable = (Object.create === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "create") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.create;

-

-            var isConfigurable = !Object.hasOwnProperty("create");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "create", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.create are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "create");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.create;
+
+        try {
+            Object.create = "2010";
+
+            var isWritable = (Object.create === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "create") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.create;
+
+            var isConfigurable = !Object.hasOwnProperty("create");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "create", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-602.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-602.js
index 61b30ad1f..a71377456 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-602.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-602.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-602.js

- * @description ES5 Attributes - all attributes in Object.defineProperty are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "defineProperty");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-        var temp = Object.defineProperty;

-        try {

-            Object.defineProperty = "2010";

-

-            var isWritable = (Object.defineProperty === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "defineProperty") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Object.defineProperty;

-

-            var isConfigurable = !Object.hasOwnProperty("defineProperty");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty = temp;

-            Object.defineProperty(Object, "defineProperty", {

-                enumerable: false

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.defineProperty are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "defineProperty");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+        var temp = Object.defineProperty;
+        try {
+            Object.defineProperty = "2010";
+
+            var isWritable = (Object.defineProperty === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "defineProperty") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Object.defineProperty;
+
+            var isConfigurable = !Object.hasOwnProperty("defineProperty");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty = temp;
+            Object.defineProperty(Object, "defineProperty", {
+                enumerable: false
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-603.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-603.js
index d67b2596b..f029d8fcc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-603.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-603.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-603.js

- * @description ES5 Attributes - all attributes in Object.defineProperties are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "defineProperties");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.defineProperties;

-

-        try {

-            Object.defineProperties = "2010";

-

-            var isWritable = (Object.defineProperties === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "defineProperties") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.defineProperties;

-

-            var isConfigurable = !Object.hasOwnProperty("defineProperties");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "defineProperties", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.defineProperties are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "defineProperties");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.defineProperties;
+
+        try {
+            Object.defineProperties = "2010";
+
+            var isWritable = (Object.defineProperties === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "defineProperties") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.defineProperties;
+
+            var isConfigurable = !Object.hasOwnProperty("defineProperties");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "defineProperties", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-604.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-604.js
index 73dae60e5..a8c45166e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-604.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-604.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-604.js

- * @description ES5 Attributes - all attributes in Object.seal are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "seal");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.seal;

-

-        try {

-            Object.seal = "2010";

-

-            var isWritable = (Object.seal === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "seal") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.seal;

-

-            var isConfigurable = !Object.hasOwnProperty("seal");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "seal", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.seal are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "seal");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.seal;
+
+        try {
+            Object.seal = "2010";
+
+            var isWritable = (Object.seal === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "seal") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.seal;
+
+            var isConfigurable = !Object.hasOwnProperty("seal");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "seal", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-605.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-605.js
index aad6bd4fa..e5f04c300 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-605.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-605.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-605.js

- * @description ES5 Attributes - all attributes in Object.freeze are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "freeze");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.freeze;

-

-        try {

-            Object.freeze = "2010";

-

-            var isWritable = (Object.freeze === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "freeze") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.freeze;

-

-            var isConfigurable = !Object.hasOwnProperty("freeze");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "freeze", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.freeze are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "freeze");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.freeze;
+
+        try {
+            Object.freeze = "2010";
+
+            var isWritable = (Object.freeze === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "freeze") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.freeze;
+
+            var isConfigurable = !Object.hasOwnProperty("freeze");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "freeze", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-606.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-606.js
index f4528bc56..ed3784e89 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-606.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-606.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-606.js

- * @description ES5 Attributes - all attributes in Object.preventExtensions are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "preventExtensions");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.preventExtensions;

-

-        try {

-            Object.preventExtensions = "2010";

-

-            var isWritable = (Object.preventExtensions === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "preventExtensions") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.preventExtensions;

-

-            var isConfigurable = !Object.hasOwnProperty("preventExtensions");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "preventExtensions", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Object.preventExtensions are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "preventExtensions");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.preventExtensions;
+
+        try {
+            Object.preventExtensions = "2010";
+
+            var isWritable = (Object.preventExtensions === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "preventExtensions") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.preventExtensions;
+
+            var isConfigurable = !Object.hasOwnProperty("preventExtensions");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "preventExtensions", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-607.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-607.js
index f3bf6fc03..e3f9eb39d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-607.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-607.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-607.js

- * @description ES5 Attributes - all attributes in Object.isSealed are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "isSealed");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.isSealed;

-

-        try {

-            Object.isSealed = "2010";

-

-            var isWritable = (Object.isSealed === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "isSealed") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.isSealed;

-

-            var isConfigurable = !Object.hasOwnProperty("isSealed");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "isSealed", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.isSealed are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "isSealed");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.isSealed;
+
+        try {
+            Object.isSealed = "2010";
+
+            var isWritable = (Object.isSealed === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "isSealed") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.isSealed;
+
+            var isConfigurable = !Object.hasOwnProperty("isSealed");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "isSealed", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-608.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-608.js
index dac49dd37..0bb01911f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-608.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-608.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-608.js

- * @description ES5 Attributes - all attributes in Object.isFrozen are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "isFrozen");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.isFrozen;

-

-        try {

-            Object.isFrozen = "2010";

-

-            var isWritable = (Object.isFrozen === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "isFrozen") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.isFrozen;

-

-            var isConfigurable = !Object.hasOwnProperty("isFrozen");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "isFrozen", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.isFrozen are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "isFrozen");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.isFrozen;
+
+        try {
+            Object.isFrozen = "2010";
+
+            var isWritable = (Object.isFrozen === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "isFrozen") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.isFrozen;
+
+            var isConfigurable = !Object.hasOwnProperty("isFrozen");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "isFrozen", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-609.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-609.js
index ac69ba508..4965b41c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-609.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-609.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-609.js

- * @description ES5 Attributes - all attributes in Object.isExtensible are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "isExtensible");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.isExtensible;

-

-        try {

-            Object.isExtensible = "2010";

-

-            var isWritable = (Object.isExtensible === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "isExtensible") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.isExtensible;

-

-            var isConfigurable = !Object.hasOwnProperty("isExtensible");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "isExtensible", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.isExtensible are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "isExtensible");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.isExtensible;
+
+        try {
+            Object.isExtensible = "2010";
+
+            var isWritable = (Object.isExtensible === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "isExtensible") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.isExtensible;
+
+            var isConfigurable = !Object.hasOwnProperty("isExtensible");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "isExtensible", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-61.js
index 9d61bb08b..c102c3a1b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-61.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-61.js

- * @description Object.defineProperty - both desc.value and name.value are undefined (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: undefined });

-

-        Object.defineProperty(obj, "foo", { value: undefined });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are
+    undefined (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: undefined });
+
+        Object.defineProperty(obj, "foo", { value: undefined });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-610.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-610.js
index 09b6cee63..d1766bf0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-610.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-610.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-610.js

- * @description ES5 Attributes - all attributes in Object.keys are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Object, "keys");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Object.keys;

-

-        try {

-            Object.keys = "2010";

-

-            var isWritable = (Object.keys === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Object) {

-                if (prop === "keys") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Object.keys;

-

-            var isConfigurable = !Object.hasOwnProperty("keys");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Object, "keys", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.keys are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Object, "keys");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Object.keys;
+
+        try {
+            Object.keys = "2010";
+
+            var isWritable = (Object.keys === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Object) {
+                if (prop === "keys") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Object.keys;
+
+            var isConfigurable = !Object.hasOwnProperty("keys");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Object, "keys", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-611.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-611.js
index 038b31c38..c1e57c97e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-611.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-611.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-611.js

- * @description ES5 Attributes - all attributes in Function.prototype.bind are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Function.prototype, "bind");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Function.prototype.bind;

-

-        try {

-            Function.prototype.bind = "2010";

-

-            var isWritable = (Function.prototype.bind === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Function.prototype) {

-                if (prop === "bind") {

-                    isEnumerable = true;

-                }

-            }

-        

-            delete Function.prototype.bind;

-

-            var isConfigurable = !Function.prototype.hasOwnProperty("bind");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Function.prototype, "bind", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Function.prototype.bind are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Function.prototype, "bind");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Function.prototype.bind;
+
+        try {
+            Function.prototype.bind = "2010";
+
+            var isWritable = (Function.prototype.bind === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Function.prototype) {
+                if (prop === "bind") {
+                    isEnumerable = true;
+                }
+            }
+        
+            delete Function.prototype.bind;
+
+            var isConfigurable = !Function.prototype.hasOwnProperty("bind");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Function.prototype, "bind", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-612.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-612.js
index 1bcd93bba..2964385e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-612.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-612.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-612.js

- * @description ES5 Attributes - all attributes in Array.prototype.indexOf are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "indexOf");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.indexOf;

-

-        try {

-            Array.prototype.indexOf = "2010";

-

-            var isWritable = (Array.prototype.indexOf === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "indexOf") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.indexOf;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("indexOf");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "indexOf", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.indexOf are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "indexOf");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.indexOf;
+
+        try {
+            Array.prototype.indexOf = "2010";
+
+            var isWritable = (Array.prototype.indexOf === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "indexOf") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.indexOf;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("indexOf");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "indexOf", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-613.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-613.js
index fa16480f4..7bd466b4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-613.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-613.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-613.js

- * @description ES5 Attributes - all attributes in Object.lastIndexOf are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "lastIndexOf");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.lastIndexOf;

-

-        try {

-            Array.prototype.lastIndexOf = "2010";

-

-            var isWritable = (Array.prototype.lastIndexOf === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "lastIndexOf") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.lastIndexOf;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("lastIndexOf");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "lastIndexOf", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Object.lastIndexOf are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "lastIndexOf");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.lastIndexOf;
+
+        try {
+            Array.prototype.lastIndexOf = "2010";
+
+            var isWritable = (Array.prototype.lastIndexOf === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "lastIndexOf") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.lastIndexOf;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("lastIndexOf");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "lastIndexOf", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-614.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-614.js
index d96f0687c..82e5b07d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-614.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-614.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-614.js

- * @description ES5 Attributes - all attributes in Array.prototype.every are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "every");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.every;

-

-        try {

-            Array.prototype.every = "2010";

-

-            var isWritable = (Array.prototype.every === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "every") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.every;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("every");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "every", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.every are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "every");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.every;
+
+        try {
+            Array.prototype.every = "2010";
+
+            var isWritable = (Array.prototype.every === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "every") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.every;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("every");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "every", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-615.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-615.js
index 7fbaf9f52..8fc9b933c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-615.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-615.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-615.js

- * @description ES5 Attributes - all attributes in Array.prototype.some are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "some");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.some;

-

-        try {

-            Array.prototype.some = "2010";

-

-            var isWritable = (Array.prototype.some === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "some") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.some;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("some");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "some", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Array.prototype.some are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "some");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.some;
+
+        try {
+            Array.prototype.some = "2010";
+
+            var isWritable = (Array.prototype.some === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "some") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.some;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("some");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "some", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-616.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-616.js
index 189e3e03a..de305ebab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-616.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-616.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-616.js

- * @description ES5 Attributes - all attributes in Array.prototype.forEach are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "forEach");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.forEach;

-

-        try {

-            Array.prototype.forEach = "2010";

-

-            var isWritable = (Array.prototype.forEach === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "forEach") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.forEach;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("forEach");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "forEach", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.forEach are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "forEach");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.forEach;
+
+        try {
+            Array.prototype.forEach = "2010";
+
+            var isWritable = (Array.prototype.forEach === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "forEach") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.forEach;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("forEach");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "forEach", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-617.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-617.js
index b75875dd5..9ad53a263 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-617.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-617.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-617.js

- * @description ES5 Attributes - all attributes in Array.prototype.map are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "map");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.map;

-

-        try {

-            Array.prototype.map = "2010";

-

-            var isWritable = (Array.prototype.map === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "map") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.map;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("map");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "map", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Array.prototype.map are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "map");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.map;
+
+        try {
+            Array.prototype.map = "2010";
+
+            var isWritable = (Array.prototype.map === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "map") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.map;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("map");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "map", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-618.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-618.js
index 176f93485..adfaea4c0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-618.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-618.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-618.js

- * @description ES5 Attributes - all attributes in Array.prototype.filter are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "filter");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.filter;

-

-        try {

-            Array.prototype.filter = "2010";

-

-            var isWritable = (Array.prototype.filter === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "filter") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.filter;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("filter");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "filter", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.filter are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "filter");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.filter;
+
+        try {
+            Array.prototype.filter = "2010";
+
+            var isWritable = (Array.prototype.filter === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "filter") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.filter;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("filter");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "filter", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-619.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-619.js
index 317661492..06342451a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-619.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-619.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-619.js

- * @description ES5 Attributes - all attributes in Array.prototype.reduce are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.reduce;

-

-        try {

-            Array.prototype.reduce = "2010";

-

-            var isWritable = (Array.prototype.reduce === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "reduce") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.reduce;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("reduce");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "reduce", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.reduce are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduce");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.reduce;
+
+        try {
+            Array.prototype.reduce = "2010";
+
+            var isWritable = (Array.prototype.reduce === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "reduce") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.reduce;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("reduce");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "reduce", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-62.js
index 582b4c62c..1461c4c65 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-62.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-62.js

- * @description Object.defineProperty - both desc.value and name.value are null (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: null });

-

-        Object.defineProperty(obj, "foo", { value: null });

-        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are null
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: null });
+
+        Object.defineProperty(obj, "foo", { value: null });
+        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-620.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-620.js
index 1c77bfcca..1df777bda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-620.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-620.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-620.js

- * @description ES5 Attributes - all attributes in Array.prototype.reduceRight are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduceRight");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Array.prototype.reduceRight;

-

-        try {

-            Array.prototype.reduceRight = "2010";

-

-            var isWritable = (Array.prototype.reduceRight === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Array.prototype) {

-                if (prop === "reduceRight") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Array.prototype.reduceRight;

-

-            var isConfigurable = !Array.prototype.hasOwnProperty("reduceRight");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Array.prototype, "reduceRight", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Array.prototype.reduceRight are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Array.prototype, "reduceRight");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Array.prototype.reduceRight;
+
+        try {
+            Array.prototype.reduceRight = "2010";
+
+            var isWritable = (Array.prototype.reduceRight === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Array.prototype) {
+                if (prop === "reduceRight") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Array.prototype.reduceRight;
+
+            var isConfigurable = !Array.prototype.hasOwnProperty("reduceRight");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Array.prototype, "reduceRight", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-621.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-621.js
index 48a14ce13..9a0d94c0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-621.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-621.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-621.js

- * @description ES5 Attributes - all attributes in String.prototype.trim are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(String.prototype, "trim");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = String.prototype.trim;

-

-        try {

-            String.prototype.trim = "2010";

-

-            var isWritable = (String.prototype.trim === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in String.prototype) {

-                if (prop === "trim") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete String.prototype.trim;

-

-            var isConfigurable = !String.prototype.hasOwnProperty("trim");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(String.prototype, "trim", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in String.prototype.trim are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(String.prototype, "trim");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = String.prototype.trim;
+
+        try {
+            String.prototype.trim = "2010";
+
+            var isWritable = (String.prototype.trim === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in String.prototype) {
+                if (prop === "trim") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete String.prototype.trim;
+
+            var isConfigurable = !String.prototype.hasOwnProperty("trim");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(String.prototype, "trim", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-622.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-622.js
index aae0a80be..81c6f87e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-622.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-622.js
@@ -1,46 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-622.js

- * @description ES5 Attributes - all attributes in Date.now are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Date, "now");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Date.now;

-

-        try {

-            Date.now = "2010";

-

-            var isWritable = (Date.now === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Date) {

-                if (prop === "now") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Date.now;

-

-            var isConfigurable = !Date.hasOwnProperty("now");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Date, "now", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: ES5 Attributes - all attributes in Date.now are correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Date, "now");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Date.now;
+
+        try {
+            Date.now = "2010";
+
+            var isWritable = (Date.now === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Date) {
+                if (prop === "now") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Date.now;
+
+            var isConfigurable = !Date.hasOwnProperty("now");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Date, "now", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-623.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-623.js
index 1b29367a3..4c1845ee3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-623.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-623.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-623.js

- * @description ES5 Attributes - all attributes in Date.prototype.toISOString are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toISOString");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Date.prototype.toISOString;

-

-        try {

-            Date.prototype.toISOString = "2010";

-

-            var isWritable = (Date.prototype.toISOString === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Date.prototype) {

-                if (prop === "toISOString") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Date.prototype.toISOString;

-

-            var isConfigurable = !Date.prototype.hasOwnProperty("toISOString");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Date.prototype, "toISOString", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Date.prototype.toISOString are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toISOString");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Date.prototype.toISOString;
+
+        try {
+            Date.prototype.toISOString = "2010";
+
+            var isWritable = (Date.prototype.toISOString === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Date.prototype) {
+                if (prop === "toISOString") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Date.prototype.toISOString;
+
+            var isConfigurable = !Date.prototype.hasOwnProperty("toISOString");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Date.prototype, "toISOString", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-624.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-624.js
index 3b479d488..41702fb73 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-624.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-624.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-624.js

- * @description ES5 Attributes - all attributes in Date.prototype.toJSON are correct

- */

-

-

-function testcase() {

-        var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toJSON");

-

-        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);

-

-        var temp = Date.prototype.toJSON;

-

-        try {

-            Date.prototype.toJSON = "2010";

-

-            var isWritable = (Date.prototype.toJSON === "2010");

-

-            var isEnumerable = false;

-

-            for (var prop in Date.prototype) {

-                if (prop === "toJSON") {

-                    isEnumerable = true;

-                }

-            }

-

-            delete Date.prototype.toJSON;

-

-            var isConfigurable = !Date.prototype.hasOwnProperty("toJSON");

-

-            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;

-        } finally {

-            Object.defineProperty(Date.prototype, "toJSON", {

-                value: temp,

-                writable: true,

-                enumerable: false,

-                configurable: true

-            });

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    ES5 Attributes - all attributes in Date.prototype.toJSON are
+    correct
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var desc = Object.getOwnPropertyDescriptor(Date.prototype, "toJSON");
+
+        var propertyAreCorrect = (desc.writable === true && desc.enumerable === false && desc.configurable === true);
+
+        var temp = Date.prototype.toJSON;
+
+        try {
+            Date.prototype.toJSON = "2010";
+
+            var isWritable = (Date.prototype.toJSON === "2010");
+
+            var isEnumerable = false;
+
+            for (var prop in Date.prototype) {
+                if (prop === "toJSON") {
+                    isEnumerable = true;
+                }
+            }
+
+            delete Date.prototype.toJSON;
+
+            var isConfigurable = !Date.prototype.hasOwnProperty("toJSON");
+
+            return propertyAreCorrect && isWritable && !isEnumerable && isConfigurable;
+        } finally {
+            Object.defineProperty(Date.prototype, "toJSON", {
+                value: temp,
+                writable: true,
+                enumerable: false,
+                configurable: true
+            });
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-625gs.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-625gs.js
index 924e47d10..695f527d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-625gs.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-625gs.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-625gs.js

- * @description Globally declared variable should take precedence over Object.prototype property of the same name

- */

-

-Object.defineProperty(Object.prototype, 

-                      "prop", 

-                      { value: 1001, writable: false, enumerable: false, configurable: false} 

-                      );

-var prop = 1002;

-

-if (! (this.hasOwnProperty("prop") && prop === 1002)) {

-    throw "this.prop should take precedence over Object.prototype.prop";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Globally declared variable should take precedence over
+    Object.prototype property of the same name
+---*/
+
+Object.defineProperty(Object.prototype, 
+                      "prop", 
+                      { value: 1001, writable: false, enumerable: false, configurable: false} 
+                      );
+var prop = 1002;
+
+if (! (this.hasOwnProperty("prop") && prop === 1002)) {
+    throw "this.prop should take precedence over Object.prototype.prop";
+}
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-63.js
index 02733ff66..1b126319b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-63.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-63.js

- * @description Object.defineProperty - both desc.value and name.value are NaN (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: NaN });

-

-        Object.defineProperty(obj, "foo", { value: NaN });

-

-        if (!isNaN(obj.foo)) {

-            return false;

-        }

-

-        obj.foo = "verifyValue";

-        if (obj.foo === "verifyValue") {

-            return false;

-        }

-

-        for (var prop in obj) {

-            if (obj.hasOwnProperty(prop) && prop === "foo") {

-                return false;

-            }

-        }

-

-        delete obj.foo;

-        if (!obj.hasOwnProperty("foo")) {

-            return false;

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are NaN
+    (8.12.9 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: NaN });
+
+        Object.defineProperty(obj, "foo", { value: NaN });
+
+        if (!isNaN(obj.foo)) {
+            return false;
+        }
+
+        obj.foo = "verifyValue";
+        if (obj.foo === "verifyValue") {
+            return false;
+        }
+
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop) && prop === "foo") {
+                return false;
+            }
+        }
+
+        delete obj.foo;
+        if (!obj.hasOwnProperty("foo")) {
+            return false;
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-64.js
index 3f60c4f09..b2087b8e2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-64.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-64.js

- * @description Object.defineProperty - desc.value = +0 and name.value = -0 (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: -0 });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: +0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value = +0 and name.value = -0
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: -0 });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: +0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-65.js
index 5538ec7a2..21bb36889 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-65.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-65.js

- * @description Object.defineProperty - desc.value = -0 and name.value = +0 (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: +0 });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: -0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value = -0 and name.value = +0
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: +0 });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: -0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-66.js
index 7b59c2714..c73d7a2b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-66.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-66.js

- * @description Object.defineProperty - desc.value and name.value are two numbers with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: 102 });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 102, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value and name.value are two numbers
+    with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: 102 });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 102, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-67.js
index 5ce17b5ce..547833788 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-67.js
@@ -1,21 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-67.js

- * @description Object.defineProperty - both desc.value and name.value are two strings which have same length and same characters in corresponding positions (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: "abcd" });

-

-        Object.defineProperty(obj, "foo", { value: "abcd" });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are two
+    strings which have same length and same characters in
+    corresponding positions (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: "abcd" });
+
+        Object.defineProperty(obj, "foo", { value: "abcd" });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-68.js
index 8b60868db..8d20b7e8a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-68.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-68.js

- * @description Object.defineProperty - desc.value and name.value are two strings with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = "abcd"; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: "fghj" });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "fghj", true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value and name.value are two strings
+    with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = "abcd"; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: "fghj" });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "fghj", true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-69.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-69.js
index e00bc118b..3f2b00b40 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-69.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-69.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-69.js

- * @description Object.defineProperty - both desc.value and name.value are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { value: true });

-

-        Object.defineProperty(obj, "foo", { value: true });

-        return dataPropertyAttributesAreCorrect(obj, "foo", true, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are boolean
+    values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { value: true });
+
+        Object.defineProperty(obj, "foo", { value: true });
+        return dataPropertyAttributesAreCorrect(obj, "foo", true, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-7.js
index d9d86c0ba..c103f10e6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-7.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 7a of [[DefineOwnProperty]] rejects if

- * current.[[Configurable]] is false and desc.[[Configurable]] is true.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-7.js

- * @description Object.defineProperty throws TypeError when changing [[Configurable]] from false to true

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property; all other attributes default to false.

-  var d1 = { value: 101, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  var desc = { value: 101, configurable: true };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.value === 101 &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 7a of [[DefineOwnProperty]] rejects if
+    current.[[Configurable]] is false and desc.[[Configurable]] is true.
+description: >
+    Object.defineProperty throws TypeError when changing
+    [[Configurable]] from false to true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property; all other attributes default to false.
+  var d1 = { value: 101, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  var desc = { value: 101, configurable: true };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.value === 101 &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-70.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-70.js
index 8cbd26969..d712118a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-70.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-70.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-70.js

- * @description Object.defineProperty - desc.value and name.value are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = true; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperty(obj, "foo", { value: false });

-        return dataPropertyAttributesAreCorrect(obj, "foo", false, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value and name.value are two boolean
+    values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = true; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperty(obj, "foo", { value: false });
+        return dataPropertyAttributesAreCorrect(obj, "foo", false, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-71.js
index 02878239e..2a1b4bc6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-71.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-71.js

- * @description Object.defineProperty - both desc.value and name.value are Ojbects which refer to the same Object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", { value: obj1 });

-

-        Object.defineProperty(obj, "foo", { value: obj1 });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.value and name.value are Ojbects
+    which refer to the same Object (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", { value: obj1 });
+
+        Object.defineProperty(obj, "foo", { value: obj1 });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-72.js
index 09a0aba9b..06eeef5f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-72.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-72.js

- * @description Object.defineProperty - desc.value and name.value are two Ojbects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-        obj.foo = obj1; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        var obj2 = { length: 20 };

-

-        Object.defineProperty(obj, "foo", { value: obj2 });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj2, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.value and name.value are two Ojbects
+    which refer to the different objects (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+        obj.foo = obj1; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        var obj2 = { length: 20 };
+
+        Object.defineProperty(obj, "foo", { value: obj2 });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj2, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-73.js
index c45f4fd31..b5c104ca7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-73.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-73.js

- * @description Object.defineProperty - both desc.writable and name.writable are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { writable: false});

-

-        Object.defineProperty(obj, "foo", { writable: false });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.writable and name.writable are
+    boolean values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { writable: false});
+
+        Object.defineProperty(obj, "foo", { writable: false });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-74.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-74.js
index b933de520..d4de6ab9d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-74.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-74.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-74.js

- * @description Object.defineProperty - desc.writable and name.writable are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { writable: false, configurable: true });

-

-        Object.defineProperty(obj, "foo", { writable: true });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.writable and name.writable are two
+    boolean values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { writable: false, configurable: true });
+
+        Object.defineProperty(obj, "foo", { writable: true });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-75.js
index 93e983b8b..1de816b7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-75.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-75.js

- * @description Object.defineProperty - both desc.[[Get]] and name.[[Get]] are two objects which refer to the same object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-        function setFunc(value) {

-            obj.helpVerifySet = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc

-        });

-

-        Object.defineProperty(obj, "foo", { get: getFunc });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "helpVerifySet", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.[[Get]] and name.[[Get]] are two
+    objects which refer to the same object (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+        function setFunc(value) {
+            obj.helpVerifySet = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc
+        });
+
+        Object.defineProperty(obj, "foo", { get: getFunc });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "helpVerifySet", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-76.js
index 40e31f14c..654340a36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-76.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-76.js

- * @description Object.defineProperty - desc.[[Get]] and name.[[Get]] are two objects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc1() {

-            return 10;

-        }

-        function setFunc1(value) {

-            obj.helpVerifySet = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc1,

-            set: setFunc1,

-            configurable: true

-        });

-

-        function getFunc2() {

-            return 20;

-        }

-

-        Object.defineProperty(obj, "foo", { get: getFunc2 });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc1, "helpVerifySet", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.[[Get]] and name.[[Get]] are two
+    objects which refer to the different objects (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc1() {
+            return 10;
+        }
+        function setFunc1(value) {
+            obj.helpVerifySet = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc1,
+            set: setFunc1,
+            configurable: true
+        });
+
+        function getFunc2() {
+            return 20;
+        }
+
+        Object.defineProperty(obj, "foo", { get: getFunc2 });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc2, setFunc1, "helpVerifySet", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-77.js
index ae16bedc0..9d5c10f61 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-77.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-77.js

- * @description Object.defineProperty - both desc.[[Set]] and name.[[Set]] are two objects which refer to the same object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", { set: setFunc });

-

-        Object.defineProperty(obj, "foo", { set: setFunc });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.[[Set]] and name.[[Set]] are two
+    objects which refer to the same object (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", { set: setFunc });
+
+        Object.defineProperty(obj, "foo", { set: setFunc });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-78.js
index ed4a0d89a..017e31803 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-78.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-78.js

- * @description Object.defineProperty - desc.[[Set]] and name.[[Set]] are two objects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc1() { }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc1,

-            configurable: true

-        });

-

-        function setFunc2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", { set: setFunc2 });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc2, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.[[Set]] and name.[[Set]] are two
+    objects which refer to the different objects (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc1() { }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc1,
+            configurable: true
+        });
+
+        function setFunc2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", { set: setFunc2 });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc2, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-79.js
index 1d6c8d9d2..43ebd14cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-79.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-79.js

- * @description Object.defineProperty - both desc.enumerable and name.enumerable are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { enumerable: false });

-

-        Object.defineProperty(obj, "foo", { enumerable: false });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.enumerable and name.enumerable
+    are boolean values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { enumerable: false });
+
+        Object.defineProperty(obj, "foo", { enumerable: false });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-8.js
index 72ff05af9..6de42573d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-8.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if

- * current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations

- * of each other.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-8.js

- * @description Object.defineProperty throws TypeError when changing [[Enumerable]] from false to true on non-configurable data properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property; all other attributes default to false.

-  var d1 = { value: 101, enumerable: false, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, setting enumerable to true should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { value: 101, enumerable: true };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.value === 101 &&

-          d2.enumerable === false &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if
+    current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations
+    of each other.
+description: >
+    Object.defineProperty throws TypeError when changing
+    [[Enumerable]] from false to true on non-configurable data
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property; all other attributes default to false.
+  var d1 = { value: 101, enumerable: false, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, setting enumerable to true should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { value: 101, enumerable: true };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.value === 101 &&
+          d2.enumerable === false &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-80.js
index 45dade816..dfe126742 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-80.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-80.js

- * @description Object.defineProperty - desc.enumerable and name.enumerable are boolean negation of each other (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { enumerable: false, configurable: true });

-

-        Object.defineProperty(obj, "foo", { enumerable: true });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.enumerable and name.enumerable are
+    boolean negation of each other (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { enumerable: false, configurable: true });
+
+        Object.defineProperty(obj, "foo", { enumerable: true });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-81.js
index 5fe6acada..a929cb3ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-81.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-81.js

- * @description Object.defineProperty - both desc.configurable and name.configurable are booleans with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { configurable: false });

-

-        Object.defineProperty(obj, "foo", { configurable: false });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - both desc.configurable and
+    name.configurable are booleans with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { configurable: false });
+
+        Object.defineProperty(obj, "foo", { configurable: false });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-1.js
index e7fdde43c..b2df49150 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-1.js
@@ -1,29 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-1.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as false, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false

-        });

-        

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains [[Enumerable]]
+    attribute as false, 'name' property is a data property (8.12.9
+    step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false
+        });
+        
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-10.js
index 785d45f77..c756961b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-10.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-10.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as true and [[Configurable]] attribute is false, 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: true,

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as true and [[Configurable]] attribute is false, 'name'
+    property is an accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: true,
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-11.js
index 3e0c8daea..f5d0877db 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-11.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-11.js

- * @description Object.defineProperty - Update [[Enumerable]] and [[Configurable]] attributes of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] and [[Configurable]] attributes as false, 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false,

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] and [[Configurable]]
+    attributes of 'name' property to false successfully when
+    [[Enumerable]] and [[Configurable]] attributes of 'name' property
+    are true,  the 'desc' is a generic descriptor which contains
+    [[Enumerable]] and [[Configurable]] attributes as false, 'name'
+    property is an accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false,
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-12.js
index ae8dc1d7b..af444d2d5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-12.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-12.js

- * @description Object.defineProperty - Update [[Enumerable]] attributes of 'name' property to true successfully when [[Enumerable]] attribute of 'name' is false and [[Configurable]] attribute of 'name' is true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as true, 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attributes of 'name'
+    property to true successfully when [[Enumerable]] attribute of
+    'name' is false and [[Configurable]] attribute of 'name' is true,
+    the 'desc' is a generic descriptor which only contains
+    [[Enumerable]] attribute as true, 'name' property is an accessor
+    property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-13.js
index db242f255..ab5973c28 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-13.js
@@ -1,29 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-13.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as false, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false

-        });

-        

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains [[Enumerable]]
+    attribute as false, 'name' property is an index data property
+    (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false
+        });
+        
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-14.js
index f4fb29329..93d9bbfce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-14.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-14.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as false and [[Configurable]] attribute as true, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false,

-            configurable: true

-        });

-        

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as false and [[Configurable]] attribute as true, 'name'
+    property is an index data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false,
+            configurable: true
+        });
+        
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-15.js
index 9b5cb812a..54e48fe7d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-15.js
@@ -1,29 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-15.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Configurable]] attribute of 'name' property is true,  the 'desc' is a generic descriptor which contains [[Configurable]] attribute as false, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Configurable]]
+    attribute of 'name' property is true,  the 'desc' is a generic
+    descriptor which contains [[Configurable]] attribute as false,
+    'name' property is an index data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-16.js
index 43ee9c892..b05a41087 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-16.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-16.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as true and [[Configurable]] attribute as false, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: true, 

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as true and [[Configurable]] attribute as false, 'name'
+    property is an index data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: true, 
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-17.js
index 79df0b86a..419f87c4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-17.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-17.js

- * @description Object.defineProperty - Update [[Enumerable]] and [[Configurable]] attributes of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true, the 'desc' is a generic descriptor which contains [[Enumerable]] and [[Configurable]] attributes as false, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] and [[Configurable]]
+    attributes of 'name' property to false successfully when
+    [[Enumerable]] and [[Configurable]] attributes of 'name' property
+    are true, the 'desc' is a generic descriptor which contains
+    [[Enumerable]] and [[Configurable]] attributes as false, 'name'
+    property is an index data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-18.js
index c935503f2..efee15214 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-18.js
@@ -1,29 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-18.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to true successfully when [[Enumerable]] attribute of 'name' is false and [[Configurable]] attribute of 'name' is true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as true, 'name' property is an index data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: true

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to true successfully when [[Enumerable]] attribute of
+    'name' is false and [[Configurable]] attribute of 'name' is true,
+    the 'desc' is a generic descriptor which only contains
+    [[Enumerable]] attribute as true, 'name' property is an index data
+    property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: true
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "0", 1001, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-19.js
index e64f31c8f..5192eaae3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-19.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-19.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [Enumerable]] attribute as false and 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains [Enumerable]]
+    attribute as false and 'name' property is an index accessor
+    property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-2.js
index 7b8bb7b54..de2e27a2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-2.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-2.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as false and [[Configurable]] attribute as true, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false,

-            configurable: true

-        });

-        

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as false and [[Configurable]] attribute as true, 'name'
+    property is a data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false,
+            configurable: true
+        });
+        
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-20.js
index 8d81f176d..ad117b152 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-20.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-20.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [Enumerable]] attribute as false and [[Configurable]] property is true, 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false,

-            configurable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [Enumerable]]
+    attribute as false and [[Configurable]] property is true, 'name'
+    property is an index accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false,
+            configurable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-21.js
index 547a29d84..326d75abf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-21.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-21.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [[Configurable]] attribute as false, 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains
+    [[Configurable]] attribute as false, 'name' property is an index
+    accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-22.js
index b2cbc501c..e61e6515d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-22.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-22.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as true and [[Configurable]] attribute is false, 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: true,

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as true and [[Configurable]] attribute is false, 'name'
+    property is an index accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: true,
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-23.js
index 1acfafee4..8d775bf9f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-23.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-23.js

- * @description Object.defineProperty - Update [[Enumerable]] and [[Configurable]] attributes of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] and [[Configurable]] attributes as false, 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: false,

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] and [[Configurable]]
+    attributes of 'name' property to false successfully when
+    [[Enumerable]] and [[Configurable]] attributes of 'name' property
+    are true,  the 'desc' is a generic descriptor which contains
+    [[Enumerable]] and [[Configurable]] attributes as false, 'name'
+    property is an index accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: false,
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-24.js
index ea23ee7de..3f4b22a4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-24.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-24.js

- * @description Object.defineProperty - Update [[Enumerable]] attributes of 'name' property to true successfully when [[Enumerable]] attribute of 'name' is false and [[Configurable]] attribute of 'name' is true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as true, 'name' property is an index accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            enumerable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attributes of 'name'
+    property to true successfully when [[Enumerable]] attribute of
+    'name' is false and [[Configurable]] attribute of 'name' is true,
+    the 'desc' is a generic descriptor which only contains
+    [[Enumerable]] attribute as true, 'name' property is an index
+    accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            enumerable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "0", get_func, set_func, "verifySetFunction", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-3.js
index 45234601e..60bec7655 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-3.js
@@ -1,29 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-3.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Configurable]] attribute of 'name' property is true,  the 'desc' is a generic descriptor which contains [[Configurable]] attribute as false, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Configurable]]
+    attribute of 'name' property is true,  the 'desc' is a generic
+    descriptor which contains [[Configurable]] attribute as false,
+    'name' property is a data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-4.js
index b211bd757..e4f1801c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-4.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-4.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [[Enumerable]] attribute as true and [[Configurable]] attribute as false, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: true, 

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [[Enumerable]]
+    attribute as true and [[Configurable]] attribute as false, 'name'
+    property is a data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: true, 
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-5.js
index ba167dde2..fdbccc14e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-5.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-5.js

- * @description Object.defineProperty - Update [[Enumerable]] and [[Configurable]] attributes of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true, the 'desc' is a generic descriptor which contains [[Enumerable]] and [[Configurable]] attributes as false, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false,

-            configurable: false

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] and [[Configurable]]
+    attributes of 'name' property to false successfully when
+    [[Enumerable]] and [[Configurable]] attributes of 'name' property
+    are true, the 'desc' is a generic descriptor which contains
+    [[Enumerable]] and [[Configurable]] attributes as false, 'name'
+    property is a data property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false,
+            configurable: false
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-6.js
index b11388da9..cba102b91 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-6.js
@@ -1,29 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-6.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to true successfully when [[Enumerable]] attribute of 'name' is false and [[Configurable]] attribute of 'name' is true,  the 'desc' is a generic descriptor which only contains [[Enumerable]] attribute as true, 'name' property is a data property (8.12.9 step 8)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 1001,

-            writable: true,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: true

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to true successfully when [[Enumerable]] attribute of
+    'name' is false and [[Configurable]] attribute of 'name' is true,
+    the 'desc' is a generic descriptor which only contains
+    [[Enumerable]] attribute as true, 'name' property is a data
+    property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 1001,
+            writable: true,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: true
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 1001, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-7.js
index cdcb1286e..a2ae4cec6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-7.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-7.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [Enumerable]] attribute as false and 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains [Enumerable]]
+    attribute as false and 'name' property is an accessor property
+    (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-8.js
index 23df37c12..ec503b836 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-8.js
@@ -1,36 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-8.js

- * @description Object.defineProperty - Update [[Enumerable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which contains [Enumerable]] attribute as false and [[Configurable]] property is true, 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            enumerable: false,

-            configurable: true

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Enumerable]] attribute of 'name'
+    property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which contains [Enumerable]]
+    attribute as false and [[Configurable]] property is true, 'name'
+    property is an accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            enumerable: false,
+            configurable: true
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-9.js
index 5cb332369..11fde7b9e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-9.js
@@ -1,35 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82-9.js

- * @description Object.defineProperty - Update [[Configurable]] attribute of 'name' property to false successfully when [[Enumerable]] and [[Configurable]] attributes of 'name' property are true,  the 'desc' is a generic descriptor which only contains [[Configurable]] attribute as false, 'name' property is an accessor property (8.12.9 step 8)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.verifySetFunction = "data";

-        var get_func = function () {

-            return obj.verifySetFunction;

-        };

-        var set_func = function (value) {

-            obj.verifySetFunction = value;

-        };

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "foo", {

-            configurable: false

-        });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - Update [[Configurable]] attribute of
+    'name' property to false successfully when [[Enumerable]] and
+    [[Configurable]] attributes of 'name' property are true,  the
+    'desc' is a generic descriptor which only contains
+    [[Configurable]] attribute as false, 'name' property is an
+    accessor property (8.12.9 step 8)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.verifySetFunction = "data";
+        var get_func = function () {
+            return obj.verifySetFunction;
+        };
+        var set_func = function (value) {
+            obj.verifySetFunction = value;
+        };
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "foo", {
+            configurable: false
+        });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "verifySetFunction", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82.js
index 4f90454af..8995828f6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-82.js

- * @description Object.defineProperty - desc.configurable and name.configurable are boolean negation of each other (8.12.9 step 6)

- */

-

-

-function testcase() {

-    

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { configurable: true });

-

-        Object.defineProperty(obj, "foo", { configurable: false });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty - desc.configurable and name.configurable
+    are boolean negation of each other (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+    
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { configurable: true });
+
+        Object.defineProperty(obj, "foo", { configurable: false });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-83.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-83.js
index 6199a0f01..1ce435839 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-83.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-83.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-83.js

- * @description Object.defineProperty will not throw TypeError if name.configurable = false, name.writable = false, name.value = undefined and desc.value = undefined (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: undefined, 

-            writable: false, 

-            configurable: false 

-        });

-

-        Object.defineProperty(obj, "foo", { 

-            value: undefined, 

-            writable: false, 

-            configurable: false

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError if
+    name.configurable = false, name.writable = false, name.value =
+    undefined and desc.value = undefined (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: undefined, 
+            writable: false, 
+            configurable: false 
+        });
+
+        Object.defineProperty(obj, "foo", { 
+            value: undefined, 
+            writable: false, 
+            configurable: false
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-84.js
index d36d691b5..a47322b64 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-84.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-84.js

- * @description Object.defineProperty will not throw TypeError if name.configurable = false, name.writable = false, name.value = null and desc.value = null (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: null, 

-            writable: false, 

-            configurable: false 

-        });

-

-        Object.defineProperty(obj, "foo", { 

-            value: null,  

-            writable: false, 

-            configurable: false 

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError if
+    name.configurable = false, name.writable = false, name.value =
+    null and desc.value = null (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: null, 
+            writable: false, 
+            configurable: false 
+        });
+
+        Object.defineProperty(obj, "foo", { 
+            value: null,  
+            writable: false, 
+            configurable: false 
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-85.js
index fbda3581d..3174d2d02 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-85.js
@@ -1,50 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-85.js

- * @description Object.defineProperty will not throw TypeError if name.configurable = false, name.writable = false, name.value = NaN and desc.value = NaN (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: NaN,

-            writable: false,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "foo", {

-            value: NaN,

-            writable: false,

-            configurable: false

-        });

-

-        if (!isNaN(obj.foo)) {

-            return false;

-        }

-

-        obj.foo = "verifyValue";

-        if (obj.foo === "verifyValue") {

-            return false;

-        }

-

-        for (var prop in obj) {

-            if (obj.hasOwnProperty(prop) && prop === "foo") {

-                return false;

-            }

-        }

-

-        delete obj.foo;

-        if (!obj.hasOwnProperty("foo")) {

-            return false;

-        }

-

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError if
+    name.configurable = false, name.writable = false, name.value = NaN
+    and desc.value = NaN (8.12.9 step 10.a.ii.1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: NaN,
+            writable: false,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "foo", {
+            value: NaN,
+            writable: false,
+            configurable: false
+        });
+
+        if (!isNaN(obj.foo)) {
+            return false;
+        }
+
+        obj.foo = "verifyValue";
+        if (obj.foo === "verifyValue") {
+            return false;
+        }
+
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop) && prop === "foo") {
+                return false;
+            }
+        }
+
+        delete obj.foo;
+        if (!obj.hasOwnProperty("foo")) {
+            return false;
+        }
+
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-86.js
index 069287930..f8da608df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-86.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-86.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value = +0 and name.value = -0 (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: -0, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: +0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value = +0 and name.value =
+    -0 (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: -0, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: +0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-87.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-87.js
index 146360732..4c22ecf44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-87.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-87.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-87.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value = -0 and name.value = +0 (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: +0, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: -0 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value = -0 and name.value =
+    +0 (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: +0, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: -0 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-88.js
index a54c9a03d..561eb6d2f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-88.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-88.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two numbers with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 100, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: 100 });

-            return dataPropertyAttributesAreCorrect(obj, "foo", 100, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, name.writable = false, desc.value and
+    name.value are two numbers with the same value (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 100, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: 100 });
+            return dataPropertyAttributesAreCorrect(obj, "foo", 100, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-89.js
index cce60fc0f..4c12f977c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-89.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-89.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two numbers with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            writable: false, 

-            configurable: false 

-        });

-        

-        try {

-            Object.defineProperty(obj, "foo", { value: 20 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value and name.value are two
+    numbers with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            writable: false, 
+            configurable: false 
+        });
+        
+        try {
+            Object.defineProperty(obj, "foo", { value: 20 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-9.js
index 618b974e0..5d03e85c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-9.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method

- * of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if

- * current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations

- * of each other.

- *

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-9.js

- * @description Object.defineProperty throws TypeError when changing [[Enumerable]] from true to false on non-configurable data properties

- */

-

-

-function testcase() {

-  var o = {};

-

-  // create a data valued property with [[Enumerable]] explicitly set to true;

-  // all other attributes default to false.

-  var d1 = { value: 101, enumerable: true, configurable: false };

-  Object.defineProperty(o, "foo", d1);

-

-  // now, setting enumerable to false should fail, since [[Configurable]]

-  // on the original property will be false.

-  var desc = { value: 101, enumerable: false };

-

-  try {

-    Object.defineProperty(o, "foo", desc);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      // the property should remain unchanged.

-      var d2 = Object.getOwnPropertyDescriptor(o, "foo");

-      if (d2.value === 101 &&

-          d2.enumerable === true &&

-          d2.configurable === false) {

-        return true;

-      }

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    Step 4 of defineProperty calls the [[DefineOwnProperty]] internal method
+    of O to define the property. Step 7b of [[DefineOwnProperty]] rejects if
+    current.[[Enumerable]] and desc.[[Enumerable]] are the boolean negations
+    of each other.
+description: >
+    Object.defineProperty throws TypeError when changing
+    [[Enumerable]] from true to false on non-configurable data
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = {};
+
+  // create a data valued property with [[Enumerable]] explicitly set to true;
+  // all other attributes default to false.
+  var d1 = { value: 101, enumerable: true, configurable: false };
+  Object.defineProperty(o, "foo", d1);
+
+  // now, setting enumerable to false should fail, since [[Configurable]]
+  // on the original property will be false.
+  var desc = { value: 101, enumerable: false };
+
+  try {
+    Object.defineProperty(o, "foo", desc);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      // the property should remain unchanged.
+      var d2 = Object.getOwnPropertyDescriptor(o, "foo");
+      if (d2.value === 101 &&
+          d2.enumerable === true &&
+          d2.configurable === false) {
+        return true;
+      }
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-90.js
index b0a2872ab..23fdcd65d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-90.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-90.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two strings with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: "abcd",

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: "abcd" });

-            return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, name.writable = false, desc.value and
+    name.value are two strings with the same value (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: "abcd",
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: "abcd" });
+            return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-91.js
index 53096d5f1..455f6b48b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-91.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-91.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two strings with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: "abcd",

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: "fghj" });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value and name.value are two
+    strings with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: "abcd",
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: "fghj" });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-92.js
index 339056a44..1576678c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-92.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-92.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two booleans with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: false,

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: false });

-            return dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, name.writable = false, desc.value and
+    name.value are two booleans with the same value (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: false,
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: false });
+            return dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-93.js
index a58fa696f..401ad6f0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-93.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-93.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two booleans with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: false,

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: true });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value and name.value are two
+    booleans with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: false,
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: true });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-94.js
index 2b1429446..e6a033796 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-94.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-94.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two Objects refer to the same object (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", {

-            value: obj1,

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { value: obj1 });

-            return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, name.writable = false, desc.value and
+    name.value are two Objects refer to the same object (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", {
+            value: obj1,
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { value: obj1 });
+            return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-95.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-95.js
index d175f92ac..3f92a7c2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-95.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-95.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-95.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.writable = false, desc.value and name.value are two objects which refer to the different objects (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", {

-            value: obj1,

-            writable: false,

-            configurable: false 

-        });

-

-        var obj2 = { length: 20 };

-

-        try {

-            Object.defineProperty(obj, "foo", { value: obj2 });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.writable = false, desc.value and name.value are two
+    objects which refer to the different objects (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", {
+            value: obj1,
+            writable: false,
+            configurable: false 
+        });
+
+        var obj2 = { length: 20 };
+
+        try {
+            Object.defineProperty(obj, "foo", { value: obj2 });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-96.js
index 061dac5ac..8268acd1b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-96.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-96.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, both desc.[[Set]] and name.[[Set]] are two objects which refer to the same object (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { set: setFunc });

-            return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, both desc.[[Set]] and name.[[Set]] are
+    two objects which refer to the same object (8.12.9 step 11.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { set: setFunc });
+            return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-97.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-97.js
index 5eb9455c3..a903f8ba5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-97.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-97.js
@@ -1,38 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-97.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.[[Set]] is undefined, desc.[[Set]] refers to an object (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return "property";

-        }

-

-        Object.defineProperty(obj, "property", {

-            get: getFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "property", {

-                get: getFunc,

-                set: function () { },

-                configurable: false

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.[[Set]] is undefined, desc.[[Set]] refers to an
+    object (8.12.9 step 11.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return "property";
+        }
+
+        Object.defineProperty(obj, "property", {
+            get: getFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "property", {
+                get: getFunc,
+                set: function () { },
+                configurable: false
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(obj, "property", getFunc, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-98.js
index 0b1cd9f2a..d813539a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-98.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-98.js

- * @description Object.defineProperty will not throw TypeError when name.configurable = false, both desc.[[Get]] and name.[[Get]] are two objects which refer to the same object (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function getFunc() {

-            return 10;

-        }

-        function setFunc(value) {

-            obj.verifyGetHelpMethod = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperty(obj, "foo", { get: getFunc });

-            return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "verifyGetHelpMethod", false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will not throw TypeError when
+    name.configurable = false, both desc.[[Get]] and name.[[Get]] are
+    two objects which refer to the same object (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function getFunc() {
+            return 10;
+        }
+        function setFunc(value) {
+            obj.verifyGetHelpMethod = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperty(obj, "foo", { get: getFunc });
+            return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "verifyGetHelpMethod", false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-99.js
index af8d79687..33ee03d3e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-99.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.6/15.2.3.6-4-99.js

- * @description Object.defineProperty will throw TypeError when name.configurable = false, name.[[Get]] is undefined, desc.[[Get]] refers to an object (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function setFunc(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: setFunc,

-            configurable: false

-        });

-

-        function getFunc() {

-            return 10;

-        }

-

-        try {

-            Object.defineProperty(obj, "foo", {

-                get: getFunc,

-                set: setFunc

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperty will throw TypeError when name.configurable
+    = false, name.[[Get]] is undefined, desc.[[Get]] refers to an
+    object (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function setFunc(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: setFunc,
+            configurable: false
+        });
+
+        function getFunc() {
+            return 10;
+        }
+
+        try {
+            Object.defineProperty(obj, "foo", {
+                get: getFunc,
+                set: setFunc
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, setFunc, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A1.js
index 714098e5e..1332bd8d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A1.js
@@ -1,16 +1,15 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If a particular API exists (document.createElement, as happens to
- * exist in a browser environment), check if the form objects it makes
- * obey the constraints that even host objects must obey. In this
- * case, that if defineProperty seems to have successfully installed a
- * non-configurable getter, that it is still there.
- *
- * @path ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A1.js
- * @description Do getters on HTMLFormElements disappear?
- */
+/*---
+info: >
+    If a particular API exists (document.createElement, as happens to
+    exist in a browser environment), check if the form objects it makes
+    obey the constraints that even host objects must obey. In this
+    case, that if defineProperty seems to have successfully installed a
+    non-configurable getter, that it is still there.
+description: Do getters on HTMLFormElements disappear?
+---*/
 
 function getter() { return 'gotten'; }
 
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A2.js
index 7693af845..15993773a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A2.js
@@ -1,11 +1,11 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.3/15.2.3.6/S15.2.3.6_A2.js
- * @description Checks if an inherited accessor property appears to be
- * an own property.
- */
+/*---
+description: >
+    Checks if an inherited accessor property appears to be  an own
+    property.
+---*/
 
 var base = {};
 var derived = Object.create(base);
@@ -14,4 +14,3 @@ Object.defineProperty(base, 'foo', {get: getter});
 if (derived.hasOwnProperty('foo')) {
   $ERROR('Accessor properties inherit as own properties');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-1.js
index d9c4cd57f..45b74ede1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-1.js

- * @description Object.defineProperties must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.defineProperties;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.defineProperties;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-2.js
index 04dbbf355..e212a1d1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-0-2.js

- * @description Object.defineProperties must exist as a function taking 2 parameters

- */

-

-

-function testcase() {

-  if (Object.defineProperties.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties must exist as a function taking 2
+    parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.defineProperties.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-1.js
index e303305a4..1bd32427e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-1.js

- * @description Object.defineProperties throws TypeError if 'O' is undefined

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties(undefined, {});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties throws TypeError if 'O' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties(undefined, {});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-2.js
index 00a709f9c..b3ce0fc7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-2.js

- * @description Object.defineProperties throws TypeError if 'O' is null

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties(null, {});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties throws TypeError if 'O' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties(null, {});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-3.js
index 607b44b2e..a992f2177 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-3.js

- * @description Object.defineProperties throws TypeError if 'O' is a boolean

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties(true, {});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties throws TypeError if 'O' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties(true, {});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-4.js
index 2c9e6cfaa..e79747853 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1-4.js

- * @description Object.defineProperties throws TypeError if 'O' is a string

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties("abc", {});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties throws TypeError if 'O' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties("abc", {});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1.js
index 0992ef2bd..79c43d94c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-1.js

- * @description Object.defineProperties throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.defineProperties(0, {});

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError if type of first param is
+    not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.defineProperties(0, {});
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-1.js
index 1f1e32827..0a233cd35 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-1.js

- * @description Object.defineProperties throws TypeError if 'Properties' is null

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties({}, null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties throws TypeError if 'Properties' is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties({}, null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-10.js
index a66b3ccf6..bc6ffd049 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-10.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-10.js

- * @description Object.defineProperties - argument 'Properties' is an Array object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = [];

-        var result = false;

-        

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Array;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = [];
+        var result = false;
+        
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Array;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-11.js
index 5c7ef0019..eeb28f40c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-11.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-11.js

- * @description Object.defineProperties - argument 'Properties' is the Math object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = false;

-       

-        try {

-            Object.defineProperty(Math, "prop", {

-                get: function () {

-                    result = (this === Math);

-                    return {};

-                },

-                enumerable: true,

-                configurable: true

-            });

-

-            Object.defineProperties(obj, Math);

-            return result;

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = false;
+       
+        try {
+            Object.defineProperty(Math, "prop", {
+                get: function () {
+                    result = (this === Math);
+                    return {};
+                },
+                enumerable: true,
+                configurable: true
+            });
+
+            Object.defineProperties(obj, Math);
+            return result;
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-12.js
index c205fe604..1a4f09bed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-12.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-12.js

- * @description Object.defineProperties - argument 'Properties' is a Date object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Date();

-        var result = false;

-        

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Date;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Date();
+        var result = false;
+        
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Date;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-13.js
index 3c312334b..e418e12c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-13.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-13.js

- * @description Object.defineProperties - argument 'Properties' is a RegExp object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new RegExp();

-        var result = false;

-       

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof RegExp;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is a RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new RegExp();
+        var result = false;
+       
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof RegExp;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-14.js
index 872db0668..43dfe1aa8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-14.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-14.js

- * @description Object.defineProperties - argument 'Properties' is the JSON object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = false;

-

-        try {

-            Object.defineProperty(JSON, "prop", {

-                get: function () {

-                    result = (this === JSON);

-                    return {};

-                },

-                enumerable: true,

-                configurable: true

-            });

-

-            Object.defineProperties(obj, JSON);

-            return result;

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = false;
+
+        try {
+            Object.defineProperty(JSON, "prop", {
+                get: function () {
+                    result = (this === JSON);
+                    return {};
+                },
+                enumerable: true,
+                configurable: true
+            });
+
+            Object.defineProperties(obj, JSON);
+            return result;
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-15.js
index f804405c2..ea8ed7c38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-15.js
@@ -1,36 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-15.js

- * @description Object.defineProperties - argument 'Properties' is an Error object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Error("test");

-        var obj1 = {

-            value: 11

-        };

-        props.description = obj1;

-        props.message = obj1;

-        props.name = obj1;

-

-        var result = false;

-       

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Error;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - argument 'Properties' is an Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Error("test");
+        var obj1 = {
+            value: 11
+        };
+        props.description = obj1;
+        props.message = obj1;
+        props.name = obj1;
+
+        var result = false;
+       
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Error;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-16.js
index 04bcffa45..adfb27776 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-16.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-16.js

- * @description Object.defineProperties - argument 'Properties' is the Arguments object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = false;

-

-        var Fun = function () {

-            return arguments;

-        };        

-        var props = new Fun();

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = ('[object Arguments]' === Object.prototype.toString.call(this));

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is the Arguments
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = false;
+
+        var Fun = function () {
+            return arguments;
+        };        
+        var props = new Fun();
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = ('[object Arguments]' === Object.prototype.toString.call(this));
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-18.js
index aef491cf2..fd2f49cf8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-18.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-18.js

- * @description Object.defineProperties - argument 'Properties' is the global object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var result = false;

-

-        try {

-            Object.defineProperty(fnGlobalObject(), "prop", {

-                get: function () {

-                    result = (this === fnGlobalObject());

-                    return {};

-                },

-                enumerable: true,

-				configurable:true

-            });

-

-            Object.defineProperties(obj, fnGlobalObject());

-            return result;

-        } catch (e) {

-            return (e instanceof TypeError);

-        } finally {

-            delete fnGlobalObject().prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var result = false;
+
+        try {
+            Object.defineProperty(fnGlobalObject(), "prop", {
+                get: function () {
+                    result = (this === fnGlobalObject());
+                    return {};
+                },
+                enumerable: true,
+				configurable:true
+            });
+
+            Object.defineProperties(obj, fnGlobalObject());
+            return result;
+        } catch (e) {
+            return (e instanceof TypeError);
+        } finally {
+            delete fnGlobalObject().prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-2.js
index 737391428..835e22097 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-2.js

- * @description Object.defineProperties throws TypeError if 'Properties' is undefined

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperties({}, undefined);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError if 'Properties' is
+    undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperties({}, undefined);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-3.js
index 92b3a9eca..7a52a6a63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-3.js

- * @description Object.defineProperties - argument 'Properties' is a boolean whose value is false

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var obj1 = Object.defineProperties(obj, false);

-        return obj === obj1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a boolean whose
+    value is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var obj1 = Object.defineProperties(obj, false);
+        return obj === obj1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-4.js
index 5a8baf834..57973192f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-4.js

- * @description Object.defineProperties - argument 'Properties' is a Boolean object whose primitive value is true

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Boolean(true);

-        var result = false;

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Boolean;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a Boolean
+    object whose primitive value is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Boolean(true);
+        var result = false;
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Boolean;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-5.js
index 9b7d82bf2..c7c9c09c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-5.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-5.js

- * @description Object.defineProperties - argument 'Properties' is any interesting number

- */

-

-

-function testcase() {

-

-        var obj = { "123": 100 };

-        var obj1 = Object.defineProperties(obj, -12);

-        return obj === obj1;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is any interesting
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { "123": 100 };
+        var obj1 = Object.defineProperties(obj, -12);
+        return obj === obj1;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-6.js
index 9996b7d14..3c827f9b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-6.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-6.js

- * @description Object.defineProperties - argument 'Properties' is a Number object whose primitive value is any interesting number

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Number(-12);

-        var result = false;

-    

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Number;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a Number object
+    whose primitive value is any interesting number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Number(-12);
+        var result = false;
+    
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Number;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-7.js
index 2a0dd3de2..d94b45606 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-7.js

- * @description Object.defineProperties - argument 'Properties' is a string whose value is any interesting string

- */

-

-

-function testcase() {

-

-        var obj = { "123": 100 };

-        var obj1 = Object.defineProperties(obj, "");

-        return obj === obj1;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a string whose
+    value is any interesting string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { "123": 100 };
+        var obj1 = Object.defineProperties(obj, "");
+        return obj === obj1;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-8.js
index 0f708e543..a28e0a375 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-8.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-8.js

- * @description Object.defineProperties - argument 'Properties' is a String object whose primitive value is any interesting string

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new String();

-        var result = false;

-   

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof String;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a String object
+    whose primitive value is any interesting string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new String();
+        var result = false;
+   
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof String;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-9.js
index e6d25532e..723393a55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-9.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-2-9.js

- * @description Object.defineProperties - argument 'Properties' is a Function object

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = function () { };

-        var result = false;

-      

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                result = this instanceof Function;

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - argument 'Properties' is a Function
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = function () { };
+        var result = false;
+      
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                result = this instanceof Function;
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-1.js
index 8d9bce57c..99afa5b87 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-1.js

- * @description Object.defineProperties - enumerable own data property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};      

-        var props = {};

-        Object.defineProperty(props, "prop", {

-            value: {},

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own data property of
+    'Properties' is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};      
+        var props = {};
+        Object.defineProperty(props, "prop", {
+            value: {},
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-2.js
index d745cc460..beb2e801d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-2.js

- * @description Object.defineProperties - own data property of 'Properties' which is not enumerable is not defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = {};

-

-        Object.defineProperty(props, "prop", {

-            value: {},

-            enumerable: false

-        });

-

-        Object.defineProperties(obj, props);

-

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - own data property of 'Properties' which
+    is not enumerable is not defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = {};
+
+        Object.defineProperty(props, "prop", {
+            value: {},
+            enumerable: false
+        });
+
+        Object.defineProperties(obj, props);
+
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-3.js
index 856d08627..e50de561e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-3.js

- * @description Object.defineProperties - enumerable inherited data property of 'Properties' is not defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            value: {},

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        Object.defineProperties(obj, child);

-

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable inherited data property of
+    'Properties' is not defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            value: {},
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        Object.defineProperties(obj, child);
+
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-4.js
index 59ef454c7..0c9eb8d12 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-4.js

- * @description Object.defineProperties - enumerable own accessor property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var props = {};

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own accessor property of
+    'Properties' is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var props = {};
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-5.js
index 0d374a524..3601a422d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-5.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-5.js

- * @description Object.defineProperties - own accessor property of 'Properties' which is not enumerable is not defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var props = {};

-

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: false

-        });

-

-        Object.defineProperties(obj, props);

-

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - own accessor property of 'Properties'
+    which is not enumerable is not defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var props = {};
+
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: false
+        });
+
+        Object.defineProperties(obj, props);
+
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-6.js
index a709b751a..addc54aa1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-6.js

- * @description Object.defineProperties - enumerable inherited accessor property of 'Properties' is not defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        Object.defineProperties(obj, child);

-

-        return !obj.hasOwnProperty("prop");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable inherited accessor property
+    of 'Properties' is not defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        Object.defineProperties(obj, child);
+
+        return !obj.hasOwnProperty("prop");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-7.js
index 4507dd3a8..1b58cbeba 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-7.js

- * @description Object.defineProperties - no additional property is defined in 'O' when 'Properties' doesn't contain enumerable own property 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var props = {};

-

-        Object.defineProperty(props, "prop1", {

-            value: {},

-            enumerable: false

-        });

-

-        Object.defineProperty(props, "prop2", {

-            get: function () {

-                return {};

-            },

-            enumerable: false

-        });

-

-        Object.defineProperties(obj, props);

-

-        return !obj.hasOwnProperty("prop1") && !obj.hasOwnProperty("prop2");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - no additional property is defined in 'O'
+    when 'Properties' doesn't contain enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var props = {};
+
+        Object.defineProperty(props, "prop1", {
+            value: {},
+            enumerable: false
+        });
+
+        Object.defineProperty(props, "prop2", {
+            get: function () {
+                return {};
+            },
+            enumerable: false
+        });
+
+        Object.defineProperties(obj, props);
+
+        return !obj.hasOwnProperty("prop1") && !obj.hasOwnProperty("prop2");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-8.js
index d8e177f57..e93198933 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-3-8.js

- * @description Object.defineProperties - no additional property is defined in 'O' when 'Properties' doesn't contain enumerable own property 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var props = {};

-

-        Object.defineProperty(props, "prop1", {

-            value: {},

-            enumerable: false

-        });

-

-        Object.defineProperty(props, "prop2", {

-            get: function () {

-                return {};

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-

-        return !obj.hasOwnProperty("prop1") && obj.hasOwnProperty("prop2");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - no additional property is defined in 'O'
+    when 'Properties' doesn't contain enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var props = {};
+
+        Object.defineProperty(props, "prop1", {
+            value: {},
+            enumerable: false
+        });
+
+        Object.defineProperty(props, "prop2", {
+            get: function () {
+                return {};
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+
+        return !obj.hasOwnProperty("prop1") && obj.hasOwnProperty("prop2");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-1.js
index 58a9bd0ee..1e13cd541 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-1.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-1.js

- * @description Object.defineProperties - 'P' is own data property that overrides enumerable inherited data property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            value: {

-                value: 9

-            },

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "prop", {

-            value: {

-                value: 12

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, child);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own data property that overrides
+    enumerable inherited data property of 'Properties' is defined in
+    'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            value: {
+                value: 9
+            },
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "prop", {
+            value: {
+                value: 12
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, child);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-10.js
index b9fde3327..c510abc7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-10.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-10.js

- * @description Object.defineProperties - 'Properties' is a Boolean object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Boolean(false);

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 10

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a Boolean object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Boolean(false);
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 10
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-11.js
index f8ec4a8c3..e657857ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-11.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-11.js

- * @description Object.defineProperties - 'Properties' is a Number object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Number(-9);

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 12

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a Number object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Number(-9);
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 12
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-12.js
index 7550db5d6..8ab8d8d66 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-12.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-12.js

- * @description Object.defineProperties - 'Properties' is the Math object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Math.prop = {

-                value: 12

-            };

-            Object.defineProperties(obj, Math);

-

-            return obj.hasOwnProperty("prop") && obj.prop === 12;

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is the Math object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Math.prop = {
+                value: 12
+            };
+            Object.defineProperties(obj, Math);
+
+            return obj.hasOwnProperty("prop") && obj.prop === 12;
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-13.js
index dd325b14c..f3ec31866 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-13.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-13.js

- * @description Object.defineProperties - 'Properties' is a Date object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Date();

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 13

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 13;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a Date object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Date();
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 13
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 13;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-14.js
index e546a9dfc..0d2503e45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-14.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-14.js

- * @description Object.defineProperties - 'Properties' is a RegExp object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new RegExp();

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 14

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 14;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a RegExp object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new RegExp();
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 14
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 14;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-15.js
index e886127f4..f307607cc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-15.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-15.js

- * @description Object.defineProperties - 'Properties' is the JSON object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.prop = {

-                value: 15

-            };

-            Object.defineProperties(obj, JSON);

-

-            return obj.hasOwnProperty("prop") && obj.prop === 15;

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is the JSON object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.prop = {
+                value: 15
+            };
+            Object.defineProperties(obj, JSON);
+
+            return obj.hasOwnProperty("prop") && obj.prop === 15;
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-16.js
index 367dea362..e027ac9d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-16.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-16.js

- * @description Object.defineProperties - 'Properties' is an Error object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new Error("test");

-        var obj1 = {

-            value: 11

-        };

-        props.message = obj1;

-        props.name = obj1;

-        props.description = obj1;

-

-        props.prop = {

-            value: 16

-        };

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 16;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is an Error object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new Error("test");
+        var obj1 = {
+            value: 11
+        };
+        props.message = obj1;
+        props.name = obj1;
+        props.description = obj1;
+
+        props.prop = {
+            value: 16
+        };
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 16;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-17.js
index 0c69d97a0..f4f9ad702 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-17.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-17.js

- * @description Object.defineProperties - 'Properties' is the Arguments object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        Object.defineProperty(arg, "prop", {

-            value: {

-                value: 17

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, arg);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 17;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is the Arguments object
+    which implements its own [[Get]] method to get enumerable own
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        Object.defineProperty(arg, "prop", {
+            value: {
+                value: 17
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, arg);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 17;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-2.js
index 783a90102..b55313fdf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-2.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-2.js

- * @description Object.defineProperties - 'P' is own data property that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {

-                    value: 9

-                };

-            },

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "prop", {

-            value: {

-                value: 12

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, child);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own data property that overrides
+    enumerable inherited accessor property of 'Properties' is defined
+    in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {
+                    value: 9
+                };
+            },
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "prop", {
+            value: {
+                value: 12
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, child);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-3.js
index a0f05ae6b..bfdc11d39 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-3.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-3.js

- * @description Object.defineProperties - enumerable own accessor property of 'Properties' that overrides enumerable inherited data property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            value: {

-                value: 9

-            },

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "prop", {

-            get: function () {

-                return {

-                    value: 12

-                };

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, child);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own accessor property of
+    'Properties' that overrides enumerable inherited data property of
+    'Properties' is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            value: {
+                value: 9
+            },
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "prop", {
+            get: function () {
+                return {
+                    value: 12
+                };
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, child);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-4.js
index 6b6369722..8769e109e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-4.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-4.js

- * @description Object.defineProperties - enumerable own accessor property of 'Properties' that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return {

-                    value: 9

-                };

-            },

-            enumerable: false

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "prop", {

-            get: function () {

-                return {

-                    value: 12

-                };

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, child);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own accessor property of
+    'Properties' that overrides enumerable inherited accessor property
+    of 'Properties' is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return {
+                    value: 9
+                };
+            },
+            enumerable: false
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "prop", {
+            get: function () {
+                return {
+                    value: 12
+                };
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, child);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-5.js
index bc3c23ce8..21ae33be6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-5.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-5.js

- * @description Object.defineProperties - enumerable own accessor property of 'Properties' without a get function is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var props = {};

-        Object.defineProperty(props, "prop", {

-            get: function () {

-                return {

-                    set: function () { }

-                };

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own accessor property of
+    'Properties' without a get function is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var props = {};
+        Object.defineProperty(props, "prop", {
+            get: function () {
+                return {
+                    set: function () { }
+                };
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-6.js
index 18bcc3f11..e4f8f6d4f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-6.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-6.js

- * @description Object.defineProperties - enumerable own accessor property of 'Properties' without a get function that overrides enumerable inherited accessor property of 'Properties' is defined in 'O' 

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return 12;

-            },

-            enumerable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "prop", {

-            get: function () {

-                return {

-                    set: function () { }

-                };

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, child);

-

-        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - enumerable own accessor property of
+    'Properties' without a get function that overrides enumerable
+    inherited accessor property of 'Properties' is defined in 'O'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return 12;
+            },
+            enumerable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "prop", {
+            get: function () {
+                return {
+                    set: function () { }
+                };
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, child);
+
+        return obj.hasOwnProperty("prop") && typeof obj.prop === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-7.js
index 5ec31411b..05a88d1ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-7.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-7.js

- * @description Object.defineProperties - 'Properties' is a Function object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = function () { };

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 7

-            },

-            enumerable: true

-        });

-

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 7;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a Function object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = function () { };
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 7
+            },
+            enumerable: true
+        });
+
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 7;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-8.js
index dfe4b3f85..9ff716677 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-8.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-8.js

- * @description Object.defineProperties - 'Properties' is an Array object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = [];

-        var descObj = {

-            value: 8

-        };

-

-        Object.defineProperty(props, "prop", {

-            value: descObj,

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 8;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is an Array object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = [];
+        var descObj = {
+            value: 8
+        };
+
+        Object.defineProperty(props, "prop", {
+            value: descObj,
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 8;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-9.js
index 508a2771b..692c1f8f7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-9.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-a-9.js

- * @description Object.defineProperties - 'Properties' is a String object which implements its own [[Get]] method to get enumerable own property

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var props = new String();

-

-        Object.defineProperty(props, "prop", {

-            value: {

-                value: 9

-            },

-            enumerable: true

-        });

-        Object.defineProperties(obj, props);

-

-        return obj.hasOwnProperty("prop") && obj.prop === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'Properties' is a String object which
+    implements its own [[Get]] method to get enumerable own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var props = new String();
+
+        Object.defineProperty(props, "prop", {
+            value: {
+                value: 9
+            },
+            enumerable: true
+        });
+        Object.defineProperties(obj, props);
+
+        return obj.hasOwnProperty("prop") && obj.prop === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-1.js
index 8982868e5..c92c5ccc8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-1.js

- * @description Object.defineProperties - 'descObj' is undefined (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: undefined

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - 'descObj' is undefined (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: undefined
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-10.js
index fdf4df639..ed414b920 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-10.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-10.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        var proto = {

-            enumerable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "enumerable", {

-            value: false

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        var proto = {
+            enumerable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "enumerable", {
+            value: false
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-100.js
index 1fed03b2d..de5bcb800 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-100.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-100.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Boolean object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new Boolean(true)

-            }

-        });

-

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Boolean object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new Boolean(true)
+            }
+        });
+
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-101.js
index 6a6d3ff92..0496d0d2f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-101.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-101.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Number object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new Number(-123)

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Number object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new Number(-123)
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-102.js
index 14c755d1b..a9d8e0f30 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-102.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-102.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is the Math object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: Math

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is the Math object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: Math
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-103.js
index 3626ed1ca..87122c32b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-103.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-103.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Date object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new Date()

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Date object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new Date()
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-104.js
index f67d4d3a2..969fa00f3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-104.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-104.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is RegExp object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new RegExp()

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is RegExp object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new RegExp()
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-105.js
index 0feaaab37..420607ac3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-105.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-105.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is the JSON object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: JSON

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is the JSON object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: JSON
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-106.js
index 091ae9758..d9c16c8dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-106.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-106.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Error object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new SyntaxError()

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Error object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new SyntaxError()
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-107.js
index 1f4f6ba80..8e9bd911e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-107.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-107.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is the Argument object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b, c) {

-            return arguments;

-        };

-

-        var args = func(1, true, "a");

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: args

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is the Argument object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b, c) {
+            return arguments;
+        };
+
+        var args = func(1, true, "a");
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: args
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-109.js
index 4f8c12940..03c5a942f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-109.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-109.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is  the global object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: fnGlobalObject()

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is  the global object (8.10.5 step 4.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: fnGlobalObject()
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-11.js
index b1c3ca0a9..df0580fb5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-11.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-11.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "enumerable", {

-            value: false

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "enumerable", {
+            value: false
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-110.js
index 46e54c538..5d81d8037 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-110.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-110.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: "false"

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is a string (value is 'false') which is treated as true
+    value (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: "false"
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-111.js
index 48f7efec0..1c68213d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-111.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-111.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is  new Boolean(false) which is treated as true value (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new Boolean(false)

-            }

-        });

-        var preCheck = obj.hasOwnProperty("property");

-        delete obj.property;

-

-        return preCheck && !obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is  new Boolean(false) which is treated as true value
+    (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new Boolean(false)
+            }
+        });
+        var preCheck = obj.hasOwnProperty("property");
+        delete obj.property;
+
+        return preCheck && !obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-112.js
index b34f00398..00c175ced 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-112.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-112.js

- * @description Object.defineProperties - 'value' property of 'descObj' is present (8.10.5 step 5)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                value: 300

-            }

-        });

-

-        return obj.property === 300;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is present
+    (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                value: 300
+            }
+        });
+
+        return obj.property === 300;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-113.js
index b560fb237..52b899f3e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-113.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-113.js

- * @description Object.defineProperties - 'value' property of 'descObj' is not present (8.10.5 step 5)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: true

-            }

-        });

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is not
+    present (8.10.5 step 5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: true
+            }
+        });
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-114.js
index bb0b87e07..0e910d4df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-114.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-114.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                value: "ownDataProperty"

-            }

-        });

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    data property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                value: "ownDataProperty"
+            }
+        });
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-115.js
index 7f9133c39..67276c4b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-115.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-115.js

- * @description Object.defineProperties - 'value' property of 'descObj' is inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "inheritedDataProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is
+    inherited data property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "inheritedDataProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-116.js
index 18ccb60ab..62827a236 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-116.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-116.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        descObj.value = "ownDataProperty";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownDataProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    data property that overrides an inherited data property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        descObj.value = "ownDataProperty";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownDataProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-117.js
index d73a750b5..9e4c1b1c6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-117.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-117.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "value", {

-            value: "ownDataProperty"

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownDataProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    data property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "value", {
+            value: "ownDataProperty"
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownDataProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-118.js
index efcdac2d4..872c7b074 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-118.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-118.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-119.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-119.js
index 684267a37..cde0f7b95 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-119.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-119.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-119.js

- * @description Object.defineProperties - 'value' property of 'descObj' is inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "inheritedAccessorProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is
+    inherited accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "inheritedAccessorProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-12.js
index 04fba743d..acc48a49e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-12.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-12.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-        var descObj = {};

-

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+        var descObj = {};
+
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-120.js
index 424916c8a..730c52d5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-120.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-120.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {}; 

-

-        var proto = {

-            value: "inheritedDataProperty"

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {}; 
+
+        var proto = {
+            value: "inheritedDataProperty"
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-121.js
index 873c50cbf..9e2c46577 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-121.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-121.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "value", {

-            get: function () {

-                return "ownAccessorProperty";

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "value", {
+            get: function () {
+                return "ownAccessorProperty";
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-122.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-122.js
index 5bdc2fed2..4500974c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-122.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-122.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-122.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own accessor property without a get function (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "value", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property without a get function (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "value", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-123.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-123.js
index a85c9a29e..38f857e0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-123.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-123.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-123.js

- * @description Object.defineProperties - 'value' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            get: function () {

-                return "inheritedAccessorProperty";

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "value", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is own
+    accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            get: function () {
+                return "inheritedAccessorProperty";
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "value", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-124.js
index 29b14fe96..164a0c434 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-124.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-124.js

- * @description Object.defineProperties - 'value' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "value", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'value' property of 'descObj' is
+    inherited accessor property without a get function (8.10.5 step
+    5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "value", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-125.js
index a2e919fa6..afc5d45ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-125.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-125.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            return a + b;

-        };

-

-        func.value = "Function";

-

-        Object.defineProperties(obj, {

-            property: func

-        });

-

-        return obj.property === "Function";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            return a + b;
+        };
+
+        func.value = "Function";
+
+        Object.defineProperties(obj, {
+            property: func
+        });
+
+        return obj.property === "Function";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-126.js
index 3e5f284a6..15de2e5b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-126.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-126.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var arr = [1, 2, 3];

-

-        arr.value = "Array";

-

-        Object.defineProperties(obj, {

-            property: arr

-        });

-

-        return obj.property === "Array";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var arr = [1, 2, 3];
+
+        arr.value = "Array";
+
+        Object.defineProperties(obj, {
+            property: arr
+        });
+
+        return obj.property === "Array";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-127.js
index 8978b8c29..18e0aab36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-127.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-127.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var str = new String("abc");

-

-        str.value = "String";

-

-        Object.defineProperties(obj, {

-            property: str

-        });

-

-        return obj.property === "String";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var str = new String("abc");
+
+        str.value = "String";
+
+        Object.defineProperties(obj, {
+            property: str
+        });
+
+        return obj.property === "String";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-128.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-128.js
index ef6f0683c..27a56e316 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-128.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-128.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-128.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Boolean(false);

-

-        descObj.value = "Boolean";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Boolean";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Boolean(false);
+
+        descObj.value = "Boolean";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Boolean";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-129.js
index 331508a42..78f82f29a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-129.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-129.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Number(-9);

-

-        descObj.value = "Number";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Number";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Number(-9);
+
+        descObj.value = "Number";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Number";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-13.js
index a9106eee6..df1bfa9cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-13.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-13.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-130.js
index 53d3591bc..a930300ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-130.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-130.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Math.value = "Math";

-

-            Object.defineProperties(obj, {

-                property: Math

-            });

-

-            return obj.property === "Math";

-        } finally {

-            delete Math.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Math.value = "Math";
+
+            Object.defineProperties(obj, {
+                property: Math
+            });
+
+            return obj.property === "Math";
+        } finally {
+            delete Math.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-131.js
index b3deec303..323fe29ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-131.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-131.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Date();

-

-        descObj.value = "Date";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Date";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Date();
+
+        descObj.value = "Date";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Date";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-132.js
index 9711b6f61..c33e88a0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-132.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-132.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new RegExp();

-

-        descObj.value = "RegExp";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "RegExp";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new RegExp();
+
+        descObj.value = "RegExp";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "RegExp";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-133.js
index 81dbac1d1..dac49e9c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-133.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-133.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            JSON.value = "JSON";

-

-            Object.defineProperties(obj, {

-                property: JSON

-            });

-

-            return obj.property === "JSON";

-        } finally {

-            delete JSON.value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            JSON.value = "JSON";
+
+            Object.defineProperties(obj, {
+                property: JSON
+            });
+
+            return obj.property === "JSON";
+        } finally {
+            delete JSON.value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-134.js
index 18b1dd1f9..377f5b861 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-134.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-134.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Error();

-

-        descObj.value = "Error";

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Error";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Error();
+
+        descObj.value = "Error";
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Error";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-135.js
index 31d6d2b5a..07672cf3f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-135.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-135.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            arguments.value = "arguments";

-

-            Object.defineProperties(obj, {

-                property: arguments

-            });

-

-            return obj.property === "arguments";

-        };

-

-        return func();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            arguments.value = "arguments";
+
+            Object.defineProperties(obj, {
+                property: arguments
+            });
+
+            return obj.property === "arguments";
+        };
+
+        return func();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-137.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-137.js
index d2d2838a1..42c57ecf1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-137.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-137.js
@@ -1,27 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-137.js

- * @description Object.defineProperties - 'descObj' is the global object which implements its own [[Get]] method to get 'value' property (8.10.5 step 5.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            fnGlobalObject().value = "global";

-

-            Object.defineProperties(obj, {

-                property: fnGlobalObject()

-            });

-

-            return obj.property === "global";

-        } finally {

-            delete fnGlobalObject().value;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the global object which
+    implements its own [[Get]] method to get 'value' property (8.10.5
+    step 5.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            fnGlobalObject().value = "global";
+
+            Object.defineProperties(obj, {
+                property: fnGlobalObject()
+            });
+
+            return obj.property === "global";
+        } finally {
+            delete fnGlobalObject().value;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-138.js
index 59213738c..897996251 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-138.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-138.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is present (8.10.5 step 6)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: false

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is
+    present (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: false
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-139.js
index c86d56d5b..7b1d63b3a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-139.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-139.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is not present (8.10.5 step 6)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                value: "abc"

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is not
+    present (8.10.5 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                value: "abc"
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-14.js
index 4edfcabe4..f6e4d32e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-14.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-14.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-        var proto = {

-            enumerable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+        var proto = {
+            enumerable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-140.js
index ae4bfed53..194297796 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-140.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-140.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: false

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    data property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: false
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-141.js
index 3cd909a67..ffba891ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-141.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-141.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            writable: false

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is
+    inherited data property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            writable: false
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-142.js
index 36d961509..e44d8277a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-142.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-142.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            writable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    data property that overrides an inherited data property (8.10.5
+    step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            writable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-143.js
index cc446e504..29d720376 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-143.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-143.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = { value: 120 };

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "writable", {

-            value: false

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && obj.property === 120;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    data property that overrides an inherited accessor property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = { value: 120 };
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "writable", {
+            value: false
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && obj.property === 120;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-144.js
index b6b317979..621a2a97c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-144.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-144.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-145.js
index 079a64cda..f150159b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-145.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-145.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is
+    inherited accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-146.js
index efcbb574d..d01619cd9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-146.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-146.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            writable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            writable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-147.js
index e495ea2e2..dd77ec50c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-147.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-147.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "writable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "writable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-148.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-148.js
index 464bcdf52..c90406554 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-148.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-148.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-148.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own accessor property without a get function (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "writable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    accessor property without a get function (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "writable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-149.js
index d06cec25f..c2b93bf9e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-149.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-149.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "writable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is own
+    accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "writable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-15.js
index 2b769b799..240047d7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-15.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-15.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        var accessed = false;

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        var accessed = false;
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-150.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-150.js
index 9dbc88f9b..568267e47 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-150.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-150.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-150.js

- * @description Object.defineProperties - 'writable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "writable", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'writable' property of 'descObj' is
+    inherited accessor property without a get function (8.10.5 step
+    6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "writable", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-151.js
index 4f306ec2d..f47f16ee5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-151.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-151.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            return a + b;

-        };

-

-        func.writable = false;

-

-        Object.defineProperties(obj, {

-            property: func

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            return a + b;
+        };
+
+        func.writable = false;
+
+        Object.defineProperties(obj, {
+            property: func
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-152.js
index cadeed3c7..6ce4befdb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-152.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-152.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var arr = [1, 2, 3];

-

-        arr.writable = false;

-

-        Object.defineProperties(obj, {

-            property: arr

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var arr = [1, 2, 3];
+
+        arr.writable = false;
+
+        Object.defineProperties(obj, {
+            property: arr
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-153.js
index 4fbf0b3d6..c1002aec6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-153.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-153.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var str = new String("abc");

-

-        str.writable = false;

-

-        Object.defineProperties(obj, {

-            property: str

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var str = new String("abc");
+
+        str.writable = false;
+
+        Object.defineProperties(obj, {
+            property: str
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-154.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-154.js
index 2d43785df..c57abf8be 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-154.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-154.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-154.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Boolean(false);

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Boolean(false);
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-155.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-155.js
index 36b5b8760..f990114bc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-155.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-155.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-155.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Number(-9);

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Number(-9);
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-156.js
index 445421295..c9b89f8a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-156.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-156.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Math.writable = false;

-

-            Object.defineProperties(obj, {

-                property: Math

-            });

-

-            obj.property = "isWritable";

-

-            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-        } finally {

-            delete Math.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Math.writable = false;
+
+            Object.defineProperties(obj, {
+                property: Math
+            });
+
+            obj.property = "isWritable";
+
+            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+        } finally {
+            delete Math.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-157.js
index 1bbd65cb4..28ef611ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-157.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-157.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Date();

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Date();
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-158.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-158.js
index e9b5504da..7335ae70c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-158.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-158.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-158.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new RegExp();

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new RegExp();
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-159.js
index 82ec511bf..5fb863962 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-159.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-159.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            JSON.writable = false;

-

-            Object.defineProperties(obj, {

-                property: JSON

-            });

-

-            obj.property = "isWritable";

-

-            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-        } finally {

-            delete JSON.writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            JSON.writable = false;
+
+            Object.defineProperties(obj, {
+                property: JSON
+            });
+
+            obj.property = "isWritable";
+
+            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+        } finally {
+            delete JSON.writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-16.js
index 8e01a63f6..51878894d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-16.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-16.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-        var descObj = {};

-

-        Object.defineProperty(descObj, "enumerable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own accessor property without a get function (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+        var descObj = {};
+
+        Object.defineProperty(descObj, "enumerable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-160.js
index 307ca72a8..e90ec8bc6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-160.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-160.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Error();

-

-        descObj.writable = false;

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Error();
+
+        descObj.writable = false;
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-161.js
index bac3280c7..b4d424094 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-161.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-161.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            arguments.writable = false;

-

-            Object.defineProperties(obj, {

-                property: arguments

-            });

-

-            obj.property = "isWritable";

-

-            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-        };

-

-        return func();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            arguments.writable = false;
+
+            Object.defineProperties(obj, {
+                property: arguments
+            });
+
+            obj.property = "isWritable";
+
+            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+        };
+
+        return func();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-163.js
index bae1ad92f..0ff779c30 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-163.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-163.js

- * @description Object.defineProperties - 'descObj' is the global object which implements its own [[Get]] method to get 'writable' property (8.10.5 step 6.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            fnGlobalObject().writable = false;

-

-            Object.defineProperties(obj, {

-                property: fnGlobalObject()

-            });

-

-            obj.property = "isWritable";

-

-            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-        } finally {

-            delete fnGlobalObject().writable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the global object which
+    implements its own [[Get]] method to get 'writable' property
+    (8.10.5 step 6.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            fnGlobalObject().writable = false;
+
+            Object.defineProperties(obj, {
+                property: fnGlobalObject()
+            });
+
+            obj.property = "isWritable";
+
+            return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+        } finally {
+            delete fnGlobalObject().writable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-164.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-164.js
index 834c1eff5..2082b23c3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-164.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-164.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-164.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is undefined (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: undefined

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is undefined (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: undefined
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-165.js
index 552b10d71..21c39dafb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-165.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-165.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is null (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: null

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is null (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: null
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-166.js
index 24d62efa4..cd7879348 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-166.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-166.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is true (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: true

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is true (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: true
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-167.js
index a1415191a..7c51c2543 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-167.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-167.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is false (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: false

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is false (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: false
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-168.js
index 0dd0fed77..fa7f6ac56 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-168.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-168.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is 0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: 0

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is 0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: 0
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-169.js
index fc765ce04..0ed9b2d53 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-169.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-169.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is +0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: +0

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is +0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: +0
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-17.js
index d7c4c7215..66fefa91c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-17.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-17.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj'  is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        var accessed = false;

-        Object.defineProperty(proto, "enumerable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "enumerable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj'  is
+    own accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        var accessed = false;
+        Object.defineProperty(proto, "enumerable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "enumerable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-170.js
index d068d62fc..c7d2d801c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-170.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-170.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is -0 (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: -0

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is -0 (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: -0
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-171.js
index e92a2b23f..eb5291df5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-171.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-171.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is NaN (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: NaN

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is NaN (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: NaN
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-172.js
index 8ba112d97..1d05bf2ed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-172.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-172.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is positive number (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: 123

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is positive number (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: 123
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-173.js
index fef0fe1c2..cbc958de1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-173.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-173.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is negative number (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: -123

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is negative number (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: -123
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-174.js
index 4400118a2..41c2c405b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-174.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-174.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is empty string (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: ""

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is empty string (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: ""
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-175.js
index c2d5806d4..611aef3c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-175.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-175.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is non-empty string (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: "abc"

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is non-empty string (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: "abc"
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-176.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-176.js
index d21760ed5..ec1d8e576 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-176.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-176.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-176.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is Function object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: function () { }

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is Function object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: function () { }
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-177.js
index fb2f97c32..b5e69b483 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-177.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-177.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is Array object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: []

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is Array object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: []
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-178.js
index ae9f69682..1e710f41f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-178.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-178.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is String object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new String("abc")

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is String object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new String("abc")
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-179.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-179.js
index 5f2f10fc0..f0188bf19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-179.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-179.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-179.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is Boolean object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new Boolean(true)

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is Boolean object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new Boolean(true)
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-18.js
index 2840cdac1..dd55ea732 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-18.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-18.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        var accessed = false;

-

-        Object.defineProperty(proto, "enumerable", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    inherited accessor property without a get function (8.10.5 step
+    3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        var accessed = false;
+
+        Object.defineProperty(proto, "enumerable", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-180.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-180.js
index b74158180..e6a9334a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-180.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-180.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-180.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is Number object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new Number(123)

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is Number object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new Number(123)
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-181.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-181.js
index 6fde31585..162473940 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-181.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-181.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-181.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is the Math object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: Math

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is the Math object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: Math
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-182.js
index 2f4359f94..87fcb3544 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-182.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-182.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is  Date object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new Date()

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is  Date object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new Date()
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-183.js
index 1036dbf6f..aa27409a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-183.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-183.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is RegExp object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new RegExp()

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is RegExp object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new RegExp()
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-184.js
index c90f89dd3..bf724b72f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-184.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-184.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is the JSON object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: JSON

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is the JSON object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: JSON
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-185.js
index 191e90476..55331d41c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-185.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-185.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is Error object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new SyntaxError()

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is Error object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new SyntaxError()
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-186.js
index 3d9b222c6..eb1f83334 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-186.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-186.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is the Argument object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b, c) {

-            return arguments;

-        };

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: func(1, true, "a")

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is the Argument object (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b, c) {
+            return arguments;
+        };
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: func(1, true, "a")
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-188.js
index db988505d..75fb85b37 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-188.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-188.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is the global object (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: fnGlobalObject()

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is the global object (8.10.5 step 6.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: fnGlobalObject()
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-189.js
index fa1689f96..71dca6611 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-189.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-189.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: "false"

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is a string (value is 'false') which is treated as true
+    value (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: "false"
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-19.js
index aed16b65c..45ef6bf30 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-19.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-19.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = function () { };

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = function () { };
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-190.js
index 087368d4f..3ff1522bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-190.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-190.js

- * @description Object.defineProperties - value of 'writable' property of 'descObj' is  new Boolean(false) which is treated as true value (8.10.5 step 6.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                writable: new Boolean(false)

-            }

-        });

-

-        obj.property = "isWritable";

-

-        return obj.property === "isWritable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'writable' property of
+    'descObj' is  new Boolean(false) which is treated as true value
+    (8.10.5 step 6.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                writable: new Boolean(false)
+            }
+        });
+
+        obj.property = "isWritable";
+
+        return obj.property === "isWritable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-191.js
index 2406ffa15..15a03c8fe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-191.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-191.js

- * @description Object.defineProperties - 'get' property of 'descObj' is present (8.10.5 step 7)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getter = function () {

-            return "present";

-        };

-

-        Object.defineProperties(obj, {

-            property: {

-                get: getter

-            }

-        });

-

-        return obj.property === "present";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is present
+    (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getter = function () {
+            return "present";
+        };
+
+        Object.defineProperties(obj, {
+            property: {
+                get: getter
+            }
+        });
+
+        return obj.property === "present";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-192.js
index 230ce4987..6c0d0ee95 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-192.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-192.js

- * @description Object.defineProperties - 'get' property of 'descObj' is not present (8.10.5 step 7)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var setter = function () { };

-

-        Object.defineProperties(obj, {

-            property: {

-                set: setter

-            }

-        });

-

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is not
+    present (8.10.5 step 7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var setter = function () { };
+
+        Object.defineProperties(obj, {
+            property: {
+                set: setter
+            }
+        });
+
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-193.js
index 7d701fc82..7452d0bed 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-193.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-193.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getter = function () {

-            return "ownDataProperty";

-        };

-

-        Object.defineProperties(obj, {

-            property: {

-                get: getter

-            }

-        });

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own data
+    property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getter = function () {
+            return "ownDataProperty";
+        };
+
+        Object.defineProperties(obj, {
+            property: {
+                get: getter
+            }
+        });
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-194.js
index 0830a276b..35f77b952 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-194.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-194.js

- * @description Object.defineProperties - 'get' property of 'descObj' is inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getter = function () {

-            return "inheritedDataProperty";

-        };

-

-        var proto = {

-            get: getter

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "inheritedDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is inherited
+    data property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getter = function () {
+            return "inheritedDataProperty";
+        };
+
+        var proto = {
+            get: getter
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "inheritedDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-195.js
index 697c80929..6ea37f654 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-195.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-195.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getter = function () {

-            return "inheritedDataProperty";

-        };

-

-        var proto = {

-            get: getter

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        descObj.get = function () {

-            return "ownDataProperty";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own data
+    property that overrides an inherited data property (8.10.5 step
+    7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getter = function () {
+            return "inheritedDataProperty";
+        };
+
+        var proto = {
+            get: getter
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        descObj.get = function () {
+            return "ownDataProperty";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-196.js
index 00f793118..53a9c1f3b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-196.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-196.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "get", {

-            value: function () {

-                return "ownDataProperty";

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownDataProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own data
+    property that overrides an inherited accessor property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "get", {
+            value: function () {
+                return "ownDataProperty";
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownDataProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-197.js
index 2b85f4592..8d29ccccf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-197.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-197.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own
+    accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-198.js
index bb527654b..aa47eb3e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-198.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-198.js

- * @description Object.defineProperties - 'get' property of 'descObj' is inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "inheritedAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is inherited
+    accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "inheritedAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-199.js
index 5c694b2b6..ae80d0bec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-199.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-199.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {

-            get: function () {

-                return "inheritedDataProperty";

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {
+            get: function () {
+                return "inheritedDataProperty";
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-2.js
index 68e860a3d..f5649c9ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-2.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-2.js

- * @description Object.defineProperties - 'descObj' is null (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-      

-        try {

-            Object.defineProperties(obj, {

-                prop: null

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop"); ;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - 'descObj' is null (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+      
+        try {
+            Object.defineProperties(obj, {
+                prop: null
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop"); ;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-20.js
index 48cf2e4fe..4068b1dbd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-20.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-20.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-        var descObj = [];

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+        var descObj = [];
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-200.js
index 00ae3d0e4..8bf07b4cf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-200.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-200.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "get", {

-            get: function () {

-                return function () {

-                    return "ownAccessorProperty";

-                };

-            }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "ownAccessorProperty";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "get", {
+            get: function () {
+                return function () {
+                    return "ownAccessorProperty";
+                };
+            }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "ownAccessorProperty";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-201.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-201.js
index 4dee2d556..0e66237dd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-201.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-201.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-201.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = {};

-

-        Object.defineProperty(descObj, "get", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own
+    accessor property without a get function (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = {};
+
+        Object.defineProperty(descObj, "get", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-202.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-202.js
index acdd75927..215ad425f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-202.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-202.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-202.js

- * @description Object.defineProperties - 'get' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            get: function () {

-                return function () {

-                    return "inheritedAccessorProperty";

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "get", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is own
+    accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            get: function () {
+                return function () {
+                    return "inheritedAccessorProperty";
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "get", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-203.js
index 01b8fd7ef..95964864e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-203.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-203.js

- * @description Object.defineProperties - 'get' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var proto = {};

-

-        Object.defineProperty(proto, "get", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'get' property of 'descObj' is inherited
+    accessor property without a get function (8.10.5 step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var proto = {};
+
+        Object.defineProperty(proto, "get", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-204.js
index f7fbfff4b..136dc02dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-204.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-204.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            return a + b;

-        };

-

-        func.get = function () {

-            return "Function";

-        };

-

-        Object.defineProperties(obj, {

-            property: func

-        });

-

-        return obj.property === "Function";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            return a + b;
+        };
+
+        func.get = function () {
+            return "Function";
+        };
+
+        Object.defineProperties(obj, {
+            property: func
+        });
+
+        return obj.property === "Function";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-205.js
index 34722bd45..91252c04a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-205.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-205.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var arr = [];

-

-        arr.get = function () {

-            return "Array";

-        };

-

-        Object.defineProperties(obj, {

-            property: arr

-        });

-

-        return obj.property === "Array";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var arr = [];
+
+        arr.get = function () {
+            return "Array";
+        };
+
+        Object.defineProperties(obj, {
+            property: arr
+        });
+
+        return obj.property === "Array";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-206.js
index 49014f5ad..cd1ffb349 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-206.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-206.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var str = new String("abc");

-

-        str.get = function () {

-            return "string Object";

-        };

-

-        Object.defineProperties(obj, {

-            property: str

-        });

-

-        return obj.property === "string Object";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var str = new String("abc");
+
+        str.get = function () {
+            return "string Object";
+        };
+
+        Object.defineProperties(obj, {
+            property: str
+        });
+
+        return obj.property === "string Object";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-207.js
index c2aa17273..bcdc163ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-207.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-207.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Boolean(false);

-

-        descObj.get = function () {

-            return "Boolean";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Boolean";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Boolean(false);
+
+        descObj.get = function () {
+            return "Boolean";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Boolean";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-208.js
index 601fe6325..914354ca8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-208.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-208.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Number(-9);

-

-        descObj.get = function () {

-            return "Number";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Number";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Number(-9);
+
+        descObj.get = function () {
+            return "Number";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Number";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-209.js
index 2333e743c..974e787ab 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-209.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-209.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Math.get = function () {

-                return "Math";

-            };

-

-            Object.defineProperties(obj, {

-                property: Math

-            });

-

-            return obj.property === "Math";

-        } finally {

-            delete Math.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Math.get = function () {
+                return "Math";
+            };
+
+            Object.defineProperties(obj, {
+                property: Math
+            });
+
+            return obj.property === "Math";
+        } finally {
+            delete Math.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-21.js
index 959350084..4ae8eeb19 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-21.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-21.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new String();

-        var accessed = false;

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new String();
+        var accessed = false;
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-210.js
index 320c688cf..d3036afbb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-210.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-210.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Date();

-

-        descObj.get = function () {

-            return "Date";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Date";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Date();
+
+        descObj.get = function () {
+            return "Date";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Date";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-211.js
index 4feeae08d..265757567 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-211.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-211.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new RegExp();

-

-        descObj.get = function () {

-            return "RegExp";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "RegExp";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new RegExp();
+
+        descObj.get = function () {
+            return "RegExp";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "RegExp";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-212.js
index 5b536504f..53fa64ae6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-212.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-212.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            JSON.get = function () {

-                return "JSON";

-            };

-

-            Object.defineProperties(obj, {

-                property: JSON

-            });

-

-            return obj.property === "JSON";

-        } finally {

-            delete JSON.get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            JSON.get = function () {
+                return "JSON";
+            };
+
+            Object.defineProperties(obj, {
+                property: JSON
+            });
+
+            return obj.property === "JSON";
+        } finally {
+            delete JSON.get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-213.js
index 2905a30dd..c4dd38418 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-213.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-213.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var descObj = new Error();

-

-        descObj.get = function () {

-            return "Error";

-        };

-

-        Object.defineProperties(obj, {

-            property: descObj

-        });

-

-        return obj.property === "Error";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var descObj = new Error();
+
+        descObj.get = function () {
+            return "Error";
+        };
+
+        Object.defineProperties(obj, {
+            property: descObj
+        });
+
+        return obj.property === "Error";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-214.js
index 9484b9135..cabe10e14 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-214.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-214.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var func = function (a, b) {

-            arguments.get = function () {

-                return "arguments";

-            };

-

-            Object.defineProperties(obj, {

-                property: arguments

-            });

-

-            return obj.property === "arguments";

-        };

-

-        return func();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var func = function (a, b) {
+            arguments.get = function () {
+                return "arguments";
+            };
+
+            Object.defineProperties(obj, {
+                property: arguments
+            });
+
+            return obj.property === "arguments";
+        };
+
+        return func();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-216.js
index ea8ee7e18..58780b3eb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-216.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-216.js

- * @description Object.defineProperties - 'descObj' is the global object which implements its own [[Get]] method to get 'get' property (8.10.5 step 7.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            fnGlobalObject().get = function () {

-                return "global";

-            };

-

-            Object.defineProperties(obj, {

-                property: fnGlobalObject()

-            });

-

-            return obj.property === "global";

-        } finally {

-            delete fnGlobalObject().get;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the global object which
+    implements its own [[Get]] method to get 'get' property (8.10.5
+    step 7.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            fnGlobalObject().get = function () {
+                return "global";
+            };
+
+            Object.defineProperties(obj, {
+                property: fnGlobalObject()
+            });
+
+            return obj.property === "global";
+        } finally {
+            delete fnGlobalObject().get;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-217.js
index 7bc3a6a8b..1a1ec8fc0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-217.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-217.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is undefined (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                get: undefined

-            }

-        });

-

-        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    undefined (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                get: undefined
+            }
+        });
+
+        return obj.hasOwnProperty("property") && typeof obj.property === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-218.js
index bc2bf525a..35ff08623 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-218.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-218.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is primitive values( value is null) (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    get: null

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    primitive values( value is null) (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    get: null
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-219.js
index 4781afc5f..5ab9b5b5c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-219.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-219.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is primitive values( value is boolean) (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    get: false

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    primitive values( value is boolean) (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    get: false
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-22.js
index 4faa587a3..7459006e4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-22.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-22.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new Boolean(false);

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new Boolean(false);
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-220.js
index 37562cba6..ace805f55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-220.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-220.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is primitive values( value is number) (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    get: 123

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    primitive values( value is number) (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    get: 123
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-221.js
index 59a035074..aac035f67 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-221.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-221.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is primitive values( value is string) (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    get: "string"

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    primitive values( value is string) (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    get: "string"
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-222.js
index 7e5079e95..728dcb02c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-222.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-222.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is applied to Array object (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    get: []

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    applied to Array object (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    get: []
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-223.js
index 161d1cb52..1fbc2482c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-223.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-223.js

- * @description Object.defineProperties - value of 'get' property of 'descObj' is a function (8.10.5 step 7.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var getter = function () {

-            return 100;

-        };

-

-        Object.defineProperties(obj, {

-            property: {

-                get: getter

-            }

-        });

-

-        return obj.property === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'get' property of 'descObj' is
+    a function (8.10.5 step 7.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var getter = function () {
+            return 100;
+        };
+
+        Object.defineProperties(obj, {
+            property: {
+                get: getter
+            }
+        });
+
+        return obj.property === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-226.js
index 2ea3d234c..729ce03d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-226.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-226.js

- * @description Object.defineProperties - 'set' property of 'descObj' is present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var data = "data";

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            "prop": {

-                set: function (value) {

-                    data = value;

-                }

-            }

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is present
+    (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            "prop": {
+                set: function (value) {
+                    data = value;
+                }
+            }
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-227.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-227.js
index e12ba96cf..8f4aa42e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-227.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-227.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-227.js

- * @description Object.defineProperties - 'set' property of 'descObj' is not present (8.10.5 step 8)

- */

-

-

-function testcase() {

-        var data = "data";

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                descObj: {

-                    get: function () {

-                        return data;

-                    }

-                }

-            });

-

-

-            obj.descObj = "overrideData";

-

-            var desc = Object.getOwnPropertyDescriptor(obj, "descObj");

-            return obj.hasOwnProperty("descObj") && typeof (desc.set) === "undefined" && data === "data";

-        } catch (e) {

-            return false;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is not
+    present (8.10.5 step 8)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                descObj: {
+                    get: function () {
+                        return data;
+                    }
+                }
+            });
+
+
+            obj.descObj = "overrideData";
+
+            var desc = Object.getOwnPropertyDescriptor(obj, "descObj");
+            return obj.hasOwnProperty("descObj") && typeof (desc.set) === "undefined" && data === "data";
+        } catch (e) {
+            return false;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-228.js
index 6bed0b8df..b04c35341 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-228.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-228.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            descObj: {

-                set: function (value) {

-                    data = value;

-                }

-            }

-        });

-

-        obj.descObj = "overrideData";

-

-        return obj.hasOwnProperty("descObj") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own data
+    property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            descObj: {
+                set: function (value) {
+                    data = value;
+                }
+            }
+        });
+
+        obj.descObj = "overrideData";
+
+        return obj.hasOwnProperty("descObj") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-229.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-229.js
index 66fc9c445..d4ee446e8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-229.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-229.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-229.js

- * @description Object.defineProperties - 'set' property of 'descObj' is inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var proto = {

-            set: function (value) {

-                data = value;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data === "overrideData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is inherited
+    data property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var proto = {
+            set: function (value) {
+                data = value;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data === "overrideData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-23.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-23.js
index dac72261f..1d672c543 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-23.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-23.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-23.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new Number(-9);

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new Number(-9);
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-230.js
index a1fcd3d71..b68847d35 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-230.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-230.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-        var proto = {

-            set: function (value) {

-                data2 = value;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.set = function (value) {

-            data1 = value;

-        };

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own data
+    property that overrides an inherited data property (8.10.5 step
+    8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+        var proto = {
+            set: function (value) {
+                data2 = value;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.set = function (value) {
+            data1 = value;
+        };
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-231.js
index 6265597dc..1a183822d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-231.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-231.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-        var fun = function (value) {

-            data2 = value;

-        };

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return fun;

-            },

-            set: function (value) {

-                fun = value;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.set = function (value) {

-            data1 = value;

-        };

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own data
+    property that overrides an inherited accessor property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+        var fun = function (value) {
+            data2 = value;
+        };
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return fun;
+            },
+            set: function (value) {
+                fun = value;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.set = function (value) {
+            data1 = value;
+        };
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data1 === "overrideData" && data2 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-232.js
index a586d233d..ec59a725d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-232.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-232.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var setFun = function (value) {

-            data = value;

-        };

-        var descObj = {};

-        Object.defineProperty(descObj, "set", {

-            get: function () {

-                return setFun;

-            }

-        });

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data === "overrideData";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own
+    accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var setFun = function (value) {
+            data = value;
+        };
+        var descObj = {};
+        Object.defineProperty(descObj, "set", {
+            get: function () {
+                return setFun;
+            }
+        });
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data === "overrideData";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-233.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-233.js
index f0224ce41..883b50249 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-233.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-233.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-233.js

- * @description Object.defineProperties - 'set' property of 'descObj' is inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var setFun = function (value) {

-            data = value;

-        };

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return setFun;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data === "overrideData";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is inherited
+    accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var setFun = function (value) {
+            data = value;
+        };
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return setFun;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data === "overrideData";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-234.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-234.js
index 2c9149385..f7d80119e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-234.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-234.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-234.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-

-        var proto = {};

-        proto.set = function (value) {

-            data1 = value;

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own
+    accessor property that overrides an inherited data property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+
+        var proto = {};
+        proto.set = function (value) {
+            data1 = value;
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-235.js
index cfcb0b741..0b0ae6c01 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-235.js
@@ -1,47 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-235.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data1 = "data";

-        var data2 = "data";

-

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function (value) {

-                    data1 = value;

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "set", {

-            get: function () {

-                return function (value) {

-                    data2 = value;

-                };

-            }

-        });

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: child

-        });

-

-        obj.prop = "overrideData";

-

-        return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own
+    accessor property that overrides an inherited accessor property
+    (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data1 = "data";
+        var data2 = "data";
+
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function (value) {
+                    data1 = value;
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "set", {
+            get: function () {
+                return function (value) {
+                    data2 = value;
+                };
+            }
+        });
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: child
+        });
+
+        obj.prop = "overrideData";
+
+        return obj.hasOwnProperty("prop") && data2 === "overrideData" && data1 === "data";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-236.js
index cab1f2627..34ecd00f2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-236.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-236.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var fun = function () {

-            return 10;

-        };

-        var descObj = {

-            get: fun

-        };

-        Object.defineProperty(descObj, "set", {

-            set: function () { }

-        });

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && typeof desc.set === "undefined" && obj.prop === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own
+    accessor property without a get function (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var fun = function () {
+            return 10;
+        };
+        var descObj = {
+            get: fun
+        };
+        Object.defineProperty(descObj, "set", {
+            set: function () { }
+        });
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && typeof desc.set === "undefined" && obj.prop === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-237.js
index b36f3a811..091a5468c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-237.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-237.js

- * @description Object.defineProperties - 'set' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var fun = function () {

-            return 10; 

-        };

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            get: function () {

-                return function () {

-                    return arguments;

-                };

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-        Object.defineProperty(descObj, "set", {

-            set: function () { }

-        });

-

-        descObj.get = fun;

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is own
+    accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fun = function () {
+            return 10; 
+        };
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            get: function () {
+                return function () {
+                    return arguments;
+                };
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+        Object.defineProperty(descObj, "set", {
+            set: function () { }
+        });
+
+        descObj.get = fun;
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-238.js
index 61b33656f..d1efcfabd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-238.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-238.js

- * @description Object.defineProperties - 'set' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var fun = function () {

-            return 10; 

-        };

-        var proto = {};

-        Object.defineProperty(proto, "set", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var descObj = new Con();

-        descObj.get = fun;

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'set' property of 'descObj' is inherited
+    accessor property without a get function (8.10.5 step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fun = function () {
+            return 10; 
+        };
+        var proto = {};
+        Object.defineProperty(proto, "set", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var descObj = new Con();
+        descObj.get = fun;
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined" && obj.prop === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-239.js
index 9fe679d8f..b8c97f68f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-239.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-239.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var descFun = function () { };

-        var setFun = function (value) {

-            data = value;

-        };

-

-        descFun.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descFun);

-        obj.prop = "funData";

-        return obj.hasOwnProperty("prop") && data === "funData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var descFun = function () { };
+        var setFun = function (value) {
+            data = value;
+        };
+
+        descFun.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descFun);
+        obj.prop = "funData";
+        return obj.hasOwnProperty("prop") && data === "funData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-24.js
index 42061a625..9bc73f13a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-24.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-24.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        try {

-            Math.enumerable = true;

-

-            Object.defineProperties(obj, {

-                prop: Math

-            });

-            for (var property in obj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete Math.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        try {
+            Math.enumerable = true;
+
+            Object.defineProperties(obj, {
+                prop: Math
+            });
+            for (var property in obj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete Math.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-240.js
index 05e5565ab..91686ebf0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-240.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-240.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var arr = [];

-        var setFun = function (value) {

-            data = value;

-        };

-        arr.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, arr);

-        obj.prop = "arrData";

-        return obj.hasOwnProperty("prop") && data === "arrData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var arr = [];
+        var setFun = function (value) {
+            data = value;
+        };
+        arr.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, arr);
+        obj.prop = "arrData";
+        return obj.hasOwnProperty("prop") && data === "arrData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-241.js
index 4c0215058..2fb713318 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-241.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-241.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var descStr = new String();

-        var setFun = function (value) {

-            data = value;

-        };

-

-        descStr.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descStr);

-        obj.prop = "strData";

-        return obj.hasOwnProperty("prop") && data === "strData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var descStr = new String();
+        var setFun = function (value) {
+            data = value;
+        };
+
+        descStr.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descStr);
+        obj.prop = "strData";
+        return obj.hasOwnProperty("prop") && data === "strData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-242.js
index e360b1957..e2bd395ca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-242.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-242.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var descObj = new Boolean(false);

-        var setFun = function (value) {

-            data = value;

-        };

-        descObj.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descObj);

-        obj.prop = "booleanData";

-        return obj.hasOwnProperty("prop") && data === "booleanData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var descObj = new Boolean(false);
+        var setFun = function (value) {
+            data = value;
+        };
+        descObj.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descObj);
+        obj.prop = "booleanData";
+        return obj.hasOwnProperty("prop") && data === "booleanData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-243.js
index e7f9ef9b0..d758d8dda 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-243.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-243.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var descObj = new Number(-9);

-        var setFun = function (value) {

-            data = value;

-        };

-        descObj.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descObj);

-        obj.prop = "numberData";

-        return obj.hasOwnProperty("prop") && data === "numberData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var descObj = new Number(-9);
+        var setFun = function (value) {
+            data = value;
+        };
+        descObj.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descObj);
+        obj.prop = "numberData";
+        return obj.hasOwnProperty("prop") && data === "numberData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-244.js
index 653100815..968564afe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-244.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-244.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var setFun = function (value) {

-            data = value;

-        };

-        try {

-            Math.prop = {

-                set: setFun

-            };

-

-            var obj = {};

-            Object.defineProperties(obj, Math);

-            obj.prop = "mathData";

-            return obj.hasOwnProperty("prop") && data === "mathData";

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var setFun = function (value) {
+            data = value;
+        };
+        try {
+            Math.prop = {
+                set: setFun
+            };
+
+            var obj = {};
+            Object.defineProperties(obj, Math);
+            obj.prop = "mathData";
+            return obj.hasOwnProperty("prop") && data === "mathData";
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-245.js
index 2f6aba6a2..2ef36f15a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-245.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-245.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var descObj = new Date();

-        var setFun = function (value) {

-            data = value;

-        };

-        descObj.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descObj);

-        obj.prop = "dateData";

-        return obj.hasOwnProperty("prop") && data === "dateData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var descObj = new Date();
+        var setFun = function (value) {
+            data = value;
+        };
+        descObj.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descObj);
+        obj.prop = "dateData";
+        return obj.hasOwnProperty("prop") && data === "dateData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-246.js
index 71befa424..340223ca0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-246.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-246.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var descObj = new RegExp();

-        var setFun = function (value) {

-            data = value;

-        };

-        descObj.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descObj);

-        obj.prop = "regExpData";

-        return obj.hasOwnProperty("prop") && data === "regExpData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var descObj = new RegExp();
+        var setFun = function (value) {
+            data = value;
+        };
+        descObj.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descObj);
+        obj.prop = "regExpData";
+        return obj.hasOwnProperty("prop") && data === "regExpData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-247.js
index 7e3ea3845..98fbd3d00 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-247.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-247.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var setFun = function (value) {

-            data = value;

-        };

-        try {

-            JSON.prop = {

-                set: setFun

-            };

-

-            var obj = {};

-            Object.defineProperties(obj, JSON);

-            obj.prop = "JSONData";

-            return obj.hasOwnProperty("prop") && data === "JSONData";

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var setFun = function (value) {
+            data = value;
+        };
+        try {
+            JSON.prop = {
+                set: setFun
+            };
+
+            var obj = {};
+            Object.defineProperties(obj, JSON);
+            obj.prop = "JSONData";
+            return obj.hasOwnProperty("prop") && data === "JSONData";
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-248.js
index cac869fc1..80fcc3cf1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-248.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-248.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var descObj = new Error("test");

-        descObj.description = { value: 11 };

-        descObj.message = { value: 11 };

-        descObj.name = { value: 11 };

-

-        var setFun = function (value) {

-            data = value;

-        };

-        descObj.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, descObj);

-        obj.prop = "errorData";

-        return obj.hasOwnProperty("prop") && data === "errorData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var descObj = new Error("test");
+        descObj.description = { value: 11 };
+        descObj.message = { value: 11 };
+        descObj.name = { value: 11 };
+
+        var setFun = function (value) {
+            data = value;
+        };
+        descObj.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, descObj);
+        obj.prop = "errorData";
+        return obj.hasOwnProperty("prop") && data === "errorData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-249.js
index d95749b7f..d2913d0a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-249.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-249.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'set' property (8.10.5 step 8.a)

- */

-

-

-function testcase() {

-        var data = "data";

-        var fun = function () {

-            return arguments;

-        };

-        var arg = fun();

-        var setFun = function (value) {

-            data = value;

-        };

-

-        arg.prop = {

-            set: setFun

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, arg);

-        obj.prop = "argData";

-        return obj.hasOwnProperty("prop") && data === "argData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'set' property (8.10.5
+    step 8.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var data = "data";
+        var fun = function () {
+            return arguments;
+        };
+        var arg = fun();
+        var setFun = function (value) {
+            data = value;
+        };
+
+        arg.prop = {
+            set: setFun
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, arg);
+        obj.prop = "argData";
+        return obj.hasOwnProperty("prop") && data === "argData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-25.js
index a6c7da415..b9dc862f0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-25.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-25.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new Date();

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new Date();
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-252.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-252.js
index a5e665fa8..ff4c35bd7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-252.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-252.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-252.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is undefined (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var getFun = function () {

-            return 11;

-        };

-

-        var obj = {};

-        Object.defineProperties(obj, {

-            prop: {

-                get: getFun,

-                set: undefined

-            }

-        });

-

-        try {

-            var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-            return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined";

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    undefined (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var getFun = function () {
+            return 11;
+        };
+
+        var obj = {};
+        Object.defineProperties(obj, {
+            prop: {
+                get: getFun,
+                set: undefined
+            }
+        });
+
+        try {
+            var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+            return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined";
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-253.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-253.js
index 5a08b77ee..6e31059d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-253.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-253.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-253.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is primitive values null (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    set: null

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    primitive values null (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    set: null
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-254.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-254.js
index 301fdae64..0cbac679a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-254.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-254.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-254.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is primitive values boolean (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    set: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    primitive values boolean (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    set: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-255.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-255.js
index 18f63aa8d..22c3aba33 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-255.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-255.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-255.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is primitive values number (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    set: 100

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    primitive values number (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    set: 100
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-256.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-256.js
index befaef4a4..c1888f685 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-256.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-256.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-256.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is primitive values string (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    set: "abcdef"

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    primitive values string (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    set: "abcdef"
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-257.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-257.js
index fcd835711..bcd786b41 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-257.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-257.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-257.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is an interesting object other than a function (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    set: []

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    an interesting object other than a function (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    set: []
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-258.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-258.js
index ef1701833..773c3d2b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-258.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-258.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-258.js

- * @description Object.defineProperties - value of 'set' property of 'descObj' is a function (8.10.5 step 8.b)

- */

-

-

-function testcase() {

-

-        var data = "data";

-        var setFun = function (value) {

-            data = value;

-        };

-        var obj = {};

-

-

-        Object.defineProperties(obj, {

-            prop: {

-                set: setFun

-            }

-        });

-        obj.prop = "funData";

-        return obj.hasOwnProperty("prop") && data === "funData";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'set' property of 'descObj' is
+    a function (8.10.5 step 8.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var data = "data";
+        var setFun = function (value) {
+            data = value;
+        };
+        var obj = {};
+
+
+        Object.defineProperties(obj, {
+            prop: {
+                set: setFun
+            }
+        });
+        obj.prop = "funData";
+        return obj.hasOwnProperty("prop") && data === "funData";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-26.js
index f266f7c2d..cf1980b7c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-26.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-26.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new RegExp();

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new RegExp();
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-261.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-261.js
index 9928f10f6..0107bb45a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-261.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-261.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-261.js

- * @description Object.defineProperties - TypeError is thrown if both 'set' property and 'value' property of 'descObj' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        var setFun = function () {};

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    set: setFun

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if both 'set'
+    property and 'value' property of 'descObj' are present (8.10.5
+    step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var setFun = function () {};
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    set: setFun
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-262.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-262.js
index b970346e1..6e3ae126d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-262.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-262.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-262.js

- * @description Object.defineProperties - TypeError is thrown if both 'set' property and 'writable' property of 'descObj' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        var setFun = function () { };

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    writable: true,

-                    set: setFun

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if both 'set'
+    property and 'writable' property of 'descObj' are present (8.10.5
+    step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var setFun = function () { };
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    writable: true,
+                    set: setFun
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-263.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-263.js
index 3a227f469..698e3957c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-263.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-263.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-263.js

- * @description Object.defineProperties - TypeError is thrown if both 'get' property and 'value' property of 'descObj' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        var getFun = function () {};

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    get: getFun

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if both 'get'
+    property and 'value' property of 'descObj' are present (8.10.5
+    step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var getFun = function () {};
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    get: getFun
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-264.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-264.js
index 531acad78..c0b446716 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-264.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-264.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-264.js

- * @description Object.defineProperties - TypeError is thrown if both 'get' property and 'writable' property of 'descObj' are present (8.10.5 step 9.a)

- */

-

-

-function testcase() {

-

-        var getFun = function () {};

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                "prop": {

-                    writable: true,

-                    get: getFun

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if both 'get'
+    property and 'writable' property of 'descObj' are present (8.10.5
+    step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var getFun = function () {};
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                "prop": {
+                    writable: true,
+                    get: getFun
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-27.js
index 2036b7d8d..cee1f6d6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-27.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-27.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        try {

-            JSON.enumerable = true;

-

-            Object.defineProperties(obj, {

-                prop: JSON

-            });

-            for (var property in obj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete JSON.enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        try {
+            JSON.enumerable = true;
+
+            Object.defineProperties(obj, {
+                prop: JSON
+            });
+            for (var property in obj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete JSON.enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-28.js
index aaf46f2a0..bd92b0431 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-28.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-28.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var descObj = new Error();

-        var accessed = false;

-

-        descObj.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var descObj = new Error();
+        var accessed = false;
+
+        descObj.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-29.js
index 8a739d92a..5c1b40e76 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-29.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-29.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var arg;

-        var accessed = false;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        arg.enumerable = true;

-

-        Object.defineProperties(obj, {

-            prop: arg

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var arg;
+        var accessed = false;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        arg.enumerable = true;
+
+        Object.defineProperties(obj, {
+            prop: arg
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-3.js
index 44aecdca6..3c392be55 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-3.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-3.js

- * @description Object.defineProperties - 'descObj' is a boolean (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: true

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - 'descObj' is a boolean (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: true
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-31.js
index eeb7a1b1d..74996457a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-31.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-31.js

- * @description Object.defineProperties - 'descObj' is the global object which implements its own [[Get]] method to get 'enumerable' property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        try {

-            fnGlobalObject().enumerable = true;

-

-            Object.defineProperties(obj, {

-                prop: fnGlobalObject()

-            });

-            for (var property in obj) {

-                if (property === "prop") {

-                    accessed = true;

-                }

-            }

-            return accessed;

-        } finally {

-            delete fnGlobalObject().enumerable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the global object which
+    implements its own [[Get]] method to get 'enumerable' property
+    (8.10.5 step 3.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        try {
+            fnGlobalObject().enumerable = true;
+
+            Object.defineProperties(obj, {
+                prop: fnGlobalObject()
+            });
+            for (var property in obj) {
+                if (property === "prop") {
+                    accessed = true;
+                }
+            }
+            return accessed;
+        } finally {
+            delete fnGlobalObject().enumerable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-32.js
index 5e626f8e0..94286533d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-32.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-32.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is undefined (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: undefined

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is undefined (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: undefined
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-33.js
index 605a29ece..4d2a57c0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-33.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-33.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is null (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: null

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is null (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: null
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-34.js
index c1de06c50..43df8d71f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-34.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-34.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is true (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: true

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is true (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: true
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-35.js
index 4d13cc326..861b01fa5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-35.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-35.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is false (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: false

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is false (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: false
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-36.js
index f274e0727..9b21355c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-36.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-36.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is 0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: 0

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is 0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: 0
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-37.js
index 0546e8d10..6752b8fe0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-37.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-37.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is +0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: +0

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is +0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: +0
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-38.js
index a50790126..932c3201c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-38.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-38.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is -0 (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: -0

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is -0 (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: -0
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-39.js
index 67db04b98..916e5916d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-39.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-39.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is NaN (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: NaN

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is NaN (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: NaN
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-4.js
index 6397a5b41..a8b469605 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-4.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-4.js

- * @description Object.defineProperties - 'descObj' is a number (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: 12

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - 'descObj' is a number (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: 12
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-40.js
index 610f320e3..087e2e8b7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-40.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-40.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is positive number (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: 12

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is positive number (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: 12
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-41.js
index e93465793..bf17eb350 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-41.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-41.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is negative number (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: -9

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is negative number (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: -9
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-42.js
index acae2801a..deddb8ec4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-42.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-42.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: ""

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: ""
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-43.js
index 45e1daf16..c32e9b811 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-43.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-43.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is non-empty string (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: "AB\n\\cd"

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is non-empty string (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: "AB\n\\cd"
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-44.js
index 2d0d7c3c8..1d332bd22 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-44.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-44.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a Function object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: function () { }

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a Function object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: function () { }
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-45.js
index 917f1a23f..42bb6c9e7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-45.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-45.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is an Array object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: []

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is an Array object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: []
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-46.js
index ff8997fb2..fa8cdbd93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-46.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-46.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a String object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new String()

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a String object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new String()
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-47.js
index bd327497e..c62f2065a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-47.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-47.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a Boolean object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new Boolean(true)

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a Boolean object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new Boolean(true)
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-48.js
index 1ccb51acc..0f4b042ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-48.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-48.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a Number object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new Number(-9)

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a Number object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new Number(-9)
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-49.js
index dfe9f73de..f8d8223e3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-49.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-49.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is the Math object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: Math

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is the Math object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: Math
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-5.js
index 2f4ac1b34..6932d7057 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-5.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-5.js

- * @description Object.defineProperties - 'descObj' is a string (8.10.5 step 1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Object.defineProperties(obj, {

-                prop: "abc"

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - 'descObj' is a string (8.10.5 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Object.defineProperties(obj, {
+                prop: "abc"
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-50.js
index ea44d4c87..5c43d038e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-50.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-50.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a Date object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new Date()

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a Date object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new Date()
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-51.js
index c1dc8a2ad..945ca7e0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-51.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-51.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a RegExp object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new RegExp()

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a RegExp object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new RegExp()
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-52.js
index 8750c4009..9e91f65cc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-52.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-52.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is the JSON object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: JSON

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is the JSON object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: JSON
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-53.js
index a473379b9..9e7c772f0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-53.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-53.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is an Error object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new Error()

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is an Error object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new Error()
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-54.js
index f6031d98e..f75f5eb23 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-54.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-54.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is the Arguments object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-        var arg; 

-        

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: arg

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is the Arguments object (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+        var arg; 
+        
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: arg
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-56.js
index 566927150..c57b9f8a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-56.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-56.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is the global object (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: fnGlobalObject()

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is the global object (8.10.5 step 3.b)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: fnGlobalObject()
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-57.js
index 6c9286e26..db698601c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-57.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-57.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is a string (value is 'false') which is treated as true value (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: "false"

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is a string (value is 'false') which is treated as true
+    value (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: "false"
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-58.js
index 45a098198..7d8fa4cfe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-58.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-58.js

- * @description Object.defineProperties - value of 'enumerable' property of 'descObj' is new Boolean(false) which is treated as true value (8.10.5 step 3.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: new Boolean(false)

-            }

-        });

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'enumerable' property of
+    'descObj' is new Boolean(false) which is treated as true value
+    (8.10.5 step 3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: new Boolean(false)
+            }
+        });
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-59.js
index f058f367c..ddee6fb2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-59.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-59.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is present (8.10.5 step 4)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                configurable: true

-            }

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    present (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                configurable: true
+            }
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-6.js
index 510f2c4d5..3e3342ffa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-6.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-6.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is present (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {

-                enumerable: true

-            }

-        });

-

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    present (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {
+                enumerable: true
+            }
+        });
+
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-60.js
index c15bb7163..98a803159 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-60.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-60.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is not present (8.10.5 step 4)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {}

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    not present (8.10.5 step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {}
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-61.js
index a73b3d413..ad1bf1f4a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-61.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-61.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                configurable: true

-            }

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                configurable: true
+            }
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-62.js
index 96bb28391..ecec3e5d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-62.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-62.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {

-            configurable: true

-        };

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    inherited data property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {
+            configurable: true
+        };
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-63.js
index 3050309d4..78de125b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-63.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-63.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own data property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {

-            configurable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "configurable", {

-            value: false

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own data property that overrides an inherited data property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {
+            configurable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "configurable", {
+            value: false
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-64.js
index f673e012b..1b2e0b2da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-64.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-64.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own data property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "configurable", {

-            value: false

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own data property that overrides an inherited accessor property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "configurable", {
+            value: false
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-65.js
index 1b6d7e2ff..f64ef35a2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-65.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-65.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = {};

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = {};
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-66.js
index f196e3312..5e4fa42a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-66.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-66.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-67.js
index 16d570e10..d2b7ed7f8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-67.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-67.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own accessor property that overrides an inherited data property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {

-            configurable: true

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own accessor property that overrides an inherited data property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {
+            configurable: true
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-68.js
index 5172d5dc1..e1f49a19f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-68.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-68.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own accessor property that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "configurable", {

-            get: function () {

-                return false;

-            }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own accessor property that overrides an inherited accessor
+    property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "configurable", {
+            get: function () {
+                return false;
+            }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-69.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-69.js
index 257e10bb5..75f1a6320 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-69.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-69.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-69.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = {};

-        Object.defineProperty(descObj, "configurable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own accessor property without a get function (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = {};
+        Object.defineProperty(descObj, "configurable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-7.js
index e242e5676..76f4add5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-7.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-7.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is not present (8.10.5 step 3)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperties(obj, {

-            prop: {}

-        });

-

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    not present (8.10.5 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperties(obj, {
+            prop: {}
+        });
+
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-70.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-70.js
index 4b58a96bc..2e8497ffb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-70.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-70.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-70.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is own accessor property without a get function that overrides an inherited accessor property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-        Object.defineProperty(proto, "configurable", {

-            get: function () {

-                return true;

-            }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperty(descObj, "configurable", {

-            set: function () { }

-        });

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    own accessor property without a get function that overrides an
+    inherited accessor property (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+        Object.defineProperty(proto, "configurable", {
+            get: function () {
+                return true;
+            }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperty(descObj, "configurable", {
+            set: function () { }
+        });
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-71.js
index 52e3b2fb1..439745e8a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-71.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-71.js

- * @description Object.defineProperties - 'configurable' property of 'descObj' is inherited accessor property without a get function (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var proto = {};

-

-        Object.defineProperty(proto, "configurable", {

-            set: function () { }

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'configurable' property of 'descObj' is
+    inherited accessor property without a get function (8.10.5 step
+    4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var proto = {};
+
+        Object.defineProperty(proto, "configurable", {
+            set: function () { }
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-72.js
index cf9bf8d7c..f6b6eb36c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-72.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-72.js

- * @description Object.defineProperties - 'descObj' is a Function object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = function () { };

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Function object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = function () { };
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-73.js
index 26ee7bd5e..566446763 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-73.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-73.js

- * @description Object.defineProperties - 'descObj' is an Array object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = [];

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Array object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = [];
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-74.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-74.js
index 946f544b1..5207b038f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-74.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-74.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-74.js

- * @description Object.defineProperties - 'descObj' is a String object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new String();

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a String object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new String();
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-75.js
index 36d793089..6a31ce057 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-75.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-75.js

- * @description Object.defineProperties - 'descObj' is a Boolean object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new Boolean(false);

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Boolean object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new Boolean(false);
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-76.js
index e6de7bb31..6d1187155 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-76.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-76.js

- * @description Object.defineProperties - 'descObj' is a Number object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new Number(-9);

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Number object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new Number(-9);
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-77.js
index c46aff6ec..fd36d1d99 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-77.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-77.js

- * @description Object.defineProperties - 'descObj' is the Math object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            Math.configurable = true;

-

-            Object.defineProperties(obj, {

-                prop: Math

-            });

-

-            var result1 = obj.hasOwnProperty("prop");

-            delete obj.prop;

-            var result2 = obj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete Math.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Math object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            Math.configurable = true;
+
+            Object.defineProperties(obj, {
+                prop: Math
+            });
+
+            var result1 = obj.hasOwnProperty("prop");
+            delete obj.prop;
+            var result2 = obj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete Math.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-78.js
index ad02b6576..83f62ce1c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-78.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-78.js

- * @description Object.defineProperties - 'descObj' is a Date object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new Date();

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a Date object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new Date();
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-79.js
index 499bafd70..7524a1a1c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-79.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-79.js

- * @description Object.defineProperties - 'descObj' is a RegExp object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new RegExp();

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is a RegExp object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new RegExp();
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-8.js
index 4491dd118..a942cf8f5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-8.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is own data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        var descObj = { enumerable: true };

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    own data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        var descObj = { enumerable: true };
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-80.js
index e39ee868f..4bf1d69f9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-80.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-80.js

- * @description Object.defineProperties - 'descObj' is the JSON object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            JSON.configurable = true;

-

-            Object.defineProperties(obj, {

-                prop: JSON

-            });

-

-            var result1 = obj.hasOwnProperty("prop");

-            delete obj.prop;

-            var result2 = obj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete JSON.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the JSON object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            JSON.configurable = true;
+
+            Object.defineProperties(obj, {
+                prop: JSON
+            });
+
+            var result1 = obj.hasOwnProperty("prop");
+            delete obj.prop;
+            var result2 = obj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete JSON.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-81.js
index 80d2a80da..f4eb45124 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-81.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-81.js

- * @description Object.defineProperties - 'descObj' is an Error object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var descObj = new Error();

-        descObj.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is an Error object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var descObj = new Error();
+        descObj.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-82.js
index c9903dd84..13d6a8116 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-82.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-82.js

- * @description Object.defineProperties - 'descObj' is the Arguments object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var arg;

-        (function fun() {

-            arg = arguments;

-        }());

-

-        arg.configurable = true;

-

-        Object.defineProperties(obj, {

-            prop: arg

-        });

-

-        var result1 = obj.hasOwnProperty("prop");

-        delete obj.prop;

-        var result2 = obj.hasOwnProperty("prop");

-

-        return result1 === true && result2 === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the Arguments object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var arg;
+        (function fun() {
+            arg = arguments;
+        }());
+
+        arg.configurable = true;
+
+        Object.defineProperties(obj, {
+            prop: arg
+        });
+
+        var result1 = obj.hasOwnProperty("prop");
+        delete obj.prop;
+        var result2 = obj.hasOwnProperty("prop");
+
+        return result1 === true && result2 === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-84.js
index 05de150ae..f9c6f84f4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-84.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-84.js

- * @description Object.defineProperties - 'descObj' is the global object which implements its own [[Get]] method to get 'configurable' property (8.10.5 step 4.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        try {

-            fnGlobalObject().configurable = true;

-

-            Object.defineProperties(obj, {

-                prop: fnGlobalObject()

-            });

-

-            var result1 = obj.hasOwnProperty("prop");

-            delete obj.prop;

-            var result2 = obj.hasOwnProperty("prop");

-

-            return result1 === true && result2 === false;

-        } finally {

-            delete fnGlobalObject().configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'descObj' is the global object which
+    implements its own [[Get]] method to get 'configurable' property
+    (8.10.5 step 4.a)
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        try {
+            fnGlobalObject().configurable = true;
+
+            Object.defineProperties(obj, {
+                prop: fnGlobalObject()
+            });
+
+            var result1 = obj.hasOwnProperty("prop");
+            delete obj.prop;
+            var result2 = obj.hasOwnProperty("prop");
+
+            return result1 === true && result2 === false;
+        } finally {
+            delete fnGlobalObject().configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-85.js
index 3621a854b..8c434025a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-85.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-85.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is undefined (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: undefined

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is undefined (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: undefined
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-86.js
index c211671aa..967988a5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-86.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-86.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is null (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: null

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is null (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: null
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-87.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-87.js
index 84565e115..5be3f13e5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-87.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-87.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-87.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is true (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: true

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is true (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: true
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-88.js
index 4fb36bd96..de27c9254 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-88.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-88.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is false (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: false

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is false (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: false
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-89.js
index 881b767ac..2dbecdf7d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-89.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-89.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is 0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: 0

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is 0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: 0
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-9.js
index 838258b93..4246c1073 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-9.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-9.js

- * @description Object.defineProperties - 'enumerable' property of 'descObj' is inherited data property (8.10.5 step 3.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        var proto = {

-            enumerable: true

-        };

-        var Con = function () { };

-        Con.prototype = proto;

-        var descObj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: descObj

-        });

-

-        for (var property in obj) {

-            if (property === "prop") {

-                accessed = true;

-            }

-        }

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'enumerable' property of 'descObj' is
+    inherited data property (8.10.5 step 3.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        var proto = {
+            enumerable: true
+        };
+        var Con = function () { };
+        Con.prototype = proto;
+        var descObj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: descObj
+        });
+
+        for (var property in obj) {
+            if (property === "prop") {
+                accessed = true;
+            }
+        }
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-90.js
index 8a82306e0..f2d8dc042 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-90.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-90.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is +0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: +0

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is +0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: +0
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-91.js
index dc13302fc..82d87b368 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-91.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-91.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is -0 (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: -0

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is -0 (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: -0
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-92.js
index bc2ba9376..9d2dbe2fa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-92.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-92.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is NaN (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: NaN

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is NaN (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: NaN
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-93.js
index 238eba423..14bd74855 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-93.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-93.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is positive number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: 123

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is positive number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: 123
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-94.js
index c7bff4ee6..96d371378 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-94.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-94.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is negative number (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: -123

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is negative number (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: -123
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-95.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-95.js
index 28ebc605d..46ed27720 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-95.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-95.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-95.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: ""

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: ""
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-96.js
index 976cbf2a4..4c3f7ba4e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-96.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-96.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is non-empty string (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: "abc"

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is non-empty string (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: "abc"
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-97.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-97.js
index e8c3a5887..dfbb0a228 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-97.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-97.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-97.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Function object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: function () { }

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Function object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: function () { }
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-98.js
index 5fa89682f..0a2f3af08 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-98.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-98.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is Array object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: [1, 2, 3]

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is Array object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: [1, 2, 3]
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-99.js
index 08b94cbde..a1018fe18 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-99.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-5-b-99.js

- * @description Object.defineProperties - value of 'configurable' property of 'descObj' is String object (8.10.5 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            property: {

-                configurable: new String("abc")

-            }

-        });

-

-        var hadOwnProperty = obj.hasOwnProperty("property");

-

-        delete obj.property;

-

-        return !obj.hasOwnProperty("property") && hadOwnProperty;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - value of 'configurable' property of
+    'descObj' is String object (8.10.5 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            property: {
+                configurable: new String("abc")
+            }
+        });
+
+        var hadOwnProperty = obj.hasOwnProperty("property");
+
+        delete obj.property;
+
+        return !obj.hasOwnProperty("property") && hadOwnProperty;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-1.js
index 4f8565261..683f359c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-1.js

- * @description Object.defineProperties - 'P' is own existing data property (8.12.9 step 1 )

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, { 

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own existing data property
+    (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, { 
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-10.js
index c46237507..e26a28cd3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-10.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-10.js

- * @description Object.defineProperties - 'P' is own accessor property without a get function that overrides an inherited accessor property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return 11;

-            },

-            set: function () { },

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            set: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own accessor property without a
+    get function that overrides an inherited accessor property (8.12.9
+    step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return 11;
+            },
+            set: function () { },
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            set: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-100.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-100.js
index 28fc62f3d..437493722 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-100.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-100.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-100.js

- * @description Object.defineProperties - 'P' is data property, several attributes values of P and properties are different (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 100, 

-            writable: true, 

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 200,

-                writable: false,

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, several attributes
+    values of P and properties are different (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 100, 
+            writable: true, 
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 200,
+                writable: false,
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-101.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-101.js
index 5786c321c..d75454045 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-101.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-101.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-101.js

- * @description Object.defineProperties - 'P' is accessor property, both properties.[[Get]] and P.[[Get]] are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        function get_func2() {

-            return 20;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_func2

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func2, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, both
+    properties.[[Get]] and P.[[Get]] are two different values (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        function get_func2() {
+            return 20;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_func2
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func2, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-102.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-102.js
index 874057cc1..109ed39c3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-102.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-102.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-102.js

- * @description Object.defineProperties - 'P' is accessor property, P.[[Get]] is present and properties.[[Get]] is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: undefined

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.[[Get]] is
+    present and properties.[[Get]] is undefined (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: undefined
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-103.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-103.js
index 2b2e09d9b..b977eab01 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-103.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-103.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-103.js

- * @description Object.defineProperties - 'P' is accessor property, P.[[Get]] is undefined and properties.[[Get]] is normal value (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: undefined,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        function get_func() {

-            return 10;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.[[Get]] is
+    undefined and properties.[[Get]] is normal value (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: undefined,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        function get_func() {
+            return 10;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-104.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-104.js
index 9a8bfe3bb..38fa7554b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-104.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-104.js
@@ -1,42 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-104.js

- * @description Object.defineProperties - 'P' is accessor property, both properties.[[Set]] and P.[[Set]] are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-

-        function set_func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        function set_func2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: set_func2

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func2, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, both
+    properties.[[Set]] and P.[[Set]] are two different values (8.12.9
+    step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+
+        function set_func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        function set_func2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: set_func2
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func2, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-105.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-105.js
index 1986423f1..8c74618a8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-105.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-105.js
@@ -1,55 +1,57 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-105.js

- * @description Object.defineProperties - 'P' is accessor property, P.[[Set]] is present and properties.[[Set]] is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-        var obj = {};

-        function get_func() {

-            return 10;

-        }

-        function set_func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "property", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(obj, {

-            property: {

-                set: undefined

-            }

-        });

-

-        var hasProperty = obj.hasOwnProperty("property");

-        var verifyGet = false;

-        verifyGet = (obj.property === 10);

-

-        var verifySet = false;

-        var desc = Object.getOwnPropertyDescriptor(obj, "property");

-        verifySet = (typeof desc.set === 'undefined');

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "property") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyConfigurable = false;

-        delete obj.property;

-        verifyConfigurable = obj.hasOwnProperty("property");

-

-        return hasProperty && verifyGet && verifySet && verifyEnumerable && !verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.[[Set]] is
+    present and properties.[[Set]] is undefined (8.12.9 step 12)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        function get_func() {
+            return 10;
+        }
+        function set_func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "property", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(obj, {
+            property: {
+                set: undefined
+            }
+        });
+
+        var hasProperty = obj.hasOwnProperty("property");
+        var verifyGet = false;
+        verifyGet = (obj.property === 10);
+
+        var verifySet = false;
+        var desc = Object.getOwnPropertyDescriptor(obj, "property");
+        verifySet = (typeof desc.set === 'undefined');
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "property") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyConfigurable = false;
+        delete obj.property;
+        verifyConfigurable = obj.hasOwnProperty("property");
+
+        return hasProperty && verifyGet && verifySet && verifyEnumerable && !verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-106.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-106.js
index 4292000a3..8525e0ed4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-106.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-106.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-106.js

- * @description Object.defineProperties - 'P' is accessor property, P.[[Set]] is undefined and properties.[[Set]] is normal value (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: undefined,

-            enumerable: true,

-            configurable: true

-        });

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: set_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.[[Set]] is
+    undefined and properties.[[Set]] is normal value (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: undefined,
+            enumerable: true,
+            configurable: true
+        });
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: set_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-107.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-107.js
index 86657807a..675157c41 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-107.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-107.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-107.js

- * @description Object.defineProperties - 'P' is accessor property, P.enumerable and properties.enumerable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                enumerable: false

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.enumerable
+    and properties.enumerable are different values (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                enumerable: false
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-108.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-108.js
index d912878b6..6df2d5db5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-108.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-108.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-108.js

- * @description Object.defineProperties - 'P' is accessor property, P.configurable is true and properties.configurable is false

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                configurable: false

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, P.configurable
+    is true and properties.configurable is false
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                configurable: false
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-109.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-109.js
index 45757d936..9d9b02146 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-109.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-109.js
@@ -1,43 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-109.js

- * @description Object.defineProperties - 'P' is accessor property, several attributes values of P and properties are different (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func1() {

-            return 10;

-        }

-        function set_func1() { }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func1,

-            set: set_func1,

-            configurable: true

-        });

-

-        function get_func2() {

-            return 20;

-        }

-        function set_func2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_func2,

-                set: set_func2,

-                configurable: false

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func2, set_func2, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property, several
+    attributes values of P and properties are different (8.12.9 step
+    12)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func1() {
+            return 10;
+        }
+        function set_func1() { }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func1,
+            set: set_func1,
+            configurable: true
+        });
+
+        function get_func2() {
+            return 20;
+        }
+        function set_func2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_func2,
+                set: set_func2,
+                configurable: false
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func2, set_func2, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-11.js
index feec079d9..44203a1b6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-11.js

- * @description Object.defineProperties - 'P' is inherited accessor property without a get function (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            set: function () { },

-            configurable: false

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: {

-                get: function () {

-                    return 12;

-                },

-                configurable: true

-            }

-        });

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is inherited accessor property
+    without a get function (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            set: function () { },
+            configurable: false
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: {
+                get: function () {
+                    return 12;
+                },
+                configurable: true
+            }
+        });
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-110.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-110.js
index 40978b9d0..4be3084eb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-110.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-110.js
@@ -1,42 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-110.js

- * @description Object.defineProperties - all own properties (data property and accessor property)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        var properties = {

-            foo1: {

-                value: 200,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            },

-            foo2: {

-                get: get_func,

-                set: set_func,

-                enumerable: true,

-                configurable: true

-            }

-        };

-

-        Object.defineProperties(obj, properties);

-        return dataPropertyAttributesAreCorrect(obj, "foo1", 200, true, true, true) && accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "setVerifyHelpProp", true, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - all own properties (data property and
+    accessor property)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        var properties = {
+            foo1: {
+                value: 200,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            },
+            foo2: {
+                get: get_func,
+                set: set_func,
+                enumerable: true,
+                configurable: true
+            }
+        };
+
+        Object.defineProperties(obj, properties);
+        return dataPropertyAttributesAreCorrect(obj, "foo1", 200, true, true, true) && accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "setVerifyHelpProp", true, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-111.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-111.js
index 5987f1986..cf82cf0b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-111.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-111.js
@@ -1,47 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-111.js

- * @description Object.defineProperties - each properties are in list order

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 20;

-        }

-

-        function set_func() { }

-

-        var properties = {

-            a: {

-                value: 100,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            },

-            b: {

-                get: get_func,

-                set: set_func,

-                enumerable: true,

-                configurable: true

-            },

-            c: {

-                value: 200,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            }

-        };

-

-        Object.defineProperties(obj, properties);

-        return (obj["a"] === 100 && obj["b"] === 20 && obj["c"] === 200);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.defineProperties - each properties are in list order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 20;
+        }
+
+        function set_func() { }
+
+        var properties = {
+            a: {
+                value: 100,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            },
+            b: {
+                get: get_func,
+                set: set_func,
+                enumerable: true,
+                configurable: true
+            },
+            c: {
+                value: 200,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            }
+        };
+
+        Object.defineProperties(obj, properties);
+        return (obj["a"] === 100 && obj["b"] === 20 && obj["c"] === 200);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-112.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-112.js
index 4229991ef..6575d7622 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-112.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-112.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-112.js

- * @description Object.defineProperties - 'O' is an Array, test the length property of 'O' is own data property (15.4.5.1 step 1)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-        Object.defineProperty(arr, "1", {

-            value: 1,

-            configurable: false

-        });

-        try {

-

-            Object.defineProperties(arr, {

-                length: { value: 1 }

-            });

-            return false;

-        } catch (ex) {

-            var desc = Object.getOwnPropertyDescriptor(arr, "length");

-

-            return ex instanceof TypeError && desc.value === 2 &&

-                desc.writable && !desc.enumerable && !desc.configurable;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, test the length
+    property of 'O' is own data property (15.4.5.1 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+        Object.defineProperty(arr, "1", {
+            value: 1,
+            configurable: false
+        });
+        try {
+
+            Object.defineProperties(arr, {
+                length: { value: 1 }
+            });
+            return false;
+        } catch (ex) {
+            var desc = Object.getOwnPropertyDescriptor(arr, "length");
+
+            return ex instanceof TypeError && desc.value === 2 &&
+                desc.writable && !desc.enumerable && !desc.configurable;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-113.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-113.js
index aa3021bb7..bab41b7c3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-113.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-113.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-113.js

- * @description Object.defineProperties - 'O' is an Array, test the length property of 'O' is own data property that overrides an inherited data property (15.4.5.1 step 1)

- */

-

-

-function testcase() {

-

-        var arrProtoLen;

-        var arr = [0, 1, 2];

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-

-            Object.defineProperty(arr, "2", {

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                length: { value: 1 }

-            });

-            return false;

-        } catch (e) {

-            var desc = Object.getOwnPropertyDescriptor(arr, "length");

-

-            return e instanceof TypeError && desc.value === 3 &&

-                desc.writable && !desc.enumerable && !desc.configurable;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, test the length
+    property of 'O' is own data property that overrides an inherited
+    data property (15.4.5.1 step 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrProtoLen;
+        var arr = [0, 1, 2];
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+
+            Object.defineProperty(arr, "2", {
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                length: { value: 1 }
+            });
+            return false;
+        } catch (e) {
+            var desc = Object.getOwnPropertyDescriptor(arr, "length");
+
+            return e instanceof TypeError && desc.value === 3 &&
+                desc.writable && !desc.enumerable && !desc.configurable;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-114.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-114.js
index fbb2216b9..811cf6335 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-114.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-114.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-114.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is absent (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, { length: {} });

-

-        var verifyValue = false;

-        verifyValue = (arr.length === 0);

-

-        var verifyWritable = false;

-        arr.length = 2;

-        verifyWritable = (arr.length === 2);

-

-        var verifyEnumerable = false;

-        for (var p in arr) {

-            if (p === "length") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyConfigurable = false;

-        delete arr.length;

-        verifyConfigurable = arr.hasOwnProperty("length");

-

-        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    every field in 'desc' is absent (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, { length: {} });
+
+        var verifyValue = false;
+        verifyValue = (arr.length === 0);
+
+        var verifyWritable = false;
+        arr.length = 2;
+        verifyWritable = (arr.length === 2);
+
+        var verifyEnumerable = false;
+        for (var p in arr) {
+            if (p === "length") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyConfigurable = false;
+        delete arr.length;
+        verifyConfigurable = arr.hasOwnProperty("length");
+
+        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-115.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-115.js
index 100919b35..5839eab09 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-115.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-115.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-115.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test every field in 'desc' is same with corresponding attribute value of the length property in 'O' (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                writable: true,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        var verifyValue = false;

-        verifyValue = (arr.length === 0);

-

-        var verifyWritable = false;

-        arr.length = 2;

-        verifyWritable = (arr.length === 2);

-

-        var verifyEnumerable = false;

-        for (var p in arr) {

-            if (p === "length") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyConfigurable = false;

-        delete arr.length;

-        verifyConfigurable = arr.hasOwnProperty("length");

-

-        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    every field in 'desc' is same with corresponding attribute value
+    of the length property in 'O' (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                writable: true,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        var verifyValue = false;
+        verifyValue = (arr.length === 0);
+
+        var verifyWritable = false;
+        arr.length = 2;
+        verifyWritable = (arr.length === 2);
+
+        var verifyEnumerable = false;
+        for (var p in arr) {
+            if (p === "length") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyConfigurable = false;
+        delete arr.length;
+        verifyConfigurable = arr.hasOwnProperty("length");
+
+        return verifyValue && verifyWritable && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-116.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-116.js
index bddc1a8e8..e772f6e77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-116.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-116.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-116.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Configurable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: { configurable: true }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Configurable]] attribute
+    of the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: { configurable: true }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-117.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-117.js
index 2b4c69e5f..5284dd155 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-117.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-117.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-117.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Enumerable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: { enumerable: true }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Enumerable]] attribute of
+    the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: { enumerable: true }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-118.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-118.js
index 4f850466e..c7de65e7f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-118.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-118.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-118.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when 'desc' is accessor descriptor (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    get: function () {

-                        return 2;

-                    }

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when 'desc' is accessor descriptor (15.4.5.1
+    step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    get: function () {
+                        return 2;
+                    }
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-119.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-119.js
index a465d0f46..9e23b1469 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-119.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-119.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-119.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test TypeError is thrown when updating the [[Writable]] attribute of the length property from false to true (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, { 

-                length: { writable: true } 

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    TypeError is thrown when updating the [[Writable]] attribute of
+    the length property from false to true (15.4.5.1 step 3.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, { 
+                length: { writable: true } 
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-12.js
index a2929e95c..871f6dd33 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-12.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-12.js

- * @description Object.defineProperties - 'O' is a Function object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var fun = function () { };

-

-        Object.defineProperty(fun, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(fun, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(fun, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a Function object which
+    implements its own [[GetOwnProperty]] method to get 'P' (8.12.9
+    step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var fun = function () { };
+
+        Object.defineProperty(fun, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(fun, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(fun, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-120.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-120.js
index abebf7d7e..9bad0dd58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-120.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-120.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-120.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is absent, test updating the [[Writable]] attribute of the length property from true to false (15.4.5.1 step 3.a.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: { writable: false }

-            });

-

-            return dataPropertyAttributesAreCorrect(arr, "length", 0, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is absent, test
+    updating the [[Writable]] attribute of the length property from
+    true to false (15.4.5.1 step 3.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: { writable: false }
+            });
+
+            return dataPropertyAttributesAreCorrect(arr, "length", 0, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-121.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-121.js
index e104b784b..b0ed48377 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-121.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-121.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-121.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test RangeError is thrown when setting the [[Value]] field of 'desc' to undefined (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: { value: undefined }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test RangeError is thrown when setting the
+    [[Value]] field of 'desc' to undefined (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: { value: undefined }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-122.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-122.js
index 05902dd14..75b8bab90 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-122.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-122.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-122.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test setting the [[Value]] field of 'desc' to null actuall is set to 0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: { value: null }

-        });

-        return arr.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test setting the [[Value]] field of 'desc' to
+    null actuall is set to 0 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: { value: null }
+        });
+        return arr.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-123.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-123.js
index 05fc71a60..f5379fb77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-123.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-123.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-123.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value false (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: { value: false }

-        });

-        return arr.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a boolean
+    with value false (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: { value: false }
+        });
+        return arr.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-124.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-124.js
index 5e8e92a66..c383e2f97 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-124.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-124.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-124.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a boolean with value true (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: { value: true }

-        });

-        return arr.length === 1;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a boolean
+    with value true (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: { value: true }
+        });
+        return arr.length === 1;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-125.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-125.js
index caf10f756..d07b011b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-125.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-125.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-125.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is 0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: { value: 0 }

-        });

-        return arr.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is 0 (15.4.5.1
+    step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: { value: 0 }
+        });
+        return arr.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-126.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-126.js
index fec852621..2b9eefc60 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-126.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-126.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-126.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is +0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: { value: +0 }

-        });

-        return arr.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is +0
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: { value: +0 }
+        });
+        return arr.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-127.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-127.js
index 261a197aa..b34a29269 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-127.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-127.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-127.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is -0 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: { value: -0 }

-        });

-        return arr.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is -0
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: { value: -0 }
+        });
+        return arr.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-128.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-128.js
index eb379cf8c..5bc294126 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-128.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-128.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-128.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is positive number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: { value: 12 }

-        });

-        return arr.length === 12;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is positive
+    number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: { value: 12 }
+        });
+        return arr.length === 12;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-129.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-129.js
index 0c9c04a46..b0a90af73 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-129.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-129.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-129.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is negative number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: -9

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is negative
+    number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: -9
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-13.js
index 83f322e77..6a60b5940 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-13.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-13.js

- * @description Object.defineProperties - 'O' is an Array object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arr, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(arr, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-130.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-130.js
index 8594d36c5..9a9dbdab7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-130.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-130.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-130.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is +Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: +Infinity

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is +Infinity
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: +Infinity
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-131.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-131.js
index 50ca6d2fe..296410dd3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-131.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-131.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-131.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is -Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: -Infinity

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is -Infinity
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: -Infinity
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-132.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-132.js
index 7ab929d59..18aca0fc4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-132.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-132.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-132.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is NaN (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: NaN

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is NaN
+    (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: NaN
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-133.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-133.js
index d09253f5e..f4963c59b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-133.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-133.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-133.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a positive number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: "2"

-            }

-        });

-        return arr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing a positive number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: "2"
+            }
+        });
+        return arr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-134.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-134.js
index 5af2ba8bc..2d2c5d3d4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-134.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-134.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-134.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a negative number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: "-42"

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing a negative number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: "-42"
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-135.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-135.js
index 764582d68..1aae3e11b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-135.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-135.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-135.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing a decimal number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: "200.59"

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing a decimal number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: "200.59"
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-136.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-136.js
index 7b65eba0a..9e53d5a47 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-136.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-136.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-136.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing +Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: "+Infinity"

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing +Infinity (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: "+Infinity"
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-137.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-137.js
index cad56ab11..06aebd76c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-137.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-137.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-137.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing -Infinity (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: "-Infinity"

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing -Infinity (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: "-Infinity"
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-138.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-138.js
index ad35d39c0..2918712e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-138.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-138.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-138.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an exponential number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: "2E3"

-            }

-        });

-        return arr.length === 2E3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing an exponential number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: "2E3"
+            }
+        });
+        return arr.length === 2E3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-139.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-139.js
index 3521e7385..59e78dc8b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-139.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-139.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-139.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an hex number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: "0x00B"

-            }

-        });

-        return arr.length === 0x00B;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing an hex number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: "0x00B"
+            }
+        });
+        return arr.length === 0x00B;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-14.js
index 14da1cf47..f82d4cafc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-14.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-14.js

- * @description Object.defineProperties - 'O' is a String object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var str = new String();

-

-        Object.defineProperty(str, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(str, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(str, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a String object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var str = new String();
+
+        Object.defineProperty(str, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(str, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(str, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-140.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-140.js
index 128797c85..8ba2736b8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-140.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-140.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-140.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is a string containing an leading zero number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: "0002.0"

-            }

-        });

-        return arr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    containing an leading zero number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: "0002.0"
+            }
+        });
+        return arr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-141.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-141.js
index c2c74d787..841848333 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-141.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-141.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-141.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' is a string which doesn't convert to a number (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: "two"

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test the [[Value]] field of 'desc' is a string
+    which doesn't convert to a number (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: "two"
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-142.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-142.js
index 73d85c89d..3bc41b4ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-142.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-142.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-142.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own toString method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: {

-                    toString: function () {

-                        return '2';

-                    }

-                }

-            }

-        });

-

-        return arr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own toString method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: {
+                    toString: function () {
+                        return '2';
+                    }
+                }
+            }
+        });
+
+        return arr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-143.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-143.js
index 6ad792cf1..c974b8ab9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-143.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-143.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-143.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: {

-                    valueOf: function () {

-                        return 2;

-                    }

-                }

-            }

-        });

-        return arr.length === 2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own valueOf method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: {
+                    valueOf: function () {
+                        return 2;
+                    }
+                }
+            }
+        });
+        return arr.length === 2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-144.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-144.js
index 99f6b8505..745926a9b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-144.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-144.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-144.js

- * @description Object.defineProperties -  'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own valueOf method that returns an object and toString method that returns a string (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        Object.defineProperties(arr, {

-            length: {

-                value: {

-                    toString: function () {

-                        toStringAccessed = true;

-                        return '2';

-                    },

-

-                    valueOf: function () {

-                        valueOfAccessed = true;

-                        return {};

-                    }

-                }

-            }

-        });

-        return arr.length === 2 && toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties -  'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own valueOf method that returns an object and
+    toString method that returns a string (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        Object.defineProperties(arr, {
+            length: {
+                value: {
+                    toString: function () {
+                        toStringAccessed = true;
+                        return '2';
+                    },
+
+                    valueOf: function () {
+                        valueOfAccessed = true;
+                        return {};
+                    }
+                }
+            }
+        });
+        return arr.length === 2 && toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-145.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-145.js
index a342f7471..c70601170 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-145.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-145.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-145.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is an Object which has an own toString and valueOf method (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        Object.defineProperties(arr, {

-            length: {

-                value: {

-                    toString: function () {

-                        toStringAccessed = true;

-                        return '2';

-                    },

-

-                    valueOf: function () {

-                        valueOfAccessed = true;

-                        return 3;

-                    }

-                }

-            }

-        });

-        return arr.length === 3 && !toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is an Object
+    which has an own toString and valueOf method (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        Object.defineProperties(arr, {
+            length: {
+                value: {
+                    toString: function () {
+                        toStringAccessed = true;
+                        return '2';
+                    },
+
+                    valueOf: function () {
+                        valueOfAccessed = true;
+                        return 3;
+                    }
+                }
+            }
+        });
+        return arr.length === 3 && !toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-146.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-146.js
index b84086a44..2c8d55f38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-146.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-146.js
@@ -1,40 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-146.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test TypeError is thrown when the [[Value]] field of 'desc' is an Object that both toString and valueOf wouldn't return primitive value (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: {

-                        toString: function () {

-                            toStringAccessed = true;

-                            return {};

-                        },

-

-                        valueOf: function () {

-                            valueOfAccessed = true;

-                            return {};

-                        }

-                    }

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test TypeError is thrown when the [[Value]] field
+    of 'desc' is an Object that both toString and valueOf wouldn't
+    return primitive value (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: {
+                        toString: function () {
+                            toStringAccessed = true;
+                            return {};
+                        },
+
+                        valueOf: function () {
+                            valueOfAccessed = true;
+                            return {};
+                        }
+                    }
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-147.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-147.js
index e485b51d6..cfff3696c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-147.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-147.js
@@ -1,45 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-147.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test using inherited valueOf method when the [[Value]] field of 'desc' is an Objec with an own toString and inherited valueOf methods (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            value: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return 2;

-                }

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "value", {

-            value: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return 3;

-                }

-            }

-        });

-

-        Object.defineProperties(arr, {

-            length: child

-        });

-        return arr.length === 3 && toStringAccessed && !valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test using inherited valueOf method when the
+    [[Value]] field of 'desc' is an Objec with an own toString and
+    inherited valueOf methods (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            value: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return 2;
+                }
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "value", {
+            value: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return 3;
+                }
+            }
+        });
+
+        Object.defineProperties(arr, {
+            length: child
+        });
+        return arr.length === 3 && toStringAccessed && !valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-148.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-148.js
index 07408edde..bbf09b066 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-148.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-148.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-148.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O',  test RangeError is thrown when the [[Value]] field of 'desc' is positive non-integer values (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 123.5

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O',  test RangeError is thrown when the [[Value]]
+    field of 'desc' is positive non-integer values (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 123.5
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-149.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-149.js
index 5d28b234f..3661c17e0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-149.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-149.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-149.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O',  test RangeError is thrown when the [[Value]] field of 'desc' is negative non-integer values (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: -4294967294.5

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O',  test RangeError is thrown when the [[Value]]
+    field of 'desc' is negative non-integer values (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: -4294967294.5
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-15.js
index 46e2f2fd7..0a776daa1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-15.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-15.js

- * @description Object.defineProperties - 'O' is a Boolean object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-       

-        var obj = new Boolean(false);

-

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a Boolean object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+       
+        var obj = new Boolean(false);
+
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-150.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-150.js
index 1f3d9dc80..0d09eb976 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-150.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-150.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-150.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 2 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 4294967294

-            }

-        });

-

-        return arr.length === 4294967294;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is boundary
+    value 2^32 - 2 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 4294967294
+            }
+        });
+
+        return arr.length === 4294967294;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-151.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-151.js
index 288e5f3ca..eee3392ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-151.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-151.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-151.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test the [[Value]] field of 'desc' is boundary value 2^32 - 1 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 4294967295

-            }

-        });

-

-        return arr.length === 4294967295;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test the [[Value]] field of 'desc' is boundary
+    value 2^32 - 1 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 4294967295
+            }
+        });
+
+        return arr.length === 4294967295;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-152.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-152.js
index f9bad3ea6..03a070885 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-152.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-152.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-152.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test RangeError is thrown when the [[Value]] field of 'desc' is boundary value 2^32 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 4294967296

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError is thrown when the [[Value]]
+    field of 'desc' is boundary value 2^32 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 4294967296
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-153.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-153.js
index 1d72f3a9f..a57442332 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-153.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-153.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-153.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is the length property of 'O', test RangeError is thrown when the [[Value]] field of 'desc' is boundary value 2^32 + 1 (15.4.5.1 step 3.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 4294967297

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof RangeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is the length
+    property of 'O', test RangeError is thrown when the [[Value]]
+    field of 'desc' is boundary value 2^32 + 1 (15.4.5.1 step 3.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 4294967297
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof RangeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-155.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-155.js
index 5dae7802f..0c67677b5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-155.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-155.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-155.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' which is greater than value of the length property is defined into 'O' without deleting any property with large index named (15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 5

-                }

-            });

-

-            return arr.length === 5 && arr[0] === 0 && !arr.hasOwnProperty("1") && arr[2] === 2;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test the [[Value]] field of 'desc' which is
+    greater than value of the length property is defined into 'O'
+    without deleting any property with large index named (15.4.5.1
+    step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 5
+                }
+            });
+
+            return arr.length === 5 && arr[0] === 0 && !arr.hasOwnProperty("1") && arr[2] === 2;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-156.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-156.js
index 7514b0cca..724126e56 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-156.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-156.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-156.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' which equals to value of the length property is defined into 'O' without deleting any property with large index named (15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 3

-                }

-            });

-

-            return arr.length === 3 && arr[0] === 0 && !arr.hasOwnProperty("1") && arr[2] === 2;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test the [[Value]] field of 'desc' which equals
+    to value of the length property is defined into 'O' without
+    deleting any property with large index named (15.4.5.1 step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 3
+                }
+            });
+
+            return arr.length === 3 && arr[0] === 0 && !arr.hasOwnProperty("1") && arr[2] === 2;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-157.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-157.js
index 95e2601ab..bebc2fb36 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-157.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-157.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-157.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', test the [[Value]] field of 'desc' which is less than value of the length property is defined into 'O' with deleting properties with large index named (15.4.5.1 step 3.f)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 1

-            }

-        });

-        return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', test the [[Value]] field of 'desc' which is less
+    than value of the length property is defined into 'O' with
+    deleting properties with large index named (15.4.5.1 step 3.f)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 1
+            }
+        });
+        return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-158.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-158.js
index 03d606a7e..9a336ff6f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-158.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-158.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-158.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is greater than value of the length property, test TypeError is thrown when the length property is not writable (15.4.5.1 step 3.f.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 12

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 0;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is greater than
+    value of the length property, test TypeError is thrown when the
+    length property is not writable (15.4.5.1 step 3.f.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 12
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 0;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-159.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-159.js
index cee46c5fb..e616553ce 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-159.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-159.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-159.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' equals to value of the length property, test TypeError wouldn't be thrown when the length property is not writable (15.4.5.1 step 3.f.i)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 0

-                }

-            });

-            return true && arr.length === 0;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' equals to value of
+    the length property, test TypeError wouldn't be thrown when the
+    length property is not writable (15.4.5.1 step 3.f.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 0
+                }
+            });
+            return true && arr.length === 0;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-16.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-16.js
index abf0c4dee..5bd748568 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-16.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-16.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-16.js

- * @description Object.defineProperties - 'O' is a Number object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        var obj = new Number(-9);

-

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a Number object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = new Number(-9);
+
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-160.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-160.js
index 8d259764c..baaf7f628 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-160.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-160.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-160.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test TypeError is thrown when the [[Writable]] attribute of the length property is false (15.4.5.1 step 3.g)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 0

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 && arr[0] === 0 && arr[1] === 1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test TypeError is thrown when the
+    [[Writable]] attribute of the length property is false (15.4.5.1
+    step 3.g)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 0
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 && arr[0] === 0 && arr[1] === 1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-161.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-161.js
index 8010c450b..121095ab8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-161.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-161.js
@@ -1,25 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-161.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property,  test the [[Writable]] attribute of the length property is set to true at last after deleting properties with large index named if the [[Writable]] field of 'desc' is absent (15.4.5.1 step 3.h)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 1

-            }

-        });

-

-        arr.length = 10; //try to overwrite length value of arr

-        return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property,  test the [[Writable]] attribute of the
+    length property is set to true at last after deleting properties
+    with large index named if the [[Writable]] field of 'desc' is
+    absent (15.4.5.1 step 3.h)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 1
+            }
+        });
+
+        arr.length = 10; //try to overwrite length value of arr
+        return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-162.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-162.js
index 74cdc7431..253712ee3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-162.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-162.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-162.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property,  test the [[Writable]] attribute of the length property is set to true at last after deleting properties with large index named if the [[Writable]] field of 'desc' is true (15.4.5.1 step 3.h)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 1,

-                writable: true

-            }

-        });

-

-        arr.length = 10; //try to overwrite length value of arr

-        return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property,  test the [[Writable]] attribute of the
+    length property is set to true at last after deleting properties
+    with large index named if the [[Writable]] field of 'desc' is true
+    (15.4.5.1 step 3.h)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 1,
+                writable: true
+            }
+        });
+
+        arr.length = 10; //try to overwrite length value of arr
+        return !arr.hasOwnProperty("1") && arr.length === 10 && arr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-163.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-163.js
index 1783cc9a9..a099e203f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-163.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-163.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-163.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Writable]] attribute of the length property is set to false at last after deleting properties with large index named if the [[Writable]] field of 'desc' is false (15.4.5.1 step 3.i.ii)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 1,

-                writable: false

-            }

-        });

-

-        arr.length = 10; //try to overwrite length value of arr

-        return !arr.hasOwnProperty("1") && arr.length === 1 && arr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Writable]] attribute of the
+    length property is set to false at last after deleting properties
+    with large index named if the [[Writable]] field of 'desc' is
+    false (15.4.5.1 step 3.i.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 1,
+                writable: false
+            }
+        });
+
+        arr.length = 10; //try to overwrite length value of arr
+        return !arr.hasOwnProperty("1") && arr.length === 1 && arr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-164.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-164.js
index d3d5b2877..25fcfe56c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-164.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-164.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-164.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of the length property, test the [[Writable]] attribute of the length property in 'O' is set as true before deleting properties with large index named (15.4.5.1 step 3.i.iii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2];

-        var result = 0;

-

-        try {

-            Object.defineProperty(arr, "1", {

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 0,

-                    writable: false

-                }

-            });

-

-            return false;

-        } catch (e) {

-            result = (arr.length === 2);

-            arr.length = 10;

-            return (e instanceof TypeError) && result && arr.length === 2;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of the length property, test the [[Writable]] attribute of the
+    length property in 'O' is set as true before deleting properties
+    with large index named (15.4.5.1 step 3.i.iii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2];
+        var result = 0;
+
+        try {
+            Object.defineProperty(arr, "1", {
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 0,
+                    writable: false
+                }
+            });
+
+            return false;
+        } catch (e) {
+            result = (arr.length === 2);
+            arr.length = 10;
+            return (e instanceof TypeError) && result && arr.length === 2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-165.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-165.js
index ad26a4ce4..5991bfdcd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-165.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-165.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-165.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the length property is decreased by 1 (15.4.5.1 step 3.l.i)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "1", {

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "2", {

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 &&

-                !arr.hasOwnProperty("2") && arr[0] === 0 && arr[1] === 1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the length property is decreased by
+    1 (15.4.5.1 step 3.l.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "1", {
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "2", {
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 &&
+                !arr.hasOwnProperty("2") && arr[0] === 0 && arr[1] === 1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-166.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-166.js
index c555ad88c..59aa89d0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-166.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-166.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-166.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own data property with large index named in 'O' can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        try {

-            Object.defineProperty(arr, "1", {

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && arr.length === 2 &&

-                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own data property with large index named in 'O' can stop deleting
+    index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        try {
+            Object.defineProperty(arr, "1", {
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && arr.length === 2 &&
+                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-167.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-167.js
index 788f74f85..2b0f656ee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-167.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-167.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-167.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of inherited data property with large index named in 'O' can't stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-        try {

-            Array.prototype[1] = 2; //we are not allowed to set the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-

-            return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0 && Array.prototype[1] === 2;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    inherited data property with large index named in 'O' can't stop
+    deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+        try {
+            Array.prototype[1] = 2; //we are not allowed to set the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+
+            return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0 && Array.prototype[1] === 2;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-168.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-168.js
index 20e667955..34d741afd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-168.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-168.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-168.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own data property with large index named in 'O' that overrides inherited data property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-        try {

-            Object.defineProperty(arr, "1", {

-                configurable: false

-            });

-

-            Array.prototype[1] = 2;

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 &&

-                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own data property with large index named in 'O' that overrides
+    inherited data property can stop deleting index named properties
+    (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+        try {
+            Object.defineProperty(arr, "1", {
+                configurable: false
+            });
+
+            Array.prototype[1] = 2;
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 &&
+                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-169.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-169.js
index 16918cc04..3067014fa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-169.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-169.js
@@ -1,41 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-169.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own data property with large index named in 'O' that overrides inherited accessor property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-        try {

-            Object.defineProperty(arr, "1", {

-                configurable: false

-            });

-

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 && arr.hasOwnProperty("1") &&

-                arr[0] === 0 && arr[1] === 1 && Array.prototype[1] === 2;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own data property with large index named in 'O' that overrides
+    inherited accessor property can stop deleting index named
+    properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+        try {
+            Object.defineProperty(arr, "1", {
+                configurable: false
+            });
+
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 && arr.hasOwnProperty("1") &&
+                arr[0] === 0 && arr[1] === 1 && Array.prototype[1] === 2;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-17.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-17.js
index abfa2e2ad..656c0b82a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-17.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-17.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-17.js

- * @description Object.defineProperties - 'O' is the Math object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Math, "prop", {

-                value: 11,

-                writable: true,

-                configurable: true

-            });

-            var hasProperty = Math.hasOwnProperty("prop") && Math.prop === 11;

-

-            Object.defineProperties(Math, {

-                prop: {

-                    value: 12

-                }

-            });

-            return hasProperty && Math.prop === 12;

-        } finally {

-            delete Math.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is the Math object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Math, "prop", {
+                value: 11,
+                writable: true,
+                configurable: true
+            });
+            var hasProperty = Math.hasOwnProperty("prop") && Math.prop === 11;
+
+            Object.defineProperties(Math, {
+                prop: {
+                    value: 12
+                }
+            });
+            return hasProperty && Math.prop === 12;
+        } finally {
+            delete Math.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-170.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-170.js
index df61965ba..976ca2493 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-170.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-170.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-170.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        try {

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && arr.length === 2 &&

-                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' can stop
+    deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        try {
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && arr.length === 2 &&
+                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-171.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-171.js
index 28c0413c7..6d155b571 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-171.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-171.js
@@ -1,34 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-171.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of inherited accessor property with large index named in 'O' can't stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true //we are not allowed to set the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-

-            return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0 && Array.prototype[1] === 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    inherited accessor property with large index named in 'O' can't
+    stop deleting index named properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true //we are not allowed to set the [[Configurable]] attribute of property "1" to false here, since Array.prototype is a global object, and non-configurbale property can't revert to configurable
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+
+            return arr.length === 1 && !arr.hasOwnProperty("1") && arr[0] === 0 && Array.prototype[1] === 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-172.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-172.js
index 07144eb1b..3b2d7dc07 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-172.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-172.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-172.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' that overrides inherited data property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-        try {

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: false

-            });

-

-            Array.prototype[1] = 3;

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 &&

-                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 2;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' that overrides
+    inherited data property can stop deleting index named properties
+    (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+        try {
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: false
+            });
+
+            Array.prototype[1] = 3;
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 &&
+                arr.hasOwnProperty("1") && arr[0] === 0 && arr[1] === 2;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-173.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-173.js
index fa97c91e3..989e619ef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-173.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-173.js
@@ -1,43 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-173.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Configurable]] attribute of own accessor property with large index named in 'O' that overrides inherited accessor property can stop deleting index named properties (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-        try {

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: false

-            });

-

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr.length === 2 && arr.hasOwnProperty("1") &&

-                arr[0] === 0 && arr[1] === 1 && Array.prototype[1] === 2;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Configurable]] attribute of
+    own accessor property with large index named in 'O' that overrides
+    inherited accessor property can stop deleting index named
+    properties (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+        try {
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: false
+            });
+
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr.length === 2 && arr.hasOwnProperty("1") &&
+                arr[0] === 0 && arr[1] === 1 && Array.prototype[1] === 2;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-174.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-174.js
index 8ccb7317f..b152d15a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-174.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-174.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-174.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the configurable large index named property of 'O' can be deleted (15.4.5.1 step 3.l.ii)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        Object.defineProperties(arr, {

-            length: {

-                value: 1

-            }

-        });

-

-        return !arr.hasOwnProperty("1");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the configurable large index named
+    property of 'O' can be deleted (15.4.5.1 step 3.l.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        Object.defineProperties(arr, {
+            length: {
+                value: 1
+            }
+        });
+
+        return !arr.hasOwnProperty("1");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-175.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-175.js
index ccb571ca1..dcd1d4626 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-175.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-175.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-175.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test value of the length property is set to the last non-configurable index named property of 'O' plus 1 (15.4.5.1 step 3.l.iii.1)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "1", {

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && (arr.length === 2);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test value of the length property is set
+    to the last non-configurable index named property of 'O' plus 1
+    (15.4.5.1 step 3.l.iii.1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "1", {
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && (arr.length === 2);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-176.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-176.js
index ce0e86f42..d6acc542a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-176.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-176.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-176.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Writable]] attribute of the length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' contains non-configurable large index named property (15.4.5.1 step 3.l.iii.2)

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-

-        try {

-            Object.defineProperty(arr, "1", {

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                length: {

-                    value: 1,

-                    writable: false

-                }

-            });

-            return false;

-        } catch (e) {

-            arr.length = 10; //try to overwrite length value of arr

-            return e instanceof TypeError && arr.hasOwnProperty("1") &&

-                arr.length === 2 && arr[0] === 0 && arr[1] === 1;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Writable]] attribute of the
+    length property is set to false at last when the [[Writable]]
+    field of 'desc' is false and 'O' contains non-configurable large
+    index named property (15.4.5.1 step 3.l.iii.2)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+
+        try {
+            Object.defineProperty(arr, "1", {
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                length: {
+                    value: 1,
+                    writable: false
+                }
+            });
+            return false;
+        } catch (e) {
+            arr.length = 10; //try to overwrite length value of arr
+            return e instanceof TypeError && arr.hasOwnProperty("1") &&
+                arr.length === 2 && arr[0] === 0 && arr[1] === 1;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-177.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-177.js
index 962d5ed86..b5f700637 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-177.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-177.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-177.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is the length property of 'O', the [[Value]] field of 'desc' is less than value of  the length property, test the [[Writable]] attribute of the length property is set to false at last when the [[Writable]] field of 'desc' is false and 'O' doesn't contain non-configurable large index named property (15.4.5.1 step 3.m)

- */

-

-

-function testcase() {

-    

-        var arr = [0, 1];

-

-        try {

-            Object.defineProperties(arr, {

-                length: {

-                    value: 0,

-                    writable: false

-                }

-            });

-

-            arr.length = 10; //try to overwrite length value of arr

-            return !arr.hasOwnProperty("1") && arr.length === 0 && !arr.hasOwnProperty("0");

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is the length
+    property of 'O', the [[Value]] field of 'desc' is less than value
+    of  the length property, test the [[Writable]] attribute of the
+    length property is set to false at last when the [[Writable]]
+    field of 'desc' is false and 'O' doesn't contain non-configurable
+    large index named property (15.4.5.1 step 3.m)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = [0, 1];
+
+        try {
+            Object.defineProperties(arr, {
+                length: {
+                    value: 0,
+                    writable: false
+                }
+            });
+
+            arr.length = 10; //try to overwrite length value of arr
+            return !arr.hasOwnProperty("1") && arr.length === 0 && !arr.hasOwnProperty("0");
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-178.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-178.js
index ed31e513e..f560ac314 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-178.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-178.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-178.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is available String values that convert to numbers (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-

-        var arr = [0];

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 12

-            }

-        });

-        return arr[0] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is available String values that convert to
+    numbers (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0];
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 12
+            }
+        });
+        return arr[0] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-179.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-179.js
index 6748036ba..2551efaf6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-179.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-179.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-179.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 - 2 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "4294967294": {

-                value: 100

-            }

-        });

-

-        return arr.hasOwnProperty("4294967294") && arr.length === 4294967295 && arr[4294967294] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is boundary value 2^32 - 2 (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "4294967294": {
+                value: 100
+            }
+        });
+
+        return arr.hasOwnProperty("4294967294") && arr.length === 4294967295 && arr[4294967294] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-18.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-18.js
index 5b8fb6114..7c213b45f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-18.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-18.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-18.js

- * @description Object.defineProperties - 'O' is a Date object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        var obj = new Date();

-

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a Date object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = new Date();
+
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-180.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-180.js
index 23e9d1c73..9a65b20d4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-180.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-180.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-180.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 - 1 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "4294967295": {

-                value: 100

-            }

-        });

-

-        return arr.hasOwnProperty("4294967295") && arr.length === 0 && arr[4294967295] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is boundary value 2^32 - 1 (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "4294967295": {
+                value: 100
+            }
+        });
+
+        return arr.hasOwnProperty("4294967295") && arr.length === 0 && arr[4294967295] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-181.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-181.js
index 1278c013c..4428a5ff9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-181.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-181.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-181.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "4294967296": {

-                value: 100

-            }

-        });

-

-        return arr.hasOwnProperty("4294967296") && arr.length === 0 && arr[4294967296] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is boundary value 2^32 (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "4294967296": {
+                value: 100
+            }
+        });
+
+        return arr.hasOwnProperty("4294967296") && arr.length === 0 && arr[4294967296] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-182.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-182.js
index eb1935bb2..47e0a4244 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-182.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-182.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-182.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is boundary value 2^32 + 1 (15.4.5.1 step 4.a)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "4294967297": {

-                value: 100

-            }

-        });

-

-        return arr.hasOwnProperty("4294967297") && arr.length === 0 && arr[4294967297] === 100;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is boundary value 2^32 + 1 (15.4.5.1 step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "4294967297": {
+                value: 100
+            }
+        });
+
+        return arr.hasOwnProperty("4294967297") && arr.length === 0 && arr[4294967297] === 100;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-183.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-183.js
index 7e4b07fbf..91adc50d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-183.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-183.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-183.js

- * @description Object.defineProperties - TypeError is not thrown if 'O' is an Array, 'P' is an array index named property, [[Writable]] attribute of the length property in 'O' is false, value of 'P' is less than value of the length property in'O'  (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arr = [1, 2, 3];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        Object.defineProperties(arr, {

-            "1": {

-                value: "abc"

-            }

-        });

-

-        return arr[0] === 1 && arr[1] === "abc" && arr[2] === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is not thrown if 'O' is an
+    Array, 'P' is an array index named property, [[Writable]]
+    attribute of the length property in 'O' is false, value of 'P' is
+    less than value of the length property in'O'  (15.4.5.1 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [1, 2, 3];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        Object.defineProperties(arr, {
+            "1": {
+                value: "abc"
+            }
+        });
+
+        return arr[0] === 1 && arr[1] === "abc" && arr[2] === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-184.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-184.js
index 250d768af..e99cd8fd0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-184.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-184.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-184.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property,[[Writable]] attribute of the length property in 'O' is false, value of 'P' is equal to value of the length property in 'O' (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arr = [1, 2, 3];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "3": {

-                    value: "abc"

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 1 &&

-                arr[1] === 2 && arr[2] === 3 && !arr.hasOwnProperty("3");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property,[[Writable]] attribute of the
+    length property in 'O' is false, value of 'P' is equal to value of
+    the length property in 'O' (15.4.5.1 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [1, 2, 3];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "3": {
+                    value: "abc"
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 1 &&
+                arr[1] === 2 && arr[2] === 3 && !arr.hasOwnProperty("3");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-185.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-185.js
index e763b8f4a..7e9ffcff0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-185.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-185.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-185.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property,[[Writable]] attribute of the length property in 'O' is false, value of 'P' is bigger than value of the length property in 'O'  (15.4.5.1 step 4.b)

- */

-

-

-function testcase() {

-        var arr = [1, 2, 3];

-

-        Object.defineProperty(arr, "length", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "4": {

-                    value: "abc"

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 1 && arr[1] === 2 &&

-                arr[2] === 3 && !arr.hasOwnProperty("3") && !arr.hasOwnProperty("4");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property,[[Writable]] attribute of the
+    length property in 'O' is false, value of 'P' is bigger than value
+    of the length property in 'O'  (15.4.5.1 step 4.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [1, 2, 3];
+
+        Object.defineProperty(arr, "length", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "4": {
+                    value: "abc"
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 1 && arr[1] === 2 &&
+                arr[2] === 3 && !arr.hasOwnProperty("3") && !arr.hasOwnProperty("4");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-186.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-186.js
index 836d3c16d..da5963a77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-186.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-186.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-186.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own data property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        Object.defineProperty(arr, 0, {

-            value: "ownDataProperty",

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: "abc",

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === "ownDataProperty";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own data property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        Object.defineProperty(arr, 0, {
+            value: "ownDataProperty",
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: "abc",
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === "ownDataProperty";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-187.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-187.js
index 47e3f48c2..94b7c5de2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-187.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-187.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-187.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is inherited data property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arr = [];

-

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: false

-                }

-            });

-            return arr.hasOwnProperty("0") && typeof arr[0] === "undefined" && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is inherited data property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arr = [];
+
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: false
+                }
+            });
+            return arr.hasOwnProperty("0") && typeof arr[0] === "undefined" && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-188.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-188.js
index a440ae284..ab12123d6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-188.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-188.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-188.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own data property that overrides an inherited data property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arr = [];

-            Object.defineProperty(arr, "0", {

-                value: 12,

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own data property that overrides an
+    inherited data property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arr = [];
+            Object.defineProperty(arr, "0", {
+                value: 12,
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-189.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-189.js
index db92f74b0..0a4719fd6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-189.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-189.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-189.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own data property that overrides an inherited accessor property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arr = [];

-            Object.defineProperty(arr, "0", {

-                value: 12,

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own data property that overrides an
+    inherited accessor property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arr = [];
+            Object.defineProperty(arr, "0", {
+                value: 12,
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-19.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-19.js
index 74942c8c8..7850a69c2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-19.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-19.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-19.js

- * @description Object.defineProperties - 'O' is a RegExp object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        var obj = new RegExp();

-

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a RegExp object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = new RegExp();
+
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-190.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-190.js
index 3b42f283b..d15aa6250 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-190.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-190.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-190.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own accessor property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    get: function () {

-                        return 12;

-                    },

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 11;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own accessor property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    get: function () {
+                        return 12;
+                    },
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 11;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-191.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-191.js
index d0ff1a063..3484ebdf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-191.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-191.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-191.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, 'P' is inherited accessor property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arr = [];

-

-            Object.defineProperties(arr, {

-                "0": {

-                    get: function () {

-                        return 12;

-                    },

-                    configurable: false

-                }

-            });

-            return arr.hasOwnProperty("0") && arr[0] === 12 && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, 'P' is inherited accessor property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arr = [];
+
+            Object.defineProperties(arr, {
+                "0": {
+                    get: function () {
+                        return 12;
+                    },
+                    configurable: false
+                }
+            });
+            return arr.hasOwnProperty("0") && arr[0] === 12 && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-192.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-192.js
index 57fd72825..057e3c6c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-192.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-192.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-192.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own accessor property that overrides an inherited data property (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 11,

-                configurable: true

-            });

-

-            var arr = [];

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 12;

-                },

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own accessor property that overrides an
+    inherited data property (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 11,
+                configurable: true
+            });
+
+            var arr = [];
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 12;
+                },
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-193.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-193.js
index 4968f669c..f0f8519aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-193.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-193.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-193.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' is own accessor property that overrides an inherited accessor property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arr = [];

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 12;

-                },

-                configurable: false

-            });

-

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' is own accessor property that overrides an
+    inherited accessor property  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arr = [];
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 12;
+                },
+                configurable: false
+            });
+
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && arr[0] === 12 && Array.prototype[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-194.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-194.js
index f69a58617..b49c3f96e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-194.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-194.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-194.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test TypeError is thrown when 'O' is not extensible  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        Object.preventExtensions(arr);

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: 1

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && (arr.hasOwnProperty("0") === false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test TypeError
+    is thrown when 'O' is not extensible  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        Object.preventExtensions(arr);
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: 1
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && (arr.hasOwnProperty("0") === false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-195.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-195.js
index 4ce56f1eb..5dbe78403 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-195.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-195.js
@@ -1,23 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-195.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test 'P' is defined as data property when 'desc' is generic descriptor  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "0": {

-                enumerable: true

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test 'P' is
+    defined as data property when 'desc' is generic descriptor
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "0": {
+                enumerable: true
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-196.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-196.js
index 99f55fb78..bb516ccf9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-196.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-196.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-196.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Value]] of 'P' property in 'Attributes' is set as undefined value if [[Value]] is absent in data descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "0": {

-                writable: true,

-                enumerable: true,

-                configurable: false

-            }

-        });

-

-        return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test [[Value]]
+    of 'P' property in 'Attributes' is set as undefined value if
+    [[Value]] is absent in data descriptor 'desc'  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "0": {
+                writable: true,
+                enumerable: true,
+                configurable: false
+            }
+        });
+
+        return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-197.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-197.js
index 3271212d5..e233d8e72 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-197.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-197.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-197.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Writable]] of 'P' property in 'Attributes' is set as false value if [[Writable]] is absent in data descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var isOwnProperty = false;

-        var canWritable = false;

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 1001,

-                enumerable: true,

-                configurable: false

-            }

-        });

-

-        isOwnProperty = arr.hasOwnProperty("0");

-

-        arr[0] = 12;

-

-        canWritable = (arr[0] === 12);

-

-        return isOwnProperty && !canWritable && arr[0] === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test
+    [[Writable]] of 'P' property in 'Attributes' is set as false value
+    if [[Writable]] is absent in data descriptor 'desc'  (15.4.5.1
+    step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        var isOwnProperty = false;
+        var canWritable = false;
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 1001,
+                enumerable: true,
+                configurable: false
+            }
+        });
+
+        isOwnProperty = arr.hasOwnProperty("0");
+
+        arr[0] = 12;
+
+        canWritable = (arr[0] === 12);
+
+        return isOwnProperty && !canWritable && arr[0] === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-198.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-198.js
index a03637be6..99446779d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-198.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-198.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-198.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Enumerable]] of 'P' property in 'Attributes' is set as false value if [[Enumerable]] is absent in data descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var isOwnProperty = false;

-        var canEnumerable = false;

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 1001,

-                writable: true,

-                configurable: true

-            }

-        });

-

-        isOwnProperty = arr.hasOwnProperty("0");

-        for (var i in arr) {

-            if (i === "0") {

-                canEnumerable = true;

-            }

-        }

-        return isOwnProperty && !canEnumerable && arr[0] === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test
+    [[Enumerable]] of 'P' property in 'Attributes' is set as false
+    value if [[Enumerable]] is absent in data descriptor 'desc'
+    (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        var isOwnProperty = false;
+        var canEnumerable = false;
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 1001,
+                writable: true,
+                configurable: true
+            }
+        });
+
+        isOwnProperty = arr.hasOwnProperty("0");
+        for (var i in arr) {
+            if (i === "0") {
+                canEnumerable = true;
+            }
+        }
+        return isOwnProperty && !canEnumerable && arr[0] === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-199.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-199.js
index 50ca00dd4..660e9bf3a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-199.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-199.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-199.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Configurable]] of 'P' property in 'Attributes' is set as false value if [[Configurable]] is absent in data descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var beforeDeleted = false;

-        var afterDeleted = false;

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 1001,

-                writable: true,

-                enumerable: true

-            }

-        });

-

-        beforeDeleted = arr.hasOwnProperty("0");

-        delete arr[0];

-        afterDeleted = arr.hasOwnProperty("0");

-        return beforeDeleted && afterDeleted && arr[0] === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test
+    [[Configurable]] of 'P' property in 'Attributes' is set as false
+    value if [[Configurable]] is absent in data descriptor 'desc'
+    (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        var beforeDeleted = false;
+        var afterDeleted = false;
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 1001,
+                writable: true,
+                enumerable: true
+            }
+        });
+
+        beforeDeleted = arr.hasOwnProperty("0");
+        delete arr[0];
+        afterDeleted = arr.hasOwnProperty("0");
+        return beforeDeleted && afterDeleted && arr[0] === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-2.js
index c3d5a7530..9bb87975b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-2.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-2.js

- * @description Object.defineProperties - 'P' is inherited data property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            value: 11,

-            configurable: false

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: {

-                value: 12,

-                configurable: true

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(obj, "prop", 12, false, false, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is inherited data property (8.12.9
+    step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            value: 11,
+            configurable: false
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: {
+                value: 12,
+                configurable: true
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(obj, "prop", 12, false, false, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-20.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-20.js
index 8617309e9..52a144deb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-20.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-20.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-20.js

- * @description Object.defineProperties - 'O' is a JSON object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(JSON, "prop", {

-                value: 11,

-                writable: true,

-                configurable: true

-            });

-            var hasProperty = JSON.hasOwnProperty("prop") && JSON.prop === 11;

-            Object.defineProperties(JSON, {

-                prop: {

-                    value: 12

-                }

-            });

-            return hasProperty && JSON.prop === 12;

-        } finally {

-            delete JSON.prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is a JSON object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(JSON, "prop", {
+                value: 11,
+                writable: true,
+                configurable: true
+            });
+            var hasProperty = JSON.hasOwnProperty("prop") && JSON.prop === 11;
+            Object.defineProperties(JSON, {
+                prop: {
+                    value: 12
+                }
+            });
+            return hasProperty && JSON.prop === 12;
+        } finally {
+            delete JSON.prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-200.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-200.js
index 81f52138e..3c19beed4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-200.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-200.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-200.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'desc' is data descriptor, test updating all attribute values of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [1]; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 1001,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arr, "0", 1001, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'desc' is data descriptor, test updating all
+    attribute values of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [1]; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 1001,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arr, "0", 1001, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-201.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-201.js
index 19a88731b..135cfa9a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-201.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-201.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-201.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Get]] of 'P' property in 'Attributes' is set as undefined value if [[Get]] is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "0": {

-                set: function () { },

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test [[Get]] of
+    'P' property in 'Attributes' is set as undefined value if [[Get]]
+    is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "0": {
+                set: function () { },
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return arr.hasOwnProperty("0") && typeof (arr[0]) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-202.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-202.js
index f07424e16..3e651cab5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-202.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-202.js
@@ -1,43 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-202.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Set]] of 'P' property in 'Attributes' is set as undefined value if [[Set]] is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var getFunc = function () {

-            return 11;

-        };

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: getFunc,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var i in arr) {

-            if (i === "0" && arr.hasOwnProperty("0")) {

-                verifyEnumerable = true;

-            }

-        }

-

-        var desc = Object.getOwnPropertyDescriptor(arr, "0");

-        var propertyDefineCorrect = arr.hasOwnProperty("0");

-

-        var verifyConfigurable = false;

-        delete arr[0];

-        verifyConfigurable = arr.hasOwnProperty("0");

-        return typeof desc.set === "undefined" && propertyDefineCorrect &&

-            desc.get === getFunc && !verifyConfigurable && verifyEnumerable;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test [[Set]] of
+    'P' property in 'Attributes' is set as undefined value if [[Set]]
+    is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        var getFunc = function () {
+            return 11;
+        };
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: getFunc,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var i in arr) {
+            if (i === "0" && arr.hasOwnProperty("0")) {
+                verifyEnumerable = true;
+            }
+        }
+
+        var desc = Object.getOwnPropertyDescriptor(arr, "0");
+        var propertyDefineCorrect = arr.hasOwnProperty("0");
+
+        var verifyConfigurable = false;
+        delete arr[0];
+        verifyConfigurable = arr.hasOwnProperty("0");
+        return typeof desc.set === "undefined" && propertyDefineCorrect &&
+            desc.get === getFunc && !verifyConfigurable && verifyEnumerable;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-203.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-203.js
index b68da7b61..bcc25b9a6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-203.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-203.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-203.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Enumerable]] of 'P' property in 'Attributes' is set as false value if [[Enumerable]] is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "0": {

-                set: function () { },

-                get: function () { },

-                configurable: true

-            }

-        });

-

-        for (var i in arr) {

-            if (i === "0" && arr.hasOwnProperty("0")) {

-                return false;

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test
+    [[Enumerable]] of 'P' property in 'Attributes' is set as false
+    value if [[Enumerable]] is absent in accessor descriptor 'desc'
+    (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "0": {
+                set: function () { },
+                get: function () { },
+                configurable: true
+            }
+        });
+
+        for (var i in arr) {
+            if (i === "0" && arr.hasOwnProperty("0")) {
+                return false;
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-204.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-204.js
index af338c938..8a93d56c1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-204.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-204.js
@@ -1,38 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-204.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' property doesn't exist in 'O', test [[Configurable]] of 'P' property in 'Attributes' is set as false value if [[Configurable]] is absent in accessor descriptor 'desc'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var beforeDeleted = false;

-        var afterDeleted = false;

-        arr.verifySetter = 100;

-

-        Object.defineProperties(arr, {

-            "0": {

-                set: function (value) {

-                    arr.verifySetter = value;

-                },

-                get: function () {

-                    return arr.verifySetter;

-                },

-                enumerable: true

-            }

-        });

-

-        beforeDeleted = arr.hasOwnProperty("0");

-        delete arr[0];

-        afterDeleted = arr.hasOwnProperty("0");

-

-        arr[0] = 101;

-

-        return beforeDeleted && afterDeleted && arr[0] === 101 && arr.verifySetter === 101;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' property doesn't exist in 'O', test
+    [[Configurable]] of 'P' property in 'Attributes' is set as false
+    value if [[Configurable]] is absent in accessor descriptor 'desc'
+    (15.4.5.1 step 4.c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        var beforeDeleted = false;
+        var afterDeleted = false;
+        arr.verifySetter = 100;
+
+        Object.defineProperties(arr, {
+            "0": {
+                set: function (value) {
+                    arr.verifySetter = value;
+                },
+                get: function () {
+                    return arr.verifySetter;
+                },
+                enumerable: true
+            }
+        });
+
+        beforeDeleted = arr.hasOwnProperty("0");
+        delete arr[0];
+        afterDeleted = arr.hasOwnProperty("0");
+
+        arr[0] = 101;
+
+        return beforeDeleted && afterDeleted && arr[0] === 101 && arr.verifySetter === 101;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-205.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-205.js
index 664513e10..702695ef9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-205.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-205.js
@@ -1,43 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-205.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'desc' is accessor descriptor, test updating all attribute values of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: function () {

-                    return 11;

-                },

-                set: function () { },

-                configurable: true,

-                enumerable: true

-            }

-        });

-

-        var setFun = function (value) {

-            arr.setVerifyHelpProp = value;

-        };

-        var getFun = function () {

-            return 14;

-        };

-        Object.defineProperties(arr, {

-            "0": {

-                get: getFun,

-                set: setFun,

-                configurable: false,

-                enumerable: false

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arr, "0", getFun, setFun, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'desc' is accessor descriptor, test updating all
+    attribute values of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: function () {
+                    return 11;
+                },
+                set: function () { },
+                configurable: true,
+                enumerable: true
+            }
+        });
+
+        var setFun = function (value) {
+            arr.setVerifyHelpProp = value;
+        };
+        var getFun = function () {
+            return 14;
+        };
+        Object.defineProperties(arr, {
+            "0": {
+                get: getFun,
+                set: setFun,
+                configurable: false,
+                enumerable: false
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arr, "0", getFun, setFun, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-206.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-206.js
index 2bb1df806..5c565aca1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-206.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-206.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-206.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' makes no change if every field in 'desc' is absent (name is data property)  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        arr[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {}

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 101, true, true, true);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' makes no change if every field in 'desc' is
+    absent (name is data property)  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        arr[0] = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {}
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 101, true, true, true);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-207.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-207.js
index 7633bd2b4..3bc112dcb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-207.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-207.js
@@ -1,38 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-207.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' makes no change if every field in 'desc' is absent (name is accessor property)  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function get_func() {

-            return 11;

-        }

-        function set_func(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {}

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", get_func, set_func, "setVerifyHelpProp", true, true);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' makes no change if every field in 'desc' is
+    absent (name is accessor property)  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function get_func() {
+            return 11;
+        }
+        function set_func(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {}
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", get_func, set_func, "setVerifyHelpProp", true, true);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-208.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-208.js
index c251283c4..f794c33ac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-208.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-208.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-208.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' makes no change if the value of every field in 'desc' is the same value as the corresponding field in 'P'(desc is data property)  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        arr[0] = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: 100,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arr, "0", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' makes no change if the value of every field in
+    'desc' is the same value as the corresponding field in 'P'(desc is
+    data property)  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        arr[0] = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: 100,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arr, "0", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-209.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-209.js
index c22d5c5e8..cee0107e2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-209.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-209.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-209.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, 'P' makes no change if the value of every field in 'desc' is the same value as the corresponding field in 'P'(desc is accessor property)  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var get_func = function () {

-            return "100";

-        };

-        var set_func = function (value) {

-            arr.setVerifyHelpProp = value;

-        };

-

-        var descObj = {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        };

-        

-        var properties = {

-            "0": descObj

-        };

-

-        Object.defineProperty(arr, "0", descObj);

-

-        Object.defineProperties(arr, properties);

-

-        return accessorPropertyAttributesAreCorrect(arr, "0", get_func, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, 'P' makes no change if the value of every field in
+    'desc' is the same value as the corresponding field in 'P'(desc is
+    accessor property)  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+        var get_func = function () {
+            return "100";
+        };
+        var set_func = function (value) {
+            arr.setVerifyHelpProp = value;
+        };
+
+        var descObj = {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        };
+        
+        var properties = {
+            "0": descObj
+        };
+
+        Object.defineProperty(arr, "0", descObj);
+
+        Object.defineProperties(arr, properties);
+
+        return accessorPropertyAttributesAreCorrect(arr, "0", get_func, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-21.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-21.js
index 9d04000ad..4337a5d08 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-21.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-21.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-21.js

- * @description Object.defineProperties - 'O' is an Error object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        var obj = new Error();

-

-        Object.defineProperty(obj, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Error object which implements
+    its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 )
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = new Error();
+
+        Object.defineProperty(obj, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && dataPropertyAttributesAreCorrect(obj, "prop", 11, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-210.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-210.js
index 5f4f1c268..3d3518877 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-210.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-210.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-210.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: undefined

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: undefined

-            }

-        });

-        return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, both the [[Value]] field of 'desc' and the
+    [[Value]] attribute value of 'name' are undefined  (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: undefined
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: undefined
+            }
+        });
+        return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-211.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-211.js
index ff4fba3cd..8559e3c8d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-211.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-211.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-211.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are null  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: null

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: null

-            }

-        });

-        return dataPropertyAttributesAreCorrect(arr, "0", null, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, both the [[Value]] field of 'desc' and the
+    [[Value]] attribute value of 'name' are null  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: null
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: null
+            }
+        });
+        return dataPropertyAttributesAreCorrect(arr, "0", null, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-212.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-212.js
index b6b528086..ed09c48d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-212.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-212.js
@@ -1,27 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-212.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, both the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are NaN  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: NaN

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                value: NaN

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arr, "0", NaN, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, both the [[Value]] field of 'desc' and the
+    [[Value]] attribute value of 'name' are NaN  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: NaN
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                value: NaN
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arr, "0", NaN, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-213.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-213.js
index e9fa73203..3ca2e8c49 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-213.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-213.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-213.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' is +0, and the [[Value]] attribute value of 'name' is -0  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: -0

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: +0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "0", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' is +0, and the
+    [[Value]] attribute value of 'name' is -0  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: -0
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: +0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "0", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-214.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-214.js
index 4bc0fc555..7ff6c5a1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-214.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-214.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-214.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' is -0, and the [[Value]] attribute value of 'name' is +0  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: +0

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: -0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "0", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' is -0, and the
+    [[Value]] attribute value of 'name' is +0  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: +0
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: -0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "0", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-215.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-215.js
index 7b9ba2101..fba89a855 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-215.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-215.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-215.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two numbers with same vaule  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: 101

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: 101

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 101, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two numbers with same vaule
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: 101
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: 101
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 101, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-216.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-216.js
index aeb8f7c2e..d96297959 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-216.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-216.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-216.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two strings which have same length and same characters in corresponding positions  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: "abcd"

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: "abcd"

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", "abcd", false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two strings which have same length
+    and same characters in corresponding positions  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: "abcd"
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: "abcd"
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", "abcd", false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-217.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-217.js
index 358ecfdbf..9f72e4a4c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-217.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-217.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-217.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two booleans with same value  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            value: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: true

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", true, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two booleans with same value
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            value: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: true
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", true, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-218.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-218.js
index 8a2fed488..72c13eb13 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-218.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-218.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-218.js

- * @description Object.defineProperties - 'O' is an Array, 'name' is an array index property, the [[Value]] field of 'desc' and the [[Value]] attribute value of 'name' are two objects which refer to the same object  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        var obj1 = { length: 10 };

-        Object.defineProperty(arr, "0", {

-            value: obj1

-        });

-

-        var properties = {

-            "0": {

-                value: obj1

-            }

-        };

-        try {

-            Object.defineProperties(arr, properties);

-            return dataPropertyAttributesAreCorrect(arr, "0", obj1, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'name' is an array
+    index property, the [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'name' are two objects which refer to the same
+    object  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        var obj1 = { length: 10 };
+        Object.defineProperty(arr, "0", {
+            value: obj1
+        });
+
+        var properties = {
+            "0": {
+                value: obj1
+            }
+        };
+        try {
+            Object.defineProperties(arr, properties);
+            return dataPropertyAttributesAreCorrect(arr, "0", obj1, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-219.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-219.js
index 5f2809739..d7ea32b44 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-219.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-219.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-219.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with [[Writable]] true, and the [[Writable]] field of 'desc' is true  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            writable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    writable: true

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, true, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with [[Writable]] true, and
+    the [[Writable]] field of 'desc' is true  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            writable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    writable: true
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, true, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-22.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-22.js
index 814b62c10..b4ed761be 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-22.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-22.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-22.js

- * @description Object.defineProperties - 'O' is the Arguments object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var arg = function () {

-            return arguments;

-        }();

-

-        Object.defineProperty(arg, "prop", {

-            value: 11,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is the Arguments object which
+    implements its own [[GetOwnProperty]] method to get 'P' (8.12.9
+    step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arg = function () {
+            return arguments;
+        }();
+
+        Object.defineProperty(arg, "prop", {
+            value: 11,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-220.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-220.js
index 5751505f6..bfe449444 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-220.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-220.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-220.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with [[Writable]] true, and the [[Writable]] field of 'desc' is false  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            writable: true,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    writable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with [[Writable]] true, and
+    the [[Writable]] field of 'desc' is false  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            writable: true,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    writable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-221.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-221.js
index 9d76013b8..ec0392cee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-221.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-221.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-221.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, the [[Get]] field of 'desc' and the [[Get]] attribute value of 'P' are two objects which refer to the same object  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function get_func() {

-            return 10;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: get_func

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: get_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "0", get_func, undefined, undefined, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, the [[Get]] field of 'desc' and the [[Get]] attribute
+    value of 'P' are two objects which refer to the same object
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function get_func() {
+            return 10;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: get_func
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: get_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "0", get_func, undefined, undefined, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-222.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-222.js
index ed8f520c5..123e311d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-222.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-222.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-222.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, the [[Set]] field of 'desc' and the [[Set]] attribute value of 'P' are two objects which refer to the same object  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function set_func(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arr, "0", {

-            set: set_func

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    set: set_func

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_func, "setVerifyHelpProp", false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, the [[Set]] field of 'desc' and the [[Set]] attribute
+    value of 'P' are two objects which refer to the same object
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function set_func(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arr, "0", {
+            set: set_func
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    set: set_func
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_func, "setVerifyHelpProp", false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-223.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-223.js
index f4f0bf8eb..61291f4df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-223.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-223.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-223.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with  [[Enumerable]] true, the [[Enumerable]] field of 'desc' is true  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            enumerable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    enumerable: true

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, true, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with  [[Enumerable]] true, the
+    [[Enumerable]] field of 'desc' is true  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            enumerable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    enumerable: true
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, true, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-224.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-224.js
index 9d7e680a9..ed20433d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-224.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-224.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-224.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with  [[Enumerable]] true, the [[Enumerable]] field of 'desc' is false  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    enumerable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with  [[Enumerable]] true, the
+    [[Enumerable]] field of 'desc' is false  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    enumerable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-225.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-225.js
index f947630f7..0a0d3efe7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-225.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-225.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-225.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with [[Configurable]] true, the [[Configurable]] field of 'desc' is true (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with [[Configurable]] true,
+    the [[Configurable]] field of 'desc' is true (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, true);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-226.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-226.js
index aa9dfacbc..6934d6a77 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-226.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-226.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-226.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property that already exists on 'O' with [[Configurable]] true, the [[Configurable]] field of 'desc' is false (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, false);

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property that already exists on 'O' with [[Configurable]] true,
+    the [[Configurable]] field of 'desc' is false (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, false, false, false);
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-227.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-227.js
index aca720002..becf0539b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-227.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-227.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-227.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, TypeError is thrown if the [[Configurable]] attribute value of 'P' is false  and the [[Configurable]] field of 'desc' is true  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: 3,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: 13,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, TypeError is thrown if the [[Configurable]] attribute
+    value of 'P' is false  and the [[Configurable]] field of 'desc' is
+    true  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: 3,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: 13,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-228.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-228.js
index 80f80401f..58f2af16c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-228.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-228.js
@@ -1,35 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-228.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, TypeError is thrown if the [[Configurable]] attribute value of 'P' is false, and [[Enumerable]] of 'desc' is present and its value is different from the [[Enumerable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: 3,

-            configurable: false,

-            enumerable: false

-

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: 13,

-                    enumerable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, TypeError is thrown if the [[Configurable]] attribute
+    value of 'P' is false, and [[Enumerable]] of 'desc' is present and
+    its value is different from the [[Enumerable]] attribute value of
+    'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: 3,
+            configurable: false,
+            enumerable: false
+
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: 13,
+                    enumerable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-229.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-229.js
index abb13a067..91e82ccc5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-229.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-229.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-229.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, TypeError is thrown if 'P' is accessor property, and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'P' is false  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arr, "1", {

-            set: set_fun,

-            configurable: false

-

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: 13

-                }

-            });

-            return false;

-

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, TypeError is thrown if 'P' is accessor property, and
+    'desc' is data descriptor, and the [[Configurable]] attribute
+    value of 'P' is false  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arr, "1", {
+            set: set_fun,
+            configurable: false
+
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: 13
+                }
+            });
+            return false;
+
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-230.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-230.js
index 560983f99..4b43fd1a0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-230.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-230.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-230.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, TypeError is thrown if  'P' is data property, and'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'P' is false  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: 3,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    set: function () { }

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, TypeError is thrown if  'P' is data property, and'desc'
+    is accessor descriptor, and the [[Configurable]] attribute value
+    of 'P' is false  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: 3,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    set: function () { }
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-231.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-231.js
index e5743f430..cf6bf47e9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-231.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-231.js
@@ -1,28 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-231.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property,  'P' is data property and 'desc' is accessor descriptor, and the [[Configurable]] attribute value of 'P' is true, test 'P' is converted from data property to accessor property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        arr[1] = 3; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(arr, {

-            "1": {

-                set: set_fun

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property,  'P' is data property and 'desc' is accessor descriptor,
+    and the [[Configurable]] attribute value of 'P' is true, test 'P'
+    is converted from data property to accessor property  (15.4.5.1
+    step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+        arr[1] = 3; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(arr, {
+            "1": {
+                set: set_fun
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-232.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-232.js
index 680b80244..4e56668d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-232.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-232.js
@@ -1,31 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-232.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property,  'P' is accessor property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'P' is true, test 'P' is converted from accessor property to data property  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-

-        });

-

-        Object.defineProperties(arr, {

-            "1": {

-                value: 12

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arr, "1", 12, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property,  'P' is accessor property and 'desc' is data descriptor,
+    and the [[Configurable]] attribute value of 'P' is true, test 'P'
+    is converted from accessor property to data property  (15.4.5.1
+    step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+
+        });
+
+        Object.defineProperties(arr, {
+            "1": {
+                value: 12
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arr, "1", 12, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-233.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-233.js
index a1ebe30d4..0d03ee7c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-233.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-233.js
@@ -1,33 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-233.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, 'P' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'P' is false, test TypeError is thrown if the [[Writable]] attribute value of 'P' is false and the [[Writable]] field of 'desc' is true.  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            configurable: false,

-            writable: false

-

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    writable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, 'P' is data property and 'desc' is data descriptor, and
+    the [[Configurable]] attribute value of 'P' is false, test
+    TypeError is thrown if the [[Writable]] attribute value of 'P' is
+    false and the [[Writable]] field of 'desc' is true.  (15.4.5.1
+    step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            configurable: false,
+            writable: false
+
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    writable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-234.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-234.js
index e845afd70..3c8bb50cc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-234.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-234.js
@@ -1,34 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-234.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index property, 'P' is data property and 'desc' is data descriptor, and the [[Configurable]] attribute value of 'P' is false, test TypeError is thrown if the [[Writable]] attribute value of 'P' is false, and the type of the [[Value]] field of 'desc' is different from the type of the [[Value]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: 3,

-            configurable: false,

-            writable: false

-        });

-

-        try {

-

-            Object.defineProperties(arr, {

-                "1": {

-                    value: "abc"

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    property, 'P' is data property and 'desc' is data descriptor, and
+    the [[Configurable]] attribute value of 'P' is false, test
+    TypeError is thrown if the [[Writable]] attribute value of 'P' is
+    false, and the type of the [[Value]] field of 'desc' is different
+    from the type of the [[Value]] attribute value of 'P'  (15.4.5.1
+    step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: 3,
+            configurable: false,
+            writable: false
+        });
+
+        try {
+
+            Object.defineProperties(arr, {
+                "1": {
+                    value: "abc"
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 3, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-235.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-235.js
index cd4347031..337bedebc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-235.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-235.js
@@ -1,30 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-235.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' is +0, and the [[Value]] attribute value of 'P' is -0  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: +0

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: -0

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' is +0, and the
+    [[Value]] attribute value of 'P' is -0  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: +0
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: -0
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-236.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-236.js
index faa063cfa..ed597d5df 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-236.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-236.js
@@ -1,31 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-236.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' is -0, and the [[Value]] attribute value of 'P' is +0  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: -0

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: +0

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' is -0, and the
+    [[Value]] attribute value of 'P' is +0  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: -0
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: +0
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-237.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-237.js
index 06e89eccf..88bc75d35 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-237.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-237.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-237.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' and the [[Value]] attribute value of 'P' are two numbers with different vaule (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: 12

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: 36

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'P' are two numbers with different vaule
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: 12
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: 36
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-238.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-238.js
index f95e027dd..fe7b0232f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-238.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-238.js
@@ -1,30 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-238.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' and the [[Value]] attribute value of 'P' are two strings with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: "abcd"

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: "efgh"

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", "abcd", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'P' are two strings with different values
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: "abcd"
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: "efgh"
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", "abcd", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-239.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-239.js
index e982fca2e..62272d754 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-239.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-239.js
@@ -1,31 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-239.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' and the [[Value]] attribute value of 'P' are two booleans with different values (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            value: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: false

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", true, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'P' are two booleans with different values
+    (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            value: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: false
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", true, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-24.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-24.js
index d96a7103c..a9f81e747 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-24.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-24.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-24.js

- * @description Object.defineProperties - 'O' is the global object which implements its own [[GetOwnProperty]] method to get 'P' (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(fnGlobalObject(), "prop", {

-                value: 11,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            });

-

-            Object.defineProperties(fnGlobalObject(), {

-                prop: {

-                    value: 12

-                }

-            });

-            return dataPropertyAttributesAreCorrect(fnGlobalObject(), "prop", 12, true, true, true);

-        }  finally {

-            delete fnGlobalObject().prop;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is the global object which
+    implements its own [[GetOwnProperty]] method to get 'P' (8.12.9
+    step 1 )
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(fnGlobalObject(), "prop", {
+                value: 11,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            });
+
+            Object.defineProperties(fnGlobalObject(), {
+                prop: {
+                    value: 12
+                }
+            });
+            return dataPropertyAttributesAreCorrect(fnGlobalObject(), "prop", 12, true, true, true);
+        }  finally {
+            delete fnGlobalObject().prop;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-240.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-240.js
index df1f8ef42..bccba6fef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-240.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-240.js
@@ -1,33 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-240.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property with  [[Configurable]], [[Writable]] false, 'desc' is data descriptor, [[Value]] field of 'desc' and the [[Value]] attribute value of 'P' are two objects which refer to the different objects (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-        var obj1 = { value: 12 };

-        var obj2 = { value: 36 };

-

-        Object.defineProperty(arr, "1", {

-            value: obj1

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    value: obj2

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", obj1, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    data property with  [[Configurable]], [[Writable]] false, 'desc'
+    is data descriptor, [[Value]] field of 'desc' and the [[Value]]
+    attribute value of 'P' are two objects which refer to the
+    different objects (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+        var obj1 = { value: 12 };
+        var obj2 = { value: 36 };
+
+        Object.defineProperty(arr, "1", {
+            value: obj1
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    value: obj2
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "1", obj1, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-241.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-241.js
index c1e3ebdd5..d0c4d734a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-241.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-241.js
@@ -1,34 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-241.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' and the [[Set]] attribute value of 'P' are two objects which refer to the different objects  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "1", {

-            set: set_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    set: function () { }

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    accessor property with  [[Configurable]] false, 'desc' is accessor
+    descriptor, the [[Set]] field of 'desc' is present, and the
+    [[Set]] field of 'desc' and the [[Set]] attribute value of 'P' are
+    two objects which refer to the different objects  (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "1", {
+            set: set_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    set: function () { }
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-242.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-242.js
index 09ba89099..6753cd470 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-242.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-242.js
@@ -1,34 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-242.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' is an object and the [[Set]] attribute value of 'P' is undefined   (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "1", {

-            set: set_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    set: undefined

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    accessor property with  [[Configurable]] false, 'desc' is accessor
+    descriptor, the [[Set]] field of 'desc' is present, and the
+    [[Set]] field of 'desc' is an object and the [[Set]] attribute
+    value of 'P' is undefined   (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "1", {
+            set: set_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    set: undefined
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-243.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-243.js
index 06661edcc..aacc06208 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-243.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-243.js
@@ -1,27 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-243.js

- * @description Object.defineProperties - TypeError is not thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, the [[Set]] field of 'desc' is present, and the [[Set]] field of 'desc' and the [[Set]] attribute value of 'P' are undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            set: undefined

-        });

-

-        Object.defineProperties(arr, {

-            "1": {

-                set: undefined

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arr, "1", undefined, undefined, undefined, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is not thrown if 'O' is an
+    Array, 'P' is an array index named property that already exists on
+    'O' is accessor property with  [[Configurable]] false, 'desc' is
+    accessor descriptor, the [[Set]] field of 'desc' is present, and
+    the [[Set]] field of 'desc' and the [[Set]] attribute value of 'P'
+    are undefined  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            set: undefined
+        });
+
+        Object.defineProperties(arr, {
+            "1": {
+                set: undefined
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arr, "1", undefined, undefined, undefined, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-244.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-244.js
index 883673107..eeff22535 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-244.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-244.js
@@ -1,36 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-244.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' and the [[Get]] attribute value of 'P' are two objects which refer to the different objects  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function get_fun() {

-            return 36;

-        }

-        Object.defineProperty(arr, "1", {

-            get: get_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    get: function () {

-                        return 12;

-                    }

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", get_fun, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    accessor property with  [[Configurable]] false, 'desc' is accessor
+    descriptor, the [[Get]] field of 'desc' is present, and the
+    [[Get]] field of 'desc' and the [[Get]] attribute value of 'P' are
+    two objects which refer to the different objects  (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function get_fun() {
+            return 36;
+        }
+        Object.defineProperty(arr, "1", {
+            get: get_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    get: function () {
+                        return 12;
+                    }
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", get_fun, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-245.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-245.js
index 1dc5ad6b9..8d3549423 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-245.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-245.js
@@ -1,33 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-245.js

- * @description Object.defineProperties - TypeError is thrown if 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, the [[Get]] field of 'desc' is present, and  the [[Get]] field of 'desc' is an object and the [[Get]] attribute value of 'P' is undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function get_fun() {

-            return 36;

-        }

-        Object.defineProperty(arr, "1", {

-            get: get_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    get: undefined

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", get_fun, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is thrown if 'O' is an Array,
+    'P' is an array index named property that already exists on 'O' is
+    accessor property with  [[Configurable]] false, 'desc' is accessor
+    descriptor, the [[Get]] field of 'desc' is present, and  the
+    [[Get]] field of 'desc' is an object and the [[Get]] attribute
+    value of 'P' is undefined  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function get_fun() {
+            return 36;
+        }
+        Object.defineProperty(arr, "1", {
+            get: get_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    get: undefined
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "1", get_fun, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-246.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-246.js
index c3a312f2e..0e9e45c1e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-246.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-246.js
@@ -1,31 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-246.js

- * @description Object.defineProperties - TypeError is not thrown if ''O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property with  [[Configurable]] false, 'desc' is accessor descriptor, test TypeError is not thrown if the [[Get]] field of 'desc' is present, and the [[Get]] field of 'desc' and the [[Get]] attribute value of 'P' are undefined (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            get: undefined

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "1": {

-                    get: undefined

-                }

-            });

-

-            return accessorPropertyAttributesAreCorrect(arr, "1", undefined, undefined, undefined, false, false);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - TypeError is not thrown if ''O' is an
+    Array, 'P' is an array index named property that already exists on
+    'O' is accessor property with  [[Configurable]] false, 'desc' is
+    accessor descriptor, test TypeError is not thrown if the [[Get]]
+    field of 'desc' is present, and the [[Get]] field of 'desc' and
+    the [[Get]] attribute value of 'P' are undefined (15.4.5.1 step
+    4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            get: undefined
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "1": {
+                    get: undefined
+                }
+            });
+
+            return accessorPropertyAttributesAreCorrect(arr, "1", undefined, undefined, undefined, false, false);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-247.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-247.js
index 23d3c2e3b..b31d4f114 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-247.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-247.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-247.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test updating the [[Value]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [12];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: 36

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 36, true, true, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test updating the [[Value]] attribute
+    value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [12];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: 36
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 36, true, true, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-248.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-248.js
index d141cb84f..4ccdac996 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-248.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-248.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-248.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test setting the [[Value]] attribute value of 'P' as undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [12];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: undefined

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", undefined, true, true, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test setting the [[Value]] attribute
+    value of 'P' as undefined  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [12];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: undefined
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", undefined, true, true, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-249.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-249.js
index 93cf84120..813395af9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-249.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-249.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-249.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test setting the [[Value]] attribute value of 'P' from undefined to normal value  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [undefined];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: 12

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, true, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test setting the [[Value]] attribute
+    value of 'P' from undefined to normal value  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [undefined];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: 12
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, true, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-25.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-25.js
index 15f4072d5..efb9f2bf5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-25.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-25.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-25.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test TypeError is thrown when 'O' is not extensible (8.12.9 step 3)

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.preventExtensions(obj);

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && !obj.hasOwnProperty("prop");

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test TypeError
+    is thrown when 'O' is not extensible (8.12.9 step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.preventExtensions(obj);
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && !obj.hasOwnProperty("prop");
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-250.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-250.js
index 660ffd92a..bb077ada8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-250.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-250.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-250.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test updating the [[Writable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [100];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    writable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 100, false, true, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test updating the [[Writable]]
+    attribute value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [100];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    writable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 100, false, true, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-251.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-251.js
index 368af9b89..ca4469561 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-251.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-251.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-251.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test updating the [[Enumerable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [12];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    enumerable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, false, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test updating the [[Enumerable]]
+    attribute value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [12];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    enumerable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, false, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-252.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-252.js
index 412f12ecb..01dbf0b94 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-252.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-252.js
@@ -1,27 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-252.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test updating the [[Configurable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [12];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, true, false);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test updating the [[Configurable]]
+    attribute value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [12];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 12, true, true, false);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-253.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-253.js
index 04f9e5b8f..dc984444c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-253.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-253.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-253.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is data property and 'desc' is data descriptor, test updating multiple attribute values of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [12];

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    value: 36,

-                    writable: false,

-                    configurable: false

-                }

-            });

-            return dataPropertyAttributesAreCorrect(arr, "0", 36, false, true, false);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is data property and
+    'desc' is data descriptor, test updating multiple attribute values
+    of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [12];
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    value: 36,
+                    writable: false,
+                    configurable: false
+                }
+            });
+            return dataPropertyAttributesAreCorrect(arr, "0", 36, false, true, false);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-254.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-254.js
index 4317de855..32f9ed75f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-254.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-254.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-254.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Get]] attribute value of 'P' with different getter function (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function get_fun() {

-            return 36;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: get_fun

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Get]] attribute
+    value of 'P' with different getter function (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function get_fun() {
+            return 36;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: get_fun
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-255.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-255.js
index b85af3c34..82022c8a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-255.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-255.js
@@ -1,30 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-255.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test setting the [[Get]] attribute value of 'P' as undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: undefined

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "0", undefined, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test setting the [[Get]] attribute
+    value of 'P' as undefined  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: undefined
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "0", undefined, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-256.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-256.js
index 49ae1f541..fecbe1f5a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-256.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-256.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-256.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Get]] attribute value of 'P' from undefined to function (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function get_fun() {

-            return 36;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: undefined,

-            configurable: true

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                get: get_fun

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Get]] attribute
+    value of 'P' from undefined to function (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function get_fun() {
+            return 36;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: undefined,
+            configurable: true
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                get: get_fun
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-257.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-257.js
index 7ba06302e..c819c9d0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-257.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-257.js
@@ -1,36 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-257.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Set]] attribute value of 'P' with different getter function (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    set: set_fun

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Set]] attribute
+    value of 'P' with different getter function (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    set: set_fun
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-258.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-258.js
index ca97606a9..21b13e181 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-258.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-258.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-258.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test setting the [[Set]] attribute value of 'P' as undefined  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.defineProperties(arr, {

-            "0": {

-                set: undefined

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "0", undefined, undefined, undefined, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test setting the [[Set]] attribute
+    value of 'P' as undefined  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.defineProperties(arr, {
+            "0": {
+                set: undefined
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "0", undefined, undefined, undefined, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-259.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-259.js
index a112476f5..2d228cf45 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-259.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-259.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-259.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Set]] attribute value of 'P' from undefined to function  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "0", {

-            set: undefined,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    set: set_fun

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Set]] attribute
+    value of 'P' from undefined to function  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "0", {
+            set: undefined,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    set: set_fun
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-26.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-26.js
index 466205ce6..d8b579359 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-26.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-26.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-26.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test 'P' is defined as data property when 'desc' is generic descriptor (8.12.9 step 4.a)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                configurable: true,

-                enumerable: true

-            }

-        });

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&

-            desc.hasOwnProperty("writable") && desc.writable === false &&

-            desc.hasOwnProperty("configurable") && desc.configurable === true &&

-            desc.hasOwnProperty("enumerable") && desc.enumerable === true &&

-            !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test 'P' is
+    defined as data property when 'desc' is generic descriptor (8.12.9
+    step 4.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                configurable: true,
+                enumerable: true
+            }
+        });
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&
+            desc.hasOwnProperty("writable") && desc.writable === false &&
+            desc.hasOwnProperty("configurable") && desc.configurable === true &&
+            desc.hasOwnProperty("enumerable") && desc.enumerable === true &&
+            !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-260.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-260.js
index 56c607cb8..5c413cc0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-260.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-260.js
@@ -1,36 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-260.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Enumerable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "0", {

-            set: set_fun,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    enumerable: false

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Enumerable]]
+    attribute value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "0", {
+            set: set_fun,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    enumerable: false
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, true);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-261.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-261.js
index 5efdf82ae..45465838e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-261.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-261.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-261.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating the [[Configurable]] attribute value of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "0", {

-            set: set_fun,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    configurable: false

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, false);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating the [[Configurable]]
+    attribute value of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "0", {
+            set: set_fun,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    configurable: false
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", undefined, set_fun, "setVerifyHelpProp", false, false);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-262.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-262.js
index ed48bd909..12013ab6a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-262.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-262.js
@@ -1,44 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-262.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property that already exists on 'O' is accessor property and 'desc' is accessor descriptor, test updating multiple attribute values of 'P'  (15.4.5.1 step 4.c)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function get_fun() {

-            return 36;

-        }

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 12;

-            },

-            set: set_fun,

-            enumerable: true,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "0": {

-                    get: get_fun,

-                    enumerable: false,

-                    configurable: false

-                }

-            });

-            return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, set_fun, "setVerifyHelpProp", false, false);

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property that already exists on 'O' is accessor property and
+    'desc' is accessor descriptor, test updating multiple attribute
+    values of 'P'  (15.4.5.1 step 4.c)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function get_fun() {
+            return 36;
+        }
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 12;
+            },
+            set: set_fun,
+            enumerable: true,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "0": {
+                    get: get_fun,
+                    enumerable: false,
+                    configurable: false
+                }
+            });
+            return accessorPropertyAttributesAreCorrect(arr, "0", get_fun, set_fun, "setVerifyHelpProp", false, false);
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-263.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-263.js
index 8b32853c7..ba876a41b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-263.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-263.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-263.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, test the length property of 'O' is not changed if ToUint32('P') is less than value of the length property in 'O' (15.4.5.1 step 4.e)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false

-

-        Object.defineProperties(arr, {

-            "1": {

-                value: 26

-            }

-        });

-        return arr.length === 3 && arr[1] === 26;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, test the length property of 'O' is not changed if
+    ToUint32('P') is less than value of the length property in 'O'
+    (15.4.5.1 step 4.e)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false
+
+        Object.defineProperties(arr, {
+            "1": {
+                value: 26
+            }
+        });
+        return arr.length === 3 && arr[1] === 26;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-264.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-264.js
index 07ed0639c..8e283a251 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-264.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-264.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-264.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, test the length property of 'O' is set as ToUint32('P') + 1 if ToUint32('P') equals to value of the length property in 'O' (15.4.5.1 step 4.e.ii)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false

-

-        Object.defineProperties(arr, {

-            "3": {

-                value: 26

-            }

-        });

-        return arr.length === 4 && arr[3] === 26;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, test the length property of 'O' is set as
+    ToUint32('P') + 1 if ToUint32('P') equals to value of the length
+    property in 'O' (15.4.5.1 step 4.e.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        arr.length = 3; // default value of length: writable: true, configurable: false, enumerable: false
+
+        Object.defineProperties(arr, {
+            "3": {
+                value: 26
+            }
+        });
+        return arr.length === 4 && arr[3] === 26;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-265.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-265.js
index 6e86ab125..181b309c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-265.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-265.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-265.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is an array index named property, test the length property of 'O' is set as ToUint32('P') + 1 if ToUint32('P') is greater than value of the length property in 'O' (15.4.5.1 step 4.e.ii)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "5": {

-                value: 26

-            }

-        });

-        return arr.length === 6 && arr[5] === 26;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is an array index
+    named property, test the length property of 'O' is set as
+    ToUint32('P') + 1 if ToUint32('P') is greater than value of the
+    length property in 'O' (15.4.5.1 step 4.e.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "5": {
+                value: 26
+            }
+        });
+        return arr.length === 6 && arr[5] === 26;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-266.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-266.js
index 8565152c8..5b872bb0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-266.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-266.js
@@ -1,26 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-266.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic property that won't exist on 'O', and 'desc' is data descriptor, test 'P' is defined in 'O' with all correct attribute values (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperties(arr, {

-            "property": {

-                value: 12,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(arr, "property", 12, true, true, true) && arr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic property
+    that won't exist on 'O', and 'desc' is data descriptor, test 'P'
+    is defined in 'O' with all correct attribute values (15.4.5.1 step
+    5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperties(arr, {
+            "property": {
+                value: 12,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(arr, "property", 12, true, true, true) && arr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-267.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-267.js
index b8afb467e..aaf142dfb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-267.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-267.js
@@ -1,34 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-267.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic property, and 'desc' is accessor descriptor, test 'P' is defined in 'O' with all correct attribute values (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function get_fun() {

-            return 12;

-        }

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(arr, {

-            "property": {

-                get: get_fun,

-                set: set_fun,

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "setVerifyHelpProp", true, true) &&

-            arr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic
+    property, and 'desc' is accessor descriptor, test 'P' is defined
+    in 'O' with all correct attribute values (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function get_fun() {
+            return 12;
+        }
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(arr, {
+            "property": {
+                get: get_fun,
+                set: set_fun,
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "setVerifyHelpProp", true, true) &&
+            arr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-268.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-268.js
index 79be79c65..4b68ac497 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-268.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-268.js
@@ -1,37 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-268.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-        var arr = [];

-        function get_fun() {

-            return 12;

-        }

-        function set_fun(value) {

-            arr.verifySetFun = value;

-        }

-        Object.defineProperty(arr, "property", {

-            get: function () {

-                return 36;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(arr, {

-            "property": {

-                get: get_fun,

-                set: set_fun,

-                enumerable: false

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "verifySetFun", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own
+    accessor property of 'O', and 'desc' is accessor descriptor, test
+    updating multiple attribute values of 'P' (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+        function get_fun() {
+            return 12;
+        }
+        function set_fun(value) {
+            arr.verifySetFun = value;
+        }
+        Object.defineProperty(arr, "property", {
+            get: function () {
+                return 36;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(arr, {
+            "property": {
+                get: get_fun,
+                set: set_fun,
+                enumerable: false
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "verifySetFun", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-269.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-269.js
index 2a07de654..105bfc89c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-269.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-269.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-269.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-        arr.property = 12; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(arr, {

-            "property": {

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false) && arr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own data
+    property of 'O', and 'desc' is data descriptor, test updating
+    multiple attribute values of 'P' (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+        arr.property = 12; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(arr, {
+            "property": {
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false) && arr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-27.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-27.js
index 7d03b68ae..604f07d7e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-27.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-27.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-27.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Value]] of 'P' is set as undefined value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                writable: true

-            }

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&

-            desc.hasOwnProperty("writable") && desc.writable === true &&

-            desc.hasOwnProperty("configurable") && desc.configurable === false &&

-            desc.hasOwnProperty("enumerable") && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test [[Value]]
+    of 'P' is set as undefined value if absent in data descriptor
+    'desc' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                writable: true
+            }
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&
+            desc.hasOwnProperty("writable") && desc.writable === true &&
+            desc.hasOwnProperty("configurable") && desc.configurable === false &&
+            desc.hasOwnProperty("enumerable") && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-270.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-270.js
index bda5c3f48..8d9e3dc58 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-270.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-270.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-270.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' which is defined as unwritable and non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "property", {

-            value: 12

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    value: 36

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own data
+    property of 'O', test TypeError is thrown when updating the
+    [[Value]] attribute value of 'P' which is defined as unwritable
+    and non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "property", {
+            value: 12
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    value: 36
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-271.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-271.js
index 743ca389f..5244a3317 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-271.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-271.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-271.js

- * @description Object.defineProperties -'O' is an Array, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "property", {

-            writable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    writable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties -'O' is an Array, 'P' is generic own data
+    property of 'O', test TypeError is thrown when updating the
+    [[Writable]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "property", {
+            writable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    writable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-272.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-272.js
index cdb2a2005..8ca2bcee2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-272.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-272.js
@@ -1,32 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-272.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "property", {

-            value: 12,

-            enumerable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    enumerable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own data
+    property of 'O', test TypeError is thrown when updating the
+    [[Enumerable]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "property", {
+            value: 12,
+            enumerable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    enumerable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-273.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-273.js
index ec002d18d..9f7f9a8f8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-273.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-273.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-273.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "property", {

-            value: 12

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own data
+    property of 'O', test TypeError is thrown when updating the
+    [[Configurable]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "property", {
+            value: 12
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && dataPropertyAttributesAreCorrect(arr, "property", 12, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-274.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-274.js
index 2295cd87d..683e8555e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-274.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-274.js
@@ -1,40 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-274.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-        var arr = [];

-

-        function get_fun() {

-            return 37;

-        }

-        function set_fun(value) {

-            arr.verifySetFun = value;

-        }

-        Object.defineProperty(arr, "property", {

-            get: get_fun,

-            set: set_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    get: function () {

-                        return 36;

-                    }

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) &&

-                accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "verifySetFun", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arr = [];
+
+        function get_fun() {
+            return 37;
+        }
+        function set_fun(value) {
+            arr.verifySetFun = value;
+        }
+        Object.defineProperty(arr, "property", {
+            get: get_fun,
+            set: set_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    get: function () {
+                        return 36;
+                    }
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) &&
+                accessorPropertyAttributesAreCorrect(arr, "property", get_fun, set_fun, "verifySetFun", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-275.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-275.js
index 7825e32aa..254d9cdb8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-275.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-275.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-275.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "property", {

-            set: set_fun

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    set: function () { }

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Set]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "property", {
+            set: set_fun
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    set: function () { }
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-276.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-276.js
index 7febad27e..e6296dced 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-276.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-276.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-276.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "property", {

-            set: set_fun,

-            enumerable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    enumerable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "property", {
+            set: set_fun,
+            enumerable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    enumerable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-277.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-277.js
index d679d8182..cada6c040 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-277.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-277.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-277.js

- * @description Object.defineProperties - 'O' is an Array, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is defined as non-configurable (15.4.5.1 step 5)

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        function set_fun(value) {

-            arr.setVerifyHelpProp = value;

-        }

-        Object.defineProperty(arr, "property", {

-            set: set_fun,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arr, {

-                "property": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Array, 'P' is generic own
+    accessor property of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'P' which is defined as
+    non-configurable (15.4.5.1 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        function set_fun(value) {
+            arr.setVerifyHelpProp = value;
+        }
+        Object.defineProperty(arr, "property", {
+            set: set_fun,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arr, {
+                "property": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessorPropertyAttributesAreCorrect(arr, "property", undefined, set_fun, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-278.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-278.js
index 4be0c7165..cbc650411 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-278.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-278.js
@@ -1,33 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-278.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own property which is ever defined in both [[ParameterMap]] of 'O' and 'O', and is deleted afterwards, and 'desc' is data descriptor, test 'P' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        delete arg[0];

-

-        Object.defineProperties(arg, {

-            "0": {

-                value: 10,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "0", 10, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    property which is ever defined in both [[ParameterMap]] of 'O' and
+    'O', and is deleted afterwards, and 'desc' is data descriptor,
+    test 'P' is redefined in 'O' with all correct attribute values
+    (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        delete arg[0];
+
+        Object.defineProperties(arg, {
+            "0": {
+                value: 10,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "0", 10, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-279.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-279.js
index b8ca3e83a..e7f7aa962 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-279.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-279.js
@@ -1,40 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-279.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own property which is ever defined in both [[ParameterMap]] of 'O' and 'O', and is deleted afterwards, and 'desc' is accessor descriptor, test 'P' is redefined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        delete arg[0];

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            arg.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(arg, {

-            "0": {

-                get: get_func,

-                set: set_func,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arg, "0", get_func, set_func, "setVerifyHelpProp", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    property which is ever defined in both [[ParameterMap]] of 'O' and
+    'O', and is deleted afterwards, and 'desc' is accessor descriptor,
+    test 'P' is redefined in 'O' with all correct attribute values
+    (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        delete arg[0];
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            arg.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(arg, {
+            "0": {
+                get: get_func,
+                set: set_func,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arg, "0", get_func, set_func, "setVerifyHelpProp", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-28.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-28.js
index 7b986fda7..18913f497 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-28.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-28.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-28.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Writable]] of 'P' is set as false value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                value: 1001

-            }

-        });

-        obj.prop = 1002;

-        return obj.hasOwnProperty("prop") && obj.prop === 1001;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test
+    [[Writable]] of 'P' is set as false value if absent in data
+    descriptor 'desc' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                value: 1001
+            }
+        });
+        obj.prop = 1002;
+        return obj.hasOwnProperty("prop") && obj.prop === 1001;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-280.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-280.js
index a92e7e070..2d1e74fc3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-280.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-280.js
@@ -1,46 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-280.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        } (0, 1, 2));

-

-        function get_func1() {

-            return 10;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func1,

-            enumerable: true,

-            configurable: true

-        });

-

-        function get_func2() {

-            return 20;

-        }

-

-        Object.defineProperties(arg, {

-            "0": {

-                get: get_func2,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(arg, "0");

-        return desc.get === get_func2 && typeof desc.set === "undefined" &&

-            desc.configurable === false && desc.enumerable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O' which is also defined in [[ParameterMap]]
+    of 'O', and 'desc' is accessor descriptor, test updating multiple
+    attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        } (0, 1, 2));
+
+        function get_func1() {
+            return 10;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func1,
+            enumerable: true,
+            configurable: true
+        });
+
+        function get_func2() {
+            return 20;
+        }
+
+        Object.defineProperties(arg, {
+            "0": {
+                get: get_func2,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(arg, "0");
+        return desc.get === get_func2 && typeof desc.set === "undefined" &&
+            desc.configurable === false && desc.enumerable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-281.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-281.js
index 811057548..6e7ee5325 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-281.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-281.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-281.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperties(arg, {

-            "0": {

-                value: 20,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "0", 20, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    data property of 'O' which is also defined in [[ParameterMap]] of
+    'O', and 'desc' is data descriptor, test updating multiple
+    attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperties(arg, {
+            "0": {
+                value: 20,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "0", 20, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-282.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-282.js
index b962c4f37..a2ea0d726 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-282.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-282.js
@@ -1,38 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-282.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' whose writable and configurable attributes are false (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    value: 10

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    data property of 'O' which is also defined in [[ParameterMap]] of
+    'O', test TypeError is thrown when updating the [[Value]]
+    attribute value of 'P' whose writable and configurable attributes
+    are false (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    value: 10
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-283.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-283.js
index 77450641f..45e27d46f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-283.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-283.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-283.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    writable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    data property of 'O' which is also defined in [[ParameterMap]] of
+    'O', test TypeError is thrown when updating the [[Writable]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    writable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-284.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-284.js
index 50834034b..3bc5748d8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-284.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-284.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-284.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    enumerable: false

-                }

-            });

-

-            return false;          

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    data property of 'O' which is also defined in [[ParameterMap]] of
+    'O', test TypeError is thrown when updating the [[Enumerable]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    enumerable: false
+                }
+            });
+
+            return false;          
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-285.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-285.js
index 223a72e51..87f9621da 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-285.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-285.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-285.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own data property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    configurable: true

-                }

-            });

-

-            return false; 

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    data property of 'O' which is also defined in [[ParameterMap]] of
+    'O', test TypeError is thrown when updating the [[Configurable]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    configurable: true
+                }
+            });
+
+            return false; 
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-286.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-286.js
index 8ba195aa4..8a72472d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-286.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-286.js
@@ -1,47 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-286.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        } (0, 1, 2));

-

-        function get_func1() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func1,

-            enumerable: false,

-            configurable: false

-        });

-

-        function get_func2() {

-            return 10;

-        }

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    get: get_func2

-                }

-            });

-

-            return false;

-        } catch (e) {

-            var desc = Object.getOwnPropertyDescriptor(arg, "0");

-            return e instanceof TypeError && desc.get === get_func1 && typeof desc.set === "undefined" &&

-                desc.enumerable === false && desc.configurable === false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O' which is also defined in [[ParameterMap]]
+    of 'O', test TypeError is thrown when updating the [[Get]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        } (0, 1, 2));
+
+        function get_func1() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func1,
+            enumerable: false,
+            configurable: false
+        });
+
+        function get_func2() {
+            return 10;
+        }
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    get: get_func2
+                }
+            });
+
+            return false;
+        } catch (e) {
+            var desc = Object.getOwnPropertyDescriptor(arg, "0");
+            return e instanceof TypeError && desc.get === get_func1 && typeof desc.set === "undefined" &&
+                desc.enumerable === false && desc.configurable === false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-287.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-287.js
index f8aa84a2a..e00c9e9b2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-287.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-287.js
@@ -1,48 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-287.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        function set_func(value) {

-            arg.setVerifyHelpProp = value;

-        }

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    set: set_func

-                }

-            });

-

-            return false;

-        } catch (e) {

-            var desc = Object.getOwnPropertyDescriptor(arg, "0");

-            return e instanceof TypeError && desc.get === get_func && typeof desc.set === "undefined" &&

-                desc.enumerable === false && desc.configurable === false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O' which is also defined in [[ParameterMap]]
+    of 'O', test TypeError is thrown when updating the [[Set]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        function set_func(value) {
+            arg.setVerifyHelpProp = value;
+        }
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    set: set_func
+                }
+            });
+
+            return false;
+        } catch (e) {
+            var desc = Object.getOwnPropertyDescriptor(arg, "0");
+            return e instanceof TypeError && desc.get === get_func && typeof desc.set === "undefined" &&
+                desc.enumerable === false && desc.configurable === false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-288.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-288.js
index 850aab28a..62069572f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-288.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-288.js
@@ -1,42 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-288.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    enumerable: false

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O' which is also defined in [[ParameterMap]]
+    of 'O', test TypeError is thrown when updating the [[Enumerable]]
+    attribute value of 'P' which is defined as non-configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    enumerable: false
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-289.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-289.js
index 0bb18b700..ad43aad12 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-289.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-289.js
@@ -1,42 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-289.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is own accessor property of 'O' which is also defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is defined as non-configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun(a, b, c) {

-            arg = arguments;

-        }(0, 1, 2));

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    configurable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is own
+    accessor property of 'O' which is also defined in [[ParameterMap]]
+    of 'O', test TypeError is thrown when updating the
+    [[Configurable]] attribute value of 'P' which is defined as
+    non-configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun(a, b, c) {
+            arg = arguments;
+        }(0, 1, 2));
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    configurable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-29.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-29.js
index e296b4d61..42ad93478 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-29.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-29.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-29.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Enumerable]] of 'P' is set as false value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: { value: 1001}

-        });

-

-        for (var prop in obj) {

-            if (obj.hasOwnProperty(prop)) {

-                if (prop === "prop") {

-                    return false;

-                }

-            }

-        }

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test
+    [[Enumerable]] of 'P' is set as false value if absent in data
+    descriptor 'desc' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: { value: 1001}
+        });
+
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                if (prop === "prop") {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-290.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-290.js
index 50f771e9f..5415487a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-290.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-290.js
@@ -1,33 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-290.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(0, 1, 2));

-

-        delete arg[0];

-

-        Object.defineProperties(arg, {

-            "0": {

-                value: 10,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "0", 10, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is data descriptor, test 'P'
+    is defined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(0, 1, 2));
+
+        delete arg[0];
+
+        Object.defineProperties(arg, {
+            "0": {
+                value: 10,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "0", 10, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-291.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-291.js
index 09353d5b3..17742760c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-291.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-291.js
@@ -1,40 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-291.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(0, 1, 2));

-

-        delete arg[0];

-

-        function get_func() {

-            return 10;

-        }

-        function set_func(value) {

-            arg.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(arg, {

-            "0": {

-                get: get_func,

-                set: set_func,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arg, "0", get_func, set_func, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test
+    'P' is defined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(0, 1, 2));
+
+        delete arg[0];
+
+        function get_func() {
+            return 10;
+        }
+        function set_func(value) {
+            arg.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(arg, {
+            "0": {
+                get: get_func,
+                set: set_func,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arg, "0", get_func, set_func, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-292.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-292.js
index d1bcd32d0..6f321c537 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-292.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-292.js
@@ -1,44 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-292.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(0, 1, 2));

-

-        function get_func1() {

-            return 10;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func1,

-            enumerable: true,

-            configurable: true

-        });

-

-        function get_func2() {

-            return 20;

-        }

-

-        Object.defineProperties(arg, {

-            "0": {

-                get: get_func2,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arg, "0", get_func2, undefined, undefined, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is accessor descriptor, test
+    updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(0, 1, 2));
+
+        function get_func1() {
+            return 10;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func1,
+            enumerable: true,
+            configurable: true
+        });
+
+        function get_func2() {
+            return 20;
+        }
+
+        Object.defineProperties(arg, {
+            "0": {
+                get: get_func2,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arg, "0", get_func2, undefined, undefined, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-293.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-293.js
index fbace1785..15d2a33c8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-293.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-293.js
@@ -1,31 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-293.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named data property of 'O' but not defined in [[ParameterMap]] of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 3)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(0, 1, 2));

-

-        Object.defineProperties(arg, {

-            "0": {

-                value: 20,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "0", 20, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', and 'desc' is data descriptor, test
+    updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 3)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(0, 1, 2));
+
+        Object.defineProperties(arg, {
+            "0": {
+                value: 20,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "0", 20, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-294.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-294.js
index 52576d6d0..57aa38da3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-294.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-294.js
@@ -1,38 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-294.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' which is not writable and not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    value: 10

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Value]] attribute value of 'P' which is not writable and not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    value: 10
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-295.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-295.js
index 458a125e8..4eba1763e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-295.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-295.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-295.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    writable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Writable]] attribute value of 'P' which is not configurable
+    (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    writable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-296.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-296.js
index 74da25140..ab42ab1ec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-296.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-296.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-296.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    enumerable: false

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    enumerable: false
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-297.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-297.js
index b72c0e161..d459a14bf 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-297.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-297.js
@@ -1,39 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-297.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named data property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        Object.defineProperty(arg, "0", {

-            value: 0,

-            writable: false,

-            enumerable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    configurable: true

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named data property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        Object.defineProperty(arg, "0", {
+            value: 0,
+            writable: false,
+            enumerable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    configurable: true
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(arg, "0", 0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-298.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-298.js
index 105871dfd..e3d013f9f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-298.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-298.js
@@ -1,44 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-298.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        function get_func1() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func1,

-            enumerable: false,

-            configurable: false

-        });

-

-        function get_func2() {

-            return 10;

-        }

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    get: get_func2

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func1, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Get]] attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        function get_func1() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func1,
+            enumerable: false,
+            configurable: false
+        });
+
+        function get_func2() {
+            return 10;
+        }
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    get: get_func2
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func1, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-299.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-299.js
index fc33392c6..3d4b14d6d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-299.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-299.js
@@ -1,45 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-299.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        function set_func(value) {

-            arg.setVerifyHelpProp = value;

-        }

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    set: set_func

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Set]] attribute value of 'P' which is not configurable (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        function set_func(value) {
+            arg.setVerifyHelpProp = value;
+        }
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    set: set_func
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-3.js
index ac5969ad1..dd8ce82c5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-3.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-3.js

- * @description Object.defineProperties - 'P' is own data property that overrides an inherited data property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            value: 11,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 13,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own data property that overrides
+    an inherited data property (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            value: 11,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 13,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-30.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-30.js
index a2d36da08..87c85209b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-30.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-30.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-30.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Configurable]] of 'P' is set as false value if absent in data descriptor 'desc' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-            

-        Object.defineProperties(obj, {

-            prop: { value: 1001 }

-        });

-        delete obj.prop;

-        return obj.hasOwnProperty("prop") && obj.prop === 1001;        

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test
+    [[Configurable]] of 'P' is set as false value if absent in data
+    descriptor 'desc' (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+            
+        Object.defineProperties(obj, {
+            prop: { value: 1001 }
+        });
+        delete obj.prop;
+        return obj.hasOwnProperty("prop") && obj.prop === 1001;        
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-300.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-300.js
index 5dbe86ad5..45f07601e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-300.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-300.js
@@ -1,41 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-300.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    enumerable: false

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Enumerable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    enumerable: false
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-301.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-301.js
index 7e1e9ff8d..82c14bb9a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-301.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-301.js
@@ -1,41 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-301.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is an array index named accessor property of 'O' but not defined in [[ParameterMap]] of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }());

-

-        function get_func() {

-            return 0;

-        }

-

-        Object.defineProperty(arg, "0", {

-            get: get_func,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "0": {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is an
+    array index named accessor property of 'O' but not defined in
+    [[ParameterMap]] of 'O', test TypeError is thrown when updating
+    the [[Configurable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }());
+
+        function get_func() {
+            return 0;
+        }
+
+        Object.defineProperty(arg, "0", {
+            get: get_func,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "0": {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(arg, "0", get_func, undefined, undefined, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-302.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-302.js
index 4f142e595..8ee5cb437 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-302.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-302.js
@@ -1,28 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-302.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic property, and 'desc' is data descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperties(arg, {

-            "genericProperty": {

-                value: 1001,

-                writable: true,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "genericProperty", 1001, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic property, and 'desc' is data descriptor, test 'P' is
+    defined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperties(arg, {
+            "genericProperty": {
+                value: 1001,
+                writable: true,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "genericProperty", 1001, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-303.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-303.js
index ad3a72d78..5d4c14a0b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-303.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-303.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-303.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic property, and 'desc' is accessor descriptor, test 'P' is defined in 'O' with all correct attribute values (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        function getFun() {

-            return "getFunctionString";

-        }

-        function setFun(value) {

-            arg.testGetFunction = value;

-        }

-        Object.defineProperties(arg, {

-            "genericProperty": {

-                get: getFun,

-                set: setFun,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "testGetFunction", true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic property, and 'desc' is accessor descriptor, test 'P' is
+    defined in 'O' with all correct attribute values (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        function getFun() {
+            return "getFunctionString";
+        }
+        function setFun(value) {
+            arg.testGetFunction = value;
+        }
+        Object.defineProperties(arg, {
+            "genericProperty": {
+                get: getFun,
+                set: setFun,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "testGetFunction", true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-304.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-304.js
index ad5c880c2..65df80bf6 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-304.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-304.js
@@ -1,45 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-304.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', and 'desc' is accessor descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            get: function () {

-                return 1001;

-            },

-            set: function (value) {

-                arg.testGetFunction1 = value;

-            },

-            enumerable: true,

-            configurable: true

-        });

-

-        function getFun() {

-            return "getFunctionString";

-        }

-        function setFun(value) {

-            arg.testGetFunction = value;

-        }

-        Object.defineProperties(arg, {

-            "genericProperty": {

-                get: getFun,

-                set: setFun,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "testGetFunction", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own accessor property of 'O', and 'desc' is accessor
+    descriptor, test updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            get: function () {
+                return 1001;
+            },
+            set: function (value) {
+                arg.testGetFunction1 = value;
+            },
+            enumerable: true,
+            configurable: true
+        });
+
+        function getFun() {
+            return "getFunctionString";
+        }
+        function setFun(value) {
+            arg.testGetFunction = value;
+        }
+        Object.defineProperties(arg, {
+            "genericProperty": {
+                get: getFun,
+                set: setFun,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "testGetFunction", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-305.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-305.js
index 4d212c3cf..1bb50b574 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-305.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-305.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-305.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own data property of 'O', and 'desc' is data descriptor, test updating multiple attribute values of 'P' (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            value: 1001,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.defineProperties(arg, {

-            "genericProperty": {

-                value: 1002,

-                enumerable: false,

-                configurable: false

-            }

-        });

-

-        return dataPropertyAttributesAreCorrect(arg, "genericProperty", 1002, true, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own data property of 'O', and 'desc' is data descriptor,
+    test updating multiple attribute values of 'P' (10.6
+    [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            value: 1001,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.defineProperties(arg, {
+            "genericProperty": {
+                value: 1002,
+                enumerable: false,
+                configurable: false
+            }
+        });
+
+        return dataPropertyAttributesAreCorrect(arg, "genericProperty", 1002, true, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-306.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-306.js
index 115b025c7..a62e2d894 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-306.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-306.js
@@ -1,36 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-306.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Value]] attribute value of 'P' which is not writable and not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            value: 1001,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    value: 1002

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(arg, "genericProperty", 1001, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own data property of 'O', test TypeError is thrown when
+    updating the [[Value]] attribute value of 'P' which is not
+    writable and not configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            value: 1001,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    value: 1002
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(arg, "genericProperty", 1001, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-307.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-307.js
index 2d57b0ea6..88c97f5fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-307.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-307.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-307.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Writable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    writable: true

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own data property of 'O', test TypeError is thrown when
+    updating the [[Writable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    writable: true
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-308.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-308.js
index e6b8be4ef..eafa83f82 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-308.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-308.js
@@ -1,35 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-308.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    enumerable: false

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own data property of 'O', test TypeError is thrown when
+    updating the [[Enumerable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    enumerable: false
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-309.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-309.js
index 4d895e3e6..a4d88ce0a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-309.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-309.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-309.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own data property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        Object.defineProperty(arg, "genericProperty", {

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    configurable: true

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own data property of 'O', test TypeError is thrown when
+    updating the [[Configurable]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        Object.defineProperty(arg, "genericProperty", {
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    configurable: true
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(arg, "genericProperty", undefined, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-31.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-31.js
index 290ff2c2d..8d68499e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-31.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-31.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-31.js

- * @description Object.defineProperties - 'desc' is data descriptor, test setting all attribute values of 'P' (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, {

-            prop: {

-                value: 1002,

-                writable: false,

-                enumerable: false,

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, false, false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'desc' is data descriptor, test setting
+    all attribute values of 'P' (8.12.9 step 4.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, {
+            prop: {
+                value: 1002,
+                writable: false,
+                enumerable: false,
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "prop", 1002, false, false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-310.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-310.js
index 2baf6e41b..c39335776 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-310.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-310.js
@@ -1,44 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-310.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Get]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        } (1, 2, 3));

-

-        function getFun() {

-            return "genericPropertyString";

-        }

-        function setFun(value) {

-            arg.verifySetFun = value;

-        }

-        Object.defineProperty(arg, "genericProperty", {

-            get: getFun,

-            set: setFun,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    get: function () {

-                        return "overideGenericPropertyString";

-                    }

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "verifySetFun", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own accessor property of 'O', test TypeError is thrown
+    when updating the [[Get]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        } (1, 2, 3));
+
+        function getFun() {
+            return "genericPropertyString";
+        }
+        function setFun(value) {
+            arg.verifySetFun = value;
+        }
+        Object.defineProperty(arg, "genericProperty", {
+            get: getFun,
+            set: setFun,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    get: function () {
+                        return "overideGenericPropertyString";
+                    }
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(arg, "genericProperty", getFun, setFun, "verifySetFun", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-311.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-311.js
index dd42871c2..b499882d2 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-311.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-311.js
@@ -1,40 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-311.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Set]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        function setFun(value) {

-            arg.genericPropertyString = value;

-        }

-        Object.defineProperty(arg, "genericProperty", {

-            set: setFun,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    set: function (value) {

-                        arg.genericPropertyString1 = value;

-                    }

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own accessor property of 'O', test TypeError is thrown
+    when updating the [[Set]] attribute value of 'P' which is not
+    configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        function setFun(value) {
+            arg.genericPropertyString = value;
+        }
+        Object.defineProperty(arg, "genericProperty", {
+            set: setFun,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    set: function (value) {
+                        arg.genericPropertyString1 = value;
+                    }
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-312.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-312.js
index 9a065ffaa..464d41e29 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-312.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-312.js
@@ -1,39 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-312.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Enumerable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        function setFun(value) {

-            arg.genericPropertyString = value;

-        }

-        Object.defineProperty(arg, "genericProperty", {

-            set: setFun,

-            enumerable: true,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    enumerable: false

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own accessor property of 'O', test TypeError is thrown
+    when updating the [[Enumerable]] attribute value of 'P' which is
+    not configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        function setFun(value) {
+            arg.genericPropertyString = value;
+        }
+        Object.defineProperty(arg, "genericProperty", {
+            set: setFun,
+            enumerable: true,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    enumerable: false
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-313.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-313.js
index 42c70420b..2839290bc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-313.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-313.js
@@ -1,38 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-313.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'P' is generic own accessor property of 'O', test TypeError is thrown when updating the [[Configurable]] attribute value of 'P' which is not configurable (10.6 [[DefineOwnProperty]] step 4)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        function setFun(value) {

-            arg.genericPropertyString = value;

-        }

-        Object.defineProperty(arg, "genericProperty", {

-            set: setFun,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(arg, {

-                "genericProperty": {

-                    configurable: true

-                }

-            });

-

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError &&

-                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'P' is
+    generic own accessor property of 'O', test TypeError is thrown
+    when updating the [[Configurable]] attribute value of 'P' which is
+    not configurable (10.6 [[DefineOwnProperty]] step 4)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        function setFun(value) {
+            arg.genericPropertyString = value;
+        }
+        Object.defineProperty(arg, "genericProperty", {
+            set: setFun,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(arg, {
+                "genericProperty": {
+                    configurable: true
+                }
+            });
+
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError &&
+                accessorPropertyAttributesAreCorrect(arg, "genericProperty", undefined, setFun, "genericPropertyString", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-314.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-314.js
index 2f7db9bf5..a0f6fa9a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-314.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-314.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-314.js

- * @description Object.defineProperties - 'O' is an Arguments object, 'name' is own property of [[ParameterMap]] of 'O', test 'name' is deleted if 'name' is configurable and 'desc' is accessor descriptor (10.6 [[DefineOwnProperty]] step 5.a.i)

- */

-

-

-function testcase() {

-        var arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-        var accessed = false;

-

-        Object.defineProperties(arg, {

-            "0": {

-                get: function () {

-                    accessed = true;

-                    return 12;

-                }

-            }

-        });

-

-        return arg[0] === 12 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'O' is an Arguments object, 'name' is
+    own property of [[ParameterMap]] of 'O', test 'name' is deleted if
+    'name' is configurable and 'desc' is accessor descriptor (10.6
+    [[DefineOwnProperty]] step 5.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+        var accessed = false;
+
+        Object.defineProperties(arg, {
+            "0": {
+                get: function () {
+                    accessed = true;
+                    return 12;
+                }
+            }
+        });
+
+        return arg[0] === 12 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-32.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-32.js
index 0ee54fbf4..d090eda8c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-32.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-32.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-32.js

- * @description Object.defineProperties - 'desc' is generic descriptor without any attribute, test 'P' is defined in 'obj' with all default attribute values (8.12.9 step 4.a.i)

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperties(obj, { prop: {} });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-

-        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&

-            desc.hasOwnProperty("writable") && desc.writable === false &&

-            desc.hasOwnProperty("configurable") && desc.configurable === false &&

-            desc.hasOwnProperty("enumerable") && desc.enumerable === false &&

-            !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'desc' is generic descriptor without any
+    attribute, test 'P' is defined in 'obj' with all default attribute
+    values (8.12.9 step 4.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperties(obj, { prop: {} });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+
+        return desc.hasOwnProperty("value") && typeof desc.value === "undefined" &&
+            desc.hasOwnProperty("writable") && desc.writable === false &&
+            desc.hasOwnProperty("configurable") && desc.configurable === false &&
+            desc.hasOwnProperty("enumerable") && desc.enumerable === false &&
+            !desc.hasOwnProperty("get") && !desc.hasOwnProperty("set");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-33.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-33.js
index 5aae1e7d7..cf4634b2e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-33.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-33.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-33.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Get]] of 'P' is set as undefined value if absent in accessor descriptor 'desc' (8.12.9 step 4.b)

- */

-

-

-function testcase() {

-        var obj = {};

-        var setFun = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperties(obj, {

-            prop: {

-                set: setFun,

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "prop", undefined, setFun, "setVerifyHelpProp", true, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test [[Get]]
+    of 'P' is set as undefined value if absent in accessor descriptor
+    'desc' (8.12.9 step 4.b)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var setFun = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperties(obj, {
+            prop: {
+                set: setFun,
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "prop", undefined, setFun, "setVerifyHelpProp", true, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-34.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-34.js
index 46dfbcf8b..6000a47b5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-34.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-34.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-34.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Set]] of 'P' is set as undefined value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFunc = function () {

-            return 10; 

-        };

-

-        Object.defineProperties(obj, {

-            prop: {

-                get: getFunc,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "prop");

-        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined";

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test [[Set]]
+    of 'P' is set as undefined value if absent in accessor descriptor
+    'desc' (8.12.9 step 4.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFunc = function () {
+            return 10; 
+        };
+
+        Object.defineProperties(obj, {
+            prop: {
+                get: getFunc,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "prop");
+        return obj.hasOwnProperty("prop") && typeof (desc.set) === "undefined";
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-35.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-35.js
index c30043f15..c88fc4d91 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-35.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-35.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-35.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Enumerable]] of 'P' is set as false value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFun = function () {

-            return 10;

-        };

-        var setFun = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperties(obj, {

-            prop: {

-                set: setFun,

-                get: getFun,

-                configurable: true

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", false, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test
+    [[Enumerable]] of 'P' is set as false value if absent in accessor
+    descriptor 'desc' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFun = function () {
+            return 10;
+        };
+        var setFun = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperties(obj, {
+            prop: {
+                set: setFun,
+                get: getFun,
+                configurable: true
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", false, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-36.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-36.js
index c8ed96a4c..80c753136 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-36.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-36.js
@@ -1,31 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-36.js

- * @description Object.defineProperties - 'P' doesn't exist in 'O', test [[Configurable]] of 'P' is set as false value if absent in accessor descriptor 'desc' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFun = function () {

-            return 10;

-        };

-        var setFun = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperties(obj, {

-            prop: {

-                set: setFun,

-                get: getFun,

-                enumerable: true

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", true, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' doesn't exist in 'O', test
+    [[Configurable]] of 'P' is set as false value if absent in
+    accessor descriptor 'desc' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFun = function () {
+            return 10;
+        };
+        var setFun = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperties(obj, {
+            prop: {
+                set: setFun,
+                get: getFun,
+                enumerable: true
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", true, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-37.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-37.js
index a38a90b2d..a126d416f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-37.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-37.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-37.js

- * @description Object.defineProperties - 'desc' is accessor descriptor, test setting all attribute values of 'P' (8.12.9 step 4.b.i)

- */

-

-

-function testcase() {

-        var obj = {};

-        var getFun = function () {

-            return 10;

-        };

-        var setFun = function (value) {

-            obj.setVerifyHelpProp = value;

-        };

-

-        Object.defineProperties(obj, {

-            prop: {

-                get: getFun,

-                set: setFun,

-                enumerable: false,

-                configurable: false

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'desc' is accessor descriptor, test
+    setting all attribute values of 'P' (8.12.9 step 4.b.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var getFun = function () {
+            return 10;
+        };
+        var setFun = function (value) {
+            obj.setVerifyHelpProp = value;
+        };
+
+        Object.defineProperties(obj, {
+            prop: {
+                get: getFun,
+                set: setFun,
+                enumerable: false,
+                configurable: false
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "prop", getFun, setFun, "setVerifyHelpProp", false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38-1.js
index 1ca03a3d6..05f859328 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38-1.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38-1.js

- * @description Object.defineProperties - 'P' exists in 'O' is an accessor property, test 'P' makes no change if 'desc' is generic descriptor without any attribute (8.12.9 step 5)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var getFunc = function () {

-            return 12;

-        };

-        Object.defineProperties(obj, {

-            foo: {

-                get: getFunc,

-                enumerable: true,

-                configurable: true

-            }

-        });

-

-        Object.defineProperties(obj, { foo: {} });

-

-        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, undefined, undefined, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' exists in 'O' is an accessor
+    property, test 'P' makes no change if 'desc' is generic descriptor
+    without any attribute (8.12.9 step 5)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var getFunc = function () {
+            return 12;
+        };
+        Object.defineProperties(obj, {
+            foo: {
+                get: getFunc,
+                enumerable: true,
+                configurable: true
+            }
+        });
+
+        Object.defineProperties(obj, { foo: {} });
+
+        return accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, undefined, undefined, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38.js
index 0d5944fc7..c9db07c32 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38.js
@@ -1,20 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-38.js

- * @description Object.defineProperties - 'P' exists in 'O', test 'P' makes no change if 'desc' is generic descriptor without any attribute (8.12.9 step 5)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, { foo: {} });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' exists in 'O', test 'P' makes no
+    change if 'desc' is generic descriptor without any attribute
+    (8.12.9 step 5)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, { foo: {} });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-39.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-39.js
index 65cf71f8d..067520a93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-39.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-39.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-39.js

- * @description Object.defineProperties - 'P' is data descriptor and every fields in 'desc' is the same with 'P' (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 101,

-                enumerable: true,

-                writable: true,

-                configurable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 101, true, true, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data descriptor and every fields
+    in 'desc' is the same with 'P' (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 101,
+                enumerable: true,
+                writable: true,
+                configurable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 101, true, true, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-4.js
index d8a81d3d6..de804241c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-4.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-4.js

- * @description Object.defineProperties - 'P' is own data property that overrides an inherited accessor property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            value: 12,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 13,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own data property that overrides
+    an inherited accessor property (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            value: 12,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 13,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-40.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-40.js
index ce24e8319..d208abd6a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-40.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-40.js
@@ -1,42 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-40.js

- * @description Object.defineProperties - 'P' is accessor descriptor and every fields in 'desc' is the same with 'P' (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 0;

-        }

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-        var desc = {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        };

-

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_func,

-                set: set_func,

-                enumerable: true,

-                configurable: true

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor descriptor and every
+    fields in 'desc' is the same with 'P' (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 0;
+        }
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+        var desc = {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        };
+
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_func,
+                set: set_func,
+                enumerable: true,
+                configurable: true
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", true, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-41.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-41.js
index 5bf0496cb..9ad435a49 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-41.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-41.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-41.js

- * @description Object.defineProperties - type of desc.value is different from type of P.value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: "102"

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "102", true, true, true);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - type of desc.value is different from
+    type of P.value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: "102"
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "102", true, true, true);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-42.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-42.js
index d1904a45f..50fad4cbe 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-42.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-42.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-42.js

- * @description Object.defineProperties - both desc.value and P.value are undefined (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: undefined };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: undefined

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are
+    undefined (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: undefined };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: undefined
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-43.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-43.js
index 1b7306cb6..8e320e935 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-43.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-43.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-43.js

- * @description Object.defineProperties - both desc.value and P.value are null (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: null };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: null

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are null
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: null };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: null
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-44.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-44.js
index c5ef3f62e..7e671d0f4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-44.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-44.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-44.js

- * @description Object.defineProperties - both desc.value and P.value are NaN (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: NaN };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: NaN

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyValue = false;

-        obj.prop = "overrideData";

-        verifyValue = obj.foo !== obj.foo && isNaN(obj.foo);

-

-        var verifyConfigurable = false;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        return verifyConfigurable && !verifyEnumerable && verifyValue;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are NaN
+    (8.12.9 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: NaN };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: NaN
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyValue = false;
+        obj.prop = "overrideData";
+        verifyValue = obj.foo !== obj.foo && isNaN(obj.foo);
+
+        var verifyConfigurable = false;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        return verifyConfigurable && !verifyEnumerable && verifyValue;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-45.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-45.js
index 742f80ec9..b9dc7d131 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-45.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-45.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-45.js

- * @description Object.defineProperties - desc.value is +0 and P.value is -0 (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: -0 };

-        Object.defineProperty(obj, "foo", desc);

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: +0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value is +0 and P.value is -0
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: -0 };
+        Object.defineProperty(obj, "foo", desc);
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: +0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-46.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-46.js
index df89dbaf6..c66897963 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-46.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-46.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-46.js

- * @description Object.defineProperties - desc.value is -0 and P.value is +0 (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: +0 };

-        Object.defineProperty(obj, "foo", desc);

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: -0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false); 

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value is -0 and P.value is +0
+    (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: +0 };
+        Object.defineProperty(obj, "foo", desc);
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: -0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false); 
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-47.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-47.js
index 17de50069..b477fbca3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-47.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-47.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-47.js

- * @description Object.defineProperties - desc.value and P.value are two numbers with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: 101 };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 101

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 101, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value and P.value are two numbers
+    with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: 101 };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 101
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 101, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-48.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-48.js
index 19bbebe31..af1072de7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-48.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-48.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-48.js

- * @description Object.defineProperties - desc.value and P.value are two numbers with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 102

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 102, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value and P.value are two numbers
+    with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 101; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 102
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 102, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-49.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-49.js
index fac797631..4977eb74d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-49.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-49.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-49.js

- * @description Object.defineProperties - both desc.value and P.value are two strings which have same length and same characters in corresponding positions (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: "abcd" };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: "abcd"

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are two
+    strings which have same length and same characters in
+    corresponding positions (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: "abcd" };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: "abcd"
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-5.js
index b45262210..f9e7926d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-5.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-5.js

- * @description Object.defineProperties - 'P' is own accessor property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var obj = {};

-        function getFunc() {

-            return 11;

-        }

-

-        Object.defineProperty(obj, "prop", {

-            get: getFunc,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 12,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, undefined, undefined, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own accessor property (8.12.9
+    step 1 )
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        function getFunc() {
+            return 11;
+        }
+
+        Object.defineProperty(obj, "prop", {
+            get: getFunc,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 12,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && accessorPropertyAttributesAreCorrect(obj, "prop", getFunc, undefined, undefined, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-50.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-50.js
index 28ada0724..ec82ee225 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-50.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-50.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-50.js

- * @description Object.defineProperties - desc.value and P.value are two strings with different values  (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = "abcd"; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: "fghj"

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "fghj", true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value and P.value are two strings
+    with different values  (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = "abcd"; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: "fghj"
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "fghj", true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-51.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-51.js
index 6c185544e..ace89f3dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-51.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-51.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-51.js

- * @description Object.defineProperties - both desc.value and P.value are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { value: true };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", true, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are boolean
+    values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { value: true };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", true, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-52.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-52.js
index 8e7c342ee..e6bf31499 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-52.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-52.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-52.js

- * @description Object.defineProperties - desc.value and P.value are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = true; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", false, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value and P.value are two boolean
+    values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = true; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", false, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-53.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-53.js
index 3bccc3c44..d4394bf11 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-53.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-53.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-53.js

- * @description Object.defineProperties - both desc.value and P.value are Ojbects which refer to the same Object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-        var desc = { value: obj1 };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: obj1

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.value and P.value are Ojbects
+    which refer to the same Object (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+        var desc = { value: obj1 };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: obj1
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-54.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-54.js
index 90f33a1e1..e145b5550 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-54.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-54.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-54.js

- * @description Object.defineProperties - desc.value and P.value are two Ojbects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-        obj.foo = obj1; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        var obj2 = { length: 20 };

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: obj2

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj2, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.value and P.value are two Ojbects
+    which refer to the different objects (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+        obj.foo = obj1; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        var obj2 = { length: 20 };
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: obj2
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj2, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-55.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-55.js
index cff3b58aa..9287d9592 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-55.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-55.js
@@ -1,26 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-55.js

- * @description Object.defineProperties - both desc.writable and P.writable are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { writable: false };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                writable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.writable and P.writable are
+    boolean values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { writable: false };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                writable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-56.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-56.js
index ba575662d..36704a142 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-56.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-56.js
@@ -1,27 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-56.js

- * @description Object.defineProperties - desc.writable and P.writable are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var desc = { writable: false, configurable: true };

-        Object.defineProperty(obj, "foo", desc);

-

-        Object.defineProperties(obj, {

-            foo: {

-                writable: true,

-                configurable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.writable and P.writable are two
+    boolean values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var desc = { writable: false, configurable: true };
+        Object.defineProperty(obj, "foo", desc);
+
+        Object.defineProperties(obj, {
+            foo: {
+                writable: true,
+                configurable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-57.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-57.js
index 52cc7a201..7302053dc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-57.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-57.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-57.js

- * @description Object.defineProperties - both desc.[[Get]] and P.[[Get]] are two objects which refer to the same object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_Func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_Func

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_Func

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyValue = false;

-        verifyValue = (obj.foo === 10);

-

-        var verifyConfigurable = false;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-        return verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.[[Get]] and P.[[Get]] are two
+    objects which refer to the same object (8.12.9 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_Func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_Func
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_Func
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyValue = false;
+        verifyValue = (obj.foo === 10);
+
+        var verifyConfigurable = false;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+        return verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-58.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-58.js
index dbac01d95..982608063 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-58.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-58.js
@@ -1,53 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-58.js

- * @description Object.defineProperties - desc.[[Get]] and P.[[Get]] are two objects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_Func1() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_Func1,

-            configurable: true

-        });

-

-        function get_Func2() {

-            return 20;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_Func2

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyValue = false;

-        verifyValue = (obj.foo === 20);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        var verifyConfigurable = false;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        return !verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.[[Get]] and P.[[Get]] are two
+    objects which refer to the different objects (8.12.9 step 6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_Func1() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_Func1,
+            configurable: true
+        });
+
+        function get_Func2() {
+            return 20;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_Func2
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyValue = false;
+        verifyValue = (obj.foo === 20);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        var verifyConfigurable = false;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        return !verifyConfigurable && !verifyEnumerable && verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-59.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-59.js
index d4194e36c..96a44f566 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-59.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-59.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-59.js

- * @description Object.defineProperties - both desc.[[Set]] and P.[[Set]] are two objects which refer to the same object (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: set_func

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: set_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.[[Set]] and P.[[Set]] are two
+    objects which refer to the same object (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: set_func
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: set_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-6.js
index e62ce1783..4c474e427 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-6.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-6.js

- * @description Object.defineProperties - 'P' is inherited accessor property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function () {

-                return 11;

-            },

-            configurable: false

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-

-        Object.defineProperties(obj, {

-            prop: {

-                get: function () {

-                    return 12;

-                },

-                configurable: true

-            }

-        });

-        return obj.hasOwnProperty("prop") && obj.prop === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is inherited accessor property
+    (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function () {
+                return 11;
+            },
+            configurable: false
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+
+        Object.defineProperties(obj, {
+            prop: {
+                get: function () {
+                    return 12;
+                },
+                configurable: true
+            }
+        });
+        return obj.hasOwnProperty("prop") && obj.prop === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-60.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-60.js
index 5551fecf6..39fce005d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-60.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-60.js
@@ -1,34 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-60.js

- * @description Object.defineProperties - desc.[[Set]] and P.[[Set]] are two objects which refer to the different objects (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func1() {}

-

-        Object.defineProperty(obj, "foo", {

-            set: set_func1,

-            configurable: true

-        });

-

-        function set_func2(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: set_func2

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func2, "setVerifyHelpProp", false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.[[Set]] and P.[[Set]] are two
+    objects which refer to the different objects (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func1() {}
+
+        Object.defineProperty(obj, "foo", {
+            set: set_func1,
+            configurable: true
+        });
+
+        function set_func2(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: set_func2
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func2, "setVerifyHelpProp", false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-61.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-61.js
index 7da46e2bf..0605f5347 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-61.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-61.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-61.js

- * @description Object.defineProperties - both desc.enumerable and P.enumerable are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            enumerable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                enumerable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.enumerable and P.enumerable
+    are boolean values with the same value (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            enumerable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                enumerable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-62.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-62.js
index 22630d09e..c3608d34e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-62.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-62.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-62.js

- * @description Object.defineProperties - desc.enumerable and P.enumerable are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            enumerable: false, 

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                enumerable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.enumerable and P.enumerable are two
+    boolean values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            enumerable: false, 
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                enumerable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-63.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-63.js
index 4067832a5..f07ca48b1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-63.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-63.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-63.js

- * @description Object.defineProperties - both desc.configurable and P.configurable are boolean values with the same value (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - both desc.configurable and
+    P.configurable are boolean values with the same value (8.12.9 step
+    6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-64.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-64.js
index 2f71ac08f..e811837aa 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-64.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-64.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-64.js

- * @description Object.defineProperties - desc.configurable and P.configurable are two boolean values with different values (8.12.9 step 6)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - desc.configurable and P.configurable are
+    two boolean values with different values (8.12.9 step 6)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-65.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-65.js
index df6bdaf5e..235019296 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-65.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-65.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-65.js

- * @description Object.defineProperties throws TypeError when P.configurable is false and desc.configurable is true (8.12.9 step 7.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false and desc.configurable is true (8.12.9 step 7.a)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66-1.js
index 264432d22..e85b45d7a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66-1.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66-1.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.enumerable and desc.enumerable has different values (8.12.9 step 7.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10, 

-            enumerable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    enumerable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.enumerable and desc.enumerable has different values
+    (8.12.9 step 7.b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10, 
+            enumerable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    enumerable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66.js
index 90e60d9d1..4d9926411 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-66.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.enumerable and desc.enumerable has different values (8.12.9 step 7.b)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            enumerable: true, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    enumerable: false

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.enumerable and desc.enumerable has different values
+    (8.12.9 step 7.b)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            enumerable: true, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    enumerable: false
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-67.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-67.js
index f3ef192d9..58a9e74cb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-67.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-67.js
@@ -1,53 +1,56 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-67.js

- * @description Object.defineProperties throws TypeError when P is accessor property and P.configurable is false, desc is data property (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_Func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_Func,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: 11

-                }

-            });

-            return false;

-        } catch (e) {

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "foo") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyValue = false;

-            verifyValue = (obj.foo === 10);

-

-            var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-            var verifyConfigurable = false;

-            delete obj.foo;

-            verifyConfigurable = obj.hasOwnProperty("foo");

-

-            return e instanceof TypeError && verifyConfigurable && !verifyEnumerable &&

-                verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P is accessor
+    property and P.configurable is false, desc is data property
+    (8.12.9 step 9.a)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_Func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_Func,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: 11
+                }
+            });
+            return false;
+        } catch (e) {
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "foo") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyValue = false;
+            verifyValue = (obj.foo === 10);
+
+            var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+            var verifyConfigurable = false;
+            delete obj.foo;
+            verifyConfigurable = obj.hasOwnProperty("foo");
+
+            return e instanceof TypeError && verifyConfigurable && !verifyEnumerable &&
+                verifyValue && typeof (desc.set) === "undefined" && desc.get === get_Func;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-68.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-68.js
index 29c8ef604..33df489d7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-68.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-68.js
@@ -1,36 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-68.js

- * @description Object.defineProperties throws TypeError when P is data property and  P.configurable is false, desc is accessor property (8.12.9 step 9.a)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            configurable: false

-        });

-

-        function get_func() {

-            return 11;

-        }

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    get: get_func

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P is data property
+    and  P.configurable is false, desc is accessor property (8.12.9
+    step 9.a)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            configurable: false
+        });
+
+        function get_func() {
+            return 11;
+        }
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    get: get_func
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-69.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-69.js
index 7cc4380ad..da5118157 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-69.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-69.js
@@ -1,50 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-69.js

- * @description Object.defineProperties - 'P' is data property and P.configurable is true, desc is accessor property (8.12.9 step 9.b.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            configurable: true

-        });

-

-        function get_Func() {

-            return 20;

-        }

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_Func

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var verifyValue = false;

-        verifyValue = (obj.foo === 20);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        var verifyConfigurable = true;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        return !verifyConfigurable && !verifyEnumerable && verifyValue &&

-            typeof desc.set === "undefined" && desc.get === get_Func;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property and P.configurable
+    is true, desc is accessor property (8.12.9 step 9.b.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            configurable: true
+        });
+
+        function get_Func() {
+            return 20;
+        }
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_Func
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var verifyValue = false;
+        verifyValue = (obj.foo === 20);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        var verifyConfigurable = true;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        return !verifyConfigurable && !verifyEnumerable && verifyValue &&
+            typeof desc.set === "undefined" && desc.get === get_Func;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-7.js
index ff379e968..274564e37 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-7.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-7.js

- * @description Object.defineProperties - 'P' is own accessor property that overrides an inherited data property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            value: 11,

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 12;

-            },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 13,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && obj.prop === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own accessor property that
+    overrides an inherited data property (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            value: 11,
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 12;
+            },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 13,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && obj.prop === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-70.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-70.js
index e7b77b928..ef4f624af 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-70.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-70.js
@@ -1,32 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-70.js

- * @description Object.defineProperties - 'P' is accessor property and  P.configurable is true, 'desc' in 'Properties' is data property (8.12.9 step 9.c.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            configurable: true

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 12

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 12, false, false, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is accessor property and
+    P.configurable is true, 'desc' in 'Properties' is data property
+    (8.12.9 step 9.c.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            configurable: true
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 12
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 12, false, false, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-71.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-71.js
index 11de43285..eea0cc8b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-71.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-71.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-71.js

- * @description Object.defineProperties throws TypeError when 'P' is data property and  P.configurable is false, P.writable is false, desc is data property and  desc.writable is true (8.12.9 step 10.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    writable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when 'P' is data property
+    and  P.configurable is false, P.writable is false, desc is data
+    property and  desc.writable is true (8.12.9 step 10.a.i)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    writable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-72.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-72.js
index 6d56f3a84..b196f1c8c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-72.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-72.js
@@ -1,33 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-72.js

- * @description Object.defineProperties throws TypeError when P is data property and  P.configurable is false, P.writable is false, desc is data property and  desc.value is not equal to P.value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: 20

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P is data property
+    and  P.configurable is false, P.writable is false, desc is data
+    property and  desc.value is not equal to P.value (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: 20
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-73.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-73.js
index 8cb92538b..c9fe72621 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-73.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-73.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-73.js

- * @description Object.defineProperties will not throw TypeError if P.configurable is false, P.writalbe is false, P.value is undefined and properties.value is undefined (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: undefined, 

-            writable: false, 

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: undefined

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError if P.configurable
+    is false, P.writalbe is false, P.value is undefined and
+    properties.value is undefined (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: undefined, 
+            writable: false, 
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: undefined
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-74.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-74.js
index 79838f499..9af9f1323 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-74.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-74.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-74.js

- * @description Object.defineProperties will not throw TypeError if P.configurable is false, P.writalbe is false, P.value is null and properties.value is null (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: null, 

-            writable: false, 

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: null

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError if P.configurable
+    is false, P.writalbe is false, P.value is null and
+    properties.value is null (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: null, 
+            writable: false, 
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: null
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", null, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-75.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-75.js
index 9125bd953..2197a5877 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-75.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-75.js
@@ -1,48 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-75.js

- * @description Object.defineProperties will not throw TypeError if P.configurable is false, P.writalbe is false, P.value is NaN and properties.value is NaN (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var accessed = false;

-

-        Object.defineProperty(obj, "foo", {

-            value: NaN,

-            writable: false,

-            configurable: false

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: NaN

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        obj.prop = "overrideData";

-        var verifyValue = false;

-        verifyValue = obj.foo !== obj.foo && isNaN(obj.foo);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        var verifyConfigurable = false;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        return verifyValue && !verifyEnumerable && verifyConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError if P.configurable
+    is false, P.writalbe is false, P.value is NaN and properties.value
+    is NaN (8.12.9 step 10.a.ii.1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var accessed = false;
+
+        Object.defineProperty(obj, "foo", {
+            value: NaN,
+            writable: false,
+            configurable: false
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: NaN
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        obj.prop = "overrideData";
+        var verifyValue = false;
+        verifyValue = obj.foo !== obj.foo && isNaN(obj.foo);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        var verifyConfigurable = false;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        return verifyValue && !verifyEnumerable && verifyConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-76.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-76.js
index 19a8311fb..a068d6257 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-76.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-76.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-76.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value is +0 and P.value is -0 (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: -0, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: +0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value is +0 and P.value is
+    -0 (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: -0, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: +0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", -0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-77.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-77.js
index 82b203e86..cec3bdf33 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-77.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-77.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-77.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value is +0 and P.value is -0 (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: +0, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: -0

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value is +0 and P.value is
+    -0 (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: +0, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: -0
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", +0, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-78.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-78.js
index 565be90a4..2b5c447f4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-78.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-78.js
@@ -1,30 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-78.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two numbers with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 100,

-            writable: false,

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 100

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 100, false, false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.writalbe is false, properties.value and
+    P.value are two numbers with the same value (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 100,
+            writable: false,
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 100
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 100, false, false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-79.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-79.js
index ed4ceadfe..5d1477eb8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-79.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-79.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-79.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two numbers with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 10, 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: 20

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value and P.value are two
+    numbers with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 10, 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: 20
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", 10, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-8.js
index 900f06b39..df51f9701 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-8.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-8.js

- * @description Object.defineProperties - 'P' is own accessor property that overrides an inherited accessor property (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "prop", {

-            get: function() {

-                return 11;

-            },

-            configurable: true

-        });

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var obj = new Con();

-        Object.defineProperty(obj, "prop", {

-            get: function () {

-                return 12;

-            },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    value: 13,

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && obj.prop === 12;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own accessor property that
+    overrides an inherited accessor property (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "prop", {
+            get: function() {
+                return 11;
+            },
+            configurable: true
+        });
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var obj = new Con();
+        Object.defineProperty(obj, "prop", {
+            get: function () {
+                return 12;
+            },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    value: 13,
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && obj.prop === 12;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-80.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-80.js
index 6ec41150d..f0af94ffb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-80.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-80.js
@@ -1,29 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-80.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two strings with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: "abcd",

-            writable: false,

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: "abcd"

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.writalbe is false, properties.value and
+    P.value are two strings with the same value (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: "abcd",
+            writable: false,
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: "abcd"
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-81.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-81.js
index 99dd20a73..c6cc8d2a1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-81.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-81.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-81.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two strings with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: "abcd", 

-            writable: false, 

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: "defg"

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value and P.value are two
+    strings with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: "abcd", 
+            writable: false, 
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: "defg"
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", "abcd", false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-82.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-82.js
index d994b8ef8..247e9c6a7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-82.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-82.js
@@ -1,29 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-82.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two booleans with the same value (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: false,

-            writable: false,

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.writalbe is false, properties.value and
+    P.value are two booleans with the same value (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: false,
+            writable: false,
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-83.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-83.js
index a3541be1b..cae8d8329 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-83.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-83.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-83.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two booleans with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: false,

-            writable: false,

-            configurable: false 

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value and P.value are two
+    booleans with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: false,
+            writable: false,
+            configurable: false 
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", false, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84-1.js
index 9de4f530b..857f028b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84-1.js
@@ -1,34 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84-1.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two Objects refer to the same object which has been updated before use it to update the object (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", {

-            value: obj1,

-            writable: false,

-            configurable: false

-        });

-

-        var obj2 = obj1;

-        obj2.y = "hello";

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: obj2

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.writalbe is false, properties.value and
+    P.value are two Objects refer to the same object which has been
+    updated before use it to update the object (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", {
+            value: obj1,
+            writable: false,
+            configurable: false
+        });
+
+        var obj2 = obj1;
+        obj2.y = "hello";
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: obj2
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84.js
index 2e4ba8a12..5ebb60c94 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84.js
@@ -1,31 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-84.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two Objects refer to the same object (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", { 

-            value: obj1, 

-            writable: false, 

-            configurable: false 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: obj1

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.writalbe is false, properties.value and
+    P.value are two Objects refer to the same object (8.12.9 step
+    10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", { 
+            value: obj1, 
+            writable: false, 
+            configurable: false 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: obj1
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-85.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-85.js
index b217a18cf..a298fe97b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-85.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-85.js
@@ -1,37 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-85.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.writalbe is false, properties.value and P.value are two objects with different values (8.12.9 step 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var obj1 = { length: 10 };

-

-        Object.defineProperty(obj, "foo", { 

-            value: obj1, 

-            writable: false, 

-            configurable: false 

-        });

-

-        var obj2 = { length: 20 };

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    value: obj2

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.writalbe is false, properties.value and P.value are two
+    objects with different values (8.12.9 step 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var obj1 = { length: 10 };
+
+        Object.defineProperty(obj, "foo", { 
+            value: obj1, 
+            writable: false, 
+            configurable: false 
+        });
+
+        var obj2 = { length: 20 };
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    value: obj2
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && dataPropertyAttributesAreCorrect(obj, "foo", obj1, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86-1.js
index 4db27601d..99cdced57 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86-1.js
@@ -1,39 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86-1.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, both properties.[[Set]] and P.[[Set]] are two objects which refer to the same object and the object has been updated after defined(8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var set_func = function (value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: set_func,

-            configurable: false

-        });

-

-        set_func = function (value) {

-            obj.setVerifyHelpProp1 = value;

-        }

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    set: set_func

-                }

-            });

-        } catch (e) {

-            return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, both properties.[[Set]] and P.[[Set]] are
+    two objects which refer to the same object and the object has been
+    updated after defined(8.12.9 step 11.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var set_func = function (value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: set_func,
+            configurable: false
+        });
+
+        set_func = function (value) {
+            obj.setVerifyHelpProp1 = value;
+        }
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    set: set_func
+                }
+            });
+        } catch (e) {
+            return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86.js
index 21371f11b..983d18cec 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-86.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, both properties.[[Set]] and P.[[Set]] are two objects which refer to the same object (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: set_func,

-            configurable: false

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: set_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, both properties.[[Set]] and P.[[Set]] are
+    two objects which refer to the same object (8.12.9 step 11.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: set_func,
+            configurable: false
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: set_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-87.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-87.js
index 186b7924b..dc41c738a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-87.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-87.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-87.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, both properties.[[Set]] and P.[[Set]] are two objects which refer to different objects (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func1(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: set_func1,

-            configurable: false

-        });

-

-        function set_func2() {}

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    set: set_func2

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func1, "setVerifyHelpProp", false, false);

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, both properties.[[Set]] and P.[[Set]] are two objects which
+    refer to different objects (8.12.9 step 11.a.i)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func1(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: set_func1,
+            configurable: false
+        });
+
+        function set_func2() {}
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    set: set_func2
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func1, "setVerifyHelpProp", false, false);
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-88.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-88.js
index 45f793fb9..170a11ea1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-88.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-88.js
@@ -1,53 +1,56 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-88.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.[[Set]] is undefined, properties.[[Set]] refers to an objcet (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_Func() {

-            return 0;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            set: undefined,

-            get: get_Func,

-            enumerable: false,

-            configurable: false

-        });

-

-        function set_Func() { }

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    set: set_Func

-                }

-            });

-            return false;

-        } catch (e) {

-            var verifyEnumerable = false;

-            for (var p in obj) {

-                if (p === "foo") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-            var verifyConfigurable = false;

-            delete obj.foo;

-            verifyConfigurable = obj.hasOwnProperty("foo");

-

-            return e instanceof TypeError && !verifyEnumerable && verifyConfigurable && typeof (desc.set) === "undefined";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.[[Set]] is undefined, properties.[[Set]] refers to an
+    objcet (8.12.9 step 11.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_Func() {
+            return 0;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            set: undefined,
+            get: get_Func,
+            enumerable: false,
+            configurable: false
+        });
+
+        function set_Func() { }
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    set: set_Func
+                }
+            });
+            return false;
+        } catch (e) {
+            var verifyEnumerable = false;
+            for (var p in obj) {
+                if (p === "foo") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+            var verifyConfigurable = false;
+            delete obj.foo;
+            verifyConfigurable = obj.hasOwnProperty("foo");
+
+            return e instanceof TypeError && !verifyEnumerable && verifyConfigurable && typeof (desc.set) === "undefined";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-89.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-89.js
index 9e8cc4ddb..a49f11b5e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-89.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-89.js
@@ -1,48 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-89.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.[[Set]] and properties.[[Set]] are undefined (8.12.9 step 11.a.i)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function get_Func() {

-            return 0;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_Func,

-            set: undefined,

-            enumerable: false,

-            configurable: false

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                set: undefined

-            }

-        });

-

-        var verifyEnumerable = false;

-        for (var p in obj) {

-            if (p === "foo") {

-                verifyEnumerable = true;

-            }

-        }

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        var verifyConfigurable = false;

-        delete obj.foo;

-        verifyConfigurable = obj.hasOwnProperty("foo");

-

-        return verifyConfigurable && !verifyEnumerable && typeof (desc.set) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.[[Set]] and properties.[[Set]] are
+    undefined (8.12.9 step 11.a.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function get_Func() {
+            return 0;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_Func,
+            set: undefined,
+            enumerable: false,
+            configurable: false
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                set: undefined
+            }
+        });
+
+        var verifyEnumerable = false;
+        for (var p in obj) {
+            if (p === "foo") {
+                verifyEnumerable = true;
+            }
+        }
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        var verifyConfigurable = false;
+        delete obj.foo;
+        verifyConfigurable = obj.hasOwnProperty("foo");
+
+        return verifyConfigurable && !verifyEnumerable && typeof (desc.set) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-9.js
index 2c6ab892f..b498b08d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-9.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-9.js

- * @description Object.defineProperties - 'P' is own accessor property without a get function (8.12.9 step 1 ) 

- */

-

-

-function testcase() {

-        var obj = {};

-        Object.defineProperty(obj, "prop", {

-            set: function () { },

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                prop: {

-                    get: function () { },

-                    configurable: true

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is own accessor property without a
+    get function (8.12.9 step 1 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        Object.defineProperty(obj, "prop", {
+            set: function () { },
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                prop: {
+                    get: function () { },
+                    configurable: true
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-90.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-90.js
index d1ae73f9e..57f1eb159 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-90.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-90.js
@@ -1,37 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-90.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, both properties.[[Get]] and P.[[Get]] are two objects which refer to the same object (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-        function get_func() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: false,

-            configurable: false

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: get_func

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, both properties.[[Get]] and P.[[Get]] are
+    two objects which refer to the same object (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+        function get_func() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: false,
+            configurable: false
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: get_func
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", get_func, set_func, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-91.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-91.js
index 067804e90..541df5f89 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-91.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-91.js
@@ -1,46 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-91.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, both properties.[[Get]] and P.[[Get]] are two objects which refer to different objects (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-        function get_func1() {

-            return 10;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func1,

-            set: set_func,

-            enumerable: false,

-            configurable: false

-        });

-

-        function get_func2() {

-            return 20;

-        }

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    get: get_func2

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", get_func1, set_func, "setVerifyHelpProp", false, false);

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, both properties.[[Get]] and P.[[Get]] are two objects which
+    refer to different objects (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+        function get_func1() {
+            return 10;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func1,
+            set: set_func,
+            enumerable: false,
+            configurable: false
+        });
+
+        function get_func2() {
+            return 20;
+        }
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    get: get_func2
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", get_func1, set_func, "setVerifyHelpProp", false, false);
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-92.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-92.js
index aeb83b136..83d225dea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-92.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-92.js
@@ -1,42 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-92.js

- * @description Object.defineProperties throws TypeError when P.configurable is false, P.[[Get]] is undefined, properties.[[Get]] refers to an objcet (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: undefined,

-            set: set_func,

-            enumerable: false,

-            configurable: false

-        });

-

-        function get_func() {

-            return 0;

-        }

-

-        try {

-            Object.defineProperties(obj, {

-                foo: {

-                    get: get_func

-                }

-            });

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties throws TypeError when P.configurable is
+    false, P.[[Get]] is undefined, properties.[[Get]] refers to an
+    objcet (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: undefined,
+            set: set_func,
+            enumerable: false,
+            configurable: false
+        });
+
+        function get_func() {
+            return 0;
+        }
+
+        try {
+            Object.defineProperties(obj, {
+                foo: {
+                    get: get_func
+                }
+            });
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-1.js
index 2ed50278f..3c90207c7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-1.js
@@ -1,45 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-1.js

- * @description Object.defineProperties will update [[Value]] attribute of named data property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false but not when both are false (8.12.9 - step Note & 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-        

-        Object.defineProperty(obj, "property1", {

-            value: 1003,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    value: 1002

-                },

-                property1: {

-                    value: 1004

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true) &&

-                dataPropertyAttributesAreCorrect(obj, "property1", 1003, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will update [[Value]] attribute of named
+    data property 'P' successfully when [[Configurable]] attribute is
+    true and [[Writable]] attribute is false but not when both are
+    false (8.12.9 - step Note & 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+        
+        Object.defineProperty(obj, "property1", {
+            value: 1003,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    value: 1002
+                },
+                property1: {
+                    value: 1004
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(obj, "property", 1002, false, false, true) &&
+                dataPropertyAttributesAreCorrect(obj, "property1", 1003, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-2.js
index df041fb15..3c103b9f7 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-2.js
@@ -1,45 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-2.js

- * @description Object.defineProperties will update [[Value]] attribute of indexed data property 'P' successfully when [[Configurable]] attribute is true and [[Writable]] attribute is false but not when both are false (8.12.9 - step Note & 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: false,

-            configurable: true

-        });

-        

-        Object.defineProperty(obj, "1", {

-            value: 1003,

-            writable: false,

-            configurable: false

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                0: {

-                    value: 1002

-                },

-                1: {

-                    value: 1004

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true) &&

-                dataPropertyAttributesAreCorrect(obj, "1", 1003, false, false, false);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will update [[Value]] attribute of indexed
+    data property 'P' successfully when [[Configurable]] attribute is
+    true and [[Writable]] attribute is false but not when both are
+    false (8.12.9 - step Note & 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: false,
+            configurable: true
+        });
+        
+        Object.defineProperty(obj, "1", {
+            value: 1003,
+            writable: false,
+            configurable: false
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                0: {
+                    value: 1002
+                },
+                1: {
+                    value: 1004
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(obj, "0", 1002, false, false, true) &&
+                dataPropertyAttributesAreCorrect(obj, "1", 1003, false, false, false);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-3.js
index ee800e22b..85319df9d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-3.js
@@ -1,45 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-3.js

- * @description Object.defineProperties will fail to update [[Value]] attribute of named data property 'P' when [[Configurable]] attribute of first updating property is false  (8.12.9 - step Note & 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "property", {

-            value: 1001,

-            writable: false,

-            configurable: false

-        });

-        

-        Object.defineProperty(obj, "property1", {

-            value: 1003,

-            writable: false,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                property: {

-                    value: 1002

-                },

-                property1: {

-                    value: 1004

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(obj, "property", 1001, false, false, false) &&

-                dataPropertyAttributesAreCorrect(obj, "property1", 1003, false, false, true);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will fail to update [[Value]] attribute of
+    named data property 'P' when [[Configurable]] attribute of first
+    updating property is false  (8.12.9 - step Note & 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "property", {
+            value: 1001,
+            writable: false,
+            configurable: false
+        });
+        
+        Object.defineProperty(obj, "property1", {
+            value: 1003,
+            writable: false,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                property: {
+                    value: 1002
+                },
+                property1: {
+                    value: 1004
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(obj, "property", 1001, false, false, false) &&
+                dataPropertyAttributesAreCorrect(obj, "property1", 1003, false, false, true);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-4.js
index 51d9aab69..74f9168ca 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-4.js
@@ -1,45 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93-4.js

- * @description Object.defineProperties will fail to update [[Value]] attribute of indexed data property 'P' when [[Configurable]] attribute of first updating property are false  (8.12.9 - step Note & 10.a.ii.1)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "0", {

-            value: 1001,

-            writable: false,

-            configurable: false

-        });

-        

-        Object.defineProperty(obj, "1", {

-            value: 1003,

-            writable: false,

-            configurable: true

-        });

-

-        try {

-            Object.defineProperties(obj, {

-                0: {

-                    value: 1002

-                },

-                1: {

-                    value: 1004

-                }

-            });

-

-            return false;

-        } catch (e) {

-            return e instanceof TypeError &&

-                dataPropertyAttributesAreCorrect(obj, "0", 1001, false, false, false) &&

-                dataPropertyAttributesAreCorrect(obj, "1", 1003, false, false, true);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will fail to update [[Value]] attribute of
+    indexed data property 'P' when [[Configurable]] attribute of first
+    updating property are false  (8.12.9 - step Note & 10.a.ii.1)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "0", {
+            value: 1001,
+            writable: false,
+            configurable: false
+        });
+        
+        Object.defineProperty(obj, "1", {
+            value: 1003,
+            writable: false,
+            configurable: true
+        });
+
+        try {
+            Object.defineProperties(obj, {
+                0: {
+                    value: 1002
+                },
+                1: {
+                    value: 1004
+                }
+            });
+
+            return false;
+        } catch (e) {
+            return e instanceof TypeError &&
+                dataPropertyAttributesAreCorrect(obj, "0", 1001, false, false, false) &&
+                dataPropertyAttributesAreCorrect(obj, "1", 1003, false, false, true);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93.js
index aebee7e85..24bc242b9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93.js
@@ -1,34 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-93.js

- * @description Object.defineProperties will not throw TypeError when P.configurable is false, P.[[Get]] and properties.[[Get]] are undefined (8.12.9 step 11.a.ii)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function set_func(value) {

-            obj.setVerifyHelpProp = value;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: undefined,

-            set: set_func,

-            enumerable: false,

-            configurable: false

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                get: undefined

-            }

-        });

-        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties will not throw TypeError when
+    P.configurable is false, P.[[Get]] and properties.[[Get]] are
+    undefined (8.12.9 step 11.a.ii)
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function set_func(value) {
+            obj.setVerifyHelpProp = value;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: undefined,
+            set: set_func,
+            enumerable: false,
+            configurable: false
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                get: undefined
+            }
+        });
+        return accessorPropertyAttributesAreCorrect(obj, "foo", undefined, set_func, "setVerifyHelpProp", false, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-94.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-94.js
index 9c1924831..7499ae71a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-94.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-94.js
@@ -1,25 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-94.js

- * @description Object.defineProperties - 'P' is data property, properties.value and P.value are two different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 200

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, properties.value
+    and P.value are two different values (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 100; // default value of attributes: writable: true, configurable: true, enumerable: true
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 200
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-95.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-95.js
index 8227e0c23..48dee43a9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-95.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-95.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-95.js

- * @description Object.defineProperties - 'P' is data property, P.value is present and properties.value is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 200,

-            enumerable: true,

-            writable: true,

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: undefined

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, P.value is present
+    and properties.value is undefined (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 200,
+            enumerable: true,
+            writable: true,
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: undefined
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", undefined, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-96.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-96.js
index 65427d1b4..7d02cc7e1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-96.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-96.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-96.js

- * @description Object.defineProperties - 'P' is data property, properties.value is present and P.value is undefined (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: undefined,

-            enumerable: true,

-            writable: true,

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                value: 200

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, properties.value
+    is present and P.value is undefined (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: undefined,
+            enumerable: true,
+            writable: true,
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                value: 200
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-97.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-97.js
index 3cbd1372d..d9a023732 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-97.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-97.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-97.js

- * @description Object.defineProperties - 'P' is data property, P.writable and properties.writable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 100, 

-            enumerable: true, 

-            writable: false, 

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                writable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, P.writable and
+    properties.writable are different values (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 100, 
+            enumerable: true, 
+            writable: false, 
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                writable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 100, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-98.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-98.js
index adf27f03f..af1933c5b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-98.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-98.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-98.js

- * @description Object.defineProperties - 'P' is data property, P.enumerable and properties.enumerable are different values (8.12.9 step 12)

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 200, 

-            enumerable: false, 

-            writable: true, 

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                enumerable: true

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, P.enumerable and
+    properties.enumerable are different values (8.12.9 step 12)
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 200, 
+            enumerable: false, 
+            writable: true, 
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                enumerable: true
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-99.js b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-99.js
index 3d52bb30b..be759fda4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-99.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-99.js
@@ -1,30 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.7/15.2.3.7-6-a-99.js

- * @description Object.defineProperties - 'P' is data property, P.configurable is true and properties.configurable is false

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", { 

-            value: 200, 

-            enumerable: true, 

-            writable: true, 

-            configurable: true 

-        });

-

-        Object.defineProperties(obj, {

-            foo: {

-                configurable: false

-            }

-        });

-        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.defineProperties - 'P' is data property, P.configurable is
+    true and properties.configurable is false
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", { 
+            value: 200, 
+            enumerable: true, 
+            writable: true, 
+            configurable: true 
+        });
+
+        Object.defineProperties(obj, {
+            foo: {
+                configurable: false
+            }
+        });
+        return dataPropertyAttributesAreCorrect(obj, "foo", 200, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-1.js
index c939c8df5..fb063f5bc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-1.js

- * @description Object.seal must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.seal;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.seal;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-2.js
index e7a19390c..841cb3c0c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-0-2.js

- * @description Object.seal must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.seal.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.seal.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-1.js
index 130804e64..913e0a0a4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-1.js

- * @description Object.seal throws TypeError if type of first param is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.seal(undefined);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal throws TypeError if type of first param is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.seal(undefined);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-2.js
index 27c28fc74..2d500119c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-2.js

- * @description Object.seal throws TypeError if type of first param is null

- */

-

-

-function testcase() {

-        try {

-            Object.seal(null);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal throws TypeError if type of first param is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.seal(null);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-3.js
index 87853ae78..76347cc1a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-3.js

- * @description Object.seal throws TypeError if type of first param is a boolean primitive

- */

-

-

-function testcase() {

-        try {

-            Object.seal(false);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal throws TypeError if type of first param is a boolean
+    primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.seal(false);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-4.js
index 65ea699f9..e5ff35b81 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1-4.js

- * @description Object.seal throws TypeError if type of first param is a string primitive

- */

-

-

-function testcase() {

-        try {

-            Object.seal("abc");

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal throws TypeError if type of first param is a string
+    primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.seal("abc");
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1.js
index 91073d1e4..1038dd6ef 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-1.js

- * @description Object.seal throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-    try {

-      Object.seal(0);

-    }

-    catch (e) {

-      if (e instanceof TypeError) {

-        return true;

-      }

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal throws TypeError if type of first param is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+      Object.seal(0);
+    }
+    catch (e) {
+      if (e instanceof TypeError) {
+        return true;
+      }
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-1.js
index c06073b89..7e9b61e61 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-1.js

- * @description Object.seal - extensible of 'O' is set as false even if 'O' has no own property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        var preCheck = Object.isExtensible(obj);

-

-        Object.seal(obj);

-

-        return preCheck && !Object.isExtensible(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - extensible of 'O' is set as false even if 'O' has no
+    own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        var preCheck = Object.isExtensible(obj);
+
+        Object.seal(obj);
+
+        return preCheck && !Object.isExtensible(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-2.js
index 424aeb164..fe5bffdad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-2.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-2.js

- * @description Object.seal - inherited data properties are ignored

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "Father", {

-            value: 10,

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        var beforeDeleted = proto.hasOwnProperty("Father");

-        delete proto.Father;

-        var afterDeleted = proto.hasOwnProperty("Father");

-

-        return preCheck && beforeDeleted && !afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - inherited data properties are ignored
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "Father", {
+            value: 10,
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        var beforeDeleted = proto.hasOwnProperty("Father");
+        delete proto.Father;
+        var afterDeleted = proto.hasOwnProperty("Father");
+
+        return preCheck && beforeDeleted && !afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-3.js
index a3e41e598..b2f750e9f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-3.js
@@ -1,35 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-3.js

- * @description Object.seal - inherited accessor properties are ignored

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "Father", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        var beforeDeleted = proto.hasOwnProperty("Father");

-        delete proto.Father;

-        var afterDeleted = proto.hasOwnProperty("Father");

-

-        return preCheck && beforeDeleted && !afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - inherited accessor properties are ignored
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "Father", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        var beforeDeleted = proto.hasOwnProperty("Father");
+        delete proto.Father;
+        var afterDeleted = proto.hasOwnProperty("Father");
+
+        return preCheck && beforeDeleted && !afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-4.js
index bf6b67d8f..f929e5c62 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-4.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-4.js

- * @description Object.seal - non-enumerable own property of 'O' is sealed

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            enumerable: false,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        var beforeDeleted = obj.hasOwnProperty("foo");

-        delete obj.foo;

-        var afterDeleted = obj.hasOwnProperty("foo");

-

-        return preCheck && beforeDeleted && afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - non-enumerable own property of 'O' is sealed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            enumerable: false,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        var beforeDeleted = obj.hasOwnProperty("foo");
+        delete obj.foo;
+        var afterDeleted = obj.hasOwnProperty("foo");
+
+        return preCheck && beforeDeleted && afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-1.js
index 5d52d84b9..dc70c919e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-1.js

- * @description Object.seal - 'P' is own data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        obj.foo = 10; // default [[Configurable]] attribute value of foo: true

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        delete obj.foo;

-        return preCheck && obj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'P' is own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        obj.foo = 10; // default [[Configurable]] attribute value of foo: true
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        delete obj.foo;
+        return preCheck && obj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-10.js
index 8497bd9ef..3af0b8a53 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-10.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-10.js

- * @description Object.seal - 'P' is own property of a Boolean object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(false);

-

-        boolObj.foo = 10;

-        var preCheck = Object.isExtensible(boolObj);

-        Object.seal(boolObj);

-

-        delete boolObj.foo;

-        return preCheck && boolObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a Boolean object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(false);
+
+        boolObj.foo = 10;
+        var preCheck = Object.isExtensible(boolObj);
+        Object.seal(boolObj);
+
+        delete boolObj.foo;
+        return preCheck && boolObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-11.js
index 6d6f19b60..304edf475 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-11.js

- * @description Object.seal - 'P' is own property of a Number object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var numObj = new Number(-1);

-

-        numObj.foo = 10;

-        var preCheck = Object.isExtensible(numObj);

-        Object.seal(numObj);

-

-        delete numObj.foo;

-        return preCheck && numObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a Number object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(-1);
+
+        numObj.foo = 10;
+        var preCheck = Object.isExtensible(numObj);
+        Object.seal(numObj);
+
+        delete numObj.foo;
+        return preCheck && numObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-12.js
index 3839fa34a..21cb432b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-12.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-12.js

- * @description Object.seal - 'P' is own property of a Date object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-

-        dateObj.foo = 10;

-        var preCheck = Object.isExtensible(dateObj);

-        Object.seal(dateObj);

-

-        delete dateObj.foo;

-        return preCheck && dateObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a Date object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+
+        dateObj.foo = 10;
+        var preCheck = Object.isExtensible(dateObj);
+        Object.seal(dateObj);
+
+        delete dateObj.foo;
+        return preCheck && dateObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-13.js
index bd1245536..e245a144f 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-13.js

- * @description Object.seal - 'P' is own property of a RegExp object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-

-        regObj.foo = 10;

-        var preCheck = Object.isExtensible(regObj);

-        Object.seal(regObj);

-

-        delete regObj.foo;

-        return preCheck && regObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a RegExp object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+
+        regObj.foo = 10;
+        var preCheck = Object.isExtensible(regObj);
+        Object.seal(regObj);
+
+        delete regObj.foo;
+        return preCheck && regObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-14.js
index d7fcbb8b6..a86da6264 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-14.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-14.js

- * @description Object.seal - 'P' is own property of an Error object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var errObj = new Error();

-

-        errObj.foo = 10;

-        var preCheck = Object.isExtensible(errObj);

-        Object.seal(errObj);

-

-        delete errObj.foo;

-        return preCheck && errObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of an Error object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error();
+
+        errObj.foo = 10;
+        var preCheck = Object.isExtensible(errObj);
+        Object.seal(errObj);
+
+        delete errObj.foo;
+        return preCheck && errObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-15.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-15.js
index 7439bd2e5..865a3111d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-15.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-15.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-15.js

- * @description Object.seal - 'P' is own property of an Arguments object which implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; })();

-

-        argObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-        var preCheck = Object.isExtensible(argObj);

-        Object.seal(argObj);

-

-        delete argObj.foo;

-        return preCheck && argObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of an Arguments object which
+    implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; })();
+
+        argObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+        var preCheck = Object.isExtensible(argObj);
+        Object.seal(argObj);
+
+        delete argObj.foo;
+        return preCheck && argObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-2.js
index 191ece56f..dbbe6a74c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-2.js

- * @description Object.seal - 'P' is own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-        var proto = { foo: 0 };

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "foo", {

-            value: 10,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        delete child.foo;

-        return preCheck && child.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own data property that overrides an inherited
+    data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = { foo: 0 };
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "foo", {
+            value: 10,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        delete child.foo;
+        return preCheck && child.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-3.js
index f81db05e1..78299f311 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-3.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-3.js

- * @description Object.seal - 'P' is own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        Object.defineProperty(child, "foo", {

-            value: 10,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        delete child.foo;

-        return preCheck && child.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own data property that overrides an inherited
+    accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        Object.defineProperty(child, "foo", {
+            value: 10,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        delete child.foo;
+        return preCheck && child.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-4.js
index d0f727987..61e564e3c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-4.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-4.js

- * @description Object.seal - 'P' is own accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        delete obj.foo;

-        return preCheck && obj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'P' is own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        delete obj.foo;
+        return preCheck && obj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-5.js
index fb4bece77..3cfd8a4ad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-5.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-5.js

- * @description Object.seal - 'P' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            value: 0,

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-        

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        delete child.foo;

-        return preCheck && child.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own accessor property that overrides an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            value: 0,
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+        
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        delete child.foo;
+        return preCheck && child.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-6.js
index 8ba68fe75..2b0e96cbb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-6.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-6.js

- * @description Object.seal - 'P' is own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var ConstructFun = function () { };

-        ConstructFun.prototype = proto;

-

-        var child = new ConstructFun();

-

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(child);

-        Object.seal(child);

-

-        delete child.foo;

-        return preCheck && child.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own accessor property that overrides an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var ConstructFun = function () { };
+        ConstructFun.prototype = proto;
+
+        var child = new ConstructFun();
+
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(child);
+        Object.seal(child);
+
+        delete child.foo;
+        return preCheck && child.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-7.js
index 80e64fc32..03248e8bd 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-7.js

- * @description Object.seal - 'P' is own property of a Function object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var funObj = function () { };

-

-        funObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-        var preCheck = Object.isExtensible(funObj);

-        Object.seal(funObj);

-

-        delete funObj.foo;

-        return preCheck && funObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a Function object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+
+        funObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+        var preCheck = Object.isExtensible(funObj);
+        Object.seal(funObj);
+
+        delete funObj.foo;
+        return preCheck && funObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-8.js
index ec0b47c4a..3d9eca508 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-8.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-8.js

- * @description Object.seal - 'P' is own property of an Array object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        arrObj.foo = 10;

-        var preCheck = Object.isExtensible(arrObj);

-        Object.seal(arrObj);

-

-        delete arrObj.foo;

-        return preCheck && arrObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of an Array object that uses
+    Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        arrObj.foo = 10;
+        var preCheck = Object.isExtensible(arrObj);
+        Object.seal(arrObj);
+
+        delete arrObj.foo;
+        return preCheck && arrObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-9.js
index edcccd4b3..1b03ca9eb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-9.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-a-9.js

- * @description Object.seal - 'P' is own property of a String object which implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var strObj = new String("abc");

-

-        strObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-        var preCheck = Object.isExtensible(strObj);

-        Object.seal(strObj);

-

-        delete strObj.foo;

-        return preCheck && strObj.foo === 10;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - 'P' is own property of a String object which
+    implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("abc");
+
+        strObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+        var preCheck = Object.isExtensible(strObj);
+        Object.seal(strObj);
+
+        delete strObj.foo;
+        return preCheck && strObj.foo === 10;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-1.js
index c6f61b6df..e0a1f59ea 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-1.js
@@ -1,26 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-1.js

- * @description Object.seal - the [[Configurable]] attribute of own data property of 'O' is set from true to false and other attributes of the property are unaltered

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo", 10, true, true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - the [[Configurable]] attribute of own data property
+    of 'O' is set from true to false and other attributes of the
+    property are unaltered
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo", 10, true, true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-2.js
index 9eedec9eb..6c8da1587 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-2.js
@@ -1,33 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-2.js

- * @description Object.seal - the [[Configurable]] attribute of own accessor property of 'O' is set from true to false and other attributes of the property are unaltered

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.variableForHelpVerify = "data";

-

-        function setFunc(value) {

-            obj.variableForHelpVerify = value;

-        }

-        function getFunc() {

-            return 10;

-        }

-        Object.defineProperty(obj, "foo", {

-            get: getFunc,

-            set: setFunc,

-            enumerable: true,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        return preCheck && accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "variableForHelpVerify", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - the [[Configurable]] attribute of own accessor
+    property of 'O' is set from true to false and other attributes of
+    the property are unaltered
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.variableForHelpVerify = "data";
+
+        function setFunc(value) {
+            obj.variableForHelpVerify = value;
+        }
+        function getFunc() {
+            return 10;
+        }
+        Object.defineProperty(obj, "foo", {
+            get: getFunc,
+            set: setFunc,
+            enumerable: true,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        return preCheck && accessorPropertyAttributesAreCorrect(obj, "foo", getFunc, setFunc, "variableForHelpVerify", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-3.js
index 6f3c4d1cc..1f254a9a3 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-3.js
@@ -1,41 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-3.js

- * @description Object.seal - the [[Configurable]] attribute of all own properties of 'O' are set from true to false and other attributes of the property are unaltered

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.variableForHelpVerify = "data";

-

-        Object.defineProperty(obj, "foo1", {

-            value: 10,

-            writable: true,

-            enumerable: true,

-            configurable: true

-        });

-

-        function set_func(value) {

-            obj.variableForHelpVerify = value;

-        }

-        function get_func() {

-            return 10;

-        }

-        Object.defineProperty(obj, "foo2", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo1", 10, true, true, false) &&

-            accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "variableForHelpVerify", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - the [[Configurable]] attribute of all own properties
+    of 'O' are set from true to false and other attributes of the
+    property are unaltered
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.variableForHelpVerify = "data";
+
+        Object.defineProperty(obj, "foo1", {
+            value: 10,
+            writable: true,
+            enumerable: true,
+            configurable: true
+        });
+
+        function set_func(value) {
+            obj.variableForHelpVerify = value;
+        }
+        function get_func() {
+            return 10;
+        }
+        Object.defineProperty(obj, "foo2", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo1", 10, true, true, false) &&
+            accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "variableForHelpVerify", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-4.js
index 6c5e83896..eae9a6c24 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-4.js
@@ -1,41 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-b-4.js

- * @description Object.seal - all own properties of 'O' are already non-configurable

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.variableForHelpVerify = "data";

-

-        Object.defineProperty(obj, "foo1", {

-            value: 10,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-

-        function set_func(value) {

-            obj.variableForHelpVerify = value;

-        }

-        function get_func() {

-            return 10;

-        }

-        Object.defineProperty(obj, "foo2", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: false

-        });

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo1", 10, true, true, false) &&

-            accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "variableForHelpVerify", true, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.seal - all own properties of 'O' are already
+    non-configurable
+includes:
+    - runTestCase.js
+    - accessorPropertyAttributesAreCorrect.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.variableForHelpVerify = "data";
+
+        Object.defineProperty(obj, "foo1", {
+            value: 10,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+
+        function set_func(value) {
+            obj.variableForHelpVerify = value;
+        }
+        function get_func() {
+            return 10;
+        }
+        Object.defineProperty(obj, "foo2", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: false
+        });
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        return preCheck && dataPropertyAttributesAreCorrect(obj, "foo1", 10, true, true, false) &&
+            accessorPropertyAttributesAreCorrect(obj, "foo2", get_func, set_func, "variableForHelpVerify", true, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-1.js
index 63663816b..836c7559b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-1.js

- * @description Object.seal - 'O' is a Function object

- */

-

-

-function testcase() {

-

-        var fun = function () { };

-        var preCheck = Object.isExtensible(fun);

-        Object.seal(fun);

-

-        return preCheck && Object.isSealed(fun);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fun = function () { };
+        var preCheck = Object.isExtensible(fun);
+        Object.seal(fun);
+
+        return preCheck && Object.isSealed(fun);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-2.js
index da65873cf..090d1570e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-2.js

- * @description Object.seal - 'O' is an Array object

- */

-

-

-function testcase() {

-

-        var arr = [0, 1];

-        var preCheck = Object.isExtensible(arr);

-        Object.seal(arr);

-

-        return preCheck && Object.isSealed(arr);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1];
+        var preCheck = Object.isExtensible(arr);
+        Object.seal(arr);
+
+        return preCheck && Object.isSealed(arr);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-3.js
index 4a8168c46..ff72aebcb 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-3.js

- * @description Object.seal - 'O' is a String object

- */

-

-

-function testcase() {

-

-        var strObj = new String("a");

-        var preCheck = Object.isExtensible(strObj);

-        Object.seal(strObj);

-

-        return preCheck && Object.isSealed(strObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var strObj = new String("a");
+        var preCheck = Object.isExtensible(strObj);
+        Object.seal(strObj);
+
+        return preCheck && Object.isSealed(strObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-4.js
index 2f70a2f2d..276ec9718 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-4.js

- * @description Object.seal - 'O' is a Boolean object

- */

-

-

-function testcase() {

-

-        var boolObj = new Boolean(false);

-        var preCheck = Object.isExtensible(boolObj);

-        Object.seal(boolObj);

-

-        return preCheck && Object.isSealed(boolObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var boolObj = new Boolean(false);
+        var preCheck = Object.isExtensible(boolObj);
+        Object.seal(boolObj);
+
+        return preCheck && Object.isSealed(boolObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-5.js
index 73dfded1a..bc9ee07d0 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-5.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-5.js

- * @description Object.seal - 'O' is a Number object

- */

-

-

-function testcase() {

-

-        var numObj = new Number(3);

-        var preCheck = Object.isExtensible(numObj);

-        Object.seal(numObj);

-

-        return preCheck && Object.isSealed(numObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var numObj = new Number(3);
+        var preCheck = Object.isExtensible(numObj);
+        Object.seal(numObj);
+
+        return preCheck && Object.isSealed(numObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-6.js
index b922d7df0..93e7895f1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-6.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-6.js

- * @description Object.seal - 'O' is a Date object

- */

-

-

-function testcase() {

-

-        var dateObj = new Date();

-        var preCheck = Object.isExtensible(dateObj);

-        Object.seal(dateObj);

-

-        return preCheck && Object.isSealed(dateObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var dateObj = new Date();
+        var preCheck = Object.isExtensible(dateObj);
+        Object.seal(dateObj);
+
+        return preCheck && Object.isSealed(dateObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-7.js
index 3c7702e1d..62a233c26 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-7.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-7.js

- * @description Object.seal - 'O' is a RegExp object

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-        var preCheck = Object.isExtensible(regObj);

-        Object.seal(regObj);

-

-        return preCheck && Object.isSealed(regObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is a RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+        var preCheck = Object.isExtensible(regObj);
+        Object.seal(regObj);
+
+        return preCheck && Object.isSealed(regObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-8.js
index 29145cb9b..47c7fbb50 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-8.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-8.js

- * @description Object.seal - 'O' is an Error object

- */

-

-

-function testcase() {

-

-        var errObj = new Error();

-        var preCheck = Object.isExtensible(errObj);

-        Object.seal(errObj);

-

-        return preCheck && Object.isSealed(errObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is an Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var errObj = new Error();
+        var preCheck = Object.isExtensible(errObj);
+        Object.seal(errObj);
+
+        return preCheck && Object.isSealed(errObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-9.js
index 91794f5aa..7159a99d9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-9.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-2-c-9.js

- * @description Object.seal - 'O' is an Arguments object

- */

-

-

-function testcase() {

-

-        var argObj = (function () { return arguments; })();

-

-        var preCheck = Object.isExtensible(argObj);

-        Object.seal(argObj);

-

-        return preCheck && Object.isSealed(argObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is an Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var argObj = (function () { return arguments; })();
+
+        var preCheck = Object.isExtensible(argObj);
+        Object.seal(argObj);
+
+        return preCheck && Object.isSealed(argObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-3-1.js
index 5e18e03ed..12f29c3fc 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-3-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-3-1.js

- * @description Object.seal - returned object is not extensible

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-        return preCheck && !Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - returned object is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+        return preCheck && !Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-1.js
index 1fec6f875..46ac8123a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-1.js

- * @description Object.seal - 'O' is sealed already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true

-        var preCheck = Object.isExtensible(obj);

-        Object.seal(obj);

-

-        Object.seal(obj);

-        return preCheck && Object.isSealed(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is sealed already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true
+        var preCheck = Object.isExtensible(obj);
+        Object.seal(obj);
+
+        Object.seal(obj);
+        return preCheck && Object.isSealed(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-2.js
index 4f1ecbde5..14ea35820 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-2.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-2.js

- * @description Object.seal - 'O' is frozen already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true

-        var preCheck = Object.isExtensible(obj);

-        Object.freeze(obj);

-

-        Object.seal(obj);

-        return preCheck && Object.isSealed(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - 'O' is frozen already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true
+        var preCheck = Object.isExtensible(obj);
+        Object.freeze(obj);
+
+        Object.seal(obj);
+        return preCheck && Object.isSealed(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-3.js
index 73fa0c108..77036a8f9 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-3.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.8/15.2.3.8-4-3.js

- * @description Object.seal - the extension of 'O' is prevented already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true

-        var preCheck = Object.isExtensible(obj);

-        Object.preventExtensions(obj);

-        Object.seal(obj);

-        return preCheck && Object.isSealed(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.seal - the extension of 'O' is prevented already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, configurable: true, enumerable: true
+        var preCheck = Object.isExtensible(obj);
+        Object.preventExtensions(obj);
+        Object.seal(obj);
+        return preCheck && Object.isSealed(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-1.js
index 594458a26..0463551d1 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-1.js

- * @description Object.freeze must exist as a function

- */

-

-

-function testcase() {

-  var f = Object.freeze;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Object.freeze;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-2.js
index 3d5dd332f..b65a2186e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-0-2.js

- * @description Object.freeze must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Object.freeze.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Object.freeze.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-1.js
index 9313c3163..c477dcd9b 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-1.js

- * @description Object.freeze throws TypeError if type of first param is undefined

- */

-

-

-function testcase() {

-        try {

-            Object.freeze(undefined);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze throws TypeError if type of first param is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.freeze(undefined);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-2.js
index 6e9024d32..abc2ea267 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-2.js

- * @description Object.freeze throws TypeError if type of first param is null

- */

-

-

-function testcase() {

-        try {

-            Object.freeze(null);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze throws TypeError if type of first param is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.freeze(null);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-3.js
index 6f23bae11..e44b29e38 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-3.js

- * @description Object.freeze throws TypeError if type of first param is boolean primitive

- */

-

-

-function testcase() {

-        var result = false;

-        try {

-            Object.freeze(false);

-

-            return false;

-        } catch (e) {

-            result = e instanceof TypeError;

-        }

-        try {

-            Object.freeze(true);

-

-            return false;

-        } catch (e) {

-            return result && e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze throws TypeError if type of first param is boolean
+    primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        try {
+            Object.freeze(false);
+
+            return false;
+        } catch (e) {
+            result = e instanceof TypeError;
+        }
+        try {
+            Object.freeze(true);
+
+            return false;
+        } catch (e) {
+            return result && e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-4.js
index fe32d4549..3ee79010e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1-4.js

- * @description Object.freeze throws TypeError if type of first param is string primitive

- */

-

-

-function testcase() {

-        try {

-            Object.freeze("abc");

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze throws TypeError if type of first param is string
+    primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.freeze("abc");
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1.js
index 2511f89d4..ca78e433c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-1.js

- * @description Object.freeze throws TypeError if type of first param is not Object

- */

-

-

-function testcase() {

-        try {

-            Object.freeze(0);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze throws TypeError if type of first param is not Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.freeze(0);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-1.js
index 9d0312273..b26e5254d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-1.js

- * @description Object.freeze - extensible of 'O' is set as false even if 'O' has no own property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.freeze(obj);

-

-        return !Object.isExtensible(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - extensible of 'O' is set as false even if 'O' has
+    no own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.freeze(obj);
+
+        return !Object.isExtensible(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-2.js
index 4f52a43a2..bbd8a8b83 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-2.js
@@ -1,32 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-2.js

- * @description Object.freeze - inherited data properties are not frozen

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "Father", {

-            value: 10,

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.freeze(child);

-

-        var beforeDeleted = proto.hasOwnProperty("Father");

-        delete proto.Father;

-        var afterDeleted = proto.hasOwnProperty("Father");

-

-        return beforeDeleted && !afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - inherited data properties are not frozen
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "Father", {
+            value: 10,
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.freeze(child);
+
+        var beforeDeleted = proto.hasOwnProperty("Father");
+        delete proto.Father;
+        var afterDeleted = proto.hasOwnProperty("Father");
+
+        return beforeDeleted && !afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-3.js
index 4f2c988e4..5507ab780 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-3.js
@@ -1,34 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-3.js

- * @description Object.freeze - inherited accessor properties are not frozen

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "Father", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.freeze(child);

-

-        var beforeDeleted = proto.hasOwnProperty("Father");

-        delete proto.Father;

-        var afterDeleted = proto.hasOwnProperty("Father");

-

-        return beforeDeleted && !afterDeleted;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - inherited accessor properties are not frozen
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "Father", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.freeze(child);
+
+        var beforeDeleted = proto.hasOwnProperty("Father");
+        delete proto.Father;
+        var afterDeleted = proto.hasOwnProperty("Father");
+
+        return beforeDeleted && !afterDeleted;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-4.js
index 43191dd89..dded7fe27 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-4.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-4.js

- * @description Object.freeze - Non-enumerable own properties of 'O' are frozen

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            enumerable: false,

-            configurable: true

-        });

-

-        Object.freeze(obj);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        var beforeDeleted = obj.hasOwnProperty("foo");

-        delete obj.foo;

-        var afterDeleted = obj.hasOwnProperty("foo");

-

-        return beforeDeleted && afterDeleted && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - Non-enumerable own properties of 'O' are frozen
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            enumerable: false,
+            configurable: true
+        });
+
+        Object.freeze(obj);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        var beforeDeleted = obj.hasOwnProperty("foo");
+        delete obj.foo;
+        var afterDeleted = obj.hasOwnProperty("foo");
+
+        return beforeDeleted && afterDeleted && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-1.js
index 535a3304d..a03205914 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-1.js

- * @description Object.freeze - 'P' is own data property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        obj.foo = 10; // default [[Configurable]] attribute value of foo: true

-

-        Object.freeze(obj);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        delete obj.foo;

-        return obj.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'P' is own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        obj.foo = 10; // default [[Configurable]] attribute value of foo: true
+
+        Object.freeze(obj);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        delete obj.foo;
+        return obj.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-10.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-10.js
index efb9a18a1..ff25a3aac 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-10.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-10.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-10.js

- * @description Object.freeze - 'P' is own named property of an Array object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var arrObj = [];

-

-        arrObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-

-        Object.freeze(arrObj);

-

-        var desc = Object.getOwnPropertyDescriptor(arrObj, "foo");

-

-        delete arrObj.foo;

-        return arrObj.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own named property of an Array object that
+    uses Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [];
+
+        arrObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+
+        Object.freeze(arrObj);
+
+        var desc = Object.getOwnPropertyDescriptor(arrObj, "foo");
+
+        delete arrObj.foo;
+        return arrObj.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-11.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-11.js
index 0cda9043b..63e12ef3a 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-11.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-11.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-11.js

- * @description Object.freeze - 'P' is own index property of the Arguments object that implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-

-        // default [[Configurable]] attribute value of "0": true

-        var argObj = (function () { return arguments; }(1, 2, 3));

-

-        Object.freeze(argObj);

-

-        var desc = Object.getOwnPropertyDescriptor(argObj, "0");

-

-        delete argObj[0];

-        return argObj[0] === 1 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own index property of the Arguments object
+    that implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // default [[Configurable]] attribute value of "0": true
+        var argObj = (function () { return arguments; }(1, 2, 3));
+
+        Object.freeze(argObj);
+
+        var desc = Object.getOwnPropertyDescriptor(argObj, "0");
+
+        delete argObj[0];
+        return argObj[0] === 1 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-12.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-12.js
index 97f0ba013..69af04a53 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-12.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-12.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-12.js

- * @description Object.freeze - 'P' is own index property of a String object that implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-

-        // default [[Configurable]] attribute value of "0": true

-        var strObj = new String("abc");

-

-        Object.freeze(strObj);

-

-        var desc = Object.getOwnPropertyDescriptor(strObj, "0");

-

-        delete strObj[0];

-        return strObj[0] === "a" && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own index property of a String object that
+    implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // default [[Configurable]] attribute value of "0": true
+        var strObj = new String("abc");
+
+        Object.freeze(strObj);
+
+        var desc = Object.getOwnPropertyDescriptor(strObj, "0");
+
+        delete strObj[0];
+        return strObj[0] === "a" && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-13.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-13.js
index 4cad5afea..7d929d59d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-13.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-13.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-13.js

- * @description Object.freeze - 'P' is own index property of the Object

- */

-

-

-function testcase() {

-

-        // default [[Configurable]] attribute value of "0": true

-        var obj = { 0: 0, 1: 1, length: 2};

-

-        Object.freeze(obj);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "0");

-

-        delete obj[0];

-        return obj[0] === 0 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'P' is own index property of the Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // default [[Configurable]] attribute value of "0": true
+        var obj = { 0: 0, 1: 1, length: 2};
+
+        Object.freeze(obj);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "0");
+
+        delete obj[0];
+        return obj[0] === 0 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-14.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-14.js
index a96c924ca..40999ffad 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-14.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-14.js

- * @description Object.freeze - 'P' is own index property of an Array object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-

-        // default [[Configurable]] attribute value of "0": true

-        var arrObj = [0, 1, 2];

-

-        Object.freeze(arrObj);

-

-        var desc = Object.getOwnPropertyDescriptor(arrObj, "0");

-

-        delete arrObj[0];

-        return arrObj[0] === 0 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own index property of an Array object that
+    uses Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // default [[Configurable]] attribute value of "0": true
+        var arrObj = [0, 1, 2];
+
+        Object.freeze(arrObj);
+
+        var desc = Object.getOwnPropertyDescriptor(arrObj, "0");
+
+        delete arrObj[0];
+        return arrObj[0] === 0 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-2.js
index 74d681c25..db0b60685 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-2.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-2.js

- * @description Object.freeze - 'P' is own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = { foo: 0 }; // default [[Configurable]] attribute value of foo: true

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.foo = 10; // default [[Configurable]] attribute value of foo: true

- 

-        Object.freeze(child);

-

-        var desc = Object.getOwnPropertyDescriptor(child, "foo");

-

-        delete child.foo;

-        return child.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own data property that overrides an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { foo: 0 }; // default [[Configurable]] attribute value of foo: true
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.foo = 10; // default [[Configurable]] attribute value of foo: true
+ 
+        Object.freeze(child);
+
+        var desc = Object.getOwnPropertyDescriptor(child, "foo");
+
+        delete child.foo;
+        return child.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-3.js
index f8d1189b9..91d8b579d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-3.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-3.js

- * @description Object.freeze - 'P' is own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "foo", {

-            value: 10,

-            configurable: true

-        });

-

-        Object.freeze(child);

-

-        var desc = Object.getOwnPropertyDescriptor(child, "foo");

-

-        delete child.foo;

-        return child.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own data property that overrides an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "foo", {
+            value: 10,
+            configurable: true
+        });
+
+        Object.freeze(child);
+
+        var desc = Object.getOwnPropertyDescriptor(child, "foo");
+
+        delete child.foo;
+        return child.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-4.js
index 304287fef..94a1a7272 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-4.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-4.js

- * @description Object.freeze - 'P' is own accessor property

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        Object.freeze(obj);

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        delete obj.foo;

-        return obj.foo === 10 && desc.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'P' is own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        Object.freeze(obj);
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        delete obj.foo;
+        return obj.foo === 10 && desc.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-5.js
index ebd51f99b..2da1998ff 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-5.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-5.js

- * @description Object.freeze - 'P' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = {};

-

-        proto.foo = 0; // default [[Configurable]] attribute value of foo: true

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        Object.freeze(child);

-

-        var desc = Object.getOwnPropertyDescriptor(child, "foo");

-

-        delete child.foo;

-        return child.foo === 10 && desc.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own accessor property that overrides an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+
+        proto.foo = 0; // default [[Configurable]] attribute value of foo: true
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        Object.freeze(child);
+
+        var desc = Object.getOwnPropertyDescriptor(child, "foo");
+
+        delete child.foo;
+        return child.foo === 10 && desc.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-6.js
index 4999d84e8..40efd9e0d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-6.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-6.js

- * @description Object.freeze - 'P' is own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var proto = {};

-

-        Object.defineProperty(proto, "foo", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "foo", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        Object.freeze(child);

-

-        var desc = Object.getOwnPropertyDescriptor(child, "foo");

-

-        delete child.foo;

-        return child.foo === 10 && desc.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own accessor property that overrides an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+
+        Object.defineProperty(proto, "foo", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "foo", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        Object.freeze(child);
+
+        var desc = Object.getOwnPropertyDescriptor(child, "foo");
+
+        delete child.foo;
+        return child.foo === 10 && desc.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-7.js
index 44fc1eccd..6c470ccd4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-7.js

- * @description Object.freeze - 'P' is own named property of an Arguments object that implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; }());

-

-        argObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-

-        Object.freeze(argObj);

-

-        var desc = Object.getOwnPropertyDescriptor(argObj, "foo");

-

-        delete argObj.foo;

-        return argObj.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own named property of an Arguments object
+    that implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; }());
+
+        argObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+
+        Object.freeze(argObj);
+
+        var desc = Object.getOwnPropertyDescriptor(argObj, "foo");
+
+        delete argObj.foo;
+        return argObj.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-8.js
index 0b81f9849..7b800af09 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-8.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-8.js

- * @description Object.freeze - 'P' is own named property of the String object that implements its own [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var strObj = new String("abc");

-

-        strObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-

-        Object.freeze(strObj);

-

-        var desc = Object.getOwnPropertyDescriptor(strObj, "foo");

-

-        delete strObj.foo;

-        return strObj.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own named property of the String object
+    that implements its own [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("abc");
+
+        strObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+
+        Object.freeze(strObj);
+
+        var desc = Object.getOwnPropertyDescriptor(strObj, "foo");
+
+        delete strObj.foo;
+        return strObj.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-9.js
index bcc125919..d8dda4e93 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-9.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-a-9.js

- * @description Object.freeze - 'P' is own property of the Function object that uses Object's [[GetOwnProperty]]

- */

-

-

-function testcase() {

-        var funObj = function () { };

-

-        funObj.foo = 10; // default [[Configurable]] attribute value of foo: true

-

-        Object.freeze(funObj);

-

-        var desc = Object.getOwnPropertyDescriptor(funObj, "foo");

-

-        delete funObj.foo;

-        return funObj.foo === 10 && desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - 'P' is own property of the Function object that
+    uses Object's [[GetOwnProperty]]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+
+        funObj.foo = 10; // default [[Configurable]] attribute value of foo: true
+
+        Object.freeze(funObj);
+
+        var desc = Object.getOwnPropertyDescriptor(funObj, "foo");
+
+        delete funObj.foo;
+        return funObj.foo === 10 && desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-1.js
index c7bf0fd78..caab036de 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-1.js
@@ -1,28 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-1.js

- * @description Object.freeze - The [[Wrtiable]] attribute of own data property of 'O' is set to false while other attributes are unchanged

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            writable: true,

-            enumerable: true,

-            configurable: false

-        });

-

-        Object.freeze(obj);

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false) &&

-            desc.writable === false && desc.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - The [[Wrtiable]] attribute of own data property of
+    'O' is set to false while other attributes are unchanged
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            writable: true,
+            enumerable: true,
+            configurable: false
+        });
+
+        Object.freeze(obj);
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false) &&
+            desc.writable === false && desc.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-2.js
index 58bb173e1..be021142c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-2.js
@@ -1,39 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-b-i-2.js

- * @description Object.freeze - The [[Wrtiable]] attribute of all own data property of 'O' is set to false while other attributes are unchanged

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo1", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-

-        Object.defineProperty(obj, "foo2", {

-            value: 20,

-            writable: true,

-            enumerable: false,

-            configurable: false

-        });

-

-        Object.freeze(obj);

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");

-

-        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) &&

-            dataPropertyAttributesAreCorrect(obj, "foo2", 20, false, false, false) &&

-            desc1.configurable === false && desc1.writable === false &&

-            desc2.configurable === false && desc2.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - The [[Wrtiable]] attribute of all own data
+    property of 'O' is set to false while other attributes are
+    unchanged
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo1", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+
+        Object.defineProperty(obj, "foo2", {
+            value: 20,
+            writable: true,
+            enumerable: false,
+            configurable: false
+        });
+
+        Object.freeze(obj);
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");
+
+        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) &&
+            dataPropertyAttributesAreCorrect(obj, "foo2", 20, false, false, false) &&
+            desc1.configurable === false && desc1.writable === false &&
+            desc2.configurable === false && desc2.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-1.js
index 3d87e76e6..089e810ae 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-1.js
@@ -1,28 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-1.js

- * @description Object.freeze - The [[Configurable]] attribute of own data property of 'O' is set to false while other attributes are unchanged

- */

-

-

-function testcase() {

-        var obj = {};

-

-        Object.defineProperty(obj, "foo", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.freeze(obj);

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-

-        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false) &&

-            desc.configurable === false && desc.writable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - The [[Configurable]] attribute of own data
+    property of 'O' is set to false while other attributes are
+    unchanged
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+
+        Object.defineProperty(obj, "foo", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.freeze(obj);
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+
+        return dataPropertyAttributesAreCorrect(obj, "foo", 10, false, true, false) &&
+            desc.configurable === false && desc.writable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-2.js
index 55d5133e3..1b586f80e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-2.js
@@ -1,52 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-2.js

- * @description Object.freeze - The [[Configurable]] attribute of own accessor property of 'O' is set to false while other attributes are unchanged

- */

-

-

-function testcase() {

-        var obj = {};

-

-        function get_func() {

-            return 10;

-        }

-

-        var resultSetFun = false;

-        function set_func() {

-            resultSetFun = true;

-        }

-

-        Object.defineProperty(obj, "foo", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.freeze(obj);

-        var res1 = obj.hasOwnProperty("foo");

-        delete obj.foo;

-        var res2 = obj.hasOwnProperty("foo");

-        var resultConfigurable = (res1 && res2);

-

-        var resultGetFun = (obj.foo === 10);

-        obj.foo = 12;

-

-        var resultEnumerable = false;

-        for (var prop in obj) {

-            if (prop === "foo") {

-                resultEnumerable = true;

-            }

-        }

-

-        var desc = Object.getOwnPropertyDescriptor(obj, "foo");

-        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;

-

-        return desc.configurable === false && result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - The [[Configurable]] attribute of own accessor
+    property of 'O' is set to false while other attributes are
+    unchanged
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+
+        function get_func() {
+            return 10;
+        }
+
+        var resultSetFun = false;
+        function set_func() {
+            resultSetFun = true;
+        }
+
+        Object.defineProperty(obj, "foo", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.freeze(obj);
+        var res1 = obj.hasOwnProperty("foo");
+        delete obj.foo;
+        var res2 = obj.hasOwnProperty("foo");
+        var resultConfigurable = (res1 && res2);
+
+        var resultGetFun = (obj.foo === 10);
+        obj.foo = 12;
+
+        var resultEnumerable = false;
+        for (var prop in obj) {
+            if (prop === "foo") {
+                resultEnumerable = true;
+            }
+        }
+
+        var desc = Object.getOwnPropertyDescriptor(obj, "foo");
+        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;
+
+        return desc.configurable === false && result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-3.js
index e0973ab9e..0c96bfb63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-3.js
@@ -1,65 +1,70 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-3.js

- * @description Object.freeze - The [[Configurable]] attribute of all own data property of 'O' is set to false while other attributes are unchanged

- */

-

-

-function testcase() {

-

-        var obj = {};

-        var resultSetFun = false;

-

-        Object.defineProperty(obj, "foo1", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: true

-        });

-

-        function get_func() {

-            return 10;

-        }

-

-        function set_func() {

-            resultSetFun = true;

-        }

-

-        Object.defineProperty(obj, "foo2", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.freeze(obj);

-

-        var res1 = obj.hasOwnProperty("foo2");

-        delete obj.foo2;

-        var res2 = obj.hasOwnProperty("foo2");

-        var resultConfigurable = (res1 && res2);

-

-        var resultGetFun = (obj.foo2 === 10);

-        obj.foo2 = 12;

-

-        var resultEnumerable = false;

-        for (var prop in obj) {

-            if (prop === "foo2") {

-                resultEnumerable = true;

-            }

-        }

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");

-

-        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;

-

-        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) && result &&

-            desc1.configurable === false && desc1.writable === false && desc2.configurable === false;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - The [[Configurable]] attribute of all own data
+    property of 'O' is set to false while other attributes are
+    unchanged
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+
+        var obj = {};
+        var resultSetFun = false;
+
+        Object.defineProperty(obj, "foo1", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: true
+        });
+
+        function get_func() {
+            return 10;
+        }
+
+        function set_func() {
+            resultSetFun = true;
+        }
+
+        Object.defineProperty(obj, "foo2", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.freeze(obj);
+
+        var res1 = obj.hasOwnProperty("foo2");
+        delete obj.foo2;
+        var res2 = obj.hasOwnProperty("foo2");
+        var resultConfigurable = (res1 && res2);
+
+        var resultGetFun = (obj.foo2 === 10);
+        obj.foo2 = 12;
+
+        var resultEnumerable = false;
+        for (var prop in obj) {
+            if (prop === "foo2") {
+                resultEnumerable = true;
+            }
+        }
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");
+
+        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;
+
+        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) && result &&
+            desc1.configurable === false && desc1.writable === false && desc2.configurable === false;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-4.js
index 60ecd93a9..87e17a75e 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-4.js
@@ -1,63 +1,67 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-c-4.js

- * @description Object.freeze - all own properties of 'O' are not writable and not configurable

- */

-

-

-function testcase() {

-        var obj = {};

-        var resultSetFun = false;

-

-        Object.defineProperty(obj, "foo1", {

-            value: 10,

-            writable: false,

-            enumerable: true,

-            configurable: false

-        });

-

-        function get_func() {

-            return 10;

-        }

-

-        function set_func() {

-            resultSetFun = true;

-        }

-

-        Object.defineProperty(obj, "foo2", {

-            get: get_func,

-            set: set_func,

-            enumerable: true,

-            configurable: true

-        });

-

-        Object.freeze(obj);

-

-        var res1 = obj.hasOwnProperty("foo2");

-        delete obj.foo2;

-        var res2 = obj.hasOwnProperty("foo2");

-        var resultConfigurable = (res1 && res2);

-

-        var resultGetFun = (obj.foo2 === 10);

-        obj.foo2 = 12;

-

-        var resultEnumerable = false;

-        for (var prop in obj) {

-            if (prop === "foo2") {

-                resultEnumerable = true;

-            }

-        }

-

-        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");

-        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");

-

-        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;

-

-        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) &&

-            result && desc1.configurable === false && desc1.writable === false && desc2.configurable === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.freeze - all own properties of 'O' are not writable and not
+    configurable
+includes:
+    - runTestCase.js
+    - dataPropertyAttributesAreCorrect.js
+---*/
+
+function testcase() {
+        var obj = {};
+        var resultSetFun = false;
+
+        Object.defineProperty(obj, "foo1", {
+            value: 10,
+            writable: false,
+            enumerable: true,
+            configurable: false
+        });
+
+        function get_func() {
+            return 10;
+        }
+
+        function set_func() {
+            resultSetFun = true;
+        }
+
+        Object.defineProperty(obj, "foo2", {
+            get: get_func,
+            set: set_func,
+            enumerable: true,
+            configurable: true
+        });
+
+        Object.freeze(obj);
+
+        var res1 = obj.hasOwnProperty("foo2");
+        delete obj.foo2;
+        var res2 = obj.hasOwnProperty("foo2");
+        var resultConfigurable = (res1 && res2);
+
+        var resultGetFun = (obj.foo2 === 10);
+        obj.foo2 = 12;
+
+        var resultEnumerable = false;
+        for (var prop in obj) {
+            if (prop === "foo2") {
+                resultEnumerable = true;
+            }
+        }
+
+        var desc1 = Object.getOwnPropertyDescriptor(obj, "foo1");
+        var desc2 = Object.getOwnPropertyDescriptor(obj, "foo2");
+
+        var result = resultConfigurable && resultEnumerable && resultGetFun && resultSetFun;
+
+        return dataPropertyAttributesAreCorrect(obj, "foo1", 10, false, true, false) &&
+            result && desc1.configurable === false && desc1.writable === false && desc2.configurable === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-1.js
index d93a4588a..2dd38534c 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-1.js

- * @description Object.freeze - 'O' is a Function object

- */

-

-

-function testcase() {

-        var funObj = function () { };

-

-        Object.freeze(funObj);

-

-        return Object.isFrozen(funObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { };
+
+        Object.freeze(funObj);
+
+        return Object.isFrozen(funObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-2.js
index 1f571b75c..8510219b4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-2.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-2.js

- * @description Object.freeze - 'O' is an Array object

- */

-

-

-function testcase() {

-        var arrObj = [0, 1];

-

-        Object.freeze(arrObj);

-

-        return Object.isFrozen(arrObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is an Array object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [0, 1];
+
+        Object.freeze(arrObj);
+
+        return Object.isFrozen(arrObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-3.js
index 6b6cc4351..42ff6fe63 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-3.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-3.js

- * @description Object.freeze - 'O' is a String object

- */

-

-

-function testcase() {

-        var strObj = new String("a");

-

-        Object.freeze(strObj);

-

-        return Object.isFrozen(strObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String("a");
+
+        Object.freeze(strObj);
+
+        return Object.isFrozen(strObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-4.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-4.js
index 0b27c3e64..9ad3027f8 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-4.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-4.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-4.js

- * @description Object.freeze - 'O' is a Boolean object

- */

-

-

-function testcase() {

-        var boolObj = new Boolean(false);

-

-        Object.freeze(boolObj);

-

-        return Object.isFrozen(boolObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var boolObj = new Boolean(false);
+
+        Object.freeze(boolObj);
+
+        return Object.isFrozen(boolObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-5.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-5.js
index 5f9a87691..a5a70d593 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-5.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-5.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-5.js

- * @description Object.freeze - 'O' is a Number object

- */

-

-

-function testcase() {

-        var numObj = new Number(3);

-

-        Object.freeze(numObj);

-

-        return Object.isFrozen(numObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var numObj = new Number(3);
+
+        Object.freeze(numObj);
+
+        return Object.isFrozen(numObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-6.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-6.js
index 5e14d6df5..3ad8daeee 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-6.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-6.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-6.js

- * @description Object.freeze - 'O' is a Date object

- */

-

-

-function testcase() {

-        var dateObj = new Date();

-

-        Object.freeze(dateObj);

-

-        return Object.isFrozen(dateObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateObj = new Date();
+
+        Object.freeze(dateObj);
+
+        return Object.isFrozen(dateObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-7.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-7.js
index a5ae89491..d2ad88764 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-7.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-7.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-7.js

- * @description Object.freeze - 'O' is a RegExp object

- */

-

-

-function testcase() {

-        var regObj = new RegExp();

-

-        Object.freeze(regObj);

-

-        return Object.isFrozen(regObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is a RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp();
+
+        Object.freeze(regObj);
+
+        return Object.isFrozen(regObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-8.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-8.js
index 1750b542f..c771e3b75 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-8.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-8.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-8.js

- * @description Object.freeze - 'O' is an Error object

- */

-

-

-function testcase() {

-        var errObj = new SyntaxError();

-

-        Object.freeze(errObj);

-

-        return Object.isFrozen(errObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is an Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new SyntaxError();
+
+        Object.freeze(errObj);
+
+        return Object.isFrozen(errObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-9.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-9.js
index e8bcaac00..8ae44a0a5 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-9.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-9.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-2-d-9.js

- * @description Object.freeze - 'O' is the Arguments object

- */

-

-

-function testcase() {

-        var argObj = (function () { return arguments; } ());

-

-        Object.freeze(argObj);

-

-        return Object.isFrozen(argObj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = (function () { return arguments; } ());
+
+        Object.freeze(argObj);
+
+        return Object.isFrozen(argObj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-3-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-3-1.js
index 9cecf9f61..bfbb087c4 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-3-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-3-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-3-1.js

- * @description Object.freeze - returned object is not extensible

- */

-

-

-function testcase() {

-

-        var obj = {};

-        Object.freeze(obj);

-        return !Object.isExtensible(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - returned object is not extensible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+        Object.freeze(obj);
+        return !Object.isExtensible(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-1.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-1.js
index dce11e657..68dfe0f57 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-1.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-1.js

- * @description Object.freeze - 'O' is sealed already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, enumerable: true

-

-        Object.seal(obj);

-

-        Object.freeze(obj);

-        return Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is sealed already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, enumerable: true
+
+        Object.seal(obj);
+
+        Object.freeze(obj);
+        return Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-2.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-2.js
index cda6cb31c..db81a650d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-2.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-2.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-2.js

- * @description Object.freeze - 'O' is frozen already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, enumerable: true

-

-        Object.freeze(obj);

-

-        Object.freeze(obj);

-        return Object.isFrozen(obj);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - 'O' is frozen already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, enumerable: true
+
+        Object.freeze(obj);
+
+        Object.freeze(obj);
+        return Object.isFrozen(obj);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-3.js b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-3.js
index f00502e56..ceb4cf77d 100644
--- a/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-3.js
+++ b/test/suite/ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-3.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.3/15.2.3.9/15.2.3.9-4-3.js

- * @description Object.freeze - the extensions of 'O' is prevented already

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        obj.foo = 10; // default value of attributes: writable: true, enumerable: true

-

-        Object.preventExtensions(obj);

-

-        Object.freeze(obj);

-        return Object.isFrozen(obj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Object.freeze - the extensions of 'O' is prevented already
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        obj.foo = 10; // default value of attributes: writable: true, enumerable: true
+
+        Object.preventExtensions(obj);
+
+        Object.freeze(obj);
+        return Object.isFrozen(obj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.3/S15.2.3_A1.js b/test/suite/ch15/15.2/15.2.3/S15.2.3_A1.js
index ec0659bf8..903a07671 100644
--- a/test/suite/ch15/15.2/15.2.3/S15.2.3_A1.js
+++ b/test/suite/ch15/15.2/15.2.3/S15.2.3_A1.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object constructor has the property "prototype"
- *
- * @path ch15/15.2/15.2.3/S15.2.3_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Object constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Object.hasOwnProperty("prototype")){
   $ERROR('#1: The Object constructor has the property "prototype"');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/S15.2.3_A2.js b/test/suite/ch15/15.2/15.2.3/S15.2.3_A2.js
index 93a8e92a5..5a8dd2f87 100644
--- a/test/suite/ch15/15.2/15.2.3/S15.2.3_A2.js
+++ b/test/suite/ch15/15.2/15.2.3/S15.2.3_A2.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Object constructor
- * is the Function prototype object
- *
- * @path ch15/15.2/15.2.3/S15.2.3_A2.js
- * @description Checking Function.prototype.isPrototypeOf(Object)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Object constructor
+    is the Function prototype object
+description: Checking Function.prototype.isPrototypeOf(Object)
+---*/
 
 // CHECK#
 if (!(Function.prototype.isPrototypeOf(Object))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Object constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.3/S15.2.3_A3.js b/test/suite/ch15/15.2/15.2.3/S15.2.3_A3.js
index 6ad395b04..a410eacfa 100644
--- a/test/suite/ch15/15.2/15.2.3/S15.2.3_A3.js
+++ b/test/suite/ch15/15.2/15.2.3/S15.2.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object constructor has length property whose value is 1
- *
- * @path ch15/15.2/15.2.3/S15.2.3_A3.js
- * @description Checking Object.length
- */
+/*---
+info: Object constructor has length property whose value is 1
+description: Checking Object.length
+---*/
 
 //CHECK#1
 if(!Object.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if(!Object.hasOwnProperty("length")){
 if (Object.length !== 1) {
   $ERROR('#2: Object.length property value should be 1');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-1.js
index 4cab4855c..9213d1b70 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-1.js

- * @description Object.prototype.toString - '[object Undefined]' will be returned when 'this' value is undefined

- */

-

-

-function testcase() {

-        return Object.prototype.toString.call(undefined) === "[object Undefined]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.toString - '[object Undefined]' will be returned
+    when 'this' value is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Object.prototype.toString.call(undefined) === "[object Undefined]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-2.js
index 38cb9c506..22881d9ef 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-1-2.js

- * @description Object.prototype.toString - '[object Undefined]' will be returned when 'this' value is undefined

- */

-

-

-function testcase() {

-        return Object.prototype.toString.apply(undefined, []) === "[object Undefined]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.toString - '[object Undefined]' will be returned
+    when 'this' value is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Object.prototype.toString.apply(undefined, []) === "[object Undefined]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-1.js
index 91d8b635b..94a99d835 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-1.js

- * @description Object.prototype.toString - '[object Null]' will be returned when 'this' value is null

- */

-

-

-function testcase() {

-        return Object.prototype.toString.call(null) === "[object Null]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.toString - '[object Null]' will be returned when
+    'this' value is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Object.prototype.toString.call(null) === "[object Null]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-2.js
index d52724e08..ce10ff6d9 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.2/15.2.4.2-2-2.js

- * @description Object.prototype.toString - '[object Null]' will be returned when 'this' value is null

- */

-

-

-function testcase() {

-        return Object.prototype.toString.apply(null, []) === "[object Null]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.toString - '[object Null]' will be returned when
+    'this' value is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Object.prototype.toString.apply(null, []) === "[object Null]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A1.js
index 5f849a63e..b40819192 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A1.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the toString method is called, the following steps are taken:
- * i) Get the [[Class]] property of this object
- * ii) Compute a string value by concatenating the three strings "[object ", Result(1), and "]"
- * iii) Return Result(2)
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A1.js
- * @description Checking the type of Object.prototype.toString and the returned result
- */
+/*---
+info: >
+    When the toString method is called, the following steps are taken:
+    i) Get the [[Class]] property of this object
+    ii) Compute a string value by concatenating the three strings "[object ", Result(1), and "]"
+    iii) Return Result(2)
+description: >
+    Checking the type of Object.prototype.toString and the returned
+    result
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.toString !== "function") {
@@ -25,4 +26,3 @@ if (Object.prototype.toString() !=="[object "+"Object"+"]") {
 if ({}.toString()!=="[object "+"Object"+"]") {
   $ERROR('#3: return a string value by concatenating the three strings "[object ", the [[Class]] property of this object, and "]"');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A10.js
index 7a3010dfb..a9ee87428 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toString.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A10.js
- * @description Checking if varying the Object.prototype.toString.length property fails
- * @noStrict
- */
+/*---
+info: The Object.prototype.toString.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Object.prototype.toString.length property
+    fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
@@ -22,4 +23,3 @@ Object.prototype.toString.length = function(){return "shifted";};
 if (Object.prototype.toString.length !== obj) {
   $ERROR('#2: the Object.prototype.toString length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A11.js
index fc2281b40..f5fe8b324 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toString method is 0
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A11.js
- * @description Checking the Object.prototype.toString.length property
- */
+/*---
+info: The length property of the toString method is 0
+description: Checking the Object.prototype.toString.length property
+---*/
 
 //CHECK#1
 if (!(Object.prototype.toString.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.toString.hasOwnProperty("length"))) {
 if (Object.prototype.toString.length !== 0) {
   $ERROR('#2: The length property of the toString method is 0');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A12.js
index 239afb792..b05b0bb25 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A12.js
@@ -1,12 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A12.js
- * @description If the this value is undefined, return "[object Undefined]".
- */
+/*---
+description: If the this value is undefined, return "[object Undefined]".
+---*/
 
 if (Object.prototype.toString.call(undefined) !== "[object Undefined]") {
   $ERROR('If the this value is undefined, return "[object Undefined]".');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A13.js
index a68665c2a..5624b0535 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A13.js
@@ -1,12 +1,10 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A13.js
- * @description If the this value is null, return "[object Null]".
- */
+/*---
+description: If the this value is null, return "[object Null]".
+---*/
 
 if (Object.prototype.toString.call(null) !== "[object Null]") {
   $ERROR('If the this value is null, return "[object Null]".');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A14.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A14.js
index 4469b7c01..ad3ce74ee 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A14.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A14.js
@@ -1,13 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A14.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+---*/
 
 if (Object.prototype.toString.call(33) !== "[object Number]") {
   $ERROR('Let O be the result of calling ToObject passing the this ' +
          'value as the argument.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A15.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A15.js
index 59753fa01..380101030 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A15.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A15.js
@@ -1,13 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A15.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+---*/
 
 if (Object.prototype.toString.call(true) !== "[object Boolean]") {
   $ERROR('Let O be the result of calling ToObject passing the this ' +
          'value as the argument.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A16.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A16.js
index 917e8965b..0a26af27c 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A16.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A16.js
@@ -1,13 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A16.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+---*/
 
 if (Object.prototype.toString.call('foo') !== "[object String]") {
   $ERROR('Let O be the result of calling ToObject passing the this ' +
          'value as the argument.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A6.js
index 2e11f8252..0b2d87ed5 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.toString has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.toString fails
- */
+/*---
+info: Object.prototype.toString has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.toString fails
+---*/
 
 //CHECK#1
 if (Object.prototype.toString.prototype !== undefined) {
   $ERROR('#1: Object.prototype.toString has not prototype property'+Object.prototype.toString.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A7.js
index 949133177..c51aabc8a 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.toString can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A7.js
- * @description Checking if creating "new Object.prototype.toString" fails
- */
+/*---
+info: Object.prototype.toString can't be used as a constructor
+description: Checking if creating "new Object.prototype.toString" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.toString;
 
@@ -16,4 +17,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A8.js
index dc4fbc4c8..7963cf273 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toString.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A8.js
- * @description Checking if enumerating the Object.prototype.toString.length property fails
- */
+/*---
+info: The Object.prototype.toString.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Object.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
@@ -25,4 +26,3 @@ for (var p in Object.prototype.toString){
         $ERROR('#2: the Object.prototype.toString.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A9.js
index 54fc68907..05c94bc9e 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toString.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.2/S15.2.4.2_A9.js
- * @description Checknig if deleting of the Object.prototype.toString.length property fails
- * @noStrict
- */
+/*---
+info: The Object.prototype.toString.length property has the attribute DontDelete
+description: >
+    Checknig if deleting of the Object.prototype.toString.length
+    property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
@@ -23,4 +24,3 @@ if (delete Object.prototype.toString.length) {
 if (!(Object.prototype.toString.hasOwnProperty('length'))) {
   $FAIL('#2: The Object.prototype.toString.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A1.js
index f849be7de..1b8df01a9 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toLocaleString function returns the result of calling toString()
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A1.js
- * @description Checking the type of Object.prototype.toLocaleString and the returned result
- */
+/*---
+info: toLocaleString function returns the result of calling toString()
+description: >
+    Checking the type of Object.prototype.toLocaleString and the
+    returned result
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.toLocaleString !== "function") {
@@ -22,4 +22,3 @@ if (Object.prototype.toLocaleString() !== Object.prototype.toString()) {
 if ({}.toLocaleString()!=={}.toString()) {
   $ERROR('#2: toLocaleString function returns the result of calling toString()');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A10.js
index e6f73800a..c0101d3bb 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toLocaleString.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A10.js
- * @description Checking if varying the Object.prototype.toLocaleString.length property fails
- */
+/*---
+info: >
+    The Object.prototype.toLocaleString.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the Object.prototype.toLocaleString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
@@ -21,4 +24,3 @@ Object.prototype.toLocaleString.length = function(){return "shifted";};
 if (Object.prototype.toLocaleString.length !== obj) {
   $ERROR('#2: the Object.prototype.toLocaleString length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A11.js
index 0d0f4108e..8c43b8d70 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toLocaleString method is 0
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A11.js
- * @description Checking the Object.prototype.toLocaleString.length
- */
+/*---
+info: The length property of the toLocaleString method is 0
+description: Checking the Object.prototype.toLocaleString.length
+---*/
 
 //CHECK#1
 if (!(Object.prototype.toLocaleString.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.toLocaleString.hasOwnProperty("length"))) {
 if (Object.prototype.toLocaleString.length !== 0) {
   $ERROR('#2: The length property of the toLocaleString method is 0');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A12.js
index 72f142264..2b114bd9b 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A12.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.toLocaleString.call(undefined);
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A13.js
index c5570753c..68088b6e7 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A13.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.toLocaleString.call(null);
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A6.js
index adb3ce993..a110e74a8 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.toLocaleString has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.toLocaleString fails
- */
+/*---
+info: Object.prototype.toLocaleString has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.toLocaleString fails
+---*/
 
 //CHECK#1
 if (Object.prototype.toLocaleString.prototype !== undefined) {
   $ERROR('#1: Object.prototype.toLocaleString has not prototype property'+Object.prototype.toLocaleString.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A7.js
index 4a15a4413..5d3142716 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.toLocaleString can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A7.js
- * @description Checking if creating "new Object.prototype.toLocaleString" fails
- */
+/*---
+info: Object.prototype.toLocaleString can't be used as a constructor
+description: Checking if creating "new Object.prototype.toLocaleString" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.toLocaleString;
 
@@ -17,4 +18,3 @@ try {
   $PRINT(e);
 
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A8.js
index 646bcb400..846e6110a 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toLocaleString.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A8.js
- * @description Checking if enumerating the Object.prototype.toLocaleString.length property fails
- */
+/*---
+info: >
+    The Object.prototype.toLocaleString.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the Object.prototype.toLocaleString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
@@ -25,4 +28,3 @@ for (p in Object.prototype.toLocaleString){
         $ERROR('#2: the Object.prototype.toLocaleString.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A9.js
index d5929c1b7..80b40d93e 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A9.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.toLocaleString.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.3/S15.2.4.3_A9.js
- * @description Checknig if deleting of the Object.prototype.toLocaleString.length property fails
- * @noStrict
- */
+/*---
+info: >
+    The Object.prototype.toLocaleString.length property has the attribute
+    DontDelete
+description: >
+    Checknig if deleting of the Object.prototype.toLocaleString.length
+    property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
@@ -23,4 +26,3 @@ if (delete Object.prototype.toLocaleString.length) {
 if (!(Object.prototype.toLocaleString.hasOwnProperty('length'))) {
   $FAIL('#2: The Object.prototype.toLocaleString.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-1.js
index b2f92f7f7..536464c95 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-1.js

- * @description Object.prototype.valueOf - typeof Object.prototype.valueOf.call(true)==="object"

- */

-

-

-function testcase() {

-        return (typeof Object.prototype.valueOf.call(true)) === "object";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.valueOf - typeof
+    Object.prototype.valueOf.call(true)==="object"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (typeof Object.prototype.valueOf.call(true)) === "object";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-2.js
index 791f5ce69..932d21be8 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.2/15.2.4/15.2.4.4/15.2.4.4-2.js

- * @description Object.prototype.valueOf - typeof Object.prototype.valueOf.call(false)==="object"

- */

-

-

-function testcase() {

-        return (typeof Object.prototype.valueOf.call(false)) === "object";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Object.prototype.valueOf - typeof
+    Object.prototype.valueOf.call(false)==="object"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (typeof Object.prototype.valueOf.call(false)) === "object";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A10.js
index e0b39e076..351a1dec9 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.valueOf.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A10.js
- * @description Checking if varying the Object.prototype.valueOf.length property fails
- */
+/*---
+info: The Object.prototype.valueOf.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Object.prototype.valueOf.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Object.prototype.valueOf.length = function(){return "shifted";};
 if (Object.prototype.valueOf.length !== obj) {
   $ERROR('#2: the Object.prototype.valueOf length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A11.js
index 2ecde7c52..e5b57fe9e 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the valueOf method is 0
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A11.js
- * @description Checking the Object.prototype.valueOf.length
- */
+/*---
+info: The length property of the valueOf method is 0
+description: Checking the Object.prototype.valueOf.length
+---*/
 
 //CHECK#1
 if (!(Object.prototype.valueOf.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.valueOf.hasOwnProperty("length"))) {
 if (Object.prototype.valueOf.length !== 0) {
   $ERROR('#2: The length property of the toObject method is 0');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A12.js
index b2bec26f3..1342d76a3 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A12.js
@@ -1,13 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let O be the result of calling ToObject passing the this value as the argument.
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A12.js
- * @description Checking Object.prototype.valueOf invoked by the 'call' property.
- * @negative
- */
+/*---
+info: >
+    Let O be the result of calling ToObject passing the this value as the
+    argument.
+description: Checking Object.prototype.valueOf invoked by the 'call' property.
+flags: [negative]
+---*/
 
 Object.prototype.valueOf.call(undefined);
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A13.js
index a9842e5a2..8e8290826 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A13.js
@@ -1,13 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let O be the result of calling ToObject passing the this value as the argument.
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A13.js
- * @description Checking Object.prototype.valueOf invoked by the 'call' property.
- * @negative
- */
+/*---
+info: >
+    Let O be the result of calling ToObject passing the this value as the
+    argument.
+description: Checking Object.prototype.valueOf invoked by the 'call' property.
+flags: [negative]
+---*/
 
 Object.prototype.valueOf.call(null);
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A14.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A14.js
index e3d1fd7d7..a387a8469 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A14.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A14.js
@@ -1,13 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let O be the result of calling ToObject passing the this value as the argument.
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A14.js
- * @description Checking Object.prototype.valueOf invoked by the 'call' property.
- * @negative
- */
+/*---
+info: >
+    Let O be the result of calling ToObject passing the this value as the
+    argument.
+description: Checking Object.prototype.valueOf invoked by the 'call' property.
+flags: [negative]
+---*/
 
 (1,Object.prototype.valueOf)();
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A15.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A15.js
index 1e26f05f5..12cade2af 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A15.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A15.js
@@ -1,14 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Let O be the result of calling ToObject passing the this value as the argument.
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A15.js
- * @description Checking Object.prototype.valueOf when called as a global function.
- * @negative
- */
+/*---
+info: >
+    Let O be the result of calling ToObject passing the this value as the
+    argument.
+description: Checking Object.prototype.valueOf when called as a global function.
+flags: [negative]
+---*/
 
 var v = Object.prototype.valueOf;
 v();
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T1.js
index 5f0dd6f27..ef1e4910f 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T1.js
- * @description "this" value is a number
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is a number"
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==1.1) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T2.js
index c5c88ff05..61e0d0e1b 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T2.js
- * @description "this" value is a boolean
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is a boolean"
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==true) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T3.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T3.js
index 66b9aa6d8..1f716d228 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T3.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T3.js
- * @description "this" value is a string
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is a string"
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!=="greenfield") {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T4.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T4.js
index 9c7b3b4df..a8d8defc5 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T4.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T4.js
- * @description "this" value is an object
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is an object"
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==obj) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T5.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T5.js
index a227c41dd..13dde808f 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T5.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T5.js
- * @description "this" value is "null"
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is \"null\""
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==obj) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T6.js
index f4b989c30..4ea142175 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T6.js
- * @description "this" value is "undefined"
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is \"undefined\""
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==obj) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T7.js
index 4e7cd7353..a7d1dc95d 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf method returns its "this" value
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A1_T7.js
- * @description "this" value is "void 0"
- */
+/*---
+info: The valueOf method returns its "this" value
+description: "\"this\" value is \"void 0\""
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.valueOf !== "function") {
@@ -24,5 +22,3 @@ if (typeof obj.valueOf !== "function") {
 if (obj.valueOf()!==obj) {
   $ERROR('#3: The valueOf method returns its this value');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A6.js
index f53fbaaaa..0079114fa 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.valueOf has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.valueOf fails
- */
+/*---
+info: Object.prototype.valueOf has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.valueOf fails
+---*/
 
 //CHECK#1
 if (Object.prototype.valueOf.prototype !== undefined) {
   $ERROR('#1: Object.prototype.valueOf has not prototype property'+Object.prototype.valueOf.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A7.js
index 23be75a1b..1a611506a 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.valueOf can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A7.js
- * @description Checking if creating "new Object.prototype.valueOf" fails
- */
+/*---
+info: Object.prototype.valueOf can't be used as a constructor
+description: Checking if creating "new Object.prototype.valueOf" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.valueOf;
 
@@ -17,4 +18,3 @@ try {
   $PRINT(e);
 
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A8.js
index 7872afa5e..14a7bc1bb 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.valueOf.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A8.js
- * @description Checking if enumerating the Object.prototype.valueOf.length property fails
- */
+/*---
+info: The Object.prototype.valueOf.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Object.prototype.valueOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
@@ -25,4 +26,3 @@ for (p in Object.prototype.valueOf){
         $ERROR('#2: the Object.prototype.valueOf.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A9.js
index 709a3313e..0a11312da 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.valueOf.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.4/S15.2.4.4_A9.js
- * @description Checknig if deleting of the Object.prototype.valueOf.length property fails
- * @noStrict
- */
+/*---
+info: The Object.prototype.valueOf.length property has the attribute DontDelete
+description: >
+    Checknig if deleting of the Object.prototype.valueOf.length
+    property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
@@ -23,4 +24,3 @@ if (delete Object.prototype.valueOf.length) {
 if (!(Object.prototype.valueOf.hasOwnProperty('length'))) {
   $FAIL('#2: The Object.prototype.valueOf.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A10.js
index 70a0ca21e..4e88267d0 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.hasOwnProperty.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A10.js
- * @description Checking if varying the Object.prototype.hasOwnProperty.length property fails
- */
+/*---
+info: >
+    The Object.prototype.hasOwnProperty.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the Object.prototype.hasOwnProperty.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
@@ -21,4 +24,3 @@ Object.prototype.hasOwnProperty.length = function(){return "shifted";};
 if (Object.prototype.hasOwnProperty.length !== obj) {
   $ERROR('#2: the Object.prototype.hasOwnProperty length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A11.js
index 176f74c25..8a8465416 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the hasOwnProperty method is 1
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A11.js
- * @description Checking the Object.prototype.hasOwnProperty.length
- */
+/*---
+info: The length property of the hasOwnProperty method is 1
+description: Checking the Object.prototype.hasOwnProperty.length
+---*/
 
 //CHECK#1
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.hasOwnProperty.hasOwnProperty("length"))) {
 if (Object.prototype.hasOwnProperty.length !== 1) {
   $ERROR('#2: The length property of the toObject method is 1');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A12.js
index aa0ab4929..1c4da440e 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A12.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.hasOwnProperty.call(undefined, 'foo');
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A13.js
index 68b75b0e7..c42cc9204 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A13.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.hasOwnProperty.call(null, 'foo');
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T1.js
index f86012728..940b4b595 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T1.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the hasOwnProperty method is called with argument V, the following steps are taken:
- * i) Let O be this object
- * ii) Call ToString(V)
- * iii) If O doesn't have a property with the name given by Result(ii), return false
- * iv) Return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T1.js
- * @description Checking type of the Object.prototype.hasOwnProperty and the returned result
- */
+/*---
+info: >
+    When the hasOwnProperty method is called with argument V, the following steps are taken:
+    i) Let O be this object
+    ii) Call ToString(V)
+    iii) If O doesn't have a property with the name given by Result(ii), return false
+    iv) Return true
+description: >
+    Checking type of the Object.prototype.hasOwnProperty and the
+    returned result
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.hasOwnProperty !== "function") {
@@ -22,4 +23,3 @@ if (!(Object.prototype.hasOwnProperty("hasOwnProperty"))) {
   $ERROR('#2: hasOwnProperty method works properly');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T2.js
index 860cd4936..e5f63d8b3 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T2.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the hasOwnProperty method is called with argument V, the following steps are taken:
- * i) Let O be this object
- * ii) Call ToString(V)
- * iii) If O doesn't have a property with the name given by Result(ii), return false
- * iv) Return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T2.js
- * @description Argument of the hasOwnProperty method is a custom boolean property
- */
+/*---
+info: >
+    When the hasOwnProperty method is called with argument V, the following steps are taken:
+    i) Let O be this object
+    ii) Call ToString(V)
+    iii) If O doesn't have a property with the name given by Result(ii), return false
+    iv) Return true
+description: Argument of the hasOwnProperty method is a custom boolean property
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.hasOwnProperty !== "function") {
@@ -34,4 +33,3 @@ if (!(obj.hasOwnProperty("the_property"))) {
   $ERROR('#4: hasOwnProperty method works properly');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T3.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T3.js
index cb6cb43bf..a9cdf24c0 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T3.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T3.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the hasOwnProperty method is called with argument V, the following steps are taken:
- * i) Let O be this object
- * ii) Call ToString(V)
- * iii) If O doesn't have a property with the name given by Result(ii), return false
- * iv) Return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A1_T3.js
- * @description Argument of the hasOwnProperty method is a custom property of a function object
- */
+/*---
+info: >
+    When the hasOwnProperty method is called with argument V, the following steps are taken:
+    i) Let O be this object
+    ii) Call ToString(V)
+    iii) If O doesn't have a property with the name given by Result(ii), return false
+    iv) Return true
+description: >
+    Argument of the hasOwnProperty method is a custom property of a
+    function object
+---*/
 
 var FACTORY = function(){
     this.aproperty = 1;
@@ -37,5 +38,3 @@ if (instance.hasOwnProperty("toString")) {
 if (!(instance.hasOwnProperty("aproperty"))) {
   $ERROR('#4: hasOwnProperty method works properly');
 }
-
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A6.js
index 2af4fa766..e5d7b02bb 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.hasOwnProperty has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.hasOwnProperty fails
- */
+/*---
+info: Object.prototype.hasOwnProperty has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.hasOwnProperty fails
+---*/
 
 //CHECK#1
 if (Object.prototype.hasOwnProperty.prototype !== undefined) {
   $ERROR('#1: Object.prototype.hasOwnProperty has not prototype property'+Object.prototype.hasOwnProperty.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A7.js
index d4543791a..b99c8f18c 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.hasOwnProperty can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A7.js
- * @description Checking if creating "new Object.prototype.hasOwnProperty" fails
- */
+/*---
+info: Object.prototype.hasOwnProperty can't be used as a constructor
+description: Checking if creating "new Object.prototype.hasOwnProperty" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.hasOwnProperty;
 
@@ -17,4 +18,3 @@ try {
   $PRINT(e);
 
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A8.js
index d1e245296..96d4ecf46 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.hasOwnProperty.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A8.js
- * @description Checking if enumerating the Object.prototype.hasOwnProperty.length property fails
- */
+/*---
+info: >
+    The Object.prototype.hasOwnProperty.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the Object.prototype.hasOwnProperty.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
@@ -25,4 +28,3 @@ for (p in Object.prototype.hasOwnProperty){
         $ERROR('#2: the Object.prototype.hasOwnProperty.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A9.js
index c32d75ff8..ba4b583a9 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.hasOwnProperty.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.5/S15.2.4.5_A9.js
- * @description Checking if deleting the Object.prototype.hasOwnProperty.length property fails
- */
+/*---
+info: >
+    The Object.prototype.hasOwnProperty.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the Object.prototype.hasOwnProperty.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
@@ -22,4 +25,3 @@ if (delete Object.prototype.hasOwnProperty.length) {
 if (!(Object.prototype.hasOwnProperty.hasOwnProperty('length'))) {
   $FAIL('#2: The Object.prototype.hasOwnProperty.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A1.js
index accc8ba7d..b92350698 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the isPrototypeOf method is called with argument V and when O and
- * V refer to the same object or to objects joined to each other, return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A1.js
- * @description Creating two objects with the same prototype
- */
+/*---
+info: >
+    When the isPrototypeOf method is called with argument V and when O and
+    V refer to the same object or to objects joined to each other, return true
+description: Creating two objects with the same prototype
+includes: [$PRINT.js]
+---*/
 
 function USER_FACTORY( name ) {
   this.name = name;
@@ -51,4 +51,3 @@ if(Number.isPrototypeOf(luke)){
 }
 //
 /////////
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A10.js
index 81609c8dc..635f7351b 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A10.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.isPrototypeOf.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A10.js
- * @description Checking if varying the Object.prototype.isPrototypeOf.length property fails
- * @noStrict
- */
+/*---
+info: >
+    The Object.prototype.isPrototypeOf.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the Object.prototype.isPrototypeOf.length
+    property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
@@ -22,4 +25,3 @@ Object.prototype.isPrototypeOf.length = function(){return "shifted";};
 if (Object.prototype.isPrototypeOf.length !== obj) {
   $ERROR('#2: the Object.prototype.isPrototypeOf length property has the attributes ReadOnly');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A11.js
index 71200a579..44dba2c3c 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the hasOwnProperty method is 1
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A11.js
- * @description Checking the Object.prototype.hasOwnProperty.length
- */
+/*---
+info: The length property of the hasOwnProperty method is 1
+description: Checking the Object.prototype.hasOwnProperty.length
+---*/
 
 //CHECK#1
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.isPrototypeOf.hasOwnProperty("length"))) {
 if (Object.prototype.isPrototypeOf.length !== 1) {
   $ERROR('#2: The length property of the toObject method is 1');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A12.js
index e81cd68d1..22c7b86e7 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A12.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.isPrototypeOf.call(undefined, {});
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A13.js
index 1a37cecdd..3e98db65e 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A13.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.isPrototypeOf.call(null, {});
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A6.js
index b55044497..9a0c74a73 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.isPrototypeOf has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.isPrototypeOf fails
- */
+/*---
+info: Object.prototype.isPrototypeOf has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.isPrototypeOf fails
+---*/
 
 //CHECK#1
 if (Object.prototype.isPrototypeOf.prototype !== undefined) {
   $ERROR('#1: Object.prototype.isPrototypeOf has not prototype property'+Object.prototype.isPrototypeOf.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A7.js
index 537ee1bb1..d1697a254 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.isPrototypeOf can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A7.js
- * @description Checking if creating new "Object.prototype.isPrototypeOf" fails
- */
+/*---
+info: Object.prototype.isPrototypeOf can't be used as a constructor
+description: Checking if creating new "Object.prototype.isPrototypeOf" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.isPrototypeOf;
 
@@ -17,4 +18,3 @@ try {
   $PRINT(e);
 
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A8.js
index 17c7e1e12..7ac195826 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.isPrototypeOf.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A8.js
- * @description Checknig if enumerating the Object.prototype.isPrototypeOf.length property fails
- */
+/*---
+info: >
+    The Object.prototype.isPrototypeOf.length property has the attribute
+    DontEnum
+description: >
+    Checknig if enumerating the Object.prototype.isPrototypeOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
@@ -25,4 +28,3 @@ for (p in Object.prototype.isPrototypeOf){
         $ERROR('#2: the Object.prototype.isPrototypeOf.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A9.js
index fe93b264d..f21ef8dbd 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.isPrototypeOf.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.6/S15.2.4.6_A9.js
- * @description Checking deleting the Object.prototype.isPrototypeOf.length property fails
- */
+/*---
+info: >
+    The Object.prototype.isPrototypeOf.length property has the attribute
+    DontDelete
+description: >
+    Checking deleting the Object.prototype.isPrototypeOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.isPrototypeOf.hasOwnProperty('length'))) {
@@ -18,4 +21,3 @@ if (delete Object.prototype.isPrototypeOf.length) {
   $ERROR('#1: The Object.prototype.isPrototypeOf.length property has the attributes DontDelete');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A10.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A10.js
index a375a71ae..c06a1b1ff 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A10.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A10.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.propertyIsEnumerable.length property has the attribute ReadOnly
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A10.js
- * @description Checking if varying the Object.prototype.propertyIsEnumerable.length property fails
- * @noStrict
- */
+/*---
+info: >
+    The Object.prototype.propertyIsEnumerable.length property has the
+    attribute ReadOnly
+description: >
+    Checking if varying the
+    Object.prototype.propertyIsEnumerable.length property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
@@ -22,4 +25,3 @@ Object.prototype.propertyIsEnumerable.length = function(){return "shifted";};
 if (Object.prototype.propertyIsEnumerable.length !== obj) {
   $ERROR('#2: the Object.prototype.propertyIsEnumerable length property has the attributes ReadOnly');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A11.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A11.js
index c6c54336e..a82dbae79 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A11.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the hasOwnProperty method is 1
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A11.js
- * @description Checking the value of Object.prototype.hasOwnProperty.length
- */
+/*---
+info: The length property of the hasOwnProperty method is 1
+description: Checking the value of Object.prototype.hasOwnProperty.length
+---*/
 
 //CHECK#1
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty("length"))) {
 if (Object.prototype.propertyIsEnumerable.length !== 1) {
   $ERROR('#2: The length property of the toObject method is 1');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A12.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A12.js
index 6340475e3..79b8dfa41 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A12.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A12.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.propertyIsEnumerable.call(undefined, 'foo');
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A13.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A13.js
index d053e6ab4..9d364d460 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A13.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A13.js
- * @description Let O be the result of calling ToObject passing the this value as the argument.
- * @negative
- */
+/*---
+description: >
+    Let O be the result of calling ToObject passing the this value as
+    the argument.
+flags: [negative]
+---*/
 
 Object.prototype.propertyIsEnumerable.call(null, 'foo');
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A1_T1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A1_T1.js
index 455bab10a..827bbe2b3 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A1_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The propertyIsEnumerable method does not consider objects in the prototype chain
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A1_T1.js
- * @description Calling the propertyIsEnumerable method for object in the prototype chain
- */
+/*---
+info: >
+    The propertyIsEnumerable method does not consider objects in the
+    prototype chain
+description: >
+    Calling the propertyIsEnumerable method for object in the
+    prototype chain
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.propertyIsEnumerable !== "function") {
@@ -36,4 +38,3 @@ if (seagull.propertyIsEnumerable("rootprop")) {
   $ERROR('#4: propertyIsEnumerable method does not consider objects in the prototype chain');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T1.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T1.js
index b7a328f79..e5105ebf5 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T1.js
@@ -1,17 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the propertyIsEnumerable method is called with argument V, the following steps are taken:
- * i) Let O be this object
- * ii) Call ToString(V)
- * iii) If O doesn't have a property with the name given by Result(ii), return false
- * iv) If the property has the DontEnum attribute, return false
- * v) Return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T1.js
- * @description Checking the type of Object.prototype.propertyIsEnumerable and the returned result
- */
+/*---
+info: >
+    When the propertyIsEnumerable method is called with argument V, the following steps are taken:
+    i) Let O be this object
+    ii) Call ToString(V)
+    iii) If O doesn't have a property with the name given by Result(ii), return false
+    iv) If the property has the DontEnum attribute, return false
+    v) Return true
+description: >
+    Checking the type of Object.prototype.propertyIsEnumerable and the
+    returned result
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.propertyIsEnumerable !== "function") {
@@ -23,4 +24,3 @@ if (Object.prototype.propertyIsEnumerable("propertyIsEnumerable")) {
   $ERROR('#2: hasOwnProperty method works properly');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T2.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T2.js
index 373880b83..abb41a237 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T2.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T2.js
@@ -1,17 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the propertyIsEnumerable method is called with argument V, the following steps are taken:
- * i) Let O be this object
- * ii) Call ToString(V)
- * iii) If O doesn't have a property with the name given by Result(ii), return false
- * iv) If the property has the DontEnum attribute, return false
- * v) Return true
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A2_T2.js
- * @description Argument of the propertyIsEnumerable method is a custom boolean property
- */
+/*---
+info: >
+    When the propertyIsEnumerable method is called with argument V, the following steps are taken:
+    i) Let O be this object
+    ii) Call ToString(V)
+    iii) If O doesn't have a property with the name given by Result(ii), return false
+    iv) If the property has the DontEnum attribute, return false
+    v) Return true
+description: >
+    Argument of the propertyIsEnumerable method is a custom boolean
+    property
+---*/
 
 //CHECK#1
 if (typeof Object.prototype.propertyIsEnumerable !== "function") {
@@ -39,4 +40,3 @@ if (accum.indexOf("the_property")!==0) {
   $ERROR('#4: enumerating works properly');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A6.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A6.js
index 0e74d7a83..a6f340e67 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A6.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.propertyIsEnumerable has not prototype property
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A6.js
- * @description Checking if obtaining the prototype property of Object.prototype.propertyIsEnumerable fails
- */
+/*---
+info: Object.prototype.propertyIsEnumerable has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Object.prototype.propertyIsEnumerable fails
+---*/
 
 //CHECK#1
 if (Object.prototype.propertyIsEnumerable.prototype !== undefined) {
   $ERROR('#1: Object.prototype.propertyIsEnumerable has not prototype property'+Object.prototype.propertyIsEnumerable.prototype);
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A7.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A7.js
index 6c0974bfd..cdb489f4b 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A7.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A7.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object.prototype.propertyIsEnumerable can't be used as a constructor
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A7.js
- * @description Checking if creating "new Object.prototype.propertyIsEnumerable" fails
- */
+/*---
+info: Object.prototype.propertyIsEnumerable can't be used as a constructor
+description: >
+    Checking if creating "new Object.prototype.propertyIsEnumerable"
+    fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Object.prototype.propertyIsEnumerable;
 
@@ -17,4 +20,3 @@ try {
   $PRINT(e);
 
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A8.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A8.js
index e83f04365..1ab6aeb1a 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A8.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.propertyIsEnumerable.length property has the attribute DontEnum
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A8.js
- * @description Checking if enumerating the Object.prototype.propertyIsEnumerable.length property fails
- */
+/*---
+info: >
+    The Object.prototype.propertyIsEnumerable.length property has the
+    attribute DontEnum
+description: >
+    Checking if enumerating the
+    Object.prototype.propertyIsEnumerable.length property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
@@ -25,4 +28,3 @@ for (p in Object.prototype.propertyIsEnumerable){
         $ERROR('#2: the Object.prototype.propertyIsEnumerable.length property has the attributes DontEnum');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A9.js b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A9.js
index 139add613..136750e52 100644
--- a/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A9.js
+++ b/test/suite/ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Object.prototype.propertyIsEnumerable.length property has the attribute DontDelete
- *
- * @path ch15/15.2/15.2.4/15.2.4.7/S15.2.4.7_A9.js
- * @description Checking if deleting the Object.prototype.propertyIsEnumerable.length property fails
- */
+/*---
+info: >
+    The Object.prototype.propertyIsEnumerable.length property has the
+    attribute DontDelete
+description: >
+    Checking if deleting the
+    Object.prototype.propertyIsEnumerable.length property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Object.prototype.propertyIsEnumerable.hasOwnProperty('length'))) {
@@ -18,4 +21,3 @@ if (delete Object.prototype.propertyIsEnumerable.length) {
   $ERROR('#1: The Object.prototype.propertyIsEnumerable.length property has the attributes DontDelete');
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T1.js b/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T1.js
index 393c83870..d09641b30 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Object.prototype.constructor is the built-in Object constructor
- *
- * @path ch15/15.2/15.2.4/S15.2.4.1_A1_T1.js
- * @description Checking the Object.prototype.constructor
- */
+/*---
+info: >
+    The initial value of Object.prototype.constructor is the built-in Object
+    constructor
+description: Checking the Object.prototype.constructor
+---*/
 
 //CHECK#1
 if (Object.prototype.constructor !== Object) {
   $ERROR('#1: The initial value of Object.prototype.constructor is the built-in Object constructor');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T2.js b/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T2.js
index df3b111f7..1c7b710cc 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4.1_A1_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Object.prototype.constructor is the built-in Object constructor
- *
- * @path ch15/15.2/15.2.4/S15.2.4.1_A1_T2.js
- * @description Creating "new Object.prototype.constructor" and checking its properties
- */
+/*---
+info: >
+    The initial value of Object.prototype.constructor is the built-in Object
+    constructor
+description: >
+    Creating "new Object.prototype.constructor" and checking its
+    properties
+---*/
 
 var constr = Object.prototype.constructor;
 
@@ -37,4 +39,3 @@ if (obj.toString() !== to_string_result) {
 if (obj.valueOf().toString() !== to_string_result) {
   $ERROR('#4: when new Object() calls the newly constructed object has no [[Value]] property.');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T1.js b/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T1.js
index cfdbafe9f..9911587e1 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T1.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object prototype object has not prototype
- *
- * @path ch15/15.2/15.2.4/S15.2.4_A1_T1.js
- * @description Checking if obtaining Object.prototype.prototype fails
- */
+/*---
+info: Object prototype object has not prototype
+description: Checking if obtaining Object.prototype.prototype fails
+---*/
 
 // CHECK#1
 if (Object.prototype.prototype !== undefined) {
   $ERROR('#1: Object prototype has not prototype');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T2.js b/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T2.js
index 1c6e97e24..35cb484b0 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T2.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object prototype object has not prototype
- *
- * @path ch15/15.2/15.2.4/S15.2.4_A1_T2.js
- * @description Since the Object prototype object has not prototype, deleted toString method can not be found in prototype chain
- */
+/*---
+info: Object prototype object has not prototype
+description: >
+    Since the Object prototype object has not prototype, deleted
+    toString method can not be found in prototype chain
+---*/
 
 //CHECK#1
 if (Object.prototype.toString() == false) {
@@ -25,4 +25,3 @@ try {
   }
 }
 //
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4_A2.js b/test/suite/ch15/15.2/15.2.4/S15.2.4_A2.js
index d0d5647cc..8111b4838 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4_A2.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4_A2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Class]] property of Object prototype object is "Object"
- *
- * @path ch15/15.2/15.2.4/S15.2.4_A2.js
- * @description Getting the value of the internal [[Class]] property with Object.prototype.toString() function
- */
+/*---
+info: >
+    The value of the internal [[Class]] property of Object prototype object
+    is "Object"
+description: >
+    Getting the value of the internal [[Class]] property with
+    Object.prototype.toString() function
+---*/
 
 var tostr = Object.prototype.toString();
 
@@ -14,4 +16,3 @@ var tostr = Object.prototype.toString();
 if (tostr !== "[object Object]") {
   $ERROR('#1: the value of the internal [[Class]] property of Object prototype object is "Object"');
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4_A3.js b/test/suite/ch15/15.2/15.2.4/S15.2.4_A3.js
index cd5dc8b2d..2f93e9d0e 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4_A3.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4_A3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since the Object prototype object is not a function, it has not [[call]] method
- *
- * @path ch15/15.2/15.2.4/S15.2.4_A3.js
- * @description Checking if calling Object prototype as a function fails
- */
+/*---
+info: >
+    Since the Object prototype object is not a function, it has not [[call]]
+    method
+description: Checking if calling Object prototype as a function fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 //CHECK#1
 try {
@@ -15,4 +18,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.2/15.2.4/S15.2.4_A4.js b/test/suite/ch15/15.2/15.2.4/S15.2.4_A4.js
index 34a95179c..f0584f3d3 100644
--- a/test/suite/ch15/15.2/15.2.4/S15.2.4_A4.js
+++ b/test/suite/ch15/15.2/15.2.4/S15.2.4_A4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since the Object prototype object is not a function, it has not [[create]] method
- *
- * @path ch15/15.2/15.2.4/S15.2.4_A4.js
- * @description Checking if creating "new Object.prototype" fails
- */
+/*---
+info: >
+    Since the Object prototype object is not a function, it has not
+    [[create]] method
+description: Checking if creating "new Object.prototype" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 //CHECK#1
 try {
@@ -15,4 +18,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.2/S15.2_A1.js b/test/suite/ch15/15.2/S15.2_A1.js
index 985b65afc..17ddf485c 100644
--- a/test/suite/ch15/15.2/S15.2_A1.js
+++ b/test/suite/ch15/15.2/S15.2_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Object is the property of global
- *
- * @path ch15/15.2/S15.2_A1.js
- * @description Checking if Object equals to this.Object
- */
+/*---
+info: Object is the property of global
+description: Checking if Object equals to this.Object
+---*/
 
 var obj=Object;
 
@@ -15,4 +13,3 @@ var thisobj=this.Object;
 if(obj!==thisobj){
   $ERROR('Object is the property of global');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
index 442da6b2a..8320664b9 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js

- * @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (global) strict mode

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-throw NotEarlyError;

-var _15_3_2_1_10_4_fun = new Function('param_1', 'param_2', 'param_1', '"use strict"; return 0;');

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function using the
+    Function constructor has two identical parameters in (global)
+    strict mode
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var _15_3_2_1_10_4_fun = new Function('param_1', 'param_2', 'param_1', '"use strict"; return 0;');
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
index 950bd16a6..7fe85eaec 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js

- * @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (local) strict mode

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-throw NotEarlyError;

-var _15_3_2_1_10_6_fun = new Function('param_1', 'param_2', 'param_1', '"use strict";return 0;');

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function using the
+    Function constructor has two identical parameters in (local)
+    strict mode
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+throw NotEarlyError;
+var _15_3_2_1_10_6_fun = new Function('param_1', 'param_2', 'param_1', '"use strict";return 0;');
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
index 4d6c194b0..8aa68ed84 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js

- * @description Duplicate seperate parameter name in Function constructor throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {   

-  try {

-    Function('a','a','"use strict";');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate seperate parameter name in Function constructor throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {   
+  try {
+    Function('a','a','"use strict";');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
index f5a4f0176..5b9330b96 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js

- * @description Duplicate separate parameter name in Function constructor allowed if body not strict

- */

-

-

-function testcase()

-{   

-    Function('a','a','return;');

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate separate parameter name in Function constructor allowed
+    if body not strict
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+    Function('a','a','return;');
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
index 84d1f1385..ed7ed525c 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js

- * @description Duplicate seperate parameter name in Function constructor called from strict mode allowed if body not strict

- * @onlyStrict

- */

-

-

-function testcase()

-{ 

-  "use strict"; 

-  try {

-    Function('a','a','return;');

-    return true;

-  } catch (e) {

-    return false;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate seperate parameter name in Function constructor called
+    from strict mode allowed if body not strict
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{ 
+  "use strict"; 
+  try {
+    Function('a','a','return;');
+    return true;
+  } catch (e) {
+    return false;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
index c01edad67..e92aa4902 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js

- * @description Function constructor having a formal parameter named 'eval' throws SyntaxError if function body is strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-

-  try {

-    Function('eval', '"use strict";');

-	return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor having a formal parameter named 'eval' throws
+    SyntaxError if function body is strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+
+  try {
+    Function('eval', '"use strict";');
+	return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
index defc1c46e..fdce73fbc 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js

- * @description Function constructor may have a formal parameter named 'eval' if body is not strict mode

- */

-

-

-function testcase() {

-  Function('eval', 'return;');

-  return true;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor may have a formal parameter named 'eval' if
+    body is not strict mode
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  Function('eval', 'return;');
+  return true;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
index 9521c6f42..4f4c7c7d6 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js

- * @description Function constructor call from strict code with formal parameter named 'eval' does not throws SyntaxError if function body is not strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-   "use strict";

-   try { 

-     Function('eval', 'return;');

-	 return true;

-   } catch (e) {

-     return false;

-   }

-   

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor call from strict code with formal parameter
+    named 'eval' does not throws SyntaxError if function body is not
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+   "use strict";
+   try { 
+     Function('eval', 'return;');
+	 return true;
+   } catch (e) {
+     return false;
+   }
+   
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
index 27d157f65..ab333f4e9 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js

- * @description Duplicate combined parameter name in Function constructor throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase()

-{   

-  try 

-  {

-    Function('a,a','"use strict";');

-	return false;

-  }

-  catch (e) {

-    return(e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name in Function constructor throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+  try 
+  {
+    Function('a,a','"use strict";');
+	return false;
+  }
+  catch (e) {
+    return(e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
index e59b188d0..bf9fc4bc2 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js

- * @description Duplicate combined parameter name in Function constructor allowed if body is not strict

- */

-

-

-function testcase()

-{   

-    Function('a,a','return;');

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name in Function constructor allowed
+    if body is not strict
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+    Function('a,a','return;');
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
index 50ced1960..98a8357aa 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js

- * @description Duplicate combined parameter name allowed in Function constructor called in strict mode if body not strict

- * @onlyStrict

- */

-

-

-function testcase()

-{ 

-  "use strict"; 

-  try {

-     Function('a,a','return a;');

-	 return true;

-  } catch (e) {

-     return false;

-  }

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name allowed in Function constructor
+    called in strict mode if body not strict
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{ 
+  "use strict"; 
+  try {
+     Function('a,a','return a;');
+	 return true;
+  } catch (e) {
+     return false;
+  }
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
index 7b01bccd2..b8ccd4499 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js

- * @description Function constructor call from strict code with formal parameter named arguments does not throws SyntaxError if function body is not strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-   "use strict";

-   try {

-     Function('arguments', 'return;');

-     return true;

-	 

-   } catch (e) {

-     return false;

-   }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor call from strict code with formal parameter
+    named arguments does not throws SyntaxError if function body is
+    not strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+   "use strict";
+   try {
+     Function('arguments', 'return;');
+     return true;
+	 
+   } catch (e) {
+     return false;
+   }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
index 5eac4dacb..b06d4cf69 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js

- * @description Strict Mode - SyntaxError is not thrown if a function is created using a Function constructor that has two identical parameters, which are separated by a unique parameter name and there is no explicit 'use strict' in the function constructor's body

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = new Function("baz", "qux", "baz", "return 0;");

-        return true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is not thrown if a function is created
+    using a Function constructor that has two identical parameters,
+    which are separated by a unique parameter name and there is no
+    explicit 'use strict' in the function constructor's body
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = new Function("baz", "qux", "baz", "return 0;");
+        return true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
index bbdbb4435..b84d6e12e 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
@@ -1,19 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using the Function constructor that has three identical parameters and there is no explicit 'use strict' in the function constructor's body

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = new Function("baz", "baz", "baz", "return 0;");

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    the Function constructor that has three identical parameters and
+    there is no explicit 'use strict' in the function constructor's
+    body
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = new Function("baz", "baz", "baz", "return 0;");
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
index b555fa475..91b5319b4 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
- * @description The body of the function is "{toString:function(){throw 7;}}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: "The body of the function is \"{toString:function(){throw 7;}}\""
+includes: [$FAIL.js]
+---*/
 
 var body = {toString:function(){throw 7;}}
 
@@ -25,4 +25,3 @@ try {
   	$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/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
index bebedfa7b..cd42f72d1 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
- * @description Value of the function constructor argument is "null"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "null"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f() !== undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
index 15c27010d..984a31263 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
- * @description Value of the function constructor argument is "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "undefined"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f() !== undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
index fd076fdd5..ee1610d46 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
- * @description Value of the function constructor argument is "void 0"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "void 0"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
index 4c29ed834..d86433103 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
- * @description Value of the function constructor argument is "{}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "{}"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -23,4 +23,3 @@ try {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
index fe9bc5575..6ff6d8623 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
- * @description The body of the function is "{toString:function(){return "return 1;";}}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    The body of the function is "{toString:function(){return "return
+    1;";}}"
+includes: [$FAIL.js]
+---*/
 
 var body={toString:function(){return "return 1;";}};
 
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==1) {
   $ERROR('#3: hen the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
index 16bbcb38b..9233c0b7a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
- * @description Value of the function constructor argument is 1
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is 1
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
index 5747cf649..d366b9cce 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
- * @description Value of the function constructor argument is x, where x is specified with "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is x, where x is
+    specified with "undefined"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -32,4 +34,3 @@ if (f()!==undefined) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
index 8465f24e2..30232040a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
- * @description Value of the function constructor argument is "Object("return \'A\'")"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is "Object("return
+    \'A\'")"
+includes: [$FAIL.js]
+---*/
 
 var body = Object("return \'A\'");
 
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!=="\u0041") {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
index 08893ef08..e6c882053 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
- * @description Value of the function constructor argument is the string "return true;"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is the string "return
+    true;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +32,3 @@ if (f.constructor !== Function) {
 if (!(f())) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
index 072bb2dad..b79a6bf17 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
- * @description Value of the function constructor argument is "Object(1)"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "Object(1)"
+includes: [$FAIL.js]
+---*/
 
 var body = new Object(1);
 
@@ -32,4 +32,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
index 66c143da2..ec62aae15 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
- * @description Value of the function constructor argument is "var 1=1;"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "var 1=1;"
+includes: [$FAIL.js]
+---*/
 
 var body = "var 1=1;";
 
@@ -25,4 +25,3 @@ try {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
index c0db5a247..6ffb278cf 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
- * @description Value of the function constructor argument is "return arguments[0];"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is "return
+    arguments[0];"
+---*/
 
 var f = new Function("return arguments[0];");
 
@@ -25,4 +26,3 @@ if (!(f instanceof Function)) {
 if (f("A") !== "A") {
   $ERROR('#2: When the Function constructor is called with one argument then body be that argument and the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
index d55278080..8a1c832b9 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
- * @description Values of the function constructor arguments are "arg1", "arg2", "arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1", "arg2",
+    "arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f(1,2,3) !== 6) {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
index b9deb65a0..6223d69e8 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
- * @description Values of the function constructor arguments are "arg1, arg2", "arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1, arg2",
+    "arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f("AB","BA",1) !== "ABBA1") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
index d46d16ac6..a71a19710 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
- * @description Values of the function constructor arguments are "arg1, arg2, arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1, arg2,
+    arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f(1,1,"ABBA") !== "2ABBA") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
index 99dab211d..245d0e6ea 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
- * @description Values of the function constructor arguments are "return"-s of various results
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f(4,"2","QUESTION") !== "42QUESTION") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-  
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
index 2953c784e..da46e57e3 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
- * @description Values of the function constructor arguments are "return"-s of various results and a concotenation of strings
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results and a concotenation of strings
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f("",1,2) !== "12") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
index c9cdbbe25..bfc24e559 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
- * @description Values of the function constructor arguments are "return"-s of various results and a concotenation of strings
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results and a concotenation of strings
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f("",1,p) !== "1arg4") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
index d88a7125b..0e93d2677 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
@@ -1,20 +1,23 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
- * @description Values of the function constructor arguments are "{toString:function(){throw 1;}}" and "{toString:function(){throw 'body';}}"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+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;}};
 var body = {toString:function(){throw "body";}};
@@ -28,6 +31,3 @@ try {
   	$ERROR('#1.1: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
index c51f90ac0..50254fb07 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
- * @description Values of the function constructor arguments are "{toString:function(){return "z;x"}}" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){return "z;x"}}" and "return this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 var p={toString:function(){return "z;x"}};
@@ -28,4 +30,3 @@ try {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
index 9bebddcc9..3af814add 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
- * @description Values of the function constructor arguments are "a,b,c" and "void 0"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and "void
+    0"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
index 2ab0d4289..3933cf7a7 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
- * @description Values of the function constructor arguments are "a,b,c" and "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and
+    "undefined"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
index 120e8f857..0213fba8a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
@@ -1,20 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
- * @description Values of the function constructor arguments are "a,b,c" and "null"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: Values of the function constructor arguments are "a,b,c" and "null"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
index 6b936260d..c51f7f5d8 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
- * @description Values of the function constructor arguments are "a,b,c" and an undefined variable
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and an
+    undefined variable
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -36,4 +38,3 @@ if (f()!==undefined) {
 }
 
 var body;
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
index b1c430d09..b67a7c580 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
- * @description Values of the function constructor arguments are are two empty strings
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are are two empty
+    strings
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
index d6ba8f1e1..df99bb1e7 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
- * @description Values of the function constructor arguments are "{toString:function(){return 'a';}}" and "return a;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){return 'a';}}" and "return a;"
+includes: [$FAIL.js]
+---*/
 
 var p = {toString:function(){return "a";}};
 var body = "return a;";
@@ -35,6 +37,3 @@ if (f.constructor !== Function) {
 if (f(42)!==42) {
   $ERROR('#3: When the Function constructor is called with arguments p, body creates a new Function object as specified in 13.2');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
index 7e23616ac..ae74908ad 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
@@ -1,20 +1,23 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
- * @description Values of the function constructor arguments are "{toString:function(){p=1;return "a";}}" and "{toString:function(){throw "body";}}"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+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";}};
 var body = {toString:function(){throw "body";}};
@@ -33,7 +36,3 @@ try {
 if (p !== 1) {
   $ERROR('#2: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
index 50ca1f4e8..b00fc0be4 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
- * @description Values of the function constructor arguments are an undefined variable and "return 1.1;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are an undefined
+    variable and "return 1.1;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return 1.1;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
index 4591d11a3..371a3918b 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
- * @description Values of the function constructor arguments are "void 0" and "return \"A\";"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "void 0" and
+    "return \"A\";"
+includes: [$FAIL.js]
+---*/
 
 var body = "return \"A\";";
 
@@ -34,6 +36,3 @@ if (f.constructor !== Function) {
 if (f()!=='\u0041') {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
index 1015e215e..5acf9b3ea 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
- * @description Values of the function constructor arguments are "null" and "return true;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "null" and
+    "return true;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return true;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
index d78484373..573e8299b 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
- * @description Values of the function constructor arguments are "Object("a")" and "return a;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "Object("a")" and
+    "return a;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return a;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
index 89464dcea..ececaaaee 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
- * @description Values of the function constructor arguments are "undefined" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "undefined" and
+    "return this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 
@@ -34,6 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==this) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
index befbdd9d2..5d527b971 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
- * @description Values of the function constructor arguments are "1,1" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "1,1" and "return
+    this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 var p="1,1";
@@ -28,4 +30,3 @@ try {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js
index 0ad4336e8..af2f4bd26 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Function is called as part of a new expression, it is a constructor: it initialises the newly created object
- *
- * @path ch15/15.3/15.3.2/S15.3.2_A1.js
- * @description Checking the constuctor of the object that is created as a new Function
- */
+/*---
+info: >
+    When Function is called as part of a new expression, it is a constructor:
+    it initialises the newly created object
+description: >
+    Checking the constuctor of the object that is created as a new
+    Function
+---*/
 
 var f = new Function;
 
@@ -19,4 +21,3 @@ if (f.constructor !== Function) {
 if (f === undefined) {
   $ERROR('#2: When Function is called as part of a new expression, it is a constructor: it initialises the newly created object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
index 0db8f44b3..8fbae5845 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
- * @description Checking if varying the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute ReadOnly
+description: Checking if varying the Function.prototype property fails
+---*/
 
 var obj = Function.prototype;
 Function.prototype = function(){return "shifted";};
@@ -24,4 +22,3 @@ try {
 } catch (e) {
   $ERROR('#2.1: the Function.prototype property has the attributes ReadOnly: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
index 7f4f9a04a..430a2c6f6 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
- * @description Checking if enumerating the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute DontEnum
+description: Checking if enumerating the Function.prototype property fails
+---*/
 
 // CHECK#1
 if (Function.propertyIsEnumerable('prototype')) {
@@ -23,4 +21,3 @@ for (p in Function){
 if (count !== 0) {
   $ERROR('#2: the Function.prototype property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
index a03351de8..bd708304a 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
- * @description Checking if deleting the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute DontDelete
+description: Checking if deleting the Function.prototype property fails
+---*/
 
 delete Function.prototype;
 
@@ -14,4 +12,3 @@ delete Function.prototype;
 if (!(Function.hasOwnProperty('prototype'))) {
   $ERROR('#1: the Function.prototype property has the attributes DontDelete.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
index edd70c32a..fb35f3a77 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
@@ -1,16 +1,16 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Detects whether the value of a function's "prototype" property
- * as seen by normal object operations might deviate from the value
- * as seem by Object.getOwnPropertyDescriptor
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
- * @description Checks if reading a function's .prototype directly
- * agrees with reading it via Object.getOwnPropertyDescriptor, after
- * having set it by Object.defineProperty.
- */
+/*---
+info: >
+    Detects whether the value of a function's "prototype" property
+    as seen by normal object operations might deviate from the value
+    as seem by Object.getOwnPropertyDescriptor
+description: >
+    Checks if reading a function's .prototype directly  agrees with
+    reading it via Object.getOwnPropertyDescriptor, after  having set
+    it by Object.defineProperty.
+---*/
 
 function foo() {}
 
@@ -19,4 +19,3 @@ if (foo.prototype !==
     Object.getOwnPropertyDescriptor(foo, 'prototype').value) {
   $ERROR("A function.prototype's descriptor lies");
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js b/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
index d75389567..bcedcf4cc 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js

- * @description Function.length - data property with value 1

- */

-

-

-function testcase() {

-

-  var desc = Object.getOwnPropertyDescriptor(Function,"length");

-  if(desc.value === 1 &&

-     desc.writable === false &&

-     desc.enumerable === false &&

-     desc.configurable === false)

-    return true; 

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.length - data property with value 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var desc = Object.getOwnPropertyDescriptor(Function,"length");
+  if(desc.value === 1 &&
+     desc.writable === false &&
+     desc.enumerable === false &&
+     desc.configurable === false)
+    return true; 
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
index 668a9ab24..ed47c9ed1 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function constructor has the property "prototype"
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Function constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Function.hasOwnProperty("prototype")){
   $ERROR('#1: The Function constructor has the property "prototype"');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
index 70a280e72..a0caf9f5a 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function constructor
- * is the Function prototype object
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A2_T1.js
- * @description Checking prototype of Function
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function constructor
+    is the Function prototype object
+description: Checking prototype of Function
+---*/
 
 // CHECK#
 if (!(Function.prototype.isPrototypeOf(Function))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Function constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js
index a067cf202..32774bcaf 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function constructor
- * is the Function prototype object
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A2_T2.js
- * @description Add new property to Function.prototype and check it
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function constructor
+    is the Function prototype object
+description: Add new property to Function.prototype and check it
+---*/
 
 Function.prototype.indicator = 1;
 
@@ -15,4 +14,3 @@ Function.prototype.indicator = 1;
 if (Function.indicator != 1) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Function constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
index 5e2ae99f9..a5b059566 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function constructor has length property whose value is 1
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A3.js
- * @description Checking Function.length property
- */
+/*---
+info: Function constructor has length property whose value is 1
+description: Checking Function.length property
+---*/
 
 //CHECK#1
 if (!Function.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if (!Function.hasOwnProperty("length")){
 if (Function.length !== 1) {
   $ERROR('#2: Function constructor length property value is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
index a48f8a86a..d0e3dd604 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
- * @description Checking if varying the Function.prototype.toString.length property fails
- */
+/*---
+info: The Function.prototype.toString.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.toString.length = function(){return "shifted";};
 if (Function.prototype.toString.length !== obj) {
   $ERROR('#2: the Function.prototype.toString length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
index b5c98b131..79b93654d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toString method is 0
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
- * @description Checking Function.prototype.toString.length
- */
+/*---
+info: The length property of the toString method is 0
+description: Checking Function.prototype.toString.length
+---*/
 
 //CHECK#1
 if (!(Function.prototype.toString.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Function.prototype.toString.hasOwnProperty("length"))) {
 if (Function.prototype.toString.length !== 0) {
   $ERROR('#2: The length property of the toString method is 0');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
index 73f979d52..e8c826722 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
- * @description The Function.prototype.toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The Function.prototype.toString function is not generic; it throws
+    a TypeError exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(undefined);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
index fe4e6a020..9a86be25f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
- * @description The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The toString function is not generic; it throws a TypeError
+    exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(null);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
index 4f7fe886d..fb9a87ece 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
- * @description The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The toString function is not generic; it throws a TypeError
+    exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call({});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
index 20e2f4362..082cef2d9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
@@ -1,13 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
- * @description Whether or not they are callable, RegExp objects are not Function objects, so toString should throw a TypeError.
- * @negative TypeError
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a Function object.
+description: >
+    Whether or not they are callable, RegExp objects are not Function
+    objects, so toString should throw a TypeError.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(/x/);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
index 141465ba3..d15d8f25e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
@@ -1,15 +1,17 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
- * @description The String constructor, given an object, should invoke that object's toString method as a method, i.e., with its this value bound to that object.
- * @negative TypeError
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a Function object.
+description: >
+    The String constructor, given an object, should invoke that
+    object's toString method as a method, i.e., with its this value
+    bound to that object.
+negative: TypeError
+---*/
 
 var obj = {toString: Function.prototype.toString};
 
 String(obj);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
index fd3578e46..d35867c71 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.toString has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
- * @description Checking if obtaining the prototype property of Function.prototype.toString fails
- */
+/*---
+info: Function.prototype.toString has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.toString fails
+---*/
 
 //CHECK#1
 if (Function.prototype.toString.prototype !== undefined) {
   $ERROR('#1: Function.prototype.toString has not prototype property'+Function.prototype.toString.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
index c7b2d4856..0d3cf17f3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.toString can't be used as constructor
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
- * @description Checking if creating "new Function.prototype.toString" fails
- */
+/*---
+info: Function.prototype.toString can't be used as constructor
+description: Checking if creating "new Function.prototype.toString" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Function.prototype.toString;
 
@@ -16,4 +17,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
index 1b81b603b..776f0d8a1 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
- * @description Checking if enumerating the Function.prototype.toString.length property fails
- */
+/*---
+info: The Function.prototype.toString.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (p in Function.prototype.toString){
   if (p==="length")
       $ERROR('#2: the Function.prototype.toString.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
index 296ca7ca0..7ab734b22 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
- * @description Checking if deleting the Function.prototype.toString.length property fails
- */
+/*---
+info: >
+    The Function.prototype.toString.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -22,4 +25,3 @@ if (delete Function.prototype.toString.length) {
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.toString.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
index c90d4942e..32530b16b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js

- * @description Strict Mode - 'this' value is a string which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function fun() {

-            return (this instanceof String);

-        }

-        return !fun.apply("", Array);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a string which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function fun() {
+            return (this instanceof String);
+        }
+        return !fun.apply("", Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
index 7f03675a3..e6024ec7a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js

- * @description Strict Mode - 'this' value is a number which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Number);

-        }

-        return !fun.apply(-12, Array);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a number which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Number);
+        }
+        return !fun.apply(-12, Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
index 7ae40757d..e2f185b2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js

- * @description Strict Mode - 'this' value is a boolean which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function fun() {

-            return (this instanceof Boolean);

-        }

-        return !fun.apply(false, Array);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a boolean which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function fun() {
+            return (this instanceof Boolean);
+        }
+        return !fun.apply(false, Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
index 71c3710fe..b4be64aee 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
- * @description Checking if varying the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.apply.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.apply.length = function(){return "shifted";};
 if (Function.prototype.apply.length !== obj) {
   $ERROR('#2: the Function.prototype.apply length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
index 8f088e62e..41ec3c7d7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
- * @description TChecking if enumerating the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute DontEnum
+description: >
+    TChecking if enumerating the Function.prototype.apply.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (var p in Function.prototype.apply){
   if (p==="length")
       $ERROR('#2: the Function.prototype.apply.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
index 85455d5bb..dea36d9a2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
- * @description Checking if obtaining the prototype property of Function.prototype.apply fails
- */
+/*---
+info: Function.prototype.apply has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.apply fails
+---*/
 
 //CHECK#1
 if (Function.prototype.apply.prototype !== undefined) {
   $ERROR('#1: Function.prototype.apply has not prototype property'+Function.prototype.apply.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
index 0f1f087c3..bb5410f30 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call(undefined, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
index a87c26d43..47d7c0d7f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call(null, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
index d4c6c1c65..548570df4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call({}, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
index 75b0af287..80a96a8a4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
- * @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.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+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/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
index 0a612b7d1..9922f695d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The apply method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
- * @description Calling "apply" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function()
- */
+/*---
+info: >
+    The apply method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+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();
 
@@ -31,4 +34,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
index 406c5c578..7428ee9ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The apply method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
- * @description Calling "apply" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function.prototype
- */
+/*---
+info: >
+    The apply method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+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(){};
 
@@ -29,4 +32,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
index 9e771fc82..9489636fe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the apply method is 2
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
- * @description Checking Function.prototype.apply.length
- */
+/*---
+info: The length property of the apply method is 2
+description: Checking Function.prototype.apply.length
+---*/
 
 //CHECK#1
 if (typeof Function.prototype.apply !== "function") {
@@ -22,4 +20,3 @@ if (typeof Function.prototype.apply.length === "undefined") {
 if (Function.prototype.apply.length !== 2) {
   $ERROR('#3: The length property of the apply method is 2');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
index f714a10c7..491fbc24f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the apply method is 2
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
- * @description Checking f.apply.length, where f is new Function
- */
+/*---
+info: The length property of the apply method is 2
+description: Checking f.apply.length, where f is new Function
+---*/
 
 var f=new Function;
 
@@ -24,4 +22,3 @@ if (typeof f.apply.length === "undefined") {
 if (f.apply.length !== 2) {
   $ERROR('#3: The length property of the apply method is 2');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
index 0b5908aa4..1720def61 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
- * @description Not any arguments at apply function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Not any arguments at apply function
+---*/
 
 Function("this.field=\"strawberry\"").apply();
 
@@ -14,4 +14,3 @@ Function("this.field=\"strawberry\"").apply();
 if (this["field"] !== "strawberry") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
index 4e7e7b2a9..3b166e327 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
- * @description Checking by using eval, no any arguments at apply function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, no any arguments at apply function
+---*/
 
 eval(" (function(){this.feat=1}).apply()");
 
@@ -14,4 +14,3 @@ eval(" (function(){this.feat=1}).apply()");
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
index 9118b69eb..d00335d2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
- * @description Argument at apply function is null
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is null
+---*/
 
 Function("this.field=\"green\"").apply(null);
 
@@ -14,4 +14,3 @@ Function("this.field=\"green\"").apply(null);
 if (this["field"] !== "green") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
index 279a70ef7..adc4245e9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
- * @description Argument at apply function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is void 0
+---*/
 
 Function("this.field=\"battle\"").apply(void 0);
 
@@ -14,4 +14,3 @@ Function("this.field=\"battle\"").apply(void 0);
 if (this["field"] !== "battle") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
index bba4b3d45..3f21ccb9d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
- * @description Argument at apply function is undefined
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is undefined
+---*/
 
 Function("this.field=\"oil\"").apply(undefined);
 
@@ -14,4 +14,3 @@ Function("this.field=\"oil\"").apply(undefined);
 if (this["field"] !== "oil") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
index 608c81f63..dd419a1ec 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
- * @description No any arguments at apply function and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    No any arguments at apply function and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   Function("this.feat=\"in da haus\"").apply();
@@ -23,4 +25,3 @@ if (this["feat"] !== "in da haus") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
index c02bcd81c..b6efc19f8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
- * @description Argument at apply function is null and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is null and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   (function(){this.feat="kamon beyba"}).apply(null);
@@ -23,4 +25,3 @@ if (this["feat"] !== "kamon beyba") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
index ca8b3248f..011b37555 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
- * @description Argument at apply function is void 0 and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is void 0 and it called inside function
+    declaration
+---*/
 
 (function FACTORY(){
   Function("this.feat=\"in da haus\"").apply(void 0);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "in da haus") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
index 07a731396..fd4a14cdb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
- * @description Argument at apply function is undefined and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is undefined and it called inside
+    function declaration
+---*/
 
 (function FACTORY(){
   (function(){this.feat="kamon beyba"}).apply(undefined);
@@ -16,4 +18,3 @@
 if (this["feat"] !== "kamon beyba") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
index 2c4d250ac..9e669b7a6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
- * @description Checking by using eval, argument at apply function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, argument at apply function is void 0
+---*/
 
 eval( " Function(\"this.feat=1\").apply(void 0) " );
 
@@ -14,4 +14,3 @@ eval( " Function(\"this.feat=1\").apply(void 0) " );
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
index 0ac56c9e7..bb74dea66 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
- * @description thisArg is number
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is number
+---*/
 
 var obj=1;
 
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
index 32d22bd0f..50dc4fddd 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
- * @description thisArg is boolean true
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is boolean true
+---*/
 
 var obj=true;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
index a2b9ae601..b2b8fbb02 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
- * @description thisArg is string
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is string
+---*/
 
 var obj="soap";
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
index 956f43e7e..0105c9384 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
- * @description thisArg is function variable that return this
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable that return this
+---*/
 
 f = function(){this.touched= true; return this;};
 
@@ -23,4 +23,3 @@ if (!(retobj["touched"])) {
 }
 
 var obj;
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
index 871b74c45..cb1e1ed5c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
- * @description thisArg is function variable
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable
+---*/
 
 var f = function(){this.touched= true;};
 
@@ -18,4 +18,3 @@ f.apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
index 31f57cb3d..9bbcee14b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
- * @description thisArg is new String()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new String()
+---*/
 
 var obj=new String("soap");
 
@@ -16,4 +16,3 @@ var obj=new String("soap");
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
index 4c0e95e89..ad7a4c135 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
- * @description thisArg is new Number()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new Number()
+---*/
 
 var obj=new Number(1);
 
@@ -16,5 +16,3 @@ Function("this.touched= true;").apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
index c0dca08eb..32bd7dc9c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
- * @description thisArg is Function()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is Function()
+---*/
 
 var obj=Function();
 
@@ -16,4 +16,3 @@ new Function("this.touched= true; return this;").apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
index d9e7ee361..ee4784900 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
- * @description argArray is (null,1)
- */
+/*---
+info: >
+    if argArray is neither an array nor an arguments object (see 10.1.8), a
+    TypeError exception is thrown
+description: argArray is (null,1)
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -17,4 +18,3 @@ try {
   	$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/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
index c7b57c7c7..0626d1458 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
- * @description argArray is (object,"1,3,4")
- */
+/*---
+info: >
+    if argArray is neither an array nor an arguments object (see 10.1.8), a
+    TypeError exception is thrown
+description: argArray is (object,"1,3,4")
+includes: [$FAIL.js]
+---*/
 
 obj={};
 
@@ -19,4 +20,3 @@ try {
   	$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/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
index d888ffb4d..28d5aa4f4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
- * @description argArray is (null,[1])
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null,[1])
+---*/
 
 Function("a1,a2,a3","this.shifted=a1;").apply(null,[1]);
 
@@ -15,5 +14,3 @@ Function("a1,a2,a3","this.shifted=a1;").apply(null,[1]);
 if (this["shifted"] !== 1) {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
index 254ccb5e5..9ad760bcd 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
- * @description argArray is (empty object, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, arguments), inside function call
+    without declaration used
+---*/
 
 var obj={};
 
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
index ef8ee5f54..ef7131d81 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
- * @description argArray is (null,[1,2,3])
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null,[1,2,3])
+---*/
 
 new Function("a1,a2","a3","this.shifted=a2;").apply(null,[1,2,3]);
 
@@ -15,5 +14,3 @@ new Function("a1,a2","a3","this.shifted=a2;").apply(null,[1,2,3]);
 if (this["shifted"] !== 2) {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
index cf003fe4b..89fc4331d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
- * @description argArray is (empty object, new Array("nine","inch","nails"))
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (empty object, new Array("nine","inch","nails"))
+---*/
 
 i=0;
 
@@ -26,5 +25,3 @@ if (obj["shifted"] !== "nine") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
index 35db7b9c2..0fa633020 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
- * @description argArray is (empty object, ( function(){return arguments;}) ("a","b","c"))
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, ( function(){return arguments;})
+    ("a","b","c"))
+---*/
 
 i=0;
 
@@ -26,5 +27,3 @@ if (obj["shifted"] !== "c") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
index ee656e882..ceb41dc92 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
- * @description argArray is (null, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null, arguments), inside function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(null,arguments);
@@ -24,5 +23,3 @@ if (this["shifted"] !== "12") {
 if (typeof obj.shifted !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
index 90ac74272..ae27c8bea 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
- * @description argArray is (this, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (this, arguments), inside function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(this,arguments);
@@ -24,5 +23,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
index ff85f3462..f2ec55255 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
- * @description argArray is (null, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (null, arguments), inside function call without
+    declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(null,arguments);
@@ -17,4 +18,3 @@
 if (this["shifted"] !== "12") {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
index 031b407f7..c5ca86b4f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
- * @description argArray is (this, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (this, arguments), inside function call without
+    declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(this,arguments);
@@ -17,5 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
index 39ee45645..ed68fd3ca 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
- * @description argArray is (empty object, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, arguments), inside function declaration
+    used
+---*/
 
 function FACTORY(){
   var obj = {};
@@ -26,5 +27,3 @@ if (typeof this["shifted"] !== "undefined") {
 if (obj.shifted !== "12") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
index 6db73fc75..ea65e4557 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
- * @description Checking if creating "new Function.prototype.apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.prototype.apply" fails
+---*/
 
 try {
   obj = new Function.prototype.apply;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
index 05cab52c5..9c10c3fc6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
- * @description Checking if creating "new Function.prototype.apply()" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.prototype.apply()" fails
+---*/
 
 try {
   obj = new Function.prototype.apply();
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
index 123948135..e6296a849 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
- * @description Checking if creating "new Function.apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.apply" fails
+---*/
 
 try {
   obj = new Function.apply;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
index 751240920..ac56b759c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
- * @description Checking if creating "new (Function("this.p1=1").apply)" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new (Function("this.p1=1").apply)" fails
+---*/
 
 try {
   obj = new (Function("this.p1=1").apply);
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
index a69cae1d3..6d1dcc1cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
- * @description Checking if creating "new Function("this.p1=1").apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function("this.p1=1").apply" fails
+---*/
 
 try {
   FACTORY = Function("this.p1=1").apply;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
index 9e44a4ab5..2aaac1707 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
- * @description Checking if creating "new (Function("function f(){this.p1=1;};return f").apply())" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: >
+    Checking if creating "new (Function("function
+    f(){this.p1=1;};return f").apply())" fails
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ try {
 if (obj.p1!== 1) {
   $ERROR('#2: Function.prototype.apply can\'t be used as [[create]] caller');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
index 9ebf423aa..278fcdf12 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
- * @description Checking if deleting the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute DontDelete
+description: >
+    Checking if deleting the Function.prototype.apply.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -22,4 +23,3 @@ if (delete Function.prototype.apply.length) {
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.apply.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js
index 9db726a1f..8946fcc0b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js

- * @description Strict Mode - 'this' value is a string which cannot be converted to wrapper objects when the function is called without an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof String);

-        }

-        return !fun.call("");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a string which cannot be converted
+    to wrapper objects when the function is called without an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof String);
+        }
+        return !fun.call("");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
index 7848d3c7b..98d1e0a0e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js

- * @description Strict Mode - 'this' value is a number which cannot be converted to wrapper objects  when the function is called without an array argument

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Number);

-        }

-        return !fun.call(-12);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a number which cannot be converted
+    to wrapper objects  when the function is called without an array
+    argument
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Number);
+        }
+        return !fun.call(-12);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
index 0d965fb67..497744771 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js

- * @description Strict Mode - 'this' value is a boolean which cannot be converted to wrapper objects when the function is called without an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Boolean);

-        }

-        return !fun.call(false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a boolean which cannot be converted
+    to wrapper objects when the function is called without an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Boolean);
+        }
+        return !fun.call(false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
index ee76d447f..8b055543f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
- * @description Checking if varying the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.call.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.call.length = function(){return "shifted";};
 if (Function.prototype.call.length !== obj) {
   $ERROR('#2: the Function.prototype.call length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
index 987f9ee3e..63399e6bb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
- * @description Checking if enumerating the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Function.prototype.call.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (p in Function.prototype.call){
   if (p==="length")
     $ERROR('#2: the Function.prototype.call.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
index c8fbff69a..547bd6f58 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
- * @description Checking if obtaining the prototype property of Function.prototype.call fails
- */
+/*---
+info: Function.prototype.call has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.call fails
+---*/
 
 //CHECK#1
 if (Function.prototype.call.prototype !== undefined) {
   $ERROR('#1: Function.prototype.call has not prototype property'+Function.prototype.call.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
index 5b08ca218..212c319ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call(undefined, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
index 9fde7ac60..f8b50978c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call(null, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
index 56624d8fd..dced623d5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call({}, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
index c32a02957..40a50e41b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
- * @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.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+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/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
index e9bec0320..d40e6778f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
- * @description Call "call" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function()
- */
+/*---
+info: >
+    The call method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+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();
 
@@ -31,4 +34,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-    
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
index 637cf20d1..5ff35e76c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
- * @description Calling "call" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function.prototype
- */
+/*---
+info: >
+    The call method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+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(){};
 
@@ -29,4 +32,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
index c8282a269..214e1d498 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the call method is 1
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
- * @description Checking Function.prototype.call.length
- */
+/*---
+info: The length property of the call method is 1
+description: Checking Function.prototype.call.length
+---*/
 
 //CHECK#1
 if (typeof Function.prototype.call !== "function") {
@@ -22,4 +20,3 @@ if (typeof Function.prototype.call.length === "undefined") {
 if (Function.prototype.call.length !== 1) {
   $ERROR('#3: The length property of the call method is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
index f76bdc230..ccceca809 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the call method is 1
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
- * @description Checking f.call.length, where f is new Function
- */
+/*---
+info: The length property of the call method is 1
+description: Checking f.call.length, where f is new Function
+---*/
 
 var f=new Function;
 
@@ -24,4 +22,3 @@ if (typeof f.call.length === "undefined") {
 if (f.call.length !== 1) {
   $ERROR('#3: The length property of the call method is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
index 6dcf5ccca..8fd063b2c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
- * @description Not any arguments at call function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Not any arguments at call function
+---*/
 
 Function("this.field=\"strawberry\"").call();
 
@@ -14,4 +14,3 @@ Function("this.field=\"strawberry\"").call();
 if (this["field"] !== "strawberry") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
index 1a8a62569..b07352b87 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
- * @description Checking by using eval, no any arguments at call function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, no any arguments at call function
+---*/
 
 eval(" (function(){this.feat=1}).call()");
 
@@ -14,4 +14,3 @@ eval(" (function(){this.feat=1}).call()");
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
index c356ff4aa..2e5208876 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
- * @description Argument at call function is null
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is null
+---*/
 
 Function("this.field=\"green\"").call(null);
 
@@ -14,4 +14,3 @@ Function("this.field=\"green\"").call(null);
 if (this["field"] !== "green") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
index 5eb42018e..66b768ddb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
- * @description Argument at call function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is void 0
+---*/
 
 Function("this.field=\"battle\"").call(void 0);
 
@@ -14,4 +14,3 @@ Function("this.field=\"battle\"").call(void 0);
 if (this["field"] !== "battle") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
index f643ac429..e0774f76c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
- * @description Argument at call function is undefined
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is undefined
+---*/
 
 Function("this.field=\"oil\"").call(undefined);
 
@@ -14,4 +14,3 @@ Function("this.field=\"oil\"").call(undefined);
 if (this["field"] !== "oil") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
index 47f35a67e..0e3473352 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
- * @description No any arguments at call function and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    No any arguments at call function and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   Function("this.feat=\"in da haus\"").call();
@@ -23,4 +25,3 @@ if (this["feat"] !== "in da haus") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
index 25c8fa070..5cb79300c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
- * @description Argument at call function is null and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is null and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   (function(){this.feat="kamon beyba"}).call(null);
@@ -23,4 +25,3 @@ if (this["feat"] !== "kamon beyba") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
index 6fa6551a7..d4325b359 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
- * @description Argument at call function is void 0 and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is void 0 and it called inside function
+    declaration
+---*/
 
 (function FACTORY(){
   Function("this.feat=\"in da haus\"").call(void 0);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "in da haus") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
index 575230da8..f46e72cd0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
- * @description Argument at call function is undefined and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is undefined and it called inside
+    function declaration
+---*/
 
 (function FACTORY(){
   (function(){this.feat="kamon beyba"}).call(undefined);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "kamon beyba") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
index 4efc2e771..773b8fec9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
- * @description Checking by using eval, argument at call function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, argument at call function is void 0
+---*/
 
 eval( " Function(\"this.feat=1\").call(void 0) " );
 
@@ -15,4 +15,3 @@ eval( " Function(\"this.feat=1\").call(void 0) " );
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
index f274db083..7dfc3cd20 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
- * @description thisArg is number
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is number
+---*/
 
 var obj=1;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
index 1e594dd96..e5a7411a8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
- * @description thisArg is boolean true
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is boolean true
+---*/
 
 var obj=true;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
index 665bf1010..199e18435 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
- * @description thisArg is string
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is string
+---*/
 
 var obj="soap";
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
index 05cff1df0..c15b7f9fc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
- * @description thisArg is function variable that return this
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable that return this
+---*/
 
 var f = function(){this.touched= true; return this;};
 
@@ -23,4 +23,3 @@ if (!(retobj["touched"])) {
 }
 
 var obj;
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
index 96795e150..1344686aa 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
- * @description thisArg is function variable
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable
+---*/
 
 var f = function(){this.touched= true;};
 
@@ -18,4 +18,3 @@ f.call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
index 127954e68..18ee613cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
- * @description thisArg is new String()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new String()
+---*/
 
 var obj=new String("soap");
 
@@ -16,4 +16,3 @@ var obj=new String("soap");
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
index f6166f31a..71c786c50 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
- * @description thisArg is new Number()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new Number()
+---*/
 
 var obj=new Number(1);
 
@@ -16,5 +16,3 @@ Function("this.touched= true;").call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
index f3f6cf18b..246ab4be0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
- * @description thisArg is Function()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is Function()
+---*/
 
 var obj=Function();
 
@@ -16,4 +16,3 @@ new Function("this.touched= true; return this;").call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
index 04b21e57a..d8e00e68b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
- * @description Argunemts of call function is (null,[1])
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: Argunemts of call function is (null,[1])
+---*/
 
 Function("a1,a2,a3","this.shifted=a1;").call(null,[1]);
 
@@ -25,5 +24,3 @@ if (this["shifted"].length !== 1) {
 if (this["shifted"][0] !== 1) {
   $ERROR('#3: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
index b9b00d1c4..a67340241 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
- * @description Argunemts of call function is (empty object, "", arguments,2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, "", arguments,2),
+    inside function call without declaration used
+---*/
 
 var obj={};
 
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
index 27afbee73..848ecb4f4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
- * @description Argunemts of call function is (null,[3,2,1])
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: Argunemts of call function is (null,[3,2,1])
+---*/
 
 new Function("a1,a2","a3","this.shifted=a1;").call(null,[3,2,1]);
 
@@ -20,5 +19,3 @@ if (this["shifted"].length !== 3) {
 if ((this["shifted"][0] !== 3)||(this["shifted"][1] !== 2)||(this["shifted"][2] !== 1)) {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
index cc51c178d..b1990fed5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
- * @description Argunemts of call function is (empty object, new Array("nine","inch","nails"))
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, new
+    Array("nine","inch","nails"))
+---*/
 
 var i=0;
 
@@ -31,5 +32,3 @@ if ((obj["shifted"][0] !== "nine")||(obj["shifted"][1] !== "inch")||(obj["shifte
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#3: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
index 90311787b..729ac7cba 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
- * @description Argunemts of call function is (empty object, ( function(){return arguments;})("a","b","c","d"),"",2)
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, ( function(){return
+    arguments;})("a","b","c","d"),"",2)
+---*/
 
 var i=0;
 
@@ -26,5 +27,3 @@ if (obj["shifted"] !== "24") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
index 35a6fd846..48d32af5d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
- * @description Argunemts of call function is (null, arguments,"",2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (null, arguments,"",2), inside
+    function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(null,arguments,"",2);
@@ -24,5 +25,3 @@ if (this["shifted"] !== "42") {
 if (typeof obj.shifted !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
index 609c8de87..2e6bc6f5e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
- * @description Argunemts of call function is (this, arguments,"",2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (this, arguments,"",2), inside
+    function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(this,arguments,"",2);
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
index 7738e09e0..d38e3a770 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
- * @description Argunemts of call function is (null, arguments,"",2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (null, arguments,"",2), inside
+    function call without declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(null,arguments,"",2);
@@ -17,4 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#1: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
index eb00e7f05..290e7c0ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
- * @description Argunemts of call function is (this, arguments,"",2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (this, arguments,"",2), inside
+    function call without declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(this,arguments,"",2);
@@ -17,5 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
index ae2abe1cc..3803a21e1 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
- * @description Argunemts of call function is (empty object, "", arguments,2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, "", arguments,2),
+    inside function declaration used
+---*/
 
 function FACTORY(){
   var obj = {};
@@ -26,5 +27,3 @@ if (typeof this["shifted"] !== "undefined") {
 if (obj.shifted !== "42") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
index 1c02dbea7..9c368a31e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
- * @description Checking if creating "new Function.prototype.call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.prototype.call" fails
+---*/
 
 try {
   var obj = new Function.prototype.call;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
index 2e6266889..b065bc3e7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
- * @description Checking if creating "new Function.prototype.call()" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.prototype.call()" fails
+---*/
 
 try {
   var FACTORY = Function.prototype.call;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
index 003e84f1c..27f5873bf 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
- * @description Checking if creating "new Function.call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.call" fails
+---*/
 
 try {
   var obj = new Function.call;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
index 34b6a4363..60a62109f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
- * @description Checking if creating "new (Function("this.p1=1").call)" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new (Function("this.p1=1").call)" fails
+---*/
 
 try {
   var obj = new (Function("this.p1=1").call);
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
index 316ac5815..0e27c361a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
- * @description Checking if creating "new Function("this.p1=1").call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function("this.p1=1").call" fails
+---*/
 
 try {
   var FACTORY = Function("this.p1=1").call;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
index 0911558c4..06270aa94 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
- * @description Checking if creating "new (Function("function f(){this.p1=1;};return f").call())" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: >
+    Checking if creating "new (Function("function
+    f(){this.p1=1;};return f").call())" fails
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ try {
 if (obj.p1!== 1) {
   $ERROR('#2: Function.prototype.call can\'t be used as [[create]] caller');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
index 8176bb2f8..6508e1b28 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
- * @description Checking if deleting the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute DontDelete
+description: >
+    Checking if deleting the Function.prototype.call.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -22,4 +23,3 @@ if (delete Function.prototype.call.length) {
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.call.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
index ba29c8188..8c6cb1050 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js

- * @description [[Call]] - 'F''s [[BoundArgs]] is used as the former part of arguments of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            return x + y + z;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");

-

-        return newFunc() === "abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - 'F''s [[BoundArgs]] is used as the former part of
+    arguments of calling the [[Call]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            return x + y + z;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");
+
+        return newFunc() === "abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
index 48e266cdc..f4969e23d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && typeof x === "undefined";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && typeof x === "undefined";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
index 17f074e4c..3294400e6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
index 4a9b5956d..b0d58e6c3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 2, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2 &&

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1, 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 2, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2 &&
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1, 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
index 9757b867a..d1358dcf8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 &&

-                arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 &&
+                arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
index 8468ad1ef..6d1effcd6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc(2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc(2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
index c5e81944f..fd8ad5698 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 2, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2 &&

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1, 2);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 2, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2 &&
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1, 2);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
index 1f2d6da24..c2d42bfb5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js

- * @description [[Call]] - 'F''s [[BoundThis]] is used as the 'this' value of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var obj = { "prop": "a" };

-

-        var func = function () {

-            return this;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc() === obj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - 'F''s [[BoundThis]] is used as the 'this' value of
+    calling the [[Call]] internal method of 'F''s [[TargetFunction]]
+    when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "prop": "a" };
+
+        var func = function () {
+            return this;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc() === obj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
index 41128642e..5e29c70a5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js

- * @description [[Call]] - the provided arguments is used as the latter part of arguments of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            return z;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, {}, "a", "b");

-

-        return newFunc("c") === "c";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - the provided arguments is used as the latter part of
+    arguments of calling the [[Call]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            return z;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, {}, "a", "b");
+
+        return newFunc("c") === "c";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
index e1ef7406c..677ebe679 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return arguments.length === 0;

-        };

-

-        var newFunc = Function.prototype.bind.call(func);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return arguments.length === 0;
+        };
+
+        var newFunc = Function.prototype.bind.call(func);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
index 2f5e6b5d3..df07a1ea3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
index b96fba085..33ee79dbb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments.length === 0;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments.length === 0;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
index bc9559ad3..4044f2ff0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
index f24aa0f4b..1369fe74a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
index e65169ec1..d9c276888 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1 && arguments[1] === 2;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc(2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1 && arguments[1] === 2;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc(2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
index 4064793c0..d4288641d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js

- * @description [[Construct]] - 'F''s [[BoundArgs]] is used as the former part of arguments of calling the [[Construct]] internal method of 'F''s [[TargetFunction]] when 'F' is called as constructor

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            var objResult = {};

-            objResult.returnValue = x + y + z;

-            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;

-            return objResult;

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");

-

-        var newInstance = new NewFunc();

-

-        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&

-            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - 'F''s [[BoundArgs]] is used as the former part of
+    arguments of calling the [[Construct]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called as constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            var objResult = {};
+            objResult.returnValue = x + y + z;
+            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;
+            return objResult;
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");
+
+        var newInstance = new NewFunc();
+
+        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&
+            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
index 1e797a3a2..11c6c987b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
index 7df435744..12ea9bec2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 2

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1, 2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1, 2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
index 5003a213f..e1d83dbc4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
index 24ca939c6..4b1e1e738 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc(2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc(2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
index 9489475f3..7cbfd10dc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 2, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1, 2);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 2, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1, 2);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
index 44d424561..2109152d0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js

- * @description [[Construct]] - the provided arguments is used as the latter part of arguments of calling the [[Construct]] internal method of 'F''s [[TargetFunction]] when 'F' is called as constructor

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            var objResult = {};

-            objResult.returnValue = x + y + z;

-            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;

-            return objResult;

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc("a", "b", "c");

-

-        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&

-            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - the provided arguments is used as the latter part
+    of arguments of calling the [[Construct]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called as constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            var objResult = {};
+            objResult.returnValue = x + y + z;
+            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;
+            return objResult;
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc("a", "b", "c");
+
+        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&
+            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
index b355e499e..b4c697a5f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 0);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 0);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
index 64c97830e..8d82312a8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments[0] === 1 && arguments.length === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func);

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments[0] === 1 && arguments.length === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func);
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
index 338256f0a..18ddd600d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        try {

-            Object.prototype.verifyThis = "verifyThis";

-            var func = function () {

-                return new Boolean(arguments.length === 0 && Object.prototype.toString.call(this) === "[object Object]" &&

-                    this.verifyThis === "verifyThis");

-            };

-

-            var NewFunc = Function.prototype.bind.call(func, obj);

-

-            var newInstance = new NewFunc();

-

-            return newInstance.valueOf();

-        } finally {

-            delete Object.prototype.verifyThis;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        try {
+            Object.prototype.verifyThis = "verifyThis";
+            var func = function () {
+                return new Boolean(arguments.length === 0 && Object.prototype.toString.call(this) === "[object Object]" &&
+                    this.verifyThis === "verifyThis");
+            };
+
+            var NewFunc = Function.prototype.bind.call(func, obj);
+
+            var newInstance = new NewFunc();
+
+            return newInstance.valueOf();
+        } finally {
+            delete Object.prototype.verifyThis;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
index a2e0fcd77..9dc06c92f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
index 867308baa..979b7bb40 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
index a0ec6fc0c..f7a06cd75 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 2 && arguments[0] === 1 && arguments[1] === 2);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc(2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 2 && arguments[0] === 1 && arguments[1] === 2);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc(2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
index 89b443923..14501aa2a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 0 && typeof x === "undefined");

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 0 && typeof x === "undefined");
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
index 5dba58d7e..0768a5181 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js

- * @description Function.prototype.bind must exist as a function

- */

-

-

-function testcase() {

-  var f = Function.prototype.bind;

-

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Function.prototype.bind;
+
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
index bef4b7b1b..e4d571c0e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js

- * @description Function.prototype.bind must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Function.prototype.bind.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Function.prototype.bind.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
index d440104df..2b8068e2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js

- * @description Function.prototype.bind - internal property [[Class]] of 'F' is set as Function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        return Object.prototype.toString.call(obj) === "[object Function]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - internal property [[Class]] of 'F' is
+    set as Function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        return Object.prototype.toString.call(obj) === "[object Function]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
index cb2777e7a..771472192 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js

- * @description Function.prototype.bind - internal property [[Prototype]] of 'F' is set as Function.prototype

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-        try {

-            Function.prototype.property = 12;

-            var obj = foo.bind({});

-

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - internal property [[Prototype]] of 'F'
+    is set as Function.prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+        try {
+            Function.prototype.property = 12;
+            var obj = foo.bind({});
+
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
index 63a59b19f..a413ace90 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js

- * @description Function.prototype.bind, bound fn has a 'length' own property

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.hasOwnProperty('length')) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, bound fn has a 'length' own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.hasOwnProperty('length')) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
index f2291dac3..2f6cf8561 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args

- */

-

-

-function testcase() {

-  function foo(x, y) { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(x, y) { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
index 8a1925dec..131cc650f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (all args prefilled)

- */

-

-

-function testcase() {

-  function foo(x, y) { }

-  var o = {};

-  

-  var bf = foo.bind(o, 42, 101);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (all args prefilled)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(x, y) { }
+  var o = {};
+  
+  var bf = foo.bind(o, 42, 101);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
index 3fe65667e..7442c2155 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (target takes 0 args)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (target takes 0 args)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
index 2269348f3..76cd3cffe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (target provided extra args)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o, 42);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (target provided extra args)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o, 42);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
index bf61a2d46..738e2d6f9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args

- */

-

-

-function testcase() {

-    function foo(x, y) { }

-    var o = {};

-

-    var bf = foo.bind(o, 42);

-    if (bf.length === 1) {

-        return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    function foo(x, y) { }
+    var o = {};
+
+    var bf = foo.bind(o, 42);
+    if (bf.length === 1) {
+        return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
index 34e4eef14..97414a9f5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js

- * @description Function.prototype.bind, 'length' is a data valued own property

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var desc = Object.getOwnPropertyDescriptor(bf, 'length');

-  if (desc.hasOwnProperty('value') === true &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, 'length' is a data valued own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var desc = Object.getOwnPropertyDescriptor(bf, 'length');
+  if (desc.hasOwnProperty('value') === true &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
index 2297286a7..20433efc4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js

- * @description Function.prototype.bind, 'length' is a data valued own property with default attributes (false)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var desc = Object.getOwnPropertyDescriptor(bf, 'length');

-  if (desc.value === 0 &&

-      desc.enumerable === false &&

-      desc.writable === false &&

-      desc.configurable == false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' is a data valued own property
+    with default attributes (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var desc = Object.getOwnPropertyDescriptor(bf, 'length');
+  if (desc.value === 0 &&
+      desc.enumerable === false &&
+      desc.writable === false &&
+      desc.configurable == false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
index e5e332c7f..d62f34d3b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js

- * @description Function.prototype.bind - The [[Writable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canWritable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        obj.length = 100;

-        canWritable = (obj.length === 100);

-        return hasProperty && !canWritable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Writable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canWritable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        obj.length = 100;
+        canWritable = (obj.length === 100);
+        return hasProperty && !canWritable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
index 954e03c68..1d08c65be 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        for (var prop in obj) {

-            if (prop === "length") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        for (var prop in obj) {
+            if (prop === "length") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
index ba9d7d5ab..a6957cd5c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        delete obj.caller;

-        canConfigurable = !obj.hasOwnProperty("length");

-        return hasProperty && !canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        delete obj.caller;
+        canConfigurable = !obj.hasOwnProperty("length");
+        return hasProperty && !canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
index db2db9513..5b4dcb9c8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js

- * @description Function.prototype.bind, [[Extensible]] of the bound fn is true

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var ex = Object.isExtensible(bf);

-  if (ex === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, [[Extensible]] of the bound fn is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var ex = Object.isExtensible(bf);
+  if (ex === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
index b7412d54f..fa2ab259a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js

- * @description Function.prototype.bind - The [[Extensible]] attribute of internal property in F set as true

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        obj.property = 12;

-        return obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Extensible]] attribute of internal
+    property in F set as true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        obj.property = 12;
+        return obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
index 3c6157285..6402d6377 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (but an instance of Function)

- */

-

-

-function testcase() {

-  foo.prototype = Function.prototype;

-  // dummy function

-  function foo() {}

-  var f = new foo();

-

-  try {

-    f.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (but an instance of Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = Function.prototype;
+  // dummy function
+  function foo() {}
+  var f = new foo();
+
+  try {
+    f.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
index 33ccf9e8c..6cf785d51 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js

- * @description Function.prototype.bind throws TypeError if 'Target' is undefined

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(undefined);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        } 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(undefined);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        } 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
index 84425babe..ca3e196f9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js

- * @description Function.prototype.bind throws TypeError if 'Target' is NULL

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is NULL
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
index 64be86e10..0eed7c207 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a boolean

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        } 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        } 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
index c0dabe21f..ac297f53e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the

-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a number

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(5);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(5);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
index 51ac5f943..d56026562 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a string

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call("abc");

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call("abc");
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
index 486e77a3f..664f49d6b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js

- * @description Function.prototype.bind throws TypeError if 'Target' is Object without Call internal method

- */

-

-

-function testcase() {

-        try {

-            Function.prototype.bind.call({});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind throws TypeError if 'Target' is Object
+    without Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call({});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
index 9af267814..cfadb95ec 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
@@ -1,22 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js

- * @description Function.prototype.bind - 'Target' is a function

- */

-

-

-function testcase() {

-        function testFunc() {}

-        try {

-            testFunc.bind();

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - 'Target' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function testFunc() {}
+        try {
+            testFunc.bind();
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
index cadeefde8..769c7f343 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (bind attached to object)

- */

-

-

-function testcase() {

-  // dummy function 

-  function foo() {}

-  var f = new foo();

-  f.bind = Function.prototype.bind;

-

-  try {

-    f.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (bind attached to object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // dummy function 
+  function foo() {}
+  var f = new foo();
+  f.bind = Function.prototype.bind;
+
+  try {
+    f.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
index a59b76a22..6b36cb39b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js

- * @description Function.prototype.bind allows Target to be a constructor (Number)

- */

-

-

-function testcase() {

-  var bnc = Number.bind(null);

-  var n = bnc(42);

-  if (n === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bnc = Number.bind(null);
+  var n = bnc(42);
+  if (n === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
index 9595be580..86a5c3fd7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js

- * @description Function.prototype.bind allows Target to be a constructor (String)

- */

-

-

-function testcase() {

-  var bsc = String.bind(null);

-  var s = bsc("hello world");

-  if (s === "hello world") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bsc = String.bind(null);
+  var s = bsc("hello world");
+  if (s === "hello world") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
index 760b7bad3..ca030b8f5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js

- * @description Function.prototype.bind allows Target to be a constructor (Boolean)

- */

-

-

-function testcase() {

-  var bbc = Boolean.bind(null);

-  var b = bbc(true);

-  if (b === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bbc = Boolean.bind(null);
+  var b = bbc(true);
+  if (b === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
index c58f76684..44b6e0f21 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js

- * @description Function.prototype.bind allows Target to be a constructor (Object)

- */

-

-

-function testcase() {

-  var boc = Object.bind(null);

-  var o = boc(42);

-  if (o == 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var boc = Object.bind(null);
+  var o = boc(42);
+  if (o == 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
index f40385247..69846ed01 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (JSON)

- */

-

-

-function testcase() {

-  try {

-    JSON.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
index 96b3d395f..fbe540042 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js

- * @description Function.prototype.bind allows Target to be a constructor (Array)

- */

-

-

-function testcase() {

-        var bac = Array.bind(null);

-        var a = bac(42);

-        a.prop = "verifyPropertyExist";

-        a[41] = 41;

-

-        return a.prop === "verifyPropertyExist" && a[41] === 41 && a.length === 42;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var bac = Array.bind(null);
+        var a = bac(42);
+        a.prop = "verifyPropertyExist";
+        a[41] = 41;
+
+        return a.prop === "verifyPropertyExist" && a[41] === 41 && a.length === 42;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
index 35994e613..96740bea0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js

- * @description Function.prototype.bind allows Target to be a constructor (Date)

- */

-

-

-function testcase() {

-  var bdc = Date.bind(null);

-  var s = bdc(0, 0, 0);

-  if (typeof(s) === 'string') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind allows Target to be a constructor (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bdc = Date.bind(null);
+  var s = bdc(0, 0, 0);
+  if (typeof(s) === 'string') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
index 6baa890d9..b69e287cc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js

- * @description Function.prototype.bind - 'caller' is defined as one property of 'F'

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        return obj.hasOwnProperty("caller");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - 'caller' is defined as one property of
+    'F'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        return obj.hasOwnProperty("caller");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
index 97352a8ac..9077d78a7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js

- * @description Function.prototype.bind - [[Get]] attribute of 'caller' property in 'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            return obj.caller && false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Get]] attribute of 'caller' property
+    in 'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            return obj.caller && false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
index d627779a3..868be1f04 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js

- * @description Function.prototype.bind - [[Set]] attribute of 'caller' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            obj.caller = 12;

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Set]] attribute of 'caller' property
+    in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            obj.caller = 12;
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
index df5c63681..0b695b452 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of 'caller' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("caller");

-        for (var prop in obj) {

-            if (prop === "caller") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of 'caller'
+    property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("caller");
+        for (var prop in obj) {
+            if (prop === "caller") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
index e5ff88537..1377dbcd4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of 'caller' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("caller");

-        delete obj.caller;

-        canConfigurable = obj.hasOwnProperty("caller");

-        return hasProperty && canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of
+    'caller' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("caller");
+        delete obj.caller;
+        canConfigurable = obj.hasOwnProperty("caller");
+        return hasProperty && canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
index 2f4f76dff..a44f29d9e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js

- * @description Function.prototype.bind - 'arguments' is defined as one property of 'F'

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        return obj.hasOwnProperty("arguments");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - 'arguments' is defined as one property
+    of 'F'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        return obj.hasOwnProperty("arguments");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
index 79b87cd9e..fde9b0460 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js

- * @description Function.prototype.bind - [[Get]] attribute of 'arguments' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            return obj.arguments && false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Get]] attribute of 'arguments'
+    property in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            return obj.arguments && false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
index 859b996fc..0b3a7948e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js

- * @description Function.prototype.bind - [[Set]] attribute of 'arguments' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            obj.arguments = 12;

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Set]] attribute of 'arguments'
+    property in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            obj.arguments = 12;
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
index 1f2b9b5af..ad0b1a23e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of 'arguments' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("arguments");

-        for (var prop in obj) {

-            if (prop === "arguments") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of
+    'arguments' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("arguments");
+        for (var prop in obj) {
+            if (prop === "arguments") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
index fb5772d60..b8c4d86cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of 'arguments' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("arguments");

-        delete obj.caller;

-        canConfigurable = !obj.hasOwnProperty("arguments");

-        return hasProperty && !canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of
+    'arguments' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("arguments");
+        delete obj.caller;
+        canConfigurable = !obj.hasOwnProperty("arguments");
+        return hasProperty && !canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
index 919b1a01f..6ba9305b8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js

- * @description Function.prototype.bind - each arg is defined in A in list order

- */

-

-

-function testcase() {

-

-        var foo = function (x, y) {

-            return new Boolean((x + y) === "ab" && arguments[0] === "a" &&

-                arguments[1] === "b" && arguments.length === 2);

-        };

-

-        var obj = foo.bind({}, "a", "b");

-        return obj()==true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - each arg is defined in A in list order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function (x, y) {
+            return new Boolean((x + y) === "ab" && arguments[0] === "a" &&
+                arguments[1] === "b" && arguments.length === 2);
+        };
+
+        var obj = foo.bind({}, "a", "b");
+        return obj()==true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
index acc864358..db3e6de19 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js

- * @description Function.prototype.bind - F can get own data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        obj.property = 12;

-        return obj.property === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        obj.property = 12;
+        return obj.property === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
index 32f349895..2d984ed8d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js

- * @description Function.prototype.bind - F can get own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "property", {

-                set: function () { }

-            });

-            return typeof (obj.property) === "undefined";

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property without
+    a get function that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "property", {
+                set: function () { }
+            });
+            return typeof (obj.property) === "undefined";
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
index ec08f1129..c5041152b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js

- * @description Function.prototype.bind - F can get inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                set: function () { },

-                configurable: true

-            });

-            return typeof (obj.property) === "undefined";

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get inherited accessor property
+    without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                set: function () { },
+                configurable: true
+            });
+            return typeof (obj.property) === "undefined";
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
index 1071f6462..60eca15fa 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js

- * @description Function.prototype.bind - F cannot get property which doesn't exist

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        return typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F cannot get property which doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        return typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
index 465322918..7d6f87b67 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js

- * @description Function.prototype.bind - F can get inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Function.prototype.property = 12;

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Function.prototype.property = 12;
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
index 18570e273..b106908c0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js

- * @description Function.prototype.bind - F can get own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-

-        try {

-            Function.prototype.property = 3;

-            obj.property = 12;

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own data property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+
+        try {
+            Function.prototype.property = 3;
+            obj.property = 12;
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
index ef687d6fd..357c005fe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js

- * @description Function.prototype.bind - F can get own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-           

-            Object.defineProperty(obj, "property", {

-                value: 12

-            });

-

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own data property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+           
+            Object.defineProperty(obj, "property", {
+                value: 12
+            });
+
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
index c98325793..b51137416 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js

- * @description Function.prototype.bind - F can get own accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 12;

-            }

-        });

-        return obj.property === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 12;
+            }
+        });
+        return obj.property === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
index 3cff59da8..3240abd31 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js

- * @description Function.prototype.bind - F can get inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 12;

-                },

-                configurable: true

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 12;
+                },
+                configurable: true
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
index f41fe83a2..b428c3e21 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js

- * @description Function.prototype.bind - F can get own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Function.prototype.property = 3;

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 12;

-                }

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Function.prototype.property = 3;
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 12;
+                }
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
index 2165355cc..3e4647a15 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js

- * @description Function.prototype.bind - F can get own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 12;

-                }

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 12;
+                }
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
index 8c2d6fd24..b1895009b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js

- * @description Function.prototype.bind - F can get own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        Object.defineProperty(obj, "property", {

-            set: function () {}

-        });

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property without
+    a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        Object.defineProperty(obj, "property", {
+            set: function () {}
+        });
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
index 4b6b7ded4..f8641bc43 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js

- * @description Function.prototype.bind, type of bound function must be 'function'

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (typeof(bf) === 'function') {

-    return  true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, type of bound function must be 'function'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (typeof(bf) === 'function') {
+    return  true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
index 65db6d625..c7704a9e7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js

- * @description Function.prototype.bind, [[Class]] of bound function must be 'Function'

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var s = Object.prototype.toString.call(bf);

-  if (s === '[object Function]') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, [[Class]] of bound function must be
+    'Function'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var s = Object.prototype.toString.call(bf);
+  if (s === '[object Function]') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
index b0fa31606..ac2b0c8da 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js

- * @description Function.prototype.bind, [[Prototype]] is Function.prototype

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (Function.prototype.isPrototypeOf(bf)) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, [[Prototype]] is Function.prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (Function.prototype.isPrototypeOf(bf)) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
index 8cff9369a..a15848d8b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js

- * @description Function.prototype.bind, [[Prototype]] is Function.prototype (using getPrototypeOf)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (Object.getPrototypeOf(bf) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, [[Prototype]] is Function.prototype
+    (using getPrototypeOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (Object.getPrototypeOf(bf) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
index 65af32d2b..d4d1d582f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
@@ -1,16 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "caller" of bound function is poisoned (step 20)
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
- * @description A bound function should fail to find its "caller"
- * @negative TypeError
- */
+/*---
+info: "\"caller\" of bound function is poisoned (step 20)"
+description: A bound function should fail to find its "caller"
+negative: TypeError
+---*/
 
 function foo() { return bar.caller; }
 var bar = foo.bind({});
 function baz() { return bar(); }
 baz();
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
index 93892e868..791529e46 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call(undefined, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
index 3fae6b26b..4bc49284b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call(null, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
index 25ac3d72a..03ba2d6be 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call({}, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
index d3336de71..4dc1a7ae2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
- * @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.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+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/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
index 7d94c7755..15defb8f8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
@@ -1,16 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "arguments" of bound function is poisoned (step 21)
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
- * @description a bound function should fail to find the bound function "arguments"
- * @negative TypeError
- */
+/*---
+info: "\"arguments\" of bound function is poisoned (step 21)"
+description: a bound function should fail to find the bound function "arguments"
+negative: TypeError
+---*/
 
 function foo() { return bar.arguments; }
 var bar = foo.bind({});
 function baz() { return bar(); }
 baz();
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
index d0cd6bbaf..216eb0c63 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
- * @description Function.prototype.bind must exist
- */
+/*---
+description: Function.prototype.bind must exist
+---*/
 
 if (!('bind' in Function.prototype)) {
   $ERROR('Function.prototype.bind is missing');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
index 719fdb531..f38eab829 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
@@ -1,11 +1,11 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
- * @description Function.prototype.bind call the original's internal
- * [[Call]] method rather than its .apply method.
- */
+/*---
+description: >
+    Function.prototype.bind call the original's internal  [[Call]]
+    method rather than its .apply method.
+---*/
 
 function foo() {}
 
@@ -14,4 +14,3 @@ foo.apply = function() {
   $ERROR("Function.prototype.bind called original's .apply method");
 };
 b(55, 66);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
index c80624e16..b09950015 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
@@ -1,11 +1,11 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
- * @description Function.prototype.bind must curry [[Construct]] as
- * well as [[Call]].
- */
+/*---
+description: >
+    Function.prototype.bind must curry [[Construct]] as  well as
+    [[Call]].
+---*/
 
 function construct(f, args) {
   var bound = Function.prototype.bind.apply(f, [null].concat(args));
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
index f41d2d94a..53063d157 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Function.prototype.constructor is the built-in Function constructor
- *
- * @path ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
- * @description Checking Function.prototype.constructor
- */
+/*---
+info: >
+    The initial value of Function.prototype.constructor is the built-in
+    Function constructor
+description: Checking Function.prototype.constructor
+---*/
 
 //CHECK#1
 if (Function.prototype.constructor !== Function) {
   $ERROR('#1: The initial value of Function.prototype.constructor is the built-in Function constructor');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
index f73e867b7..27576ea16 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object (its [[Class]] is "Function")
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A1.js
- * @description Object.prototype.toString returns [object+[[Class]]+]
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object (its [[Class]]
+    is "Function")
+description: Object.prototype.toString returns [object+[[Class]]+]
+---*/
 
 if (Object.prototype.toString.call(Function.prototype) !== "[object Function]") {
   $ERROR('#2: The Function prototype object is itself a Function ' +
          'object (its [[Class]] is "Function") (15.3.4)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js
index 8a9e9cf66..30f64d762 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T1.js
- * @description Call Function.prototype()
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype()
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +16,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js
index bbf5ac5ef..7a9a11258 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T2.js
- * @description Call Function.prototype(null,void 0)
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype(null,void 0)
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +16,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js
index d01ed8e37..48e5b5838 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T3.js
- * @description Call Function.prototype(x), where x is undefined variable
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype(x), where x is undefined variable
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +17,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
index 0c0dd8bf4..2dd037682 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.4)
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A3_T1.js
- * @description Checking prototype of Function.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function
+    prototype object is the Object prototype object (15.3.4)
+description: Checking prototype of Function.prototype
+---*/
 
 if (Object.getPrototypeOf(Function.prototype) !== Object.prototype) {
   $ERROR('#1: The value of the internal [[Prototype]] property of ' +
          'the Function prototype object is the Object prototype ' +
          'object (15.3.4)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js
index c76ebc759..1f250812a 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.2.1)
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A3_T2.js
- * @description Add new property to Object.prototype and check it at Function.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function
+    prototype object is the Object prototype object (15.3.2.1)
+description: >
+    Add new property to Object.prototype and check it at
+    Function.prototype
+---*/
 
 Object.prototype.indicator = 1;
 
@@ -14,4 +16,3 @@ Object.prototype.indicator = 1;
 if (Function.prototype.indicator!==1) {
   $ERROR('#1: The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.2.1)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
index 39b96039a..b314dd8a2 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object does not have a valueOf property of its own. however, it inherits the valueOf property from the Object prototype Object
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A4.js
- * @description Checking valueOf property at Function.prototype
- */
+/*---
+info: >
+    The Function prototype object does not have a valueOf property of its
+    own. however, it inherits the valueOf property from the Object prototype
+    Object
+description: Checking valueOf property at Function.prototype
+---*/
 
 //CHECK#1
 if (Function.prototype.hasOwnProperty("valueOf") !== false) {
@@ -22,4 +23,3 @@ if (typeof Function.prototype.valueOf === "undefined") {
 if (Function.prototype.valueOf !== Object.prototype.valueOf) {
   $ERROR('#3: however, it inherits the valueOf property from the Object prototype Object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
index d26add206..81f62eb3b 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object without [[create]] property
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A5.js
- * @description Checking if creating "new Function.prototype object" fails
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object without
+    [[create]] property
+description: Checking if creating "new Function.prototype object" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 //CHECK#
 try {
@@ -16,4 +19,3 @@ try {
   $PRINT("#1.1: The Function prototype object is itself a Function object without [[create]] property "+e);
 
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
index 87e1cf11d..d9b4ca9de 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.5/15.3.5-1gs.js

- * @description StrictMode - error is thrown when reading the 'caller' property of a function object

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-function _15_3_5_1_gs() {}

-throw NotEarlyError;

-_15_3_5_1_gs.caller;

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - error is thrown when reading the 'caller' property of
+    a function object
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function _15_3_5_1_gs() {}
+throw NotEarlyError;
+_15_3_5_1_gs.caller;
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
index c173e4413..41de01f99 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.5/15.3.5-2gs.js

- * @description StrictMode - error is thrown when reading the 'caller' property of a function object

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-function _15_3_5_1_gs() {}

-_15_3_5_1_gs.caller;

-throw NotEarlyError;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - error is thrown when reading the 'caller' property of
+    a function object
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function _15_3_5_1_gs() {}
+_15_3_5_1_gs.caller;
+throw NotEarlyError;
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
index e4709e980..c7d301c62 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed Function constructor includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = new Function("\"use strict\";\nreturn gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed Function constructor includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = new Function("\"use strict\";\nreturn gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
index e36af1df9..634f7dcd3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js

- * @description Strict mode - checking access to strict function caller from strict function (eval used within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-eval("gNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (eval used within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+eval("gNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
index 9d72fbbe4..f571e2346 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js

- * @description Strict mode - checking access to non-strict function caller from non-strict function (eval includes strict directive prologue)

- * @noStrict

- */

-

-

-eval("\"use strict\";\ngNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    non-strict function (eval includes strict directive prologue)
+flags: [noStrict]
+---*/
+
+eval("\"use strict\";\ngNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
index 65b6ea64a..b725b4035 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (indirect eval used within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var my_eval = eval;

-my_eval("gNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (indirect eval used within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var my_eval = eval;
+my_eval("gNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
index d7dcf1c4d..0a30f58b7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js

- * @description Strict mode - checking access to non-strict function caller from non-strict function (indirect eval includes strict directive prologue)

- * @noStrict

- */

-

-

-var my_eval = eval;

-my_eval("\"use strict\";\ngNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    non-strict function (indirect eval includes strict directive
+    prologue)
+flags: [noStrict]
+---*/
+
+var my_eval = eval;
+my_eval("\"use strict\";\ngNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
index f98fef128..708bfd6f0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f() {

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from FunctionDeclaration defined
+    within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
index 7e2bddb40..cbcf6a952 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from FunctionDeclaration
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
index 4052e0aef..0fc4ec341 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = function () {

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from FunctionExpression defined
+    within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
index 9282dfb62..d5d471b77 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = function () {

-    "use strict";

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from FunctionExpression
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
index 79adcf1ba..3e86ac856 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var obj = new (function () {

-    return gNonStrict();

-});

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from Anonymous FunctionExpression
+    defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var obj = new (function () {
+    return gNonStrict();
+});
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
index 4bb11ea8e..9de4ca680 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f() {

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
index 654b3ead7..5e4d42d1d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var obj = new (function () {

-    "use strict";

-    return gNonStrict();

-});

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from Anonymous
+    FunctionExpression includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var obj = new (function () {
+    "use strict";
+    return gNonStrict();
+});
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
index a62912ede..1b0474c36 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
index d710c5ef7..76506c02b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
index 8497d91fc..aab1f45b0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
index 4d0c4f658..f3daa54f1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
index 85e6f5b24..f0af53442 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
index b1f23423b..c604338ee 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
index 451a69965..00b7b87b1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within an Anonymous
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
index 12abaf581..e714ff193 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within an Anonymous
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
index 47a3091e1..98cc9832c 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    return (function () {

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within an
+    Anonymous FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    return (function () {
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
index ac0a73919..44cb36c84 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
index 8928186ac..3c431e798 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
index eae058954..66f97f752 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
index 68e6e8e5f..a9ad3c88b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
index 5186ef4a3..bf4541754 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
index 728330d49..9e8dbcd21 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
index f78ae96e9..731beaf19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
index 4dca56c3b..7b69b993a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within an
+    Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
index 866802a24..e8a37dee9 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within an
+    Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
index aa9734eb5..90faa0510 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
index a60706623..495d355ce 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
index 4f89d3727..e3d01d163 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = function () {

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
index e96e2440e..f1e9c4092 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
index f6c72bea7..26c2ddfe0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
index 32efa2793..a498ce942 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
index 3dd7ff941..d63748ea0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
index 354c354e0..2c35a708d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
index 16b05ee24..27c0a5cd4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
index 93e0beda4..e3beb585a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
index b68de18d7..6c4b2c3c4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
index 0fb987cd2..197656b09 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Literal getter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = { get foo() { return gNonStrict(); } }

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Literal getter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { get foo() { return gNonStrict(); } }
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
index 3eae7b11d..2fc6d0f19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Literal getter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = { get foo() { "use strict"; return gNonStrict(); } }

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Literal getter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { get foo() { "use strict"; return gNonStrict(); } }
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
index f6fd1036d..2b0cea156 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = function () {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
index 433bceb56..eb9a11ab7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Literal setter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = { set foo(stuff) { return gNonStrict(); } }

-o.foo = 7; 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Literal setter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { set foo(stuff) { return gNonStrict(); } }
+o.foo = 7; 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
index 49b69f4b9..bd27b5240 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Literal setter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = { set foo(stuff) { "use strict"; return gNonStrict(); } }

-o.foo = 8;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Literal setter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { set foo(stuff) { "use strict"; return gNonStrict(); } }
+o.foo = 8;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
index 6f49e6cdd..8294ed907 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Injected getter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get: function() { return gNonStrict(); } });

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Injected getter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get: function() { return gNonStrict(); } });
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
index 6c6bd48a8..20b919bce 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Injected getter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return gNonStrict(); } });

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Injected getter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return gNonStrict(); } });
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
index 9e7b792d8..218bf85a2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Injected setter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo", { set: function(stuff) { return gNonStrict(); } });

-o.foo = 9; 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Injected setter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo", { set: function(stuff) { return gNonStrict(); } });
+o.foo = 9; 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
index 2739fa9e0..345e46d42 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Injected setter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = {};

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; return gNonStrict(); } });

-o.foo = 10;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Injected setter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; return gNonStrict(); } });
+o.foo = 10;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
index 0b58b9453..caa546d01 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict function declaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-function foo() { return f();}

-foo();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict function declaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+function foo() { return f();}
+foo();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
index b13890cd3..931b17dfa 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict eval)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-eval("f();"); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict eval)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+eval("f();"); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
index e418493a1..770d95b2f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict Function constructor)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-Function("return f();")();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict Function constructor)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+Function("return f();")();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
index a66ea00ca..98a1cdc8f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict new'ed Function constructor)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-new Function("return f();")();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict new'ed Function constructor)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+new Function("return f();")();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
index ce651dd22..5b078931e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    return gNonStrict();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within
+    strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    return gNonStrict();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
index aaf42d98a..b425fe4d6 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
index 9c100aef0..6e1ff29cb 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(null))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(null);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(null))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(null);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
index fe4cfd658..96f2713d0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(undefined))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(undefined);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(undefined))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(undefined);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
index 6a77440dd..40b728c71 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(someObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.apply(o);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(someObject))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.apply(o);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
index 5d630796e..771eb77d2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(globalObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(fnGlobalObject());

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(globalObject))
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(fnGlobalObject());
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
index 5447227df..b0e016220 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
index b6a287d97..91a864d84 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(null))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(null);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(null))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(null);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
index 27bf71a06..4fcd16038 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(undefined))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(undefined);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(undefined))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(undefined);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
index a6f6d9e62..63a51a60b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(someObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.call(o); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(someObject))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.call(o); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
index 124c0d09a..12acd1c74 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(globalObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(fnGlobalObject());

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(globalObject))
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(fnGlobalObject());
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
index 7a46ca1a7..2a684aa6b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    return gNonStrict();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    return gNonStrict();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
index 587cd4d3d..6e8f838ff 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind()())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind()();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind()())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind()();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
index 6a931da77..6b4cf92dc 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(null)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(null)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(null)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(null)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
index 03c60ba4f..1881e66f4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(undefined)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(undefined)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(undefined)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(undefined)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
index 9ba366171..eb9d51c29 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(someObject)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.bind(o)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(someObject)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.bind(o)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
index dcd3a636d..a7f13e783 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(globalObject)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(fnGlobalObject())(); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(globalObject)())
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(fnGlobalObject())(); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
index cda7c0324..d81a0f0a3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-function foo() { "use strict"; return f();}

-foo(); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict function declaration)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+function foo() { "use strict"; return f();}
+foo(); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
index 89c794699..454cceac4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict eval)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return eval("f();"); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict eval)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return eval("f();"); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
index 572122575..444b6aa0e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-

-

-function f() {return gNonStrict();};

-(function () {"use strict"; return Function("return f();")(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function constructor)
+flags: [noStrict]
+---*/
+
+function f() {return gNonStrict();};
+(function () {"use strict"; return Function("return f();")(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
index 56e51c18d..252b872bd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return new Function("return f();")(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict new'ed Function constructor)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return new Function("return f();")(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
index 845d4a0dc..b391119cd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
index a75e3f030..9fb25f89f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (Function constructor defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = Function("return gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (Function constructor defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = Function("return gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
index 839c4ec6c..d9c12cc98 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(null); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(null))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(null); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
index 0425bd056..fa08289f2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(undefined); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(undefined))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(undefined); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
index 43d35835a..82b1daf86 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.apply(o); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(someObject))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.apply(o); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
index 0428553b7..7c49e6c27 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(fnGlobalObject()); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(globalObject))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(fnGlobalObject()); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
index 9984ceec7..a3ccc57eb 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
index 0eb29a573..8a1ddd4fa 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(null);})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(null))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(null);})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
index 87c216ae2..6370cd2ac 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(undefined); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(undefined))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(undefined); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
index 7936c1be2..f5144df3b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.call(o); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(someObject))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.call(o); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
index 30b8bc4b5..48682c757 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(fnGlobalObject()); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(globalObject))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(fnGlobalObject()); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
index 459cc0c23..664608f3e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind()();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind()())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind()();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
index ccaa39bc9..68562726e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Function constructor includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = Function("\"use strict\";\nreturn gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Function constructor includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = Function("\"use strict\";\nreturn gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
index ba624e0c2..c37a2124c 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(null)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(null)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(null)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
index cbb93f37f..ba676f097 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(undefined)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(undefined)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
index 96b7b1a28..91720f2be 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.bind(o)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(someObject)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.bind(o)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
index 76fd8610c..6adb789bc 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(fnGlobalObject())(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(globalObject)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(fnGlobalObject())(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
index 1bfe4693f..37186cb19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function expression (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = function () {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function expression (FunctionDeclaration includes
+    strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = function () {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
index 52c3a2e8a..2294b72dd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js

- * @description Strict mode - checking access to strict function caller from non-strict, constructor-based function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict, constructor-based function (FunctionDeclaration
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
index 27562fada..07a223dc1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js

- * @description Strict mode - checking access to strict function caller from non-strict property (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var o = { 

-    get gNonStrict() {

-        var tmp = Object.getOwnPropertyDescriptor(o, "gNonStrict").get;

-        return tmp.caller || tmp.caller.throwTypeError;

-    }

-};

-

-

-function f() {

-    "use strict";

-    return o.gNonStrict;

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict property (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { 
+    get gNonStrict() {
+        var tmp = Object.getOwnPropertyDescriptor(o, "gNonStrict").get;
+        return tmp.caller || tmp.caller.throwTypeError;
+    }
+};
+
+
+function f() {
+    "use strict";
+    return o.gNonStrict;
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
index 30b57a589..6468dc22f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js

- * @description Strict mode - checking access to strict function caller from bound non-strict function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = gNonStrictBindee.bind(null);

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrictBindee() {

-    return gNonStrictBindee.caller || gNonStrictBindee.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from bound
+    non-strict function (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = gNonStrictBindee.bind(null);
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrictBindee() {
+    return gNonStrictBindee.caller || gNonStrictBindee.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
index b41bb2ef4..304dc7d57 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = new Function("return gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (New'ed Function constructor defined within strict
+    mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = new Function("return gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
index dba019d99..4ac1846a9 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
- * @description Checking length property of Function("arg1,arg2,arg3", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: Checking length property of Function("arg1,arg2,arg3", null)
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -19,4 +20,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 3) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
index e7ee6c2d1..8853eaa21 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
- * @description Checking length property of Function("arg1,arg2,arg3","arg4,arg5", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: >
+    Checking length property of Function("arg1,arg2,arg3","arg4,arg5",
+    null)
+includes: [$FAIL.js]
+---*/
 
 f = Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -19,4 +22,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 5) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
index ebabb31a0..58dd8596d 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
- * @description Checking length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: >
+    Checking length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null)
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -19,4 +22,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 6) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
index 2029841db..b3283b20a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -29,4 +30,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 3) {
   $ERROR('#4: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
index a430c4d0f..6b91eb17c 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -26,4 +27,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 5) {
   $ERROR('#3: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
index 7c769946d..06957ee7a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -26,4 +27,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 6) {
   $ERROR('#3: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
index c11f1e620..6244fb64f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 5) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
index 36e16ada4..02feaa396 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 3) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
index 3eb47a8b1..bd3e9d80e 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 6) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
index 6ac1f63dc..96ccc51cc 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
index ae7d5f551..e2a51b636 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3","arg5,arg4", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
index a5287e541..be60b88fd 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
index d58f7c76c..061fb5ead 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the prototype property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
- * @description Checking if deleting the prototype property of Function("", null) fails
- */
+/*---
+info: the prototype property has the attributes { DontDelete }
+description: >
+    Checking if deleting the prototype property of Function("", null)
+    fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("", null);
 
@@ -26,4 +27,3 @@ if (delete f.prototype) {
 if (f.prototype !== fproto) {
   $ERROR('#3: the prototype property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
index cd8e1e4bd..fe7de3a42 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the prototype property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
- * @description Checking if deleting the prototype property of Function(void 0, "") fails
- */
+/*---
+info: the prototype property has the attributes { DontDelete }
+description: >
+    Checking if deleting the prototype property of Function(void 0,
+    "") fails
+includes: [$FAIL.js]
+---*/
 
 f = Function(void 0, "");
 
@@ -26,4 +27,3 @@ if (delete f.prototype) {
 if (f.prototype !== fproto) {
   $ERROR('#3: the prototype property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
index b90326eec..a139bd308 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
- * @description V is number
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is number
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((1 instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
index 79454b8fe..6bcde17a8 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
- * @description V is string
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is string
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if (("1" instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
index 9b7ebad28..e690608e7 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
- * @description V is boolean true
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is boolean true
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((true instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
index 364294e17..9c0476fb4 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
- * @description V is boolean false
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is boolean false
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((false instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
index ab5221bdf..012d82306 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
- * @description V is void 0
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is void 0
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((void 0 instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
index ac62538d8..9a83d745e 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
- * @description V is null
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is null
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((null instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
index 2ddb306eb..0acaef638 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
- * @description V is undefined
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is undefined
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((undefined instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
index 72cd6e7ac..3b56bf15a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
- * @description V is undefined variable
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is undefined variable
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -16,4 +17,3 @@ if ((x instanceof  FACTORY)!==false) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
index 1a76931b9..9d18b0e21 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i).
- * iii) O is not an object, throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
- * @description F.prototype is undefined, and V is empty object
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i).
+    iii) O is not an object, throw a TypeError exception
+description: F.prototype is undefined, and V is empty object
+includes: [$FAIL.js]
+---*/
 
 FACTORY = new Function;
 
@@ -26,6 +26,3 @@ try {
   	$ERROR('#1.1: O is not an object, throw a TypeError exception');
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
index c84ed748e..0be5c506f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of
- *             F is called with value V and V is an object, the following steps
- *             are taken: i) Call the [[Get]] method of F with property name
- *             "prototype". ii) Let O be Result(i). iii) O is not an object,
- *             throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
- * @description F.prototype is void 0, and V is new F
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of
+    F is called with value V and V is an object, the following steps
+    are taken: i) Call the [[Get]] method of F with property name
+    "prototype". ii) Let O be Result(i). iii) O is not an object,
+    throw a TypeError exception
+description: F.prototype is void 0, and V is new F
+includes: [$FAIL.js]
+---*/
 
 FACTORY = Function("this.prop=1;");
 
@@ -34,4 +34,3 @@ try {
 if ((instance.constructor !== FACTORY) || (instance.name !== "fairy")) {
   $ERROR('#2: instance.constructor === FACTORY');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
index 1ec347709..0cf183a50 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of
- *             F is called with value V and V is an object, the following steps
- *             are taken: i) Call the [[Get]] method of F with property name
- *             "prototype". ii) Let O be Result(i). iii) O is not an object,
- *             throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
- * @description F.prototype is string, and V is function
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of
+    F is called with value V and V is an object, the following steps
+    are taken: i) Call the [[Get]] method of F with property name
+    "prototype". ii) Let O be Result(i). iii) O is not an object,
+    throw a TypeError exception
+description: F.prototype is string, and V is function
+includes: [$FAIL.js]
+---*/
 
 FACTORY = new Function;
 
@@ -26,4 +26,3 @@ try {
     $ERROR('#1.1: O is not an object, throw a TypeError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
index 93779f8ff..8d6236fa0 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i) and O is an object.
- * iii) Let V be the value of the [[Prototype]] property of V.
- * iv) If V is null, return false.
- * v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
- * vi) Go to step iii)
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
- * @description F.prototype.type is 1, and V is new F
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i) and O is an object.
+    iii) Let V be the value of the [[Prototype]] property of V.
+    iv) If V is null, return false.
+    v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
+    vi) Go to step iii)
+description: F.prototype.type is 1, and V is new F
+---*/
 
 FACTORY = Function("this.name=\"root\"");
 
@@ -24,4 +23,3 @@ instance = new FACTORY;
 if (!(instance instanceof FACTORY)) {
   $ERROR('#1: If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
index d3f2cc7e3..5a28fb74f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i) and O is an object.
- * iii) Let V be the value of the [[Prototype]] property of V.
- * iv) If V is null, return false.
- * v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
- * vi) Go to step iii)
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
- * @description F.prototype is Object.prototype, and V is empty object
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i) and O is an object.
+    iii) Let V be the value of the [[Prototype]] property of V.
+    iv) If V is null, return false.
+    v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
+    vi) Go to step iii)
+description: F.prototype is Object.prototype, and V is empty object
+---*/
 
 FAKEFACTORY = Function();
 
@@ -29,4 +28,3 @@ FAKEFACTORY.prototype=Object.prototype;
 if (!(fakeinstance instanceof FAKEFACTORY)) {
   $ERROR('#2: If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js
index 792eb4920..fa2839f9c 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the [[Class]] property is "Function"
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A1_T1.js
- * @description For testing use variable f = new Function
- */
+/*---
+info: The value of the [[Class]] property is "Function"
+description: For testing use variable f = new Function
+---*/
 
 var f = new Function;
 
 if (Object.prototype.toString.call(f) !== "[object Function]") {
   $ERROR('#1: The value of the [[Class]] property is "Function"');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
index 1d33ccc16..03e786e0a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the [[Class]] property is "Function"
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A1_T2.js
- * @description For testing use variable f = Function()
- */
+/*---
+info: The value of the [[Class]] property is "Function"
+description: For testing use variable f = Function()
+---*/
 
 var f = Function();
 
 if (Object.prototype.toString.call(f) !== "[object Function]") {
   $ERROR('#1: The value of the [[Class]] property is "Function"');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js
index a4c5c74f0..f623cedce 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every function instance has a [[Call]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A2_T1.js
- * @description For testing call Function("var x =1; this.y=2;return \"OK\";")()
- */
+/*---
+info: Every function instance has a [[Call]] property
+description: For testing call Function("var x =1; this.y=2;return \"OK\";")()
+---*/
 
 //CHECK#1
 if (Function("var x =1; this.y=2;return \"OK\";")() !== "OK") {
@@ -22,4 +20,3 @@ if (typeof x !== "undefined") {
 if (y !== 2) {
   $ERROR('#3: Every function instance has a [[Call]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js
index 86d2ea801..b3b6426eb 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every function instance has a [[Call]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A2_T2.js
- * @description For testing call (new Function("arg1,arg2","var x =arg1; this.y=arg2;return arg1+arg2;"))("1",2)
- */
+/*---
+info: Every function instance has a [[Call]] property
+description: >
+    For testing call (new Function("arg1,arg2","var x =arg1;
+    this.y=arg2;return arg1+arg2;"))("1",2)
+---*/
 
 //CHECK#1
 if ((new Function("arg1,arg2","var x =arg1; this.y=arg2;return arg1+arg2;"))("1",2) !== "12") {
@@ -22,4 +22,3 @@ if (typeof x !== "undefined") {
 if (y !== 2) {
   $ERROR('#3: Every function instance has a [[Call]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js
index 357eb0c15..ea74492ba 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * every function instance has a [[Construct]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A3_T1.js
- * @description As constructor use Function("var x =1; this.y=2;return \"OK\";")
- */
+/*---
+info: every function instance has a [[Construct]] property
+description: As constructor use Function("var x =1; this.y=2;return \"OK\";")
+---*/
 
 FACTORY = Function("var x =1; this.y=2;return \"OK\";");
 obj = new FACTORY;
@@ -25,4 +23,3 @@ if (obj.constructor !== FACTORY) {
 if (obj.y !== 2) {
   $ERROR('#3: every function instance has a [[Construct]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
index ef8607eee..1762abba5 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * every function instance has a [[Construct]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A3_T2.js
- * @description As constructor use new Function("arg1,arg2","var x =1; this.y=arg1+arg2;return \"OK\";")
- */
+/*---
+info: every function instance has a [[Construct]] property
+description: >
+    As constructor use new Function("arg1,arg2","var x =1;
+    this.y=arg1+arg2;return \"OK\";")
+---*/
 
 FACTORY = new Function("arg1,arg2","var x =1; this.y=arg1+arg2;return \"OK\";");
 obj = new FACTORY("1",2);
@@ -25,4 +25,3 @@ if (obj.constructor !== FACTORY) {
 if (obj.y !== "12") {
   $ERROR('#3: every function instance has a [[Construct]] property');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3.1_A1_T1.js b/test/suite/ch15/15.3/S15.3.1_A1_T1.js
index 5031ad0e6..8fd644563 100644
--- a/test/suite/ch15/15.3/S15.3.1_A1_T1.js
+++ b/test/suite/ch15/15.3/S15.3.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The function call Function(…) is equivalent to the object creation expression
- * new Function(…) with the same arguments.
- *
- * @path ch15/15.3/S15.3.1_A1_T1.js
- * @description Create simple functions and check returned values
- */
+/*---
+info: >
+    The function call Function(…) is equivalent to the object creation expression
+    new Function(…) with the same arguments.
+description: Create simple functions and check returned values
+---*/
 
 var f = Function("return arguments[0];");
 
@@ -38,4 +37,3 @@ if (g("A") !== "A") {
 if (g("A") !== f("A")) {
   $ERROR('#5: g("A") !== f("A")');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A1.js b/test/suite/ch15/15.3/S15.3_A1.js
index 0b7f12e62..0777d6b09 100644
--- a/test/suite/ch15/15.3/S15.3_A1.js
+++ b/test/suite/ch15/15.3/S15.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function is the property of global
- *
- * @path ch15/15.3/S15.3_A1.js
- * @description Compare Function with this.Function
- */
+/*---
+info: Function is the property of global
+description: Compare Function with this.Function
+---*/
 
 var obj = Function;
 
@@ -15,4 +13,3 @@ var thisobj = this.Function;
 if (obj !== thisobj) {
   $ERROR('Function is the property of global');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A2_T1.js b/test/suite/ch15/15.3/S15.3_A2_T1.js
index 3b7b32995..cd67db417 100644
--- a/test/suite/ch15/15.3/S15.3_A2_T1.js
+++ b/test/suite/ch15/15.3/S15.3_A2_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since applying the "call" method to Function constructor themself leads to creating a new function instance, the second argument must be a valid function body
- *
- * @path ch15/15.3/S15.3_A2_T1.js
- * @description Checking if executing "Function.call(this, "var x / = 1;")" fails
- */
+/*---
+info: >
+    Since applying the "call" method to Function constructor themself leads
+    to creating a new function instance, the second argument must be a valid
+    function body
+description: Checking if executing "Function.call(this, "var x / = 1;")" fails
+---*/
 
 //CHECK#
 try{
@@ -15,6 +16,4 @@ try{
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1: function body must be valid');
   }
-}    
-
-
+}
diff --git a/test/suite/ch15/15.3/S15.3_A2_T2.js b/test/suite/ch15/15.3/S15.3_A2_T2.js
index c2797b540..034fc748f 100644
--- a/test/suite/ch15/15.3/S15.3_A2_T2.js
+++ b/test/suite/ch15/15.3/S15.3_A2_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since applying the "call" method to Function constructor themself leads to creating a new function instance, the second argument must be a valid function body
- *
- * @path ch15/15.3/S15.3_A2_T2.js
- * @description Checking if executing "Function.call(this, "var #x  = 1;")" fails
- */
+/*---
+info: >
+    Since applying the "call" method to Function constructor themself leads
+    to creating a new function instance, the second argument must be a valid
+    function body
+description: Checking if executing "Function.call(this, "var #x  = 1;")" fails
+---*/
 
 //CHECK#
 try{
@@ -15,6 +16,4 @@ try{
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1: function body must be valid');
   }
-}    
-
-
+}
diff --git a/test/suite/ch15/15.3/S15.3_A3_T1.js b/test/suite/ch15/15.3/S15.3_A3_T1.js
index ad10b97e4..293a1a145 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T1.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T1.js
- * @description First argument is object
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is object
+---*/
 
 //CHECK#1 - does not throw
 var f = Function.call(mars, "return name;");
@@ -26,4 +25,3 @@ if (about_mars !== undefined) {
 if (this.godname !== "ares" && mars.godname===undefined) {
   $ERROR('#3: When applied to the Function object itself, thisArg should be ignored');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T2.js b/test/suite/ch15/15.3/S15.3_A3_T2.js
index cb4cb5740..494e4d2aa 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T2.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T2.js
- * @description First argument is string and null
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is string and null
+---*/
 
 this.color="red";
 var name="mars";
@@ -25,5 +24,3 @@ var g = Function.call(null, "return this.name;");
 if (g() !== "mars") {
   $ERROR('#2: ');
 }
-
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T3.js b/test/suite/ch15/15.3/S15.3_A3_T3.js
index 8f352b54c..eec919fa2 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T3.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T3.js
- * @description First argument is this, and this don`t have needed variable
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is this, and this don`t have needed variable
+---*/
 
 var f=Function.call(this, "return planet;");
 var g=Function.call(this, "return color;");
@@ -39,4 +38,3 @@ this.color="red";
 if (g() !== "red") {
   $ERROR('#4: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T4.js b/test/suite/ch15/15.3/S15.3_A3_T4.js
index 871c3762a..e6c23229f 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T4.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T4.js
- * @description First argument is this, and this have needed variable
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is this, and this have needed variable
+---*/
 
 var f=Function.call(this, "return planet;");
 
@@ -22,4 +21,3 @@ var planet="mars";
 if (f() !== "mars") {
   $ERROR('#2: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T5.js b/test/suite/ch15/15.3/S15.3_A3_T5.js
index 9d1df2ade..70ba81c29 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T5.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T5.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T5.js
- * @description First argument is this, and this don`t have needed variable. Function return this.var_name
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: >
+    First argument is this, and this don`t have needed variable.
+    Function return this.var_name
+---*/
 
 var f=Function.call(this, "return this.planet;");
 var g=Function.call(this, "return this.color;");
@@ -35,4 +36,3 @@ this.color="red";
 if (g() !== "red") {
   $ERROR('#4: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T6.js b/test/suite/ch15/15.3/S15.3_A3_T6.js
index 4e324f8b6..a49c5b127 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T6.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T6.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T6.js
- * @description First argument is this, and this have needed variable. Function return this.var_name
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: >
+    First argument is this, and this have needed variable. Function
+    return this.var_name
+---*/
 
 var f=Function.call(this, "return this.planet;");
 
@@ -22,4 +23,3 @@ var planet="mars";
 if (f() !== "mars") {
   $ERROR('#2: ');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T1.js
index 2ee5698d1..aceab0241 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A1.1_T1.js
- * @description Create new property of Array.prototype. When new Array object has this property
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: >
+    Create new property of Array.prototype. When new Array object has
+    this property
+---*/
 
 //CHECK#1
 Array.prototype.myproperty = 1;
@@ -21,4 +22,3 @@ if (x.myproperty !== 1) {
 if (x.hasOwnProperty('myproperty') !== false) {
   $ERROR('#2: Array.prototype.myproperty = 1; var x = Array(); x.hasOwnProperty(\'myproperty\') === false. Actual: ' + (x.hasOwnProperty('myproperty')));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T2.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T2.js
index 6c9b78575..18d0418e3 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A1.1_T2.js
- * @description Array.prototype.toString = Object.prototype.toString
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Array.prototype.toString = Object.prototype.toString
+---*/
 
 //CHECK#1
 Array.prototype.toString = Object.prototype.toString;
@@ -23,5 +22,3 @@ var x = Array(0,1,2);
 if (x.toString() !== "[object " + "Array" + "]") {
   $ERROR('#2: Array.prototype.toString = Object.prototype.toString; var x = Array(0,1,2); x.toString() === "[object " + "Array" + "]". Actual: ' + (x.toString()));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T3.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T3.js
index 7bede3baf..770febb7c 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.1_T3.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A1.1_T3.js
- * @description Checking use isPrototypeOf
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Checking use isPrototypeOf
+---*/
 
 //CHECK#1
 if (Array.prototype.isPrototypeOf(Array()) !== true) {
   $ERROR('#1: Array.prototype.isPrototypeOf(Array()) === true. Actual: ' + (Array.prototype.isPrototypeOf(Array())));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.2_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.2_T1.js
index 24685612e..bda647609 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "Array"
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A1.2_T1.js
- * @description Checking use Object.prototype.toString
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "Array"
+description: Checking use Object.prototype.toString
+---*/
 
 //CHECK#1
 var x = Array(); 
@@ -21,4 +19,3 @@ x.getClass = Object.prototype.toString;
 if (x.getClass() !== "[object " + "Array" + "]") {
   $ERROR('#2: var x = Array(0,1,2); x.getClass = Object.prototype.toString; x is Array object. Actual: ' + (x.getClass()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.3_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.3_T1.js
index 8d69a5263..36bc59b6e 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * This description of Array constructor applies if and only if
- * the Array constructor is given no arguments or at least two arguments
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A1.3_T1.js
- * @description Checking case when Array constructor is given one argument
- */
+/*---
+info: >
+    This description of Array constructor applies if and only if
+    the Array constructor is given no arguments or at least two arguments
+description: Checking case when Array constructor is given one argument
+---*/
 
 var x = Array(2);
 
@@ -20,4 +19,3 @@ if (x.length === 1) {
 if (x[0] === 2) {
   $ERROR('#2: var x = Array(2); x[0] !== 2');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.1_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.1_T1.js
index ea58f69bf..05c68261a 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the newly constructed object;
- * is set to the number of arguments
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A2.1_T1.js
- * @description Array constructor is given no arguments or at least two arguments
- */
+/*---
+info: >
+    The length property of the newly constructed object;
+    is set to the number of arguments
+description: Array constructor is given no arguments or at least two arguments
+---*/
 
 //CHECK#1
 if (Array().length !== 0) {
@@ -23,4 +22,3 @@ if (Array(0,1,0,1).length !== 4) {
 if (Array(undefined, undefined).length !== 2) {
   $ERROR('#3: (Array(undefined, undefined).length === 2. Actual: ' + (Array(undefined, undefined).length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.2_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.2_T1.js
index b817a6abf..026579e15 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A2.2_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The 0 property of the newly constructed object is set to item0
- * (if supplied); the 1 property of the newly constructed object is set to item1
- * (if supplied); and, in general, for as many arguments as there are, the k property
- * of the newly constructed object is set to argument k, where the first argument is
- * considered to be argument number 0
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A2.2_T1.js
- * @description Checking correct work this algorithm
- */
+/*---
+info: >
+    The 0 property of the newly constructed object is set to item0
+    (if supplied); the 1 property of the newly constructed object is set to item1
+    (if supplied); and, in general, for as many arguments as there are, the k property
+    of the newly constructed object is set to argument k, where the first argument is
+    considered to be argument number 0
+description: Checking correct work this algorithm
+---*/
 
 //CHECK#
 var x = Array(
@@ -35,5 +34,4 @@ for (var i = 0; i < 100; i++) {
 
 if (result !== true) {
   $ERROR('#1: x[i] === i. Actual: ' + (x[i]));
-}    
-
+}
diff --git a/test/suite/ch15/15.4/15.4.1/S15.4.1_A3.1_T1.js b/test/suite/ch15/15.4/15.4.1/S15.4.1_A3.1_T1.js
index 2e0c36976..18aff63ce 100644
--- a/test/suite/ch15/15.4/15.4.1/S15.4.1_A3.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.1/S15.4.1_A3.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Array is called as a function rather than as a constructor,
- * it creates and initialises a new Array object
- *
- * @path ch15/15.4/15.4.1/S15.4.1_A3.1_T1.js
- * @description Checking use typeof, instanceof
- */
+/*---
+info: >
+    When Array is called as a function rather than as a constructor,
+    it creates and initialises a new Array object
+description: Checking use typeof, instanceof
+---*/
 
 //CHECK#1
 if (typeof Array() !== "object") {
@@ -17,5 +16,4 @@ if (typeof Array() !== "object") {
 //CHECK#2
 if ((Array() instanceof Array) !== true) {
   $ERROR('#2: (Array() instanceof Array) === true. Actual: ' + (Array() instanceof Array));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T1.js
index d833ddf9a..435038333 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T1.js
- * @description Create new property of Array.prototype. When new Array object has this property
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: >
+    Create new property of Array.prototype. When new Array object has
+    this property
+---*/
 
 //CHECK#1
 Array.prototype.myproperty = 1;
@@ -21,4 +22,3 @@ if (x.myproperty !== 1) {
 if (x.hasOwnProperty('myproperty') !== false) {
   $ERROR('#2: Array.prototype.myproperty = 1; var x = new Array(); x.hasOwnProperty(\'myproperty\') === false. Actual: ' + (x.hasOwnProperty('myproperty')));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T2.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T2.js
index 3c3098d0b..177a0156e 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T2.js
- * @description Array.prototype.toString = Object.prototype.toString
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Array.prototype.toString = Object.prototype.toString
+---*/
 
 //CHECK#1
 Array.prototype.toString = Object.prototype.toString;
@@ -23,5 +22,3 @@ var x = new Array(0,1,2);
 if (x.toString() !== "[object " + "Array" + "]") {
   $ERROR('#2: Array.prototype.toString = Object.prototype.toString; var x = new Array(0,1,2); x.toString() === "[object " + "Array" + "]". Actual: ' + (x.toString()));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T3.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T3.js
index 6e5e9ea3d..28db0bcb5 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T3.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.1_T3.js
- * @description Checking use isPrototypeOf
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Checking use isPrototypeOf
+---*/
 
 //CHECK#1
 if (Array.prototype.isPrototypeOf(new Array()) !== true) {
   $ERROR('#1: Array.prototype.isPrototypeOf(new Array()) === true. Actual: ' + (Array.prototype.isPrototypeOf(new Array())));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.2_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.2_T1.js
index 0046b6955..1b567b88f 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "Array"
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.2_T1.js
- * @description Checking use Object.prototype.toString
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "Array"
+description: Checking use Object.prototype.toString
+---*/
 
 //CHECK#1
 var x = new Array(); 
@@ -21,4 +19,3 @@ x.getClass = Object.prototype.toString;
 if (x.getClass() !== "[object " + "Array" + "]") {
   $ERROR('#2: var x = new Array(0,1,2); x.getClass = Object.prototype.toString; x is Array object. Actual: ' + (x.getClass()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.3_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.3_T1.js
index e6d11bca8..546b454b1 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * This description of Array constructor applies if and only if
- * the Array constructor is given no arguments or at least two arguments
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A1.3_T1.js
- * @description Checking case when Array constructor is given one argument
- */
+/*---
+info: >
+    This description of Array constructor applies if and only if
+    the Array constructor is given no arguments or at least two arguments
+description: Checking case when Array constructor is given one argument
+---*/
 
 var x = new Array(2);
 
@@ -20,4 +19,3 @@ if (x.length === 1) {
 if (x[0] === 2) {
   $ERROR('#2: var x = new Array(2); x[0] !== 2');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.1_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.1_T1.js
index 5bdd8828b..ddf11672a 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the newly constructed object;
- * is set to the number of arguments
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.1_T1.js
- * @description Array constructor is given no arguments or at least two arguments
- */
+/*---
+info: >
+    The length property of the newly constructed object;
+    is set to the number of arguments
+description: Array constructor is given no arguments or at least two arguments
+---*/
 
 //CHECK#1
 if (new Array().length !== 0) {
@@ -23,4 +22,3 @@ if (new Array(0,1,0,1).length !== 4) {
 if (new Array(undefined, undefined).length !== 2) {
   $ERROR('#3: new Array(undefined, undefined).length === 2. Actual: ' + (new Array(undefined, undefined).length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.2_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.2_T1.js
index 9e6371253..de4ff6181 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.2_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The 0 property of the newly constructed object is set to item0
- * (if supplied); the 1 property of the newly constructed object is set to item1
- * (if supplied); and, in general, for as many arguments as there are, the k property
- * of the newly constructed object is set to argument k, where the first argument is
- * considered to be argument number 0
- *
- * @path ch15/15.4/15.4.2/15.4.2.1/S15.4.2.1_A2.2_T1.js
- * @description Checking correct work this algorithm
- */
+/*---
+info: >
+    The 0 property of the newly constructed object is set to item0
+    (if supplied); the 1 property of the newly constructed object is set to item1
+    (if supplied); and, in general, for as many arguments as there are, the k property
+    of the newly constructed object is set to argument k, where the first argument is
+    considered to be argument number 0
+description: Checking correct work this algorithm
+---*/
 
 //CHECK#
 var x = new Array(
@@ -35,5 +34,4 @@ for (var i = 0; i < 100; i++) {
 
 if (result !== true) {
   $ERROR('#1: x[i] === i. Actual: ' + (x[i]));
-}    
-
+}
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T1.js
index 597a29467..58d351949 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T1.js
- * @description Create new property of Array.prototype. When new Array object has this property
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: >
+    Create new property of Array.prototype. When new Array object has
+    this property
+---*/
 
 //CHECK#1
 Array.prototype.myproperty = 1;
@@ -16,4 +17,3 @@ var x = new Array(0);
 if (x.myproperty !== 1) {
   $ERROR('#1: Array.prototype.myproperty = 1; var x = new Array(0); x.myproperty === 1. Actual: ' + (x.myproperty));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T2.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T2.js
index 2ae3fccaa..743e3b6d8 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T2.js
- * @description Array.prototype.toString = Object.prototype.toString
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Array.prototype.toString = Object.prototype.toString
+---*/
 
 //CHECK#1
 Array.prototype.toString = Object.prototype.toString;
@@ -16,4 +15,3 @@ var x = new Array(0);
 if (x.toString() !== "[object " + "Array" + "]") {
   $ERROR('#1: Array.prototype.toString = Object.prototype.toString; var x = new Array(0); x.toString() === "[object " + "Array" + "]". Actual: ' + (x.toString()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T3.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T3.js
index 679ff6876..4a9d40710 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T3.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Array prototype object, the one that
- * is the initial value of Array.prototype
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.1_T3.js
- * @description Checking use isPrototypeOf
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Array prototype object, the one that
+    is the initial value of Array.prototype
+description: Checking use isPrototypeOf
+---*/
 
 //CHECK#1
 if (Array.prototype.isPrototypeOf(new Array(0)) !== true) {
   $ERROR('#1: Array.prototype.isPrototypeOf(new Array(0)) === true. Actual: ' + (Array.prototype.isPrototypeOf(new Array(0))));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.2_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.2_T1.js
index 3cc17dd17..706d8d978 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "Array"
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A1.2_T1.js
- * @description Checking use Object.prototype.toString
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "Array"
+description: Checking use Object.prototype.toString
+---*/
 
 //CHECK#1
 var x = new Array(0); 
@@ -14,4 +12,3 @@ x.getClass = Object.prototype.toString;
 if (x.getClass() !== "[object " + "Array" + "]") {
   $ERROR('#1: var x = new Array(0); x.getClass = Object.prototype.toString; x is Array object. Actual: ' + (x.getClass()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.1_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.1_T1.js
index 7d9a9952c..c0e432363 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is a Number and ToUint32(len) is equal to len,
- * then the length property of the newly constructed object is set to ToUint32(len)
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.1_T1.js
- * @description Array constructor is given one argument
- */
+/*---
+info: >
+    If the argument len is a Number and ToUint32(len) is equal to len,
+    then the length property of the newly constructed object is set to ToUint32(len)
+description: Array constructor is given one argument
+---*/
 
 //CHECK#1
 var x = new Array(0); 
@@ -25,5 +24,4 @@ if (x.length !== 1) {
 var x = new Array(4294967295); 
 if (x.length !== 4294967295) {
   $ERROR('#3: var x = new Array(4294967295); x.length === 4294967295. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T1.js
index 244cdb178..59f9825c6 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is a Number and ToUint32(len) is not equal to len,
- * a RangeError exception is thrown
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T1.js
- * @description Use try statement. len = -1, 4294967296, 4294967297
- */
+/*---
+info: >
+    If the argument len is a Number and ToUint32(len) is not equal to len,
+    a RangeError exception is thrown
+description: Use try statement. len = -1, 4294967296, 4294967297
+---*/
 
 //CHECK#1
 try {  
@@ -38,4 +37,3 @@ try {
     $ERROR('#3.2: new Array(4294967297) throw RangeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T2.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T2.js
index 6b2419d6a..f80d7cef4 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is a Number and ToUint32(len) is not equal to len,
- * a RangeError exception is thrown
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T2.js
- * @description Use try statement. len = NaN, +/-Infinity
- */
+/*---
+info: >
+    If the argument len is a Number and ToUint32(len) is not equal to len,
+    a RangeError exception is thrown
+description: Use try statement. len = NaN, +/-Infinity
+---*/
 
 //CHECK#1
 try {  
@@ -38,4 +37,3 @@ try {
     $ERROR('#3.2: new Array(Number.NEGATIVE_INFINITY) throw RangeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T3.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T3.js
index 8e4a21486..6f987a756 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is a Number and ToUint32(len) is not equal to len,
- * a RangeError exception is thrown
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.2_T3.js
- * @description Use try statement. len = 1.5, Number.MAX_VALUE, Number.MIN_VALUE
- */
+/*---
+info: >
+    If the argument len is a Number and ToUint32(len) is not equal to len,
+    a RangeError exception is thrown
+description: Use try statement. len = 1.5, Number.MAX_VALUE, Number.MIN_VALUE
+---*/
 
 //CHECK#1
 try {  
@@ -38,4 +37,3 @@ try {
     $ERROR('#3.2: new Array(Number.MIN_VALUE) throw RangeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T1.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T1.js
index d5b4b5333..381bce20e 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is not a Number, then the length property of
- * the newly constructed object is set to 1 and the 0 property of
- * the newly constructed object is set to len
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T1.js
- * @description Checking for null and undefined
- */
+/*---
+info: >
+    If the argument len is not a Number, then the length property of
+    the newly constructed object is set to 1 and the 0 property of
+    the newly constructed object is set to len
+description: Checking for null and undefined
+---*/
 
 var x = new Array(null);
 
@@ -33,4 +32,3 @@ if (x.length !== 1) {
 if (x[0] !== undefined) {
   $ERROR('#4: var x = new Array(undefined); x[0] === undefined. Actual: ' + (x[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T2.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T2.js
index 5f4f26d05..940fb54bd 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T2.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is not a Number, then the length property of
- * the newly constructed object is set to 1 and the 0 property of
- * the newly constructed object is set to len
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T2.js
- * @description Checking for boolean primitive and Boolean object
- */
+/*---
+info: >
+    If the argument len is not a Number, then the length property of
+    the newly constructed object is set to 1 and the 0 property of
+    the newly constructed object is set to len
+description: Checking for boolean primitive and Boolean object
+---*/
 
 var x = new Array(true);
 
@@ -34,4 +33,3 @@ if (x.length !== 1) {
 if (x[0] !== obj) {
   $ERROR('#4: var obj = new Boolean(false); var x = new Array(obj); x[0] === obj. Actual: ' + (x[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T3.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T3.js
index 4fe1311f9..19188590e 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T3.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is not a Number, then the length property of
- * the newly constructed object is set to 1 and the 0 property of
- * the newly constructed object is set to len
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T3.js
- * @description Checking for boolean primitive and Boolean object
- */
+/*---
+info: >
+    If the argument len is not a Number, then the length property of
+    the newly constructed object is set to 1 and the 0 property of
+    the newly constructed object is set to len
+description: Checking for boolean primitive and Boolean object
+---*/
 
 var x = new Array("1");
 
@@ -34,4 +33,3 @@ if (x.length !== 1) {
 if (x[0] !== obj) {
   $ERROR('#4: var obj = new String("0"); var x = new Array(obj); x[0] === obj. Actual: ' + (x[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T4.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T4.js
index 5565e216d..28180f3d6 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T4.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is not a Number, then the length property of
- * the newly constructed object is set to 1 and the 0 property of
- * the newly constructed object is set to len
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T4.js
- * @description Checking for Number object
- */
+/*---
+info: >
+    If the argument len is not a Number, then the length property of
+    the newly constructed object is set to 1 and the 0 property of
+    the newly constructed object is set to len
+description: Checking for Number object
+---*/
 
 var obj = new Number(0);
 var x = new Array(obj);
@@ -48,5 +47,3 @@ if (x.length !== 1) {
 if (x[0] !== obj) {
   $ERROR('#6: var obj = new Number(4294967295); var x = new Array(obj); x[0] === obj. Actual: ' + (x[0]));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T5.js b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T5.js
index 10355f3bd..e91b597db 100644
--- a/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T5.js
+++ b/test/suite/ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the argument len is not a Number, then the length property of
- * the newly constructed object is set to 1 and the 0 property of
- * the newly constructed object is set to len
- *
- * @path ch15/15.4/15.4.2/15.4.2.2/S15.4.2.2_A2.3_T5.js
- * @description Checking for Number object
- */
+/*---
+info: >
+    If the argument len is not a Number, then the length property of
+    the newly constructed object is set to 1 and the 0 property of
+    the newly constructed object is set to len
+description: Checking for Number object
+---*/
 
 var obj = new Number(-1);
 var x = new Array(obj);
@@ -48,5 +47,3 @@ if (x.length !== 1) {
 if (x[0] !== obj) {
   $ERROR('#6: var obj = new Number(4294967297); var x = new Array(obj); x[0] === obj. Actual: ' + (x[0]));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A1.js b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A1.js
index 55388ecde..21cb56c70 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A1.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array has property prototype
- *
- * @path ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A1.js
- * @description Checking use hasOwnProperty
- */
+/*---
+info: The Array has property prototype
+description: Checking use hasOwnProperty
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('prototype') !== true) {
 	$FAIL('#1: Array.hasOwnProperty(\'prototype\') === true. Actual: ' + (Array.hasOwnProperty('prototype')));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A2.js b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A2.js
index 138116089..bc018302a 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A2.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array.prototype property has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A2.js
- * @description Checking if enumerating the Array.prototype property fails
- */
+/*---
+info: The Array.prototype property has the attribute DontEnum
+description: Checking if enumerating the Array.prototype property fails
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('prototype') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
 	$ERROR('#2: result = true; for (p in Array) { if (p === "prototype") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A3.js b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A3.js
index 12d2d914b..d3993a628 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A3.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array.prototype property has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A3.js
- * @description Checking if deleting the Array.prototype property fails
- * @noStrict
- */
+/*---
+info: The Array.prototype property has the attribute DontDelete
+description: Checking if deleting the Array.prototype property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('prototype') !== true) {
@@ -25,6 +24,3 @@ if (Array.hasOwnProperty('prototype') !== true) {
 if (Array.prototype === undefined) {
   $ERROR('#3: delete Array.prototype; Array.prototype !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A4.js b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A4.js
index 40c4140f8..d571bb182 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A4.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A4.js
- * @description Checking if varying the Array.prototype property fails
- * @noStrict
- */
+/*---
+info: The Array.prototype property has the attribute ReadOnly
+description: Checking if varying the Array.prototype property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype;
@@ -15,5 +13,3 @@ Array.prototype = 1;
 if (Array.prototype !== x) {
 	$ERROR('#1: x = Array.prototype; Array.prototype = 1; Array.prototype === x. Actual: ' + (Array.prototype));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A5.js b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A5.js
index bd9f87f0a..67dc2e91f 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A5.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of Array.prototype is 0
- *
- * @path ch15/15.4/15.4.3/15.4.3.1/S15.4.3.1_A5.js
- * @description Array.prototype.length === 0
- */
+/*---
+info: The length property of Array.prototype is 0
+description: Array.prototype.length === 0
+---*/
 
 //CHECK#1
 if (Array.prototype.length !== 0) {
@@ -15,6 +13,4 @@ if (Array.prototype.length !== 0) {
   if (1 / Array.prototype.length !== Number.POSITIVE_INFINITY) {
     $ERROR('#1.2: Array.prototype.length === +0. Actual: -' + (Array.prototype.length));
   }
-} 
-
-
+}
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-1.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-1.js
index ee5d7d5e4..e17332a92 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-1.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-1.js

- * @description Array.isArray must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.isArray;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.isArray;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-2.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-2.js
index c213e3be2..250822c2c 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-2.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-2.js

- * @description Array.isArray must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Array.isArray.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.isArray.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-3.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-3.js
index 7aff2e755..d76863e3a 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-3.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-3.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-3.js

- * @description Array.isArray return true if its argument is an Array

- */

-

-

-function testcase() {

-  var a = [];

-  var b = Array.isArray(a);

-  if (b === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray return true if its argument is an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [];
+  var b = Array.isArray(a);
+  if (b === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-4.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-4.js
index 0c3b7b533..d3d79e2ec 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-4.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-4.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-4.js

- * @description Array.isArray return false if its argument is not an Array

- */

-

-

-function testcase() {

-  var b_num   = Array.isArray(42);

-  var b_undef = Array.isArray(undefined);

-  var b_bool  = Array.isArray(true);

-  var b_str   = Array.isArray("abc");

-  var b_obj   = Array.isArray({});

-  var b_null  = Array.isArray(null);

-  

-  if (b_num === false &&

-      b_undef === false &&

-      b_bool === false &&

-      b_str === false &&

-      b_obj === false &&

-      b_null === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray return false if its argument is not an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b_num   = Array.isArray(42);
+  var b_undef = Array.isArray(undefined);
+  var b_bool  = Array.isArray(true);
+  var b_str   = Array.isArray("abc");
+  var b_obj   = Array.isArray({});
+  var b_null  = Array.isArray(null);
+  
+  if (b_num === false &&
+      b_undef === false &&
+      b_bool === false &&
+      b_str === false &&
+      b_obj === false &&
+      b_null === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-5.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-5.js
index 3e32f06ad..89573cc14 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-5.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-5.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-5.js

- * @description Array.isArray return true if its argument is an Array (Array.prototype)

- */

-

-

-function testcase() {

-  var b = Array.isArray(Array.prototype);

-  if (b === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.isArray return true if its argument is an Array
+    (Array.prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = Array.isArray(Array.prototype);
+  if (b === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-6.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-6.js
index b827c30e4..cb6b8151e 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-6.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-6.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-6.js

- * @description Array.isArray return true if its argument is an Array (new Array())

- */

-

-

-function testcase() {

-  var a = new Array(10);

-  var b = Array.isArray(a);

-  if (b === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray return true if its argument is an Array (new Array())
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(10);
+  var b = Array.isArray(a);
+  if (b === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-7.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-7.js
index 7ddb7e14d..4789d3c9c 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-7.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-7.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-0-7.js

- * @description Array.isArray returns false if its argument is not an Array

- */

-

-

-function testcase() {

-  var o = new Object();

-  o[12] = 13;

-  var b = Array.isArray(o);

-  if (b === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray returns false if its argument is not an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var o = new Object();
+  o[12] = 13;
+  var b = Array.isArray(o);
+  if (b === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-1.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-1.js
index e42ce7e28..243f09f53 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-1.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-1.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-1.js

- * @description Array.isArray applied to boolean primitive

- */

-

-

-function testcase() {

-

-        return !Array.isArray(true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-10.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-10.js
index 5aa9edd0c..93962f52d 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-10.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-10.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-10.js

- * @description Array.isArray applied to RegExp object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new RegExp());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new RegExp());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-11.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-11.js
index a14b3c3d5..da7ba096e 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-11.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-11.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-11.js

- * @description Array.isArray applied to the JSON object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(JSON);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(JSON);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-12.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-12.js
index ab1dbb612..eb0956d6b 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-12.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-12.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-12.js

- * @description Array.isArray applied to Error object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new SyntaxError());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new SyntaxError());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-13.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-13.js
index e623d1d36..74f3009e2 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-13.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-13.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-13.js

- * @description Array.isArray applied to Arguments object

- */

-

-

-function testcase() {

-

-        var arg;

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        return !Array.isArray(arg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        return !Array.isArray(arg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-15.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-15.js
index 113f390db..bab56c19a 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-15.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-15.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-15.js

- * @description Array.isArray applied to the global object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(fnGlobalObject());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        return !Array.isArray(fnGlobalObject());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-2.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-2.js
index 66b7dd25b..2555f362a 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-2.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-2.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-2.js

- * @description Array.isArray applied to Boolean Object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new Boolean(false));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Boolean Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new Boolean(false));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-3.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-3.js
index 343ddc43e..42627edc6 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-3.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-3.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-3.js

- * @description Array.isArray applied to number primitive

- */

-

-

-function testcase() {

-

-        return !Array.isArray(5);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(5);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-4.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-4.js
index 7f1870671..f2e7d3d76 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-4.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-4.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-4.js

- * @description Array.isArray applied to Number object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new Number(-3));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new Number(-3));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-5.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-5.js
index bb517c45e..4d180e716 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-5.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-5.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-5.js

- * @description Array.isArray applied to string primitive

- */

-

-

-function testcase() {

-

-        return !Array.isArray("abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray("abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-6.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-6.js
index 5a2a723d7..d5904e677 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-6.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-6.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-6.js

- * @description Array.isArray applied to String object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new String("hello\nworld\\!"));

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new String("hello\nworld\\!"));
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-7.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-7.js
index ce564de44..1491314b0 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-7.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-7.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-7.js

- * @description Array.isArray applied to Function object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(function () { });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(function () { });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-8.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-8.js
index c296bd373..8f870dd20 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-8.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-8.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-8.js

- * @description Array.isArray applied to the Math object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(Math);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(Math);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-9.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-9.js
index e535d2083..38b4c1140 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-9.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-9.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-1-9.js

- * @description Array.isArray applied to Date object

- */

-

-

-function testcase() {

-

-        return !Array.isArray(new Date());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray(new Date());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-1.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-1.js
index 69c642e88..baa7bf5cd 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-1.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-1.js

- * @description Array.isArray applied to an object with an array as the prototype

- */

-

-

-function testcase() {

-

-        var proto = [];

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        return !Array.isArray(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.isArray applied to an object with an array as the prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = [];
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        return !Array.isArray(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-2.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-2.js
index 493f4c760..eccfeda17 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-2.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-2.js

- * @description Array.isArray applied to an object with Array.prototype as the prototype

- */

-

-

-function testcase() {

-

-        var proto = Array.prototype;

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        return !Array.isArray(child);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.isArray applied to an object with Array.prototype as the
+    prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = Array.prototype;
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        return !Array.isArray(child);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-3.js b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-3.js
index 67e8881e7..be03e800a 100644
--- a/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-3.js
+++ b/test/suite/ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.3/15.4.3.2/15.4.3.2-2-3.js

- * @description Array.isArray applied to an Array-like object with length and some indexed properties

- */

-

-

-function testcase() {

-

-        return !Array.isArray({ 0: 12, 1: 9, length: 2 });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.isArray applied to an Array-like object with length and some
+    indexed properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return !Array.isArray({ 0: 12, 1: 9, length: 2 });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T1.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T1.js
index afb16971f..cbc7e5f86 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of
- * the Array constructor is the Function prototype object
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A1.1_T1.js
- * @description Create new property of Function.prototype. When Array constructor has this property
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of
+    the Array constructor is the Function prototype object
+description: >
+    Create new property of Function.prototype. When Array constructor
+    has this property
+---*/
 
 Function.prototype.myproperty = 1;
 
@@ -20,4 +21,3 @@ if (Array.myproperty !== 1) {
 if (Array.hasOwnProperty('myproperty') !== false) {
   $ERROR('#2: Function.prototype.myproperty = 1; Array.hasOwnProperty(\'myproperty\') === false. Actual: ' + (Array.hasOwnProperty('myproperty')));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T2.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T2.js
index ef6ab6b97..40041b6c0 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T2.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of
- * the Array constructor is the Function prototype object
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A1.1_T2.js
- * @description Function.prototype.toString = Object.prototype.toString
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of
+    the Array constructor is the Function prototype object
+description: Function.prototype.toString = Object.prototype.toString
+---*/
 
 //CHECK#1
 Function.prototype.toString = Object.prototype.toString;
 if (Array.toString() !== "[object " + "Function" + "]") {
   $ERROR('#1: Function.prototype.toString = Object.prototype.toString; Array.toString() === "[object " + "Function" + "]". Actual: ' + (Array.toString()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T3.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T3.js
index 4ef0ea020..8fd864efc 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A1.1_T3.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of
- * the Array constructor is the Function prototype object
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A1.1_T3.js
- * @description Checking use isPrototypeOf
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of
+    the Array constructor is the Function prototype object
+description: Checking use isPrototypeOf
+---*/
 
 //CHECK#1
 if (Function.prototype.isPrototypeOf(Array) !== true) {
   $ERROR('#1: Function.prototype.isPrototypeOf(Array) === true. Actual: ' + (Function.prototype.isPrototypeOf(Array)));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.1.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.1.js
index ace47db44..ea9cb4b0f 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.1.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A2.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.slice) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.2.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.2.js
index 9fc73527d..7f3d8cdb9 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.2.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of Array has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A2.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of Array has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.hasOwnProperty('length') !== true) {
@@ -24,6 +23,3 @@ if (Array.hasOwnProperty('length') !== true) {
 if (Array.length === undefined) {
   $ERROR('#3: delete Array.length; Array.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.3.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.3.js
index f7b6323a2..45d6aa275 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.3.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of Array has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A2.3.js
- * @description Checking if varying the length property fails
- */
+/*---
+info: The length property of Array has the attribute ReadOnly
+description: Checking if varying the length property fails
+---*/
 
 //CHECK#1
 x = Array.length;
@@ -14,5 +12,3 @@ Array.length = Infinity;
 if (Array.length !== x) {
   $ERROR('#1: x = Array.length; Array.length = Infinity; Array.length === x. Actual: ' + (Array.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.4.js b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.4.js
index 40bdaf796..81adbb2a5 100644
--- a/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.4.js
+++ b/test/suite/ch15/15.4/15.4.3/S15.4.3_A2.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of Array is 1
- *
- * @path ch15/15.4/15.4.3/S15.4.3_A2.4.js
- * @description Array.length === 1
- */
+/*---
+info: The length property of Array is 1
+description: Array.length === 1
+---*/
 
 //CHECK#1
 if (Array.length !== 1) {
   $ERROR('#1: Array.length === 1. Actual: ' + (Array.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A1_T1.js
index 7cc8bfb9e..42b95bf2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A1_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Array.prototype.constructor is
- * the built-in Array constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A1_T1.js
- * @description Array.prototype.constructor === Array
- */
+/*---
+info: >
+    The initial value of Array.prototype.constructor is
+    the built-in Array constructor
+description: Array.prototype.constructor === Array
+---*/
 
 //CHECK#1
 if (Array.prototype.constructor !== Array) {
   $ERROR('#1: Array.prototype.constructor === Array. Actual: ' + (Array.prototype.constructor));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A2.js
index 53adaaaeb..0e138ab5a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The constructor property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.1/S15.4.4.1_A2.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The constructor property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('constructor') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "constructor") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/15.4.4.10-10-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/15.4.4.10-10-c-ii-1.js
index 75630b888..1b6f22211 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/15.4.4.10-10-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/15.4.4.10-10-c-ii-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.10/15.4.4.10-10-c-ii-1.js

- * @description Array.prototype.slice will slice a string from start to end when index property (read-only) exists in Array.prototype (Step 10.c.ii)

- */

-

-

-function testcase() {

-        var arrObj = [1, 2, 3];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: "test",

-                writable: false,

-                configurable: true

-            });

-

-            var newArr = arrObj.slice(0, 1);

-            return newArr.hasOwnProperty("0") && newArr[0] === 1 && typeof newArr[1] === "undefined";

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.slice will slice a string from start to end when
+    index property (read-only) exists in Array.prototype (Step 10.c.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [1, 2, 3];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: "test",
+                writable: false,
+                configurable: true
+            });
+
+            var newArr = arrObj.slice(0, 1);
+            return newArr.hasOwnProperty("0") && newArr[0] === 1 && typeof newArr[1] === "undefined";
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T1.js
index 21b48b7d9..0beb08fbd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T1.js
- * @description length > end > start = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length > end > start = 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,3);
@@ -41,5 +40,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(0,3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T2.js
index 1a1bf27c0..d967b8250 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T2.js
- * @description length > end = start > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length > end = start > 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(3,3);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(3,3); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T3.js
index 4f5ec0535..5af976fe7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T3.js
- * @description length > start > end > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length > start > end > 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(4,3);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(4,3); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T4.js
index b9f2a3add..808e4e081 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T4.js
- * @description length = end = start > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length = end = start > 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(5,5);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(5,5); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T5.js
index cb527e80c..5860c3871 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T5.js
- * @description length = end > start > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length = end > start > 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(3,5);
@@ -36,5 +35,4 @@ if (arr[1] !== 4) {
 //CHECK#5
 if (arr[3] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(3,5); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T6.js
index e69330f06..a7273e288 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T6.js
- * @description length > end > start > 0;
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: length > end > start > 0;
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(2,4);
@@ -36,5 +35,4 @@ if (arr[1] !== 3) {
 //CHECK#5
 if (arr[3] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(2,4); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T7.js
index 8e170e400..27fe42d81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.1_T7.js
- * @description end > length > start > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is positive, use min(end, length)
+description: end > length > start > 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(3,6);
@@ -36,5 +35,4 @@ if (arr[1] !== 4) {
 //CHECK#5
 if (arr[3] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(3,6); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T1.js
index 1daab4f56..8c5aee496 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T1.js
- * @description length > end = abs(start), start < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is positive, use min(end, length)
+description: length > end = abs(start), start < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-3,3);
@@ -31,5 +30,4 @@ if (arr[0] !== 2) {
 //CHECK#4
 if (arr[1] !== undefined) {
   $ERROR('#4: var x = [0,1,2,3,4]; var arr = x.slice(-3,3); arr[1] === undefined. Actual: ' + (arr[1]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T2.js
index f0e65869f..7463b33a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T2.js
- * @description length = end > abs(start), start < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is positive, use min(end, length)
+description: length = end > abs(start), start < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-1,5);
@@ -31,5 +30,4 @@ if (arr[0] !== 4) {
 //CHECK#4
 if (arr[1] !== undefined) {
   $ERROR('#4: var x = [0,1,2,3,4]; var arr = x.slice(-1,5); arr[1] === undefined. Actual: ' + (arr[1]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T3.js
index c72c1f750..9713e83cf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T3.js
- * @description abs(start) = length > end > 0, start < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is positive, use min(end, length)
+description: abs(start) = length > end > 0, start < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-5,1);
@@ -31,5 +30,4 @@ if (arr[0] !== 0) {
 //CHECK#4
 if (arr[1] !== undefined) {
   $ERROR('#4: var x = [0,1,2,3,4]; var arr = x.slice(-5,1); arr[1] === undefined. Actual: ' + (arr[1]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T4.js
index d15388ee0..a6031be7b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is positive, use min(end, length)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.2_T4.js
- * @description abs(start) > length = end > 0, start < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is positive, use min(end, length)
+description: abs(start) > length = end > 0, start < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-9,5);
@@ -51,5 +50,4 @@ if (arr[4] !== 4) {
 //CHECK#8
 if (arr[5] !== undefined) {
   $ERROR('#8: var x = [0,1,2,3,4]; var arr = x.slice(-9,5); arr[5] === undefined. Actual: ' + (arr[5]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T1.js
index b23bd9482..d1475d540 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T1.js
- * @description length > abs(end) > start = 0, end < 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is negative, use max(end + length, 0)
+description: length > abs(end) > start = 0, end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,-2);
@@ -41,5 +40,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(0,-2); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T2.js
index d5348427f..5899800ba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T2.js
- * @description length > abs(end) > start > 0, end < 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is negative, use max(end + length, 0)
+description: length > abs(end) > start > 0, end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(1,-4);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(1,-4); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T3.js
index 87928d765..d4710d407 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T3.js
- * @description length = abs(end) > start = 0, end < 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is negative, use max(end + length, 0)
+description: length = abs(end) > start = 0, end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,-5);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(0,-5); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T4.js
index 7844830a0..c3b96486e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.3_T4.js
- * @description abs(end) > length > start > 0, end < 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If end is negative, use max(end + length, 0)
+description: abs(end) > length > start > 0, end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(4,-9);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(4,-9); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T1.js
index a79ced38f..7c8c53698 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T1.js
- * @description -length = start < end < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is negative, use max(end + length, 0)
+description: -length = start < end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-5,-2);
@@ -41,5 +40,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(-5,-2); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T2.js
index 385ec1028..3dab34a27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T2.js
- * @description -length < start < end < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is negative, use max(end + length, 0)
+description: -length < start < end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-3,-1);
@@ -36,5 +35,4 @@ if (arr[1] !== 3) {
 //CHECK#5
 if (arr[2] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(-3,-1); arr[2] === undefined. Actual: ' + (arr[2]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T3.js
index 5038a3248..7f2f2898a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T3.js
- * @description start < -length < end < 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is negative, use max(end + length, 0)
+description: start < -length < end < 0
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-9,-1);
@@ -46,5 +45,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (arr[4] !== undefined) {
   $ERROR('#7: var x = [0,1,2,3,4]; var arr = x.slice(-9,-1); arr[4] === undefined. Actual: ' + (arr[4]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T4.js
index c43ac02a2..4aaddaac9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If end is negative, use max(end + length, 0)
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.4_T4.js
- * @description start = end < -length
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If end is negative, use max(end + length, 0)
+description: start = end < -length
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-6,-6);
@@ -27,4 +26,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(-6,-6); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T1.js
index dba873ddc..cb3a6f765 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If end is undefined use length
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T1.js
- * @description end === undefined
- */
+/*---
+info: If end is undefined use length
+description: end === undefined
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(3, undefined);
@@ -35,5 +33,4 @@ if (arr[1] !== 4) {
 //CHECK#5
 if (arr[2] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(3, undefined); arr[2] === undefined. Actual: ' + (arr[2]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T2.js
index 764374ef3..663e5996c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If end is undefined use length
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A1.5_T2.js
- * @description end is absent
- */
+/*---
+info: If end is undefined use length
+description: end is absent
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(-2);
@@ -35,5 +33,4 @@ if (arr[1] !== 4) {
 //CHECK#5
 if (arr[2] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(-2); arr[2] === undefined. Actual: ' + (arr[2]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T1.js
index 9995f993c..16d942e43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T1.js
- * @description start is not integer
- */
+/*---
+info: Operator use ToInteger from start
+description: start is not integer
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(2.5,4);
@@ -35,5 +33,4 @@ if (arr[1] !== 3) {
 //CHECK#5
 if (arr[3] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(2.5,4); arr[3] === undefined. Actual: ' + (arr[3]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T2.js
index 1cb7b0fd7..de7354ba7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T2.js
- * @description start = NaN
- */
+/*---
+info: Operator use ToInteger from start
+description: start = NaN
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(NaN,3);
@@ -40,5 +38,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(NaN,3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T3.js
index 171df839f..2ffe71d6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T3.js
- * @description start = Infinity
- */
+/*---
+info: Operator use ToInteger from start
+description: start = Infinity
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(Number.POSITIVE_INFINITY,3);
@@ -26,4 +24,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(Number.POSITIVE_INFINITY,3); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T4.js
index 451a4fba0..983c3d82c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T4.js
- * @description start = -Infinity
- */
+/*---
+info: Operator use ToInteger from start
+description: start = -Infinity
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(Number.NEGATIVE_INFINITY,3);
@@ -40,5 +38,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(Number.NEGATIVE_INFINITY,3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T5.js
index 7be769570..a63bb3db4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.1_T5.js
- * @description ToInteger use ToNumber
- */
+/*---
+info: Operator use ToInteger from start
+description: ToInteger use ToNumber
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice({valueOf: function() {return 0}, toString: function() {return 3}},3);
@@ -40,5 +38,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice({valueOf: function() {return 0}, toString: function() {return 3}},3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T1.js
index 51209eb72..435167fff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from end
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T1.js
- * @description end is not integer
- */
+/*---
+info: Operator use ToInteger from end
+description: end is not integer
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(2,4.5);
@@ -35,5 +33,4 @@ if (arr[1] !== 3) {
 //CHECK#5
 if (arr[3] !== undefined) {
   $ERROR('#5: var x = [0,1,2,3,4]; var arr = x.slice(2,4.5); arr[3] === undefined. Actual: ' + (arr[3]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T2.js
index 1b29e02e4..669d3ad67 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from end
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T2.js
- * @description end = NaN
- */
+/*---
+info: Operator use ToInteger from end
+description: end = NaN
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,NaN);
@@ -26,4 +24,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(0,NaN); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T3.js
index 988cd1e90..d37b8e13e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from end
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T3.js
- * @description end = Infinity
- */
+/*---
+info: Operator use ToInteger from end
+description: end = Infinity
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,Number.POSITIVE_INFINITY);
@@ -50,5 +48,4 @@ if (arr[4] !== 4) {
 //CHECK#8
 if (arr[5] !== undefined) {
   $ERROR('#8: var x = [0,1,2,3,4]; var arr = x.slice(0,Number.POSITIVE_INFINITY); arr[5] === undefined. Actual: ' + (arr[5]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T4.js
index 3d98fe7f0..23a63fb6b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from end
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T4.js
- * @description end = -Infinity
- */
+/*---
+info: Operator use ToInteger from end
+description: end = -Infinity
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,Number.NEGATIVE_INFINITY);
@@ -26,4 +24,3 @@ if (arr.length !== 0) {
 if (arr[0] !== undefined) {
   $ERROR('#3: var x = [0,1,2,3,4]; var arr = x.slice(0,Number.NEGATIVE_INFINITY); arr[0] === undefined. Actual: ' + (arr[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T5.js
index 8c27e16c4..93dfb7474 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from end
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2.2_T5.js
- * @description ToInteger use ToNumber
- */
+/*---
+info: Operator use ToInteger from end
+description: ToInteger use ToNumber
+---*/
 
 var x = [0,1,2,3,4];
 var arr = x.slice(0,{valueOf: function() {return 3}, toString: function() {return 0}});
@@ -40,5 +38,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var x = [0,1,2,3,4]; var arr = x.slice(0,{valueOf: function() {return 3}, toString: function() {return 0}}); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T1.js
index c0a759292..ada7be857 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T1.js
- * @description If start is positive, use min(start, length).
- * If end is positive, use min(end, length)
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is positive, use min(start, length).  If end is positive,
+    use min(end, length)
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -49,5 +49,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(0,3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T2.js
index 04a45b79a..484294eb5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T2.js
- * @description If start is negative, use max(start + length, 0).
- * If end is positive, use min(end, length)
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is negative, use max(start + length, 0).  If end is
+    positive, use min(end, length)
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -49,5 +49,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(-5,3); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T3.js
index 6a542bd6a..5f6141133 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T3.js
- * @description If start is positive, use min(start, length).
- * If end is negative, use max(end + length, 0)
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is positive, use min(start, length).  If end is negative,
+    use max(end + length, 0)
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -49,5 +49,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(0,-2); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T4.js
index 01a4e4f60..5ea1ef7d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T4.js
- * @description If start is negative, use max(start + length, 0).
- * If end is negative, use max(end + length, 0)
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is negative, use max(start + length, 0).  If end is
+    negative, use max(end + length, 0)
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -49,5 +49,4 @@ if (arr[2] !== 2) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(-5,-2); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T5.js
index 2a9156011..744780550 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T5.js
- * @description If end is undefined use length
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If end is undefined use length
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -48,5 +47,4 @@ if (arr[2] !== 4) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(2); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T6.js
index e0c304a00..5d5b8fc22 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A2_T6.js
- * @description If end is undefined use length
- */
+/*---
+info: >
+    The slice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If end is undefined use length
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -48,5 +47,4 @@ if (arr[2] !== 4) {
 //CHECK#6
 if (arr[3] !== undefined) {
   $ERROR('#6: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = 0; obj[1] = 1; obj[2] = 2; obj[3] = 3; obj[4] = 4; obj.length = 5; var arr = obj.slice(2, undefined); arr[3] === undefined. Actual: ' + (arr[3]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T1.js
index f32a97706..4f8aaad8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -28,5 +26,4 @@ if (arr[0] !== undefined) {
 //CHECK#3
 if (arr[4294967295] !== undefined) {
    $ERROR('#3: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; var arr = obj.slice(0,4294967296); arr[4294967295] === undefined. Actual: ' + (arr[4294967295]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T2.js
index 63810d3c9..aa1ab2e20 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T2.js
- * @description length = 4294967297
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967297
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -28,5 +26,4 @@ if (arr[0] !== "x") {
 //CHECK#3
 if (arr[4294967296] !== undefined) {
    $ERROR('#3: var obj = {}; obj.slice = Array.prototype.slice; obj[0] = "x"; obj[4294967296] = "y"; obj.length = 4294967297; var arr = obj.slice(0,4294967297); arr[4294967296] === undefined. Actual: ' + (arr[4294967296]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js
index ab663fc2c..1a684f1ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A3_T3.js
- * @description length = -1
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -1
+---*/
 
 var obj = {};
 obj.slice = Array.prototype.slice;
@@ -22,5 +20,4 @@ if (arr.length !== 1) {
 //CHECK#3
 if (arr[0] !== "x") {
    $ERROR('#3: var obj = {}; obj.slice = Array.prototype.slice; obj[4294967294] = "x"; obj.length = 4294967295; var arr = obj.slice(4294967294,4294967295); arr[0] === "x". Actual: ' + (arr[0]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A4_T1.js
index b77d26b31..2b77081c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: "[[Prototype]] of Array instance is Array.prototype"
+---*/
 
 Array.prototype[1] = 1;
 var x = [0];
@@ -27,4 +25,3 @@ if (arr[1] !== 1) {
 if (arr.hasOwnProperty('1') !== true) {  
   $ERROR('#3: Array.prototype[1] = 1; x = [0]; x.length = 2; var arr = x.slice(); arr.hasOwnProperty(\'1\') === true. Actual: ' + (arr.hasOwnProperty('1')));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.1.js
index a48d1f846..6b1304036 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of slice has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of slice has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.slice.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.slice){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.slice) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.2.js
index 88cfc5134..a95cc8482 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of slice has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of slice has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.slice.hasOwnProperty('length') !== true) {
@@ -24,6 +23,3 @@ if (Array.prototype.slice.hasOwnProperty('length') !== true) {
 if (Array.prototype.slice.length === undefined) {
   $ERROR('#3: delete Array.prototype.slice.length; Array.prototype.slice.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.3.js
index f03ef81b2..6e857eb15 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of slice has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of slice has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.slice.length;
@@ -15,5 +13,3 @@ Array.prototype.slice.length = Infinity;
 if (Array.prototype.slice.length !== x) {
   $ERROR('#1: x = Array.prototype.slice.length; Array.prototype.slice.length = Infinity; Array.prototypeslice.length === x. Actual: ' + (Array.prototypeslice.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.4.js
index d0dca3396..14e436f03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of slice is 2
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.4.js
- * @description slice.length === 2
- */
+/*---
+info: The length property of slice is 2
+description: slice.length === 2
+---*/
 
 //CHECK#1
 if (Array.prototype.slice.length !== 2) {
   $ERROR('#1: Array.prototype.slice.length === 2. Actual: ' + (Array.prototype.slice.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.5.js
index fac778af6..a0940d9de 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The slice property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('slice') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "slice") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.6.js
index 6570b06ff..20e7b0a49 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.6.js
- * @description Checking Array.prototype.slice.prototype
- */
+/*---
+info: The slice property of Array has not prototype property
+description: Checking Array.prototype.slice.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.slice.prototype !== undefined) {
   $ERROR('#1: Array.prototype.slice.prototype === undefined. Actual: ' + (Array.prototype.slice.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.7.js
index 0935af478..8937ac5a8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The slice property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.10/S15.4.4.10_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The slice property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.slice() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.1_T1.js
index fe46045b6..24e8e6064 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If this object does not have a property named by ToString(j),
- * and this object does not have a property named by ToString(k), return +0
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.1_T1.js
- * @description If comparefn is undefined, use SortCompare operator
- */
+/*---
+info: >
+    If this object does not have a property named by ToString(j),
+    and this object does not have a property named by ToString(k), return +0
+description: If comparefn is undefined, use SortCompare operator
+---*/
 
 var x = new Array(2); 
 x.sort();
@@ -25,5 +24,4 @@ if (x[0] !== undefined) {
 //CHECK#3
 if (x[1] !== undefined) {
   $ERROR('#3: var x = new Array(2); x.sort(); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T1.js
index d1e818de0..a85f6b4ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If this object does not have a property named by
- * ToString(j), return 1. If this object does not have a property
- * named by ToString(k), return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T1.js
- * @description If comparefn is undefined, use SortCompare operator
- */
+/*---
+info: >
+    If this object does not have a property named by
+    ToString(j), return 1. If this object does not have a property
+    named by ToString(k), return -1
+description: If comparefn is undefined, use SortCompare operator
+---*/
 
 var x = new Array(2);
 x[1] = 1; 
@@ -46,5 +45,4 @@ if (x[0] !== 1) {
 //CHECK#6
 if (x[1] !== undefined) {
   $ERROR('#6: var x = new Array(2); x[0] = 1;  x.sort(); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T2.js
index 6b551359c..41589771b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If this object does not have a property named by
- * ToString(j), return 1. If this object does not have a property
- * named by ToString(k), return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.2_T2.js
- * @description If comparefn is not undefined
- */
+/*---
+info: >
+    If this object does not have a property named by
+    ToString(j), return 1. If this object does not have a property
+    named by ToString(k), return -1
+description: If comparefn is not undefined
+---*/
 
 var myComparefn = function(x,y) {
   if (x === undefined) return -1; 
@@ -52,5 +51,4 @@ if (x[0] !== 1) {
 //CHECK#6
 if (x[1] !== undefined) {
   $ERROR('#6: var x = new Array(2); x[0] = 1;  x.sort(myComparefn); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.3_T1.js
index 44a1d548a..c78598af1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If [[Get]] ToString(j) and [[Get]] ToString(k)
- * are both undefined, return +0
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.3_T1.js
- * @description If comparefn is undefined, use SortCompare operator
- */
+/*---
+info: >
+    If [[Get]] ToString(j) and [[Get]] ToString(k)
+    are both undefined, return +0
+description: If comparefn is undefined, use SortCompare operator
+---*/
 
 var x = new Array(undefined, undefined); 
 x.sort();
@@ -25,5 +24,4 @@ if (x[0] !== undefined) {
 //CHECK#3
 if (x[1] !== undefined) {
   $ERROR('#3: var x = new Array(undefined, undefined); x.sort(); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T1.js
index 2341ae248..2ef589f71 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If [[Get]] ToString(j) is undefined, return 1.
- * If [[]Get] ToString(k) is undefined, return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T1.js
- * @description If comparefn is undefined, use SortCompare operator
- */
+/*---
+info: >
+    If [[Get]] ToString(j) is undefined, return 1.
+    If [[]Get] ToString(k) is undefined, return -1
+description: If comparefn is undefined, use SortCompare operator
+---*/
 
 var x = new Array(undefined, 1);
 x.sort();
@@ -43,5 +42,4 @@ if (x[0] !== 1) {
 //CHECK#6
 if (x[1] !== undefined) {
   $ERROR('#6: var x = new Array(1, undefined); x.sort(); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T2.js
index 377d34649..5e3f96aaf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If [[Get]] ToString(j) is undefined, return 1.
- * If [[]Get] ToString(k) is undefined, return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.4_T2.js
- * @description If comparefn is not undefined
- */
+/*---
+info: >
+    If [[Get]] ToString(j) is undefined, return 1.
+    If [[]Get] ToString(k) is undefined, return -1
+description: If comparefn is not undefined
+---*/
 
 var myComparefn = function(x,y) {
   if (x === undefined) return -1; 
@@ -49,5 +48,4 @@ if (x[0] !== 1) {
 //CHECK#6
 if (x[1] !== undefined) {
   $ERROR('#6: var x = new Array(1, undefined); x.sort(myComparefn); x[1] === undefined. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.5_T1.js
index af706b728..1f9b3b33d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If comparefn is undefined, use SortCompare operator
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A1.5_T1.js
- * @description Checking sort() and sort(undefined)
- */
+/*---
+info: If comparefn is undefined, use SortCompare operator
+description: Checking sort() and sort(undefined)
+---*/
 
 var x = new Array(1,0);
 x.sort();
@@ -43,4 +41,3 @@ if (x[0] !== 0) {
 if (x[1] !== 1) {
   $ERROR('#6: var x = new Array(1,0);  x.sort(undefined); x[1] === 1. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T1.js
index 305ca44c2..6cfe0f734 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * * If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
- * If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
- * return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: >
+    If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
+    If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
+    return -1
+description: Checking ENGLISH ALPHABET
+---*/
 
 var alphabetR = ["z", "y", "x", "w", "v", "u", "t", "s", "r", "q", "p", "o", "n", "M", "L", "K", "J", "I", "H", "G", "F", "E", "D", "C", "B", "A"];
 var alphabet = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
@@ -23,4 +22,3 @@ for (var i = 0; i < 26; i++) {
 if (result !== true) {
   $ERROR('#1: CHECK ENGLISH ALPHABET');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T2.js
index 53ee4656b..04a879c5d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * * If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
- * If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
- * return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: >
+    If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
+    If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
+    return -1
+description: Checking RUSSIAN ALPHABET
+---*/
 
 var alphabetR = ["ё", "я", "ю", "э", "ь", "ы", "ъ", "щ", "ш", "ч", "ц", "х", "ф", "у", "т", "с", "р", "П", "О", "Н", "М", "Л", "К", "Й", "И", "З", "Ж", "Е", "Д", "Г", "В", "Б", "А"];
 var  alphabet = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
@@ -23,4 +22,3 @@ for (var i = 0; i < 26; i++) {
 if (result !== true) {
   $ERROR('#1: CHECK RUSSIAN ALPHABET');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T3.js
index 50a138c1e..0ce626518 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * * If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
- * If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
- * return -1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.1_T3.js
- * @description Checking ToString operator
- */
+/*---
+info: >
+    If ToString([[Get]] ToString(j)) < ToString([[Get]] ToString(k)), return -1.
+    If ToString([[Get]] ToString(j)) > ToString([[Get]] ToString(k)), return 1;
+    return -1
+description: Checking ToString operator
+---*/
 
 var obj = {valueOf: function() {return 1}, toString: function() {return -2}};
 var alphabetR = [undefined, 2, 1, "X", -1, "a", true, obj, NaN, Infinity]; 
@@ -26,4 +25,3 @@ for (var i = 0; i < 10; i++) {
 if (result !== true) {
   $ERROR('#1: Check ToString operator');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T1.js
index e228074ed..c8c22e37b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * My comparefn is inverse implementation comparefn
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T1.js
- * @description Checking ENGLISH ALPHABET
- */
+/*---
+info: My comparefn is inverse implementation comparefn
+description: Checking ENGLISH ALPHABET
+---*/
 
 var alphabetR = ["z", "y", "x", "w", "v", "u", "t", "s", "r", "q", "p", "o", "n", "M", "L", "K", "J", "I", "H", "G", "F", "E", "D", "C", "B", "A"];
 var  alphabet = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
@@ -28,5 +26,4 @@ for (var i = 0; i < 26; i++) {
 
 if (result !== true) {
   $ERROR('#1: CHECK ENGLISH ALPHABET');
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T2.js
index 031df25ae..5308ad6d9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * My comparefn is inverse implementation comparefn
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T2.js
- * @description Checking RUSSIAN ALPHABET
- */
+/*---
+info: My comparefn is inverse implementation comparefn
+description: Checking RUSSIAN ALPHABET
+---*/
 
 var alphabetR = ["ё", "я", "ю", "э", "ь", "ы", "ъ", "щ", "ш", "ч", "ц", "х", "ф", "у", "т", "с", "р", "П", "О", "Н", "М", "Л", "К", "Й", "И", "З", "Ж", "Е", "Д", "Г", "В", "Б", "А"];
 var  alphabet = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
@@ -29,4 +27,3 @@ for (var i = 0; i < 26; i++) {
 if (result !== true) {
   $ERROR('#1: CHECK RUSSIAN ALPHABET');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T3.js
index e628e0da8..7b9b40452 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * My comparefn is inverse implementation comparefn
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A2.2_T3.js
- * @description Checking ToString operator
- */
+/*---
+info: My comparefn is inverse implementation comparefn
+description: Checking ToString operator
+---*/
 
 var obj = {valueOf: function() {return 1}, toString: function() {return -2}}; 
 var alphabetR = [undefined, 2, 1, "X", -1, "a", true, obj, NaN, Infinity]; 
@@ -32,4 +30,3 @@ for (var i = 0; i < 10; i++) {
 if (result !== true) {
   $ERROR('#1: Check ToString operator');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T1.js
index e3b985d03..6433c7b50 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The sort function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T1.js
- * @description If comparefn is undefined, use SortCompare operator
- */
+/*---
+info: >
+    The sort function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If comparefn is undefined, use SortCompare operator
+---*/
 
 var obj = {valueOf: function() {return 1}, toString: function() {return -2}};
 var alphabetR = {0:undefined, 1:2, 2:1, 3:"X", 4:-1, 5:"a", 6:true, 7:obj, 8:NaN, 9:Infinity};
@@ -33,5 +32,4 @@ for (var i = 0; i < 10; i++) {
 
 if (result !== true) {
   $ERROR('#1: Check ToString operator');
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T2.js
index eeadc3729..abe46e9fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The sort function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A3_T2.js
- * @description If comparefn is not undefined
- */
+/*---
+info: >
+    The sort function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If comparefn is not undefined
+---*/
 
 var obj = {valueOf: function() {return 1}, toString: function() {return -2}};
 var alphabetR = {0:undefined, 1:2, 2:1, 3:"X", 4:-1, 5:"a", 6:true, 7:obj, 8:NaN, 9:Infinity};
@@ -41,5 +40,4 @@ for (var i = 0; i < 10; i++) {
 
 if (result !== true) {
   $ERROR('#1: Check ToString operator');
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T1.js
index 0f63d801c..3a211a260 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.sort = Array.prototype.sort;
@@ -33,4 +31,3 @@ if (obj[0] !== "x") {
 if (obj[4294967295] !== "y") {
   $ERROR('#4: var obj = {}; obj.sort = Array.prototype.sort; obj[] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; obj.sort(); obj[4294967295] == "y"');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T2.js
index 4116c648f..cabfd9476 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T2.js
- * @description length = 4294967298
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967298
+---*/
 
 var obj = {};
 obj.sort = Array.prototype.sort;
@@ -38,5 +36,4 @@ if (obj[1] !== "z") {
 //CHECK#5
 if (obj[4294967297] !== "x") {
   $ERROR('#5: var obj = {}; obj.sort = Array.prototype.sort; obj[0] = "z"; obj[1] = "y"; obj[4294967297] = "x"; obj.length = 4294967298; obj.sort(); obj[4294967297] === "x". Actual: ' + (obj[4294967297]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T3.js
index fe5d5de94..6eb6d069c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A4_T3.js
- * @description length = -4294967294
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -4294967294
+---*/
 
 var obj = {};
 obj.sort = Array.prototype.sort;
@@ -38,5 +36,4 @@ if (obj[1] !== "z") {
 //CHECK#5
 if (obj[2] !== "x") {
   $ERROR('#5: var obj = {}; obj.sort = Array.prototype.sort; obj[0] = "z"; obj[1] = "y"; obj[2] = "x"; obj.length = -4294967294; obj.sort(); obj[2] === "x". Actual: ' + (obj[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A5_T1.js
index a7e363e73..5be9c4961 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Array.sort should not eat exceptions
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A5_T1.js
- * @description comparefn function throw "error"
- */
+/*---
+info: Array.sort should not eat exceptions
+description: comparefn function throw "error"
+---*/
 
 //CHECK#1
 var myComparefn = function(x,y) {
@@ -20,5 +18,4 @@ try {
   if (e !== "error") {
     $ERROR('#1.2: Array.sort should not eat exceptions');
   }
-}     
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A6_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A6_T2.js
index af563e675..f24026c47 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A6_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A6_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A6_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [1,0];
@@ -63,4 +63,3 @@ if (x[0] !== undefined) {
 if (x[1] !== -1) {  
   $ERROR('#8: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.sort = Array.prototype.sort; x = {0:1,1:0}; x.sort(); delete x[0]; delete x[1]; x[1] === -1. Actual: ' + (x[1]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.1.js
index bd12a9c23..d28fac393 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of sort has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of sort has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.sort.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.sort){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.sort) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.2.js
index 891643550..907204724 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of sort has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of sort has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.sort.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.sort.hasOwnProperty('length') !== true) {
 if (Array.prototype.sort.length === undefined) {
   $ERROR('#3: delete Array.prototype.sort.length; Array.prototype.sort.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.3.js
index 927d9e050..d992679d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of sort has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.3.js
- * @description Checking if varying the length fails
- * @noStrict
- */
+/*---
+info: The length property of sort has the attribute ReadOnly
+description: Checking if varying the length fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.sort.length;
@@ -15,5 +13,3 @@ Array.prototype.sort.length = Infinity;
 if (Array.prototype.sort.length !== x) {
   $ERROR('#1: x = Array.prototype.sort.length; Array.prototype.sort.length = Infinity; Array.prototype.sort.length === x. Actual: ' + (Array.prototype.sort.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.4.js
index 6f52f6c1f..5c90adf16 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of sort is 1
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.4.js
- * @description sort.length === 1
- */
+/*---
+info: The length property of sort is 1
+description: sort.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.sort.length !== 1) {
   $ERROR('#1: Array.prototype.sort.length === 1. Actual: ' + (Array.prototype.sort.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.5.js
index 989680b75..4ac3919e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The sort property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The sort property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('sort') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "sort") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.6.js
index cacf2c7d3..1b8b87e87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The sort property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.6.js
- * @description Checking Array.prototype.sort.prototype
- */
+/*---
+info: The sort property of Array has not prototype property
+description: Checking Array.prototype.sort.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.sort.prototype !== undefined) {
   $ERROR('#1: Array.prototype.sort.prototype === undefined. Actual: ' + (Array.prototype.sort.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.7.js
index f43c0eba0..42711b1e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The sort property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A7.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The sort property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.sort() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A8.js
index 8d4169ade..f98e67b23 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A8.js
@@ -1,13 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Call the comparefn passing undefined as the this value (step 13b)
- *
- * @path ch15/15.4/15.4.4/15.4.4.11/S15.4.4.11_A8.js
- * @description comparefn tests that its this value is undefined
- * @onlyStrict
- */
+/*---
+info: Call the comparefn passing undefined as the this value (step 13b)
+description: comparefn tests that its this value is undefined
+flags: [onlyStrict]
+includes: [$FAIL.js]
+---*/
 
 var global = this;
 [2,3].sort(function(x,y) {
@@ -22,4 +21,3 @@ var global = this;
   }
   return x - y;
 });
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-a-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-a-1.js
index f3785760e..37df1ab40 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-a-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-a-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-a-1.js

- * @description Array.prototype.splice - 'from' is the result of ToString(actualStart+k) in an Array

- */

-

-

-function testcase() {

-        var arrObj = [1, 2, 3];

-        var newArrObj = arrObj.splice(-2, 1);

-        return newArrObj.length === 1 && newArrObj[0] === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.splice - 'from' is the result of
+    ToString(actualStart+k) in an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrObj = [1, 2, 3];
+        var newArrObj = arrObj.splice(-2, 1);
+        return newArrObj.length === 1 && newArrObj[0] === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-c-ii-1.js
index f2906231d..305442ce9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-c-ii-1.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.12/15.4.4.12-9-c-ii-1.js

- * @description Array.prototype.splice will splice an array even when Array.prototype has index '0' set to read-only and 'fromPresent' less than 'actualDeleteCount (Step 9.c.ii)

- */

-

-

-function testcase() {

-        try {

-            var arr = ["a", "b", "c"];

-            Array.prototype[0] = "test";

-            var newArr = arr.splice(2, 1, "d");

-

-            var verifyValue = false;

-            verifyValue = arr.length === 3 && arr[0] === "a" && arr[1] === "b" && arr[2] === "d"

-                && newArr[0] === "c" && newArr.length === 1;

-

-            var verifyEnumerable = false;

-            for (var p in newArr) {

-                if (newArr.hasOwnProperty("0") && p === "0") {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyWritable = false;

-            newArr[0] = 12;

-            verifyWritable = newArr[0] === 12;

-

-            var verifyConfigurable = false;

-            delete newArr[0];

-            verifyConfigurable = newArr.hasOwnProperty("0");

-

-            return verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.splice will splice an array even when
+    Array.prototype has index '0' set to read-only and 'fromPresent'
+    less than 'actualDeleteCount (Step 9.c.ii)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            var arr = ["a", "b", "c"];
+            Array.prototype[0] = "test";
+            var newArr = arr.splice(2, 1, "d");
+
+            var verifyValue = false;
+            verifyValue = arr.length === 3 && arr[0] === "a" && arr[1] === "b" && arr[2] === "d"
+                && newArr[0] === "c" && newArr.length === 1;
+
+            var verifyEnumerable = false;
+            for (var p in newArr) {
+                if (newArr.hasOwnProperty("0") && p === "0") {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyWritable = false;
+            newArr[0] = 12;
+            verifyWritable = newArr[0] === 12;
+
+            var verifyConfigurable = false;
+            delete newArr[0];
+            verifyConfigurable = newArr.hasOwnProperty("0");
+
+            return verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T1.js
index 1c036ffef..fb94ab4be 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T1.js
- * @description length > deleteCount > start = 0, itemCount = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length > deleteCount > start = 0, itemCount = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,3);
@@ -46,5 +45,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(0,3); x[0] === 3. Actual: ' + (x[0]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T2.js
index f3e165735..c8926034d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T2.js
- * @description length > deleteCount > start = 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length > deleteCount > start = 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,3,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 5) {
 //CHECK#9
 if (x[2] !== 3) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(0,3,4,5); x[2] === 3. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T3.js
index 2632b0fee..aac957875 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T3.js
- * @description length = deleteCount > start = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length = deleteCount > start = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,4);
@@ -46,5 +45,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (x.length !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(0,4); x.length === 0. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T4.js
index ac33a5f1e..59bca014e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T4.js
- * @description length > deleteCount > start > 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length > deleteCount > start > 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(1,3,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 4) {
 //CHECK#9
 if (x[2] !== 5) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(1,3,4,5); x[2] === 5. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T5.js
index d371e5c7d..9177ce0b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T5.js
- * @description deleteCount > length > start = 0, itemCount = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: deleteCount > length > start = 0, itemCount = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,5);
@@ -46,5 +45,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (x.length !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(0,5); x.length === 0. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T6.js
index 09592280f..cebbd914a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.1_T6.js
- * @description length = deleteCount > start > 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length = deleteCount > start > 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(1,4,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 4) {
 //CHECK#9
 if (x[2] !== 5) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(1,4,4,5); x[2] === 5. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T1.js
index e99e11eae..cb10531e2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T1.js
- * @description -length = start < deleteCount < 0, itemCount = 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is negative, use 0
+description: -length = start < deleteCount < 0, itemCount = 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(-2,-1);
@@ -36,5 +35,4 @@ if (x[0] !== 0) {
 //CHECK#4
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(-2,-1); x[1] === 1. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T2.js
index c8dfd4109..2c88e6cff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T2.js
- * @description -length < start = deleteCount < 0, itemCount = 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is negative, use 0
+description: -length < start = deleteCount < 0, itemCount = 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(-1,-1);
@@ -36,5 +35,4 @@ if (x[0] !== 0) {
 //CHECK#4
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(-1,-1); x[1] === 1. Actual: ' + (x[1]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T3.js
index c79725d48..9d759fd2b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T3.js
- * @description -length = start < deleteCount < 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is negative, use 0
+description: -length = start < deleteCount < 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(-2,-1,2,3);
@@ -46,5 +45,4 @@ if (x[2] !== 0) {
 //CHECK#6
 if (x[3] !== 1) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(-2,-1,2,3); x[3] === 1. Actual: ' + (x[3]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T4.js
index af66e8da6..7108b603c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T4.js
- * @description -length < start = deleteCount < 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is negative, use 0
+description: -length < start = deleteCount < 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(-1,-1,2,3);
@@ -46,5 +45,4 @@ if (x[2] !== 3) {
 //CHECK#6
 if (x[3] !== 1) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(-1,-1,2,3); x[3] === 1. Actual: ' + (x[3]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T5.js
index 5b78dee45..420100f17 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.2_T5.js
- * @description start < -length < deleteCount < 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is negative, use 0
+description: start < -length < deleteCount < 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(-3,-1,2,3);
@@ -46,5 +45,4 @@ if (x[2] !== 0) {
 //CHECK#6
 if (x[3] !== 1) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(-3,-1,2,3); x[3] === 1. Actual: ' + (x[3]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T1.js
index bd66019f7..0f441101e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T1.js
- * @description -length < deleteCount < start = 0, itemCount = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is negative, use 0
+description: -length < deleteCount < start = 0, itemCount = 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(0,-1);
@@ -37,4 +36,3 @@ if (x[0] !== 0) {
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(0,-1); x[1] === 1. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T2.js
index ba563cddd..af7099a02 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T2.js
- * @description -length = -start < deleteCount < 0, itemCount = 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is negative, use 0
+description: -length = -start < deleteCount < 0, itemCount = 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(2,-1);
@@ -37,4 +36,3 @@ if (x[0] !== 0) {
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(2,-1); x[1] === 1. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T3.js
index 9171acf7e..56877fb65 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T3.js
- * @description -length < deleteCount < start = 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is negative, use 0
+description: -length < deleteCount < start = 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(0,-1,2,3);
@@ -47,4 +46,3 @@ if (x[2] !== 0) {
 if (x[3] !== 1) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(0,-1,2,3); x[3] === 1. Actual: ' + (x[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T4.js
index d51559feb..7a61c0e6e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T4.js
- * @description -length = -start < deleteCount < 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is negative, use 0
+description: -length = -start < deleteCount < 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(2,-1,2,3);
@@ -47,4 +46,3 @@ if (x[2] !== 2) {
 if (x[3] !== 3) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(2,-1,2,3); x[3] === 3. Actual: ' + (x[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T5.js
index 747f1472f..c97a8d582 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.3_T5.js
- * @description -start < -length < deleteCount < 0, itemCount > 0
- */
+/*---
+info: >
+    If start is positive, use min(start, length).
+    If deleteCount is negative, use 0
+description: -start < -length < deleteCount < 0, itemCount > 0
+---*/
 
 var x = [0,1];
 var arr = x.splice(3,-1,2,3);
@@ -47,4 +46,3 @@ if (x[2] !== 2) {
 if (x[3] !== 3) {
   $ERROR('#6: var x = [0,1]; var arr = x.splice(3,-1,2,3); x[3] === 3. Actual: ' + (x[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T1.js
index 0d2902b71..fbf4c480d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T1.js
- * @description length = -start > deleteCount > 0, itemCount = 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length = -start > deleteCount > 0, itemCount = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-4,3);
@@ -46,5 +45,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(-4,3); x[0] === 3. Actual: ' + (x[0]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T2.js
index be94553db..62d21debb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T2.js
- * @description length = -start > deleteCount > 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length = -start > deleteCount > 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-4,3,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 5) {
 //CHECK#9
 if (x[2] !== 3) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(-4,3,4,5); x[2] === 3. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T3.js
index 9aee37d7f..f250ba2c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T3.js
- * @description -start > length = deleteCount > 0, itemCount = 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: -start > length = deleteCount > 0, itemCount = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-5,4);
@@ -46,5 +45,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (x.length !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(-5,4); x.length === 0. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T4.js
index d5605307d..70a081c29 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T4.js
- * @description length > -start = deleteCount > 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length > -start = deleteCount > 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-3,3,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 4) {
 //CHECK#9
 if (x[2] !== 5) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(-3,3,4,5); x[2] === 5. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T5.js
index cf5bd46cd..f72391742 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T5.js
- * @description -start > deleteCount > length > 0, itemCount = 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: -start > deleteCount > length > 0, itemCount = 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-9,5);
@@ -46,5 +45,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (x.length !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(-9,5); x.length === 0. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T6.js
index ec84cd9de..6e07b7eeb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.4_T6.js
- * @description length = deleteCount > -start > 0, itemCount > 0
- */
+/*---
+info: >
+    If start is negative, use max(start + length, 0).
+    If deleteCount is positive, use min(deleteCount, length - start)
+description: length = deleteCount > -start > 0, itemCount > 0
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(-3,4,4,5);
@@ -56,5 +55,4 @@ if (x[1] !== 4) {
 //CHECK#9
 if (x[2] !== 5) {
   $ERROR('#9: var x = [0,1,2,3]; var arr = x.splice(-3,4,4,5); x[2] === 5. Actual: ' + (x[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T1.js
index f86b12a1f..3ff4f848f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Splice with undefined arguments
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T1.js
- * @description start === undefined, end === undefined
- */
+/*---
+info: Splice with undefined arguments
+description: start === undefined, end === undefined
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(undefined, undefined);
@@ -46,4 +44,3 @@ if (x[2] !== 2) {
 if (x[3] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(undefined, undefined); x[3] === 3. Actual: ' + (x[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T2.js
index 2d7ae20ab..5f0019427 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Splice with undefined arguments
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A1.5_T2.js
- * @description end === undefined
- */
+/*---
+info: Splice with undefined arguments
+description: end === undefined
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(1,undefined);
@@ -45,5 +43,4 @@ if (x[2] !== 2) {
 //CHECK#7
 if (x[3] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(1,undefined); x[3] === 3. Actual: ' + (x[3]));
-}     
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T1.js
index cd82bdfbf..c68841cb7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T1.js
- * @description start is not integer
- */
+/*---
+info: Operator use ToInteger from start
+description: start is not integer
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(1.5,3);
@@ -45,5 +43,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(1.5,3); x[0] === 0. Actual: ' + (x[0]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T2.js
index cf448affa..60de118ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T2.js
- * @description start = NaN
- */
+/*---
+info: Operator use ToInteger from start
+description: start = NaN
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(NaN,3);
@@ -45,5 +43,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(NaN,3); x[0] === 3. Actual: ' + (x[0]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T3.js
index 0a797623f..a5ea2565b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T3.js
- * @description start = Infinity
- */
+/*---
+info: Operator use ToInteger from start
+description: start = Infinity
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(Number.POSITIVE_INFINITY,3);
@@ -40,5 +38,4 @@ if (x[2] !== 2) {
 //CHECK#6
 if (x[3] !== 3) {
   $ERROR('#6: var x = [0,1,2,3]; var x = x.splice(Number.POSITIVE_INFINITY,3); x[3] === 3. Actual: ' + (x[3]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T4.js
index cb0f5fc5a..d68eb6c72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T4.js
- * @description start = -Infinity
- */
+/*---
+info: Operator use ToInteger from start
+description: start = -Infinity
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(Number.NEGATIVE_INFINITY,3);
@@ -45,5 +43,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(Number.NEGATIVE_INFINITY,3); x[0] === 3. Actual: ' + (x[0]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T5.js
index 61a93ccff..8984c7dc6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from start
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.1_T5.js
- * @description ToInteger use ToNumber
- */
+/*---
+info: Operator use ToInteger from start
+description: ToInteger use ToNumber
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice({valueOf: function() {return 0}, toString: function() {return 3}},3);
@@ -46,4 +44,3 @@ if (x.length !== 1) {
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice({valueOf: function() {return 0}, toString: function() {return 3}},3); x[0] === 3. Actual: ' + (x[0]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T1.js
index 7bf393e85..7aa06801e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from deleteCount
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T1.js
- * @description deleteCount is not integer
- */
+/*---
+info: Operator use ToInteger from deleteCount
+description: deleteCount is not integer
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(1,3.5);
@@ -45,5 +43,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(1,3.5); x[0] === 0. Actual: ' + (x[0]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T2.js
index 51250571e..7120f8b52 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from deleteCount
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T2.js
- * @description deleteCount = NaN
- */
+/*---
+info: Operator use ToInteger from deleteCount
+description: deleteCount = NaN
+---*/
 
 var x = [0,1];
 var arr = x.splice(0,NaN);
@@ -36,4 +34,3 @@ if (x[0] !== 0) {
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(0,NaN); x[1] === 1. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T3.js
index ebbe0c605..356c4d5e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from deleteCount
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T3.js
- * @description deleteCount = Infinity
- */
+/*---
+info: Operator use ToInteger from deleteCount
+description: deleteCount = Infinity
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,Number.POSITIVE_INFINITY);
@@ -45,5 +43,4 @@ if (arr[3] !== 3) {
 //CHECK#7
 if (x.length !== 0) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(0,Number.POSITIVE_INFINITY); x.length === 0. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T4.js
index fdac7ca53..c6372500d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from deleteCount
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T4.js
- * @description deleteCount = -Infinity
- */
+/*---
+info: Operator use ToInteger from deleteCount
+description: deleteCount = -Infinity
+---*/
 
 var x = [0,1];
 var arr = x.splice(0,Number.NEGATIVE_INFINITY);
@@ -36,4 +34,3 @@ if (x[0] !== 0) {
 if (x[1] !== 1) {
   $ERROR('#4: var x = [0,1]; var arr = x.splice(0,Number.NEGATIVE_INFINITY); x[1] === 1. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T5.js
index ad988fd2e..0a4039123 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToInteger from deleteCount
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2.2_T5.js
- * @description ToInteger use ToNumber
- */
+/*---
+info: Operator use ToInteger from deleteCount
+description: ToInteger use ToNumber
+---*/
 
 var x = [0,1,2,3];
 var arr = x.splice(0,{valueOf: function() {return 3}, toString: function() {return 0}});
@@ -45,5 +43,4 @@ if (x.length !== 1) {
 //CHECK#7
 if (x[0] !== 3) {
   $ERROR('#7: var x = [0,1,2,3]; var arr = x.splice(0,{valueOf: function() {return 3}, toString: function() {return 0}}); x[0] === 3. Actual: ' + (x[0]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T1.js
index 24af0b05e..3e55b1a94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T1.js
- * @description If start is positive, use min(start, length).
- * If deleteCount is positive, use min(deleteCount, length - start)
- */
+/*---
+info: >
+    The splice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is positive, use min(start, length).  If deleteCount is
+    positive, use min(deleteCount, length - start)
+---*/
 
 var obj = {0:0,1:1,2:2,3:3};
 obj.length = 4;
@@ -65,4 +65,3 @@ if (obj[2] !== 3) {
 if (obj[3] !== undefined) {
   $ERROR('#10: var obj = {0:0,1:1,2:2,3:3}; obj.length = 4; obj.splice = Array.prototype.splice; var arr = obj.splice(0,3,4,5); obj[3] === undefined. Actual: ' + (obj[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T2.js
index 8201da5b9..8e29884ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T2.js
- * @description If start is negative, use max(start + length, 0).
- * If deleteCount is negative, use 0
- */
+/*---
+info: >
+    The splice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is negative, use max(start + length, 0).  If deleteCount
+    is negative, use 0
+---*/
 
 var obj = {0:0,1:1};
 obj.length = 2;
@@ -54,5 +54,4 @@ if (obj[3] !== 1) {
 //CHECK#7
 if (obj[4] !== undefined) {
   $ERROR('#7: var obj = {0:0,1:1}; obj.length = 2; obj.splice = Array.prototype.splice; var arr = obj.splice(-2,-1,2,3); obj[4] === undefined. Actual: ' + (obj[4]));
-}        
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T3.js
index 69cd2f395..476000900 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T3.js
- * @description If start is positive, use min(start, length).
- * If deleteCount is negative, use 0
- */
+/*---
+info: >
+    The splice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is positive, use min(start, length).  If deleteCount is
+    negative, use 0
+---*/
 
 var obj = {0:0,1:1};
 obj.length = 2;
@@ -54,5 +54,4 @@ if (obj[3] !== 1) {
 //CHECK#7
 if (obj[4] !== undefined) {
   $ERROR('#7: var obj = {0:0,1:1}; obj.length = 2; obj.splice = Array.prototype.splice; var arr = obj.splice(0,-1,2,3); obj[4] === undefined. Actual: ' + (obj[4]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T4.js
index 38d037d1e..c15f97239 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A2_T4.js
- * @description If start is negative, use max(start + length, 0).
- * If deleteCount is positive, use min(deleteCount, length - start)
- */
+/*---
+info: >
+    The splice function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If start is negative, use max(start + length, 0).  If deleteCount
+    is positive, use min(deleteCount, length - start)
+---*/
 
 var obj = {0:0,1:1,2:2,3:3};
 obj.length = 4;
@@ -65,4 +65,3 @@ if (obj[2] !== 3) {
 if (obj[3] !== undefined) {
   $ERROR('#10: var obj = {0:0,1:1,2:2,3:3}; obj.length = 4; obj.splice = Array.prototype.splice; var arr = obj.splice(-4,3,4,5); obj[3] === undefined. Actual: ' + (obj[3]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T1.js
index a6645085f..7e5d4ca36 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T1.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.splice = Array.prototype.splice;
@@ -33,5 +31,4 @@ if (obj[0] !== "x") {
 //CHECK#4
 if (obj[4294967295] !== "y") {
    $ERROR('#4: var obj = {}; obj.splice = Array.prototype.splice; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; var arr = obj.splice(4294967295,1); obj[4294967295] === "y". Actual: ' + (obj[4294967295]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T2.js
index 15893b837..fc4e17e60 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T2.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.splice = Array.prototype.splice;
@@ -32,5 +30,4 @@ if (obj.length !== 0) {
 //CHECK#4
 if (obj[0] !== undefined) {
    $ERROR('#4: var obj = {}; obj.splice = Array.prototype.splice; obj[0] = "x"; obj[0] = "y"; obj.length = 1; var arr = obj.splice(0,1); obj[0] === undefined. Actual: ' + (obj[0]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T3.js
index 5c0dce77d..9f57c781b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A3_T3.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.splice = Array.prototype.splice;
@@ -32,5 +30,4 @@ if (obj.length !== 4294967294) {
 //CHECK#4
 if (obj[4294967294] !== undefined) {
    $ERROR('#4: var obj = {}; obj.splice = Array.prototype.splice; obj[4294967294] = "x"; obj.length = 1; var arr = obj.splice(4294967294,1); obj[4294967294] === undefined. Actual: ' + (obj[4294967294]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T1.js
index ec2fb8937..a120e6be8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [0,1];
@@ -78,4 +78,3 @@ if (x[0] !== 0) {
 if (x[1] !== -1) {  
   $ERROR('#12: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.splice = Array.prototype.splice; x = {0:0, 1:1}; var arr = x.splice(1,1); x[1] === -1. Actual: ' + (x[1]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T2.js
index 3096402c3..600bf26c1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [0,1];
@@ -78,4 +78,3 @@ if (x[0] !== 0) {
 if (x[1] !== 2) {  
   $ERROR('#12: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.splice = Array.prototype.splice; x = {0:0, 1:1}; var arr = x.splice(1,1,2); x[1] === 2. Actual: ' + (x[1]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T3.js
index 381d3ce76..623576fe9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A4_T3.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[0] = -1;
 var x = [];
@@ -72,4 +72,3 @@ if (x.length !== 0) {
 if (x[0] !== -1) {  
   $ERROR('#10: Object.prototype[0] = -1; Object.prototype.length = 1; Object.prototype.splice = Array.prototype.splice; x = {}; var arr = x.splice(0,1); x[0] === -1. Actual: ' + (x[0]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.1.js
index d3db326da..450a9c569 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of splice has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of splice has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.splice.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.splice){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.splice) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.2.js
index 4730b6a4b..ffbc3a4db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of splice has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of splice has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.splice.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.splice.hasOwnProperty('length') !== true) {
 if (Array.prototype.splice.length === undefined) {
   $ERROR('#3: delete Array.prototype.splice.length; Array.prototype.splice.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.3.js
index a5d06d59d..0db3a4478 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of splice has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of splice has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.splice.length;
@@ -15,5 +13,3 @@ Array.prototype.splice.length = Infinity;
 if (Array.prototype.splice.length !== x) {
   $ERROR('#1: x = Array.prototype.splice.length; Array.prototype.splice.length = Infinity; Array.prototype.splice.length === x. Actual: ' + (Array.prototype.splice.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.4.js
index b71c37c10..1c70791ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of splice is 2
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.4.js
- * @description splice.length === 1
- */
+/*---
+info: The length property of splice is 2
+description: splice.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.splice.length !== 2) {
   $ERROR('#1: Array.prototype.splice.length === 2. Actual: ' + (Array.prototype.splice.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.5.js
index e2276b47a..c474cd84e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The splice property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('splice') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "splice") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.6.js
index 621b83307..40f573c2e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.6.js
- * @description Checking Array.prototype.splice.prototype
- */
+/*---
+info: The splice property of Array has not prototype property
+description: Checking Array.prototype.splice.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.splice.prototype !== undefined) {
   $ERROR('#1: Array.prototype.splice.prototype === undefined. Actual: ' + (Array.prototype.splice.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.7.js
index 28344c811..d0e4f5be1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The splice property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.12/S15.4.4.12_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The splice property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.splice() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T1.js
index 01fe026bd..6f44d1f0d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The arguments are prepended to the start of the array, such that
- * their order within the array is the same as the order in which they appear in
- * the argument list
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T1.js
- * @description Checking case when unsift is given no arguments or one argument
- */
+/*---
+info: >
+    The arguments are prepended to the start of the array, such that
+    their order within the array is the same as the order in which they appear in
+    the argument list
+description: Checking case when unsift is given no arguments or one argument
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -52,5 +51,4 @@ if (x[1] !== 1) {
 //CHECK#8
 if (x.length !== 2) {
   $ERROR('#8: x = new Array(); x.unshift(1); x.unshift(); x.unshift(-1); x.length === 2. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T2.js
index 55be061cc..4b0773a66 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The arguments are prepended to the start of the array, such that
- * their order within the array is the same as the order in which they appear in
- * the argument list
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A1_T2.js
- * @description Checking case when unsift is given many arguments
- */
+/*---
+info: >
+    The arguments are prepended to the start of the array, such that
+    their order within the array is the same as the order in which they appear in
+    the argument list
+description: Checking case when unsift is given many arguments
+---*/
 
 //CHECK#1
 var x = [];
@@ -57,4 +56,3 @@ if (x[4] !== -1) {
 if (x.length !== 6) {
   $ERROR('#9: x = []; x[0] = 0; x.unshift(true, Number.POSITIVE_INFINITY, "NaN", "1", -1); x.length === 6. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T1.js
index 50d180ba2..74432ad16 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T1.js
- * @description The arguments are prepended to the start of the array, such that
- * their order within the array is the same as the order in which they appear in
- * the argument list
- */
+/*---
+info: >
+    The unshift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The arguments are prepended to the start of the array, such that
+    their order within the array is the same as the order in which
+    they appear in  the argument list
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -65,4 +65,3 @@ if (obj.length !== 1) {
 if (obj["0"] !== -7) {
   $ERROR('#9: var obj = {}; obj.length = null; obj.unshift = Array.prototype.unshift; obj.unshift(-7); obj["0"] === -7. Actual: ' + (obj["0"]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T2.js
index c5850c6d8..199b9bc0f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T2.js
- * @description The arguments are prepended to the start of the array, such that
- * their order within the array is the same as the order in which they appear in
- * the argument list
- */
+/*---
+info: >
+    The unshift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The arguments are prepended to the start of the array, such that
+    their order within the array is the same as the order in which
+    they appear in  the argument list
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -114,5 +114,4 @@ if (obj.length !== 1) {
 //CHECK#18
 if (obj["0"] !== -16) {
   $ERROR('#18: var obj = {}; obj.length = new Number(0); obj.unshift = Array.prototype.unshift; obj.unshift(-16); obj["0"] === -16. Actual: ' + (obj["0"]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T3.js
index fe31fcc58..e6e6c2092 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A2_T3.js
- * @description Operator use ToNumber from length.
- * If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: >
+    The unshift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Operator use ToNumber from length.  If Type(value) is Object,
+    evaluate ToPrimitive(value, Number)
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -89,4 +89,3 @@ catch (e) {
     $ERROR('#8.2:  obj.length = {valueOf: function() {return {}}, toString: function() {return {}}}  obj.unshift() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T1.js
index 579b45ce8..7c379cbc7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -51,5 +49,4 @@ if (unshift !== 0) {
 //CHECK#7
 if (obj.length !== 0) {
   $ERROR('#7: var obj = {}; obj.unshift = Array.prototype.unshift; obj.length = 4294967296; obj.unshift(); obj.length === 0. Actual: ' + (obj.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T2.js
index 4fd6cbfa4..94f7c3088 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T2.js
- * @description length = -4294967295
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -4294967295
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -42,5 +40,4 @@ if (obj[2] !== "z") {
 //CHECK#6
 if (obj[3] !== "") {
    $ERROR('#6: var obj = {}; obj.unshift = Array.prototype.unshift; obj[0] = ""; obj.length = -4294967295; obj.unshift("x", "y", "z"); obj[3] === "". Actual: ' + (obj[3]));
-}        
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T3.js
index 226d34162..e40b00ffd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A3_T3.js
- * @description length = 4294967297
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967297
+---*/
 
 var obj = {};
 obj.unshift = Array.prototype.unshift;
@@ -42,5 +40,4 @@ if (obj[2] !== "z") {
 //CHECK#6
 if (obj[3] !== "") {
    $ERROR('#6: var obj = {}; obj.unshift = Array.prototype.unshift; obj[0] = ""; obj.length = 4294967297; obj.unshift("x", "y", "z"); obj[3] === "". Actual: ' + (obj[3]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T1.js
index 964e95ca9..0d55ddd38 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[0] = -1;
 x = [1];
@@ -73,4 +73,3 @@ delete x.length;
 if (x.length !== 1) {  
   $ERROR('#10: Object.prototype[1] = -1; Object.prototype.length = 1; Object.prototype.unshift = Array.prototype.unshift; x = {0:0}; x.unshift(0); delete x; x.length === 1. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T2.js
index 1bdd2d4a0..8f9a95451 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A4_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[0] = 1;
 var x = [];
@@ -73,4 +73,3 @@ delete x.length;
 if (x.length !== 1) {  
   $ERROR('#10: Object.prototype[1] = 1; Object.prototype.length = 1; Object.prototype.unshift = Array.prototype.unshift; x = {}; x.unshift(0); delete x; x.length === 1. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.1.js
index d7fbf1619..b08b94a2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of unshift has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of unshift has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.unshift.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.unshift){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.unshift) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.2.js
index 372ffd37d..e926dbf35 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of unshift has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of unshift has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.unshift.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.unshift.hasOwnProperty('length') !== true) {
 if (Array.prototype.unshift.length === undefined) {
   $ERROR('#3: delete Array.prototype.unshift.length; Array.prototype.unshift.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.3.js
index 85ea8a162..24026c4f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of unshift has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of unshift has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.unshift.length;
@@ -15,5 +13,3 @@ Array.prototype.unshift.length = Infinity;
 if (Array.prototype.unshift.length !== x) {
   $ERROR('#1: x = Array.prototype.unshift.length; Array.prototype.unshift.length = Infinity; Array.prototype.unshift.length === x. Actual: ' + (Array.prototype.unshift.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.4.js
index 68e1e48ee..3de6d4a33 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of unshift is 1
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.4.js
- * @description unshift.length === 1
- */
+/*---
+info: The length property of unshift is 1
+description: unshift.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.unshift.length !== 1) {
   $ERROR('#1: Array.prototype.unshift.length === 1. Actual: ' + (Array.prototype.unshift.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.5.js
index d19b56b83..7a9407ce0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The unshift property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('unshift') !== false) {
@@ -24,4 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "unshift") result = false; }  result === true;');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.6.js
index ae279b38b..15c34b9db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.6.js
- * @description Checking Array.prototype.unshift.prototype
- */
+/*---
+info: The unshift property of Array has not prototype property
+description: Checking Array.prototype.unshift.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.unshift.prototype !== undefined) {
   $ERROR('#1: Array.prototype.unshift.prototype === undefined. Actual: ' + (Array.prototype.unshift.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.7.js
index 9baa5cffb..91152db02 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The unshift property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.13/S15.4.4.13_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The unshift property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.unshift() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-1.js
index 4aecf8981..958d39ebf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-1.js

- * @description Array.prototype.indexOf must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.indexOf;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.indexOf;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-2.js
index 15b39cac0..7e6e9c928 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-0-2.js

- * @description Array.prototype.indexOf has a length property whose value is 1.

- */

-

-

-function testcase() {

-  if (Array.prototype.indexOf.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf has a length property whose value is 1.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.indexOf.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-1.js
index 1e7a5a270..36be30adc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-1.js

- * @description Array.prototype.indexOf applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-  try {

-     Array.prototype.indexOf.call(undefined);

-     return false;

-  }

-  catch (e) {

-     return e instanceof TypeError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+     Array.prototype.indexOf.call(undefined);
+     return false;
+  }
+  catch (e) {
+     return e instanceof TypeError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-10.js
index c39c62c64..ce8f27880 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-10.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-10.js

- * @description Array.prototype.indexOf applied to the Math object

- */

-

-

-function testcase() {

-        try {

-            Math[1] = true;

-            Math.length = 2;

-            return Array.prototype.indexOf.call(Math, true) === 1;

-        } finally {

-            delete Math[1];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Math[1] = true;
+            Math.length = 2;
+            return Array.prototype.indexOf.call(Math, true) === 1;
+        } finally {
+            delete Math[1];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-11.js
index 8b74af87c..c65b0b2aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-11.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-11.js

- * @description Array.prototype.indexOf applied to Date object

- */

-

-

-function testcase() {

-

-        var obj = new Date();

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Date();
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-12.js
index c619cc351..81a42fedb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-12.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-12.js

- * @description Array.prototype.indexOf applied to RegExp object

- */

-

-

-function testcase() {

-

-        var obj = new RegExp();

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new RegExp();
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-13.js
index 8e9797dc2..f33a2914f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-13.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-13.js

- * @description Array.prototype.indexOf applied to the JSON object

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            JSON[3] = targetObj;

-            JSON.length = 5;

-            return Array.prototype.indexOf.call(JSON, targetObj) === 3;

-        } finally {

-            delete JSON[3];

-            delete JSON.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            JSON[3] = targetObj;
+            JSON.length = 5;
+            return Array.prototype.indexOf.call(JSON, targetObj) === 3;
+        } finally {
+            delete JSON[3];
+            delete JSON.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-14.js
index bcd7cd3de..69c7572c8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-14.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-14.js

- * @description Array.prototype.indexOf applied to Error object

- */

-

-

-function testcase() {

-

-        var obj = new SyntaxError();

-        obj[1] = true;

-        obj.length = 2;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new SyntaxError();
+        obj[1] = true;
+        obj.length = 2;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-15.js
index 11926dffc..a550ecdac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-15.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-15.js

- * @description Array.prototype.indexOf applied to Arguments object

- */

-

-

-function testcase() {

-

-        function fun() {

-            return arguments;

-        }

-        var obj = fun(1, true, 3);

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function fun() {
+            return arguments;
+        }
+        var obj = fun(1, true, 3);
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-17.js
index a66609cd7..476b2d811 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-17.js

- * @description Array.prototype.indexOf applied to the global object

- */

-

-

-function testcase() {

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[1] = true;

-            fnGlobalObject().length = 2;

-            return Array.prototype.indexOf.call(fnGlobalObject(), true) === 1;

-        } finally {

-            delete fnGlobalObject()[1];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[1] = true;
+            fnGlobalObject().length = 2;
+            return Array.prototype.indexOf.call(fnGlobalObject(), true) === 1;
+        } finally {
+            delete fnGlobalObject()[1];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-2.js
index 944ef47d0..fd1b7b93c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-2.js

- * @description Array.prototype.indexOf applied to null throws a TypeError

- */

-

-

-function testcase() {

-  try {

-     Array.prototype.indexOf.call(null);

-     return false;

-  }

-  catch (e) {

-     return e instanceof TypeError;

-     }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+     Array.prototype.indexOf.call(null);
+     return false;
+  }
+  catch (e) {
+     return e instanceof TypeError;
+     }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-3.js
index 45077ae0e..086429db7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-3.js

- * @description Array.prototype.indexOf applied to boolean primitive

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            Boolean.prototype[1] = targetObj;

-            Boolean.prototype.length = 2;

-

-            return Array.prototype.indexOf.call(true, targetObj) === 1;

-        } finally {

-            delete Boolean.prototype[1];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            Boolean.prototype[1] = targetObj;
+            Boolean.prototype.length = 2;
+
+            return Array.prototype.indexOf.call(true, targetObj) === 1;
+        } finally {
+            delete Boolean.prototype[1];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-4.js
index a91e92170..5f49b704f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-4.js

- * @description Array.prototype.indexOf applied to Boolean Object

- */

-

-

-function testcase() {

-

-        var obj = new Boolean(false);

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Boolean Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Boolean(false);
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-5.js
index 1be433cc4..63615a95f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-5.js

- * @description Array.prototype.indexOf applied to number primitive

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            Number.prototype[1] = targetObj;

-            Number.prototype.length = 2;

-

-            return Array.prototype.indexOf.call(5, targetObj) === 1;

-        } finally {

-            delete Number.prototype[1];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            Number.prototype[1] = targetObj;
+            Number.prototype.length = 2;
+
+            return Array.prototype.indexOf.call(5, targetObj) === 1;
+        } finally {
+            delete Number.prototype[1];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-6.js
index 988a3fc52..1c2c5a356 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-6.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-6.js

- * @description Array.prototype.indexOf applied to Number object

- */

-

-

-function testcase() {

-

-        var obj = new Number(-3);

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Number(-3);
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-7.js
index 928309c72..73ac2e09c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-7.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-7.js

- * @description Array.prototype.indexOf applied to string primitive

- */

-

-

-function testcase() {

-

-        return Array.prototype.indexOf.call("abc", "b") === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return Array.prototype.indexOf.call("abc", "b") === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-8.js
index de9cf17aa..0f2252e7c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-8.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-8.js

- * @description Array.prototype.indexOf applied to String object

- */

-

-

-function testcase() {

-

-        var obj = new String("null");

-

-        return Array.prototype.indexOf.call(obj, 'l') === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new String("null");
+
+        return Array.prototype.indexOf.call(obj, 'l') === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-9.js
index f0acdce25..5b89dc657 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-9.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-1-9.js

- * @description Array.prototype.indexOf applied to Function object

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[1] = true;

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[1] = true;
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-1.js
index 80519f0e6..01b7a740f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-1.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-1.js

- * @description Array.prototype.indexOf returns -1 for elements not present in array

- */

-

-

-function testcase() {

-  var a = new Array();

-  a[100] = 1;

-  a[99999] = "";  

-  a[10] = new Object();

-  a[5555] = 5.5;

-  a[123456] = "str";

-  a[5] = 1E+309;

-  if (a.indexOf(1) !== 100 || 

-      a.indexOf("") !== 99999 ||

-      a.indexOf("str") !== 123456 ||

-      a.indexOf(1E+309) !== 5 ||   //Infinity

-      a.indexOf(5.5) !== 5555 )

-  {

-    return false;

-  }

-  if (a.indexOf(true) === -1 && 

-      a.indexOf(5) === -1 &&

-      a.indexOf("str1") === -1 &&

-      a.indexOf(null) === -1 &&

-      a.indexOf(new Object()) === -1) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 for elements not present in
+    array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array();
+  a[100] = 1;
+  a[99999] = "";  
+  a[10] = new Object();
+  a[5555] = 5.5;
+  a[123456] = "str";
+  a[5] = 1E+309;
+  if (a.indexOf(1) !== 100 || 
+      a.indexOf("") !== 99999 ||
+      a.indexOf("str") !== 123456 ||
+      a.indexOf(1E+309) !== 5 ||   //Infinity
+      a.indexOf(5.5) !== 5555 )
+  {
+    return false;
+  }
+  if (a.indexOf(true) === -1 && 
+      a.indexOf(5) === -1 &&
+      a.indexOf("str1") === -1 &&
+      a.indexOf(null) === -1 &&
+      a.indexOf(new Object()) === -1) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-2.js
index 841814c92..9326aacce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-10-2.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 and does not access any other properties

- */

-

-

-function testcase() {

-  var accessed = false;

-  var f = {length: 0};

-  Object.defineProperty(f,"0",{get: function () {accessed = true; return 1;}});

-

-  

-  var i = Array.prototype.indexOf.call(f,1);

-  

-  if (i === -1 && accessed==false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 and does not
+    access any other properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var accessed = false;
+  var f = {length: 0};
+  Object.defineProperty(f,"0",{get: function () {accessed = true; return 1;}});
+
+  
+  var i = Array.prototype.indexOf.call(f,1);
+  
+  if (i === -1 && accessed==false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-1.js
index 9c93172ce..0b77bff45 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-1.js

- * @description Array.prototype.indexOf - 'length' is own data property on an Array-like object

- */

-

-

-function testcase() {

-        var objOne = { 1: true, length: 2 };

-        var objTwo = { 2: true, length: 2 };

-        return Array.prototype.indexOf.call(objOne, true) === 1 &&

-            Array.prototype.indexOf.call(objTwo, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var objOne = { 1: true, length: 2 };
+        var objTwo = { 2: true, length: 2 };
+        return Array.prototype.indexOf.call(objOne, true) === 1 &&
+            Array.prototype.indexOf.call(objTwo, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-10.js
index f6632c7d6..93e2362a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-10.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-10.js

- * @description Array.prototype.indexOf - 'length' is inherited accessor property

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var childOne = new Con();

-        childOne[1] = true;

-        var childTwo = new Con();

-        childTwo[2] = true;

-

-        return Array.prototype.indexOf.call(childOne, true) === 1 &&

-            Array.prototype.indexOf.call(childTwo, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var childOne = new Con();
+        childOne[1] = true;
+        var childTwo = new Con();
+        childTwo[2] = true;
+
+        return Array.prototype.indexOf.call(childOne, true) === 1 &&
+            Array.prototype.indexOf.call(childTwo, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-11.js
index 6de1bd2af..050c57f3c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-11.js

- * @description Array.prototype.indexOf - 'length' is own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var obj = { 1: true };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own accessor property
+    without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-12.js
index 0755c25bd..9da8a76ed 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-12.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-12.js

- * @description Array.prototype.indexOf - 'length' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            var obj = { 1: 1 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return Array.prototype.indexOf.call(obj, 1) === -1;

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own accessor property
+    without a get function that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            var obj = { 1: 1 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return Array.prototype.indexOf.call(obj, 1) === -1;
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-13.js
index fc0ea45e6..3c88c4aca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-13.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-13.js

- * @description Array.prototype.indexOf - 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = true;

-

-        return Array.prototype.indexOf.call(child, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is inherited accessor property
+    without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = true;
+
+        return Array.prototype.indexOf.call(child, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-14.js
index 1da6bd194..440894d18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-14.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-14.js

- * @description Array.prototype.indexOf - 'length' is undefined property

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, 1: true };

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is undefined property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, 1: true };
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-15.js
index f5df7954f..8487afd24 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-15.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-15.js

- * @description Array.prototype.indexOf - 'length' is property of the global object

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject().length = 2;

-

-            fnGlobalObject()[1] = targetObj;

-            if (Array.prototype.indexOf.call(fnGlobalObject(), targetObj) !== 1) {

-                return false;

-            }

-

-            fnGlobalObject()[1] = {};

-            fnGlobalObject()[2] = targetObj;

-

-            return Array.prototype.indexOf.call(fnGlobalObject(), targetObj) === -1;

-        } finally {

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject().length = 2;
+
+            fnGlobalObject()[1] = targetObj;
+            if (Array.prototype.indexOf.call(fnGlobalObject(), targetObj) !== 1) {
+                return false;
+            }
+
+            fnGlobalObject()[1] = {};
+            fnGlobalObject()[2] = targetObj;
+
+            return Array.prototype.indexOf.call(fnGlobalObject(), targetObj) === -1;
+        } finally {
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-17.js
index a20500339..7b8b0cfee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-17.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-17.js

- * @description Array.prototype.indexOf applied to Arguments object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            arguments[2] = false;

-            return Array.prototype.indexOf.call(arguments, true) === 1 &&

-                Array.prototype.indexOf.call(arguments, false) === -1;

-        };

-

-        return func(0, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to Arguments object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            arguments[2] = false;
+            return Array.prototype.indexOf.call(arguments, true) === 1 &&
+                Array.prototype.indexOf.call(arguments, false) === -1;
+        };
+
+        return func(0, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-18.js
index 883d30cb4..969c3c9a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-18.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-18.js

- * @description Array.prototype.indexOf applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-        var str = new String("012");

-        try {

-            String.prototype[3] = "3";

-            return Array.prototype.indexOf.call(str, "2") === 2 &&

-                Array.prototype.indexOf.call(str, "3") === -1;

-        } finally {

-            delete String.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = new String("012");
+        try {
+            String.prototype[3] = "3";
+            return Array.prototype.indexOf.call(str, "2") === 2 &&
+                Array.prototype.indexOf.call(str, "3") === -1;
+        } finally {
+            delete String.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-19.js
index c874b8863..f6396152f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-19.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-19.js

- * @description Array.prototype.indexOf applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[1] = "b";

-        obj[2] = "c";

-

-        return Array.prototype.indexOf.call(obj, obj[1]) === 1 &&

-            Array.prototype.indexOf.call(obj, obj[2]) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[1] = "b";
+        obj[2] = "c";
+
+        return Array.prototype.indexOf.call(obj, obj[1]) === 1 &&
+            Array.prototype.indexOf.call(obj, obj[2]) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-2.js
index d14fff919..f990588d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-2.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-2.js

- * @description Array.prototype.indexOf - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            Array.prototype[2] = targetObj;

-            

-            return [0, targetObj].indexOf(targetObj) === 1 &&

-                [0, 1].indexOf(targetObj) === -1;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            Array.prototype[2] = targetObj;
+            
+            return [0, targetObj].indexOf(targetObj) === 1 &&
+                [0, 1].indexOf(targetObj) === -1;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-3.js
index caf68f771..e539451a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-3.js

- * @description Array.prototype.indexOf - 'length' is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = { length: 0 };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[1] = true;

-

-        return Array.prototype.indexOf.call(child, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own data property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { length: 0 };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[1] = true;
+
+        return Array.prototype.indexOf.call(child, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-4.js
index 5f6e8dd38..654717e1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-4.js

- * @description Array.prototype.indexOf - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        var arrProtoLen;

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-

-            return [0, targetObj].indexOf(targetObj) === 1;

-

-        } finally {

-

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        var arrProtoLen;
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+
+            return [0, targetObj].indexOf(targetObj) === 1;
+
+        } finally {
+
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-5.js
index 3a9f693f6..49299bbd4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-5.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-5.js

- * @description Array.prototype.indexOf - 'length' is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[1] = true;

-

-        return Array.prototype.indexOf.call(child, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own data property that
+    overrides an inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[1] = true;
+
+        return Array.prototype.indexOf.call(child, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-6.js
index 9261c7d69..b9d2c3463 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-6.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-6.js

- * @description Array.prototype.indexOf - 'length' is an inherited data property

- */

-

-

-function testcase() {

-        var proto = { length: 2 };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var childOne = new Con();

-        childOne[1] = true;

-        var childTwo = new Con();

-        childTwo[2] = true;

-

-        return Array.prototype.indexOf.call(childOne, true) === 1 &&

-            Array.prototype.indexOf.call(childTwo, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = { length: 2 };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var childOne = new Con();
+        childOne[1] = true;
+        var childTwo = new Con();
+        childTwo[2] = true;
+
+        return Array.prototype.indexOf.call(childOne, true) === 1 &&
+            Array.prototype.indexOf.call(childTwo, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-7.js
index 17ad5a70c..eaad6eb7a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-7.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-7.js

- * @description Array.prototype.indexOf - 'length' is own accessor property

- */

-

-

-function testcase() {

-        var objOne = { 1: true };

-        var objTwo = { 2: true };

-        Object.defineProperty(objOne, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-        Object.defineProperty(objTwo, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(objOne, true) === 1 &&

-            Array.prototype.indexOf.call(objTwo, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var objOne = { 1: true };
+        var objTwo = { 2: true };
+        Object.defineProperty(objOne, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+        Object.defineProperty(objTwo, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(objOne, true) === 1 &&
+            Array.prototype.indexOf.call(objTwo, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-8.js
index 697d50f16..1544172e2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-8.js

- * @description Array.prototype.indexOf - 'length' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var proto = { length: 0 };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = true;

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(child, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own accessor property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { length: 0 };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = true;
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(child, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-9.js
index 5c56b328e..e582394cd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-9.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-2-9.js

- * @description Array.prototype.indexOf - 'length' is own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = true;

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(child, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is own accessor property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = true;
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(child, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-1.js
index b7f2e2d81..796eb1e1d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-1.js

- * @description Array.prototype.indexOf - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var obj = { 0: 1, 1: 1, length: undefined };

-

-        return Array.prototype.indexOf.call(obj, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 1, 1: 1, length: undefined };
+
+        return Array.prototype.indexOf.call(obj, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-10.js
index 65828b96c..98ee88f10 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-10.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-10.js

- * @description Array.prototype.indexOf - value of 'length' is number primitive (value is NaN)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: NaN };

-

-        return Array.prototype.indexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is number primitive
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: NaN };
+
+        return Array.prototype.indexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-11.js
index 220340539..34417d5dd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-11.js

- * @description Array.prototype.indexOf - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-

-        var obj = { 1: 1, 2: 2, length: "2" };

-

-        return Array.prototype.indexOf.call(obj, 1) === 1 &&

-        Array.prototype.indexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing a
+    positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: 1, 2: 2, length: "2" };
+
+        return Array.prototype.indexOf.call(obj, 1) === 1 &&
+        Array.prototype.indexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-12.js
index 0315be5f2..261b34290 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-12.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-12.js

- * @description Array.prototype.indexOf - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        var obj = { 1: "true", 2: "2", length: "-4294967294" };

-

-        return Array.prototype.indexOf.call(obj, "true") === 1 &&

-        Array.prototype.indexOf.call(obj, "2") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing a
+    negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: "true", 2: "2", length: "-4294967294" };
+
+        return Array.prototype.indexOf.call(obj, "true") === 1 &&
+        Array.prototype.indexOf.call(obj, "2") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-13.js
index bdf22f0a4..7a0380bba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-13.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-13.js

- * @description Array.prototype.indexOf - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        var obj = { 199: true, 200: "200.59", length: "200.59" };

-

-        return Array.prototype.indexOf.call(obj, true) === 199 &&

-            Array.prototype.indexOf.call(obj, "200.59") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing a
+    decimal number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 199: true, 200: "200.59", length: "200.59" };
+
+        return Array.prototype.indexOf.call(obj, true) === 199 &&
+            Array.prototype.indexOf.call(obj, "200.59") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-14.js
index 14b89f514..6dd9cf04b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-14.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-14.js

- * @description Array.prototype.indexOf - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var objOne = { 0: true, 1: true, length: "Infinity" };

-        var objTwo = { 0: true, 1: true, length: "+Infinity" };

-        var objThree = { 0: true, 1: true, length: "-Infinity" };

-

-        return Array.prototype.indexOf.call(objOne, true) === -1 &&

-            Array.prototype.indexOf.call(objTwo, true) === -1 &&

-            Array.prototype.indexOf.call(objThree, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing
+    +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objOne = { 0: true, 1: true, length: "Infinity" };
+        var objTwo = { 0: true, 1: true, length: "+Infinity" };
+        var objThree = { 0: true, 1: true, length: "-Infinity" };
+
+        return Array.prototype.indexOf.call(objOne, true) === -1 &&
+            Array.prototype.indexOf.call(objTwo, true) === -1 &&
+            Array.prototype.indexOf.call(objThree, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-15.js
index a5b0a8150..4ac7d3589 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-15.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-15.js

- * @description Array.prototype.indexOf - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        var obj = { 1: true, 2: "2E0", length: "2E0" };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 &&

-        Array.prototype.indexOf.call(obj, "2E0") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true, 2: "2E0", length: "2E0" };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 &&
+        Array.prototype.indexOf.call(obj, "2E0") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-16.js
index 1922df6df..912c0afca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-16.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-16.js

- * @description Array.prototype.indexOf - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-

-        var obj = { 10: true, 11: "0x00B", length: "0x00B" };

-

-        return Array.prototype.indexOf.call(obj, true) === 10 &&

-            Array.prototype.indexOf.call(obj, "0x00B") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing a hex
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 10: true, 11: "0x00B", length: "0x00B" };
+
+        return Array.prototype.indexOf.call(obj, true) === 10 &&
+            Array.prototype.indexOf.call(obj, "0x00B") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-17.js
index 3cda52758..7315b2d46 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-17.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-17.js

- * @description Array.prototype.indexOf - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        var obj = { 1: true, 2: "0002.0", length: "0002.0" };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 &&

-            Array.prototype.indexOf.call(obj, "0002.0") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true, 2: "0002.0", length: "0002.0" };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 &&
+            Array.prototype.indexOf.call(obj, "0002.0") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-18.js
index d7d30b11e..e9dae5848 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-18.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-18.js

- * @description Array.prototype.indexOf - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, 100: true, length: "one" };

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, 100: true, length: "one" };
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-19.js
index e09845de8..b1b6e7d8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-19.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-19.js

- * @description Array.prototype.indexOf - value of 'length' is an Object which has an own toString method.

- */

-

-

-function testcase() {

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-

-        var obj = {

-            1: true,

-            2: 2,

-

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 &&

-            Array.prototype.indexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is an Object which has
+    an own toString method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+
+        var obj = {
+            1: true,
+            2: 2,
+
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 &&
+            Array.prototype.indexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-2.js
index a82ef2706..1d74a0d39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-2.js

- * @description Array.prototype.indexOf return -1 when 'length' is a boolean (value is true)

- */

-

-

-function testcase() {

-        var obj = { 0: 0, 1: 1, length: true };

-        return Array.prototype.indexOf.call(obj, 0) === 0 &&

-            Array.prototype.indexOf.call(obj, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf return -1 when 'length' is a boolean
+    (value is true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 0: 0, 1: 1, length: true };
+        return Array.prototype.indexOf.call(obj, 0) === 0 &&
+            Array.prototype.indexOf.call(obj, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-20.js
index 8f70eb6a2..0ed993913 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-20.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-20.js

- * @description Array.prototype.indexOf - value of 'length' is an Object which has an own valueOf method.

- */

-

-

-function testcase() {

-

-        //valueOf method will be invoked first, since hint is Number

-        var obj = {

-            1: true,

-            2: 2,

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 &&

-            Array.prototype.indexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is an Object which has
+    an own valueOf method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        //valueOf method will be invoked first, since hint is Number
+        var obj = {
+            1: true,
+            2: 2,
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 &&
+            Array.prototype.indexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-21.js
index ceb822811..03a48868f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-21.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-21.js

- * @description Array.prototype.indexOf - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            1: true,

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 && toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            1: true,
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 && toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-22.js
index 19c806f59..984416751 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-22.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-22.js

- * @description Array.prototype.indexOf throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(obj);

-            return false;

-        } catch (e) {

-            return toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf throws TypeError exception when 'length'
+    is an object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(obj);
+            return false;
+        } catch (e) {
+            return toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-23.js
index 3bd5f57fb..1408b76ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-23.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-23.js

- * @description Array.prototype.indexOf uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.toString = function () {

-            toStringAccessed = true;

-            return 2;

-        };

-

-        var obj = {

-            1: true,

-            length: child

-        };

-

-        return Array.prototype.indexOf.call(obj, true) === 1 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf uses inherited valueOf method when
+    'length' is an object with an own toString and inherited valueOf
+    methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.toString = function () {
+            toStringAccessed = true;
+            return 2;
+        };
+
+        var obj = {
+            1: true,
+            length: child
+        };
+
+        return Array.prototype.indexOf.call(obj, true) === 1 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-24.js
index eaf2794b1..d430d30af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-24.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-24.js

- * @description Array.prototype.indexOf - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var obj = { 122: true, 123: false, length: 123.321 }; //length will be 123 finally

-

-        return Array.prototype.indexOf.call(obj, true) === 122 &&

-        Array.prototype.indexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 122: true, 123: false, length: 123.321 }; //length will be 123 finally
+
+        return Array.prototype.indexOf.call(obj, true) === 122 &&
+        Array.prototype.indexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-25.js
index 0c562a54e..5130ec348 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-25.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-25.js

- * @description Array.prototype.indexOf - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var obj = { 1: true, 2: false, length: -4294967294.5 }; //length will be 2 finally

-

-        return Array.prototype.indexOf.call(obj, true) === 1 &&

-        Array.prototype.indexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true, 2: false, length: -4294967294.5 }; //length will be 2 finally
+
+        return Array.prototype.indexOf.call(obj, true) === 1 &&
+        Array.prototype.indexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-28.js
index 8528a66fb..f9f222078 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-28.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-28.js

- * @description Array.prototype.indexOf - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        var obj = {

-            0: targetObj,

-            4294967294: targetObj,

-            4294967295: targetObj,

-            length: 4294967296

-        };

-

-        return Array.prototype.indexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is boundary value
+    (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        var obj = {
+            0: targetObj,
+            4294967294: targetObj,
+            4294967295: targetObj,
+            length: 4294967296
+        };
+
+        return Array.prototype.indexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-29.js
index ddadd4d88..b106b64e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-29.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-29.js

- * @description Array.prototype.indexOf - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        var obj = {

-            0: targetObj,

-            1: 4294967297,

-            length: 4294967297

-        };

-

-        return Array.prototype.indexOf.call(obj, targetObj) === 0 &&

-            Array.prototype.indexOf.call(obj, 4294967297) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is boundary value
+    (2^32 + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        var obj = {
+            0: targetObj,
+            1: 4294967297,
+            length: 4294967297
+        };
+
+        return Array.prototype.indexOf.call(obj, targetObj) === 0 &&
+            Array.prototype.indexOf.call(obj, 4294967297) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-3.js
index 8aa187847..032b9c49d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-3.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, length: 0 };

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, length: 0 };
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-4.js
index 75fcfc5a4..35302a417 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-4.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-4.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, length: +0 };

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, length: +0 };
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-5.js
index 04a795cb6..75594c7a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-5.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-5.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, length: -0 };

-

-        return Array.prototype.indexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, length: -0 };
+
+        return Array.prototype.indexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-6.js
index af913fdb2..fabf3cae6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-6.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-6.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-

-        var obj = { 3: true, 4: false, length: 4 };

-

-        return Array.prototype.indexOf.call(obj, true) === 3 &&

-            Array.prototype.indexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 3: true, 4: false, length: 4 };
+
+        return Array.prototype.indexOf.call(obj, true) === 3 &&
+            Array.prototype.indexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-7.js
index 7c170b67b..eddde8bc9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-7.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-

-        var obj = { 4: true, 5: false, length: 5 - Math.pow(2, 32) };

-

-        return Array.prototype.indexOf.call(obj, true) === 4 &&

-            Array.prototype.indexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 4: true, 5: false, length: 5 - Math.pow(2, 32) };
+
+        return Array.prototype.indexOf.call(obj, true) === 4 &&
+            Array.prototype.indexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-8.js
index 4eec4a6f5..8343a4baa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-8.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-8.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: Infinity };

-

-        return Array.prototype.indexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: Infinity };
+
+        return Array.prototype.indexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-9.js
index 49e652d9a..ee95baa13 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-9.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-3-9.js

- * @description Array.prototype.indexOf - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: -Infinity };

-

-        return Array.prototype.indexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: -Infinity };
+
+        return Array.prototype.indexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-1.js
index 4996ea8fb..6085f851f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-1.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  var i = [].indexOf(42);

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf returns -1 if 'length' is 0 (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var i = [].indexOf(42);
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-10.js
index 1e70eaa9e..943f230c3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-10.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-10.js

- * @description Array.prototype.indexOf - 'length' is a number of value -6e-1

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: -6e-1 };

-        return Array.prototype.indexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is a number of value -6e-1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: -6e-1 };
+        return Array.prototype.indexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-11.js
index ea99de8ba..38b12e9ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-11.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-11.js

- * @description Array.prototype.indexOf - 'length' is an empty string

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: "" };

-        return Array.prototype.indexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is an empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: "" };
+        return Array.prototype.indexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-2.js
index bed15ed81..19477dd52 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-2.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 ( length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  

-  var i = Array.prototype.indexOf.call({length: null}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 ( length
+    overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var i = Array.prototype.indexOf.call({length: null}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-3.js
index 294d9d726..6cb840758 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-3.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 (length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.indexOf.call({length: false}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 (length
+    overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.indexOf.call({length: false}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-4.js
index fe838c830..c0c98db3d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-4.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-4.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 (generic 'array' with length 0 )

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.lastIndexOf.call({length: 0}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 (generic
+    'array' with length 0 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.lastIndexOf.call({length: 0}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-5.js
index 386f92a20..ee3076392 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-5.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-5.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 ( length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.indexOf.call({length: '0'}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 ( length
+    overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.indexOf.call({length: '0'}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-6.js
index aafac4e05..ea8c182c7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-6.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-6.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.indexOf.call({length: { valueOf: function () { return 0;}}}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 (subclassed
+    Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.indexOf.call({length: { valueOf: function () { return 0;}}}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-7.js
index f543d575a..60c9864b0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-7.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 ( length is object overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

- var i = Array.prototype.indexOf.call({length: { toString: function () { return '0';}}}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 ( length is
+    object overridden with obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+ var i = Array.prototype.indexOf.call({length: { toString: function () { return '0';}}}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-8.js
index 124278a54..6a1d71ac2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-8.js

- * @description Array.prototype.indexOf returns -1 if 'length' is 0 (length is an empty array)

- */

-

-

-function testcase() {

-

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

- var i = Array.prototype.indexOf.call({length: [ ]}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if 'length' is 0 (length is an
+    empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+ var i = Array.prototype.indexOf.call({length: [ ]}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-9.js
index ad1aefef3..ea0bf99ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-9.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-4-9.js

- * @description Array.prototype.indexOf - 'length' is a number of value 0.1

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: 0.1 };

-        return Array.prototype.indexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'length' is a number of value 0.1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: 0.1 };
+        return Array.prototype.indexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-1.js
index 55e7fa66d..fc3d7221a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-1.js

- * @description Array.prototype.indexOf when fromIndex is string

- */

-

-

-function testcase() {

-  var a = [1,2,1,2,1,2];

-  if (a.indexOf(2,"2") === 3 &&          // "2" resolves to 2  

-      a.indexOf(2,"one") === 1) {       // "one" resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf when fromIndex is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [1,2,1,2,1,2];
+  if (a.indexOf(2,"2") === 3 &&          // "2" resolves to 2  
+      a.indexOf(2,"one") === 1) {       // "one" resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-10.js
index 169eba1be..3b106f554 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-10.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-10.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is positive number)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, 2].indexOf(targetObj, 2) === -1 &&

-            [0, 1, targetObj].indexOf(targetObj, 2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, 2].indexOf(targetObj, 2) === -1 &&
+            [0, 1, targetObj].indexOf(targetObj, 2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-11.js
index 39c93be14..178ee616d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-11.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-11.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is negative number)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, 2].indexOf(targetObj, -1) === -1 &&

-            [0, 1, targetObj].indexOf(targetObj, -1) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, 2].indexOf(targetObj, -1) === -1 &&
+            [0, 1, targetObj].indexOf(targetObj, -1) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-12.js
index de0e282c0..7c6a1ef47 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-12.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-12.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is Infinity)

- */

-

-

-function testcase() {

-        var arr = [];

-        arr[Math.pow(2, 32) - 2] = true; //length is the max value of Uint type

-        return arr.indexOf(true, Infinity) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        arr[Math.pow(2, 32) - 2] = true; //length is the max value of Uint type
+        return arr.indexOf(true, Infinity) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-13.js
index 11be6b95e..52e76fc39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-13.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-13.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, -Infinity) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, -Infinity) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-14.js
index 88c78e1e5..67b211f0a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-14.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-14.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, NaN) === 0 && [true].indexOf(true, -NaN) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, NaN) === 0 && [true].indexOf(true, -NaN) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-15.js
index 8f39cda4e..b67169091 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-15.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-15.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        return [0, true, 2].indexOf(true, "-1") === -1 &&

-        [0, 1, true].indexOf(true, "-1") === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a string
+    containing a negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, true, 2].indexOf(true, "-1") === -1 &&
+        [0, 1, true].indexOf(true, "-1") === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-16.js
index 8b8e91e0b..46ffb164c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-16.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-16.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a string containing Infinity

- */

-

-

-function testcase() {

-        var arr = [];

-        arr[Math.pow(2, 32) - 2] = true; //length is the max value of Uint type

-        return arr.indexOf(true, "Infinity") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a string
+    containing Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        arr[Math.pow(2, 32) - 2] = true; //length is the max value of Uint type
+        return arr.indexOf(true, "Infinity") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-17.js
index 1fa680a32..f92d2dd25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-17.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-17.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a string containing -Infinity

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, "-Infinity") === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a string
+    containing -Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, "-Infinity") === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-18.js
index a630df56e..a30edda2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-18.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-18.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a string containing an exponential number

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "3E0") === -1 &&

-            [0, 1, 2, targetObj, 4].indexOf(targetObj, "3E0") === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a string
+    containing an exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "3E0") === -1 &&
+            [0, 1, 2, targetObj, 4].indexOf(targetObj, "3E0") === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-19.js
index d917045f7..d5aef49a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-19.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-19.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a string containing a hex number

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "0x0003") === -1 &&

-            [0, 1, 2, targetObj, 4].indexOf(targetObj, "0x0003") === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a string
+    containing a hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "0x0003") === -1 &&
+            [0, 1, 2, targetObj, 4].indexOf(targetObj, "0x0003") === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-2.js
index e059edb20..6e57f065c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-2.js

- * @description Array.prototype.indexOf when fromIndex is floating point number

- */

-

-

-function testcase() {

-  var a = new Array(1,2,3);

-  if (a.indexOf(3,0.49) === 2 &&    // 0.49 resolves to 0

-      a.indexOf(1,0.51) === 0 &&    // 0.51 resolves to 0

-      a.indexOf(1,1.51) === -1) {   // 1.01 resolves to 1

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf when fromIndex is floating point number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,3);
+  if (a.indexOf(3,0.49) === 2 &&    // 0.49 resolves to 0
+      a.indexOf(1,0.51) === 0 &&    // 0.51 resolves to 0
+      a.indexOf(1,1.51) === -1) {   // 1.01 resolves to 1
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-20.js
index 109c38041..c529d9b50 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-20.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-20.js

- * @description Array.prototype.indexOf - value of 'fromIndex' which is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "0003.10") === -1 &&

-            [0, 1, 2, targetObj, 4].indexOf(targetObj, "0003.10") === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' which is a string
+    containing a number with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, 1, targetObj, 3, 4].indexOf(targetObj, "0003.10") === -1 &&
+            [0, 1, 2, targetObj, 4].indexOf(targetObj, "0003.10") === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-21.js
index 1a80e7100..015e0dc75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-21.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-21.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is an Object, which has an own toString method

- */

-

-

-function testcase() {

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-        var fromIndex = {

-            toString: function () {

-                return '1';

-            }

-        };

-

-        return [0, true].indexOf(true, fromIndex) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is an Object, which
+    has an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+        var fromIndex = {
+            toString: function () {
+                return '1';
+            }
+        };
+
+        return [0, true].indexOf(true, fromIndex) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-22.js
index f4b7f410c..dcba8e0a1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-22.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-22.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is an Object, which has an own valueOf method

- */

-

-

-function testcase() {

-

-        var fromIndex = {

-            valueOf: function () {

-                return 1;

-            }

-        };

-

-

-        return [0, true].indexOf(true, fromIndex) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is an Object, which
+    has an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fromIndex = {
+            valueOf: function () {
+                return 1;
+            }
+        };
+
+
+        return [0, true].indexOf(true, fromIndex) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-23.js
index aec49eab4..13c18346d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-23.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-23.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var fromIndex = {

-            toString: function () {

-                toStringAccessed = true;

-                return '1';

-            },

-

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-

-        return [0, true].indexOf(true, fromIndex) === 1 && toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is an object that
+    has an own valueOf method that returns an object and toString
+    method that returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var fromIndex = {
+            toString: function () {
+                toStringAccessed = true;
+                return '1';
+            },
+
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+
+        return [0, true].indexOf(true, fromIndex) === 1 && toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-24.js
index af7e04be8..f9ca99e91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-24.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-24.js

- * @description Array.prototype.indexOf throws TypeError exception when value of 'fromIndex' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-        var fromIndex = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-

-        try {

-            [0, true].indexOf(true, fromIndex);

-            return false;

-        } catch (e) {

-            return toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf throws TypeError exception when value of
+    'fromIndex' is an object with toString and valueOf methods that
+    don�t return primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+        var fromIndex = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+
+        try {
+            [0, true].indexOf(true, fromIndex);
+            return false;
+        } catch (e) {
+            return toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-25.js
index 210ff59e1..42592de85 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-25.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-25.js

- * @description Array.prototype.indexOf uses inherited valueOf method when value of 'fromIndex' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 1;

-            }

-        };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.toString = function () {

-            toStringAccessed = true;

-            return 2;

-        };

-

-        return [0, true].indexOf(true, child) === 1 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf uses inherited valueOf method when value
+    of 'fromIndex' is an object with an own toString and inherited
+    valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 1;
+            }
+        };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.toString = function () {
+            toStringAccessed = true;
+            return 2;
+        };
+
+        return [0, true].indexOf(true, child) === 1 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-26.js
index 69574ff01..3f94ebd9d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-26.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-26.js

- * @description Array.prototype.indexOf - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-        var stepTwoOccurs = false;

-        var stepFiveOccurs = false;

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                stepTwoOccurs = true;

-                if (stepFiveOccurs) {

-                    throw new Error("Step 5 occurred out of order");

-                }

-                return 20;

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(obj, undefined, fromIndex);

-            return stepTwoOccurs && stepFiveOccurs;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var stepTwoOccurs = false;
+        var stepFiveOccurs = false;
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                stepTwoOccurs = true;
+                if (stepFiveOccurs) {
+                    throw new Error("Step 5 occurred out of order");
+                }
+                return 20;
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(obj, undefined, fromIndex);
+            return stepTwoOccurs && stepFiveOccurs;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-27.js
index 98ff90761..079965725 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-27.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-27.js

- * @description Array.prototype.indexOf - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-        var stepThreeOccurs = false;

-        var stepFiveOccurs = false;

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    valueOf: function () {

-                        stepThreeOccurs = true;

-                        if (stepFiveOccurs) {

-                            throw new Error("Step 5 occurred out of order");

-                        }

-                        return 20;

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(obj, undefined, fromIndex);

-            return stepThreeOccurs && stepFiveOccurs;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var stepThreeOccurs = false;
+        var stepFiveOccurs = false;
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    valueOf: function () {
+                        stepThreeOccurs = true;
+                        if (stepFiveOccurs) {
+                            throw new Error("Step 5 occurred out of order");
+                        }
+                        return 20;
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(obj, undefined, fromIndex);
+            return stepThreeOccurs && stepFiveOccurs;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-28.js
index be603a1b9..39820eec7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-28.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-28.js

- * @description Array.prototype.indexOf - side effects produced by step 1 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(undefined, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side effects produced by step 1 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(undefined, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-29.js
index ce0e9739e..56dabfedb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-29.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-29.js

- * @description Array.prototype.indexOf - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-        

-        var obj = {};

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new RangeError();

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(obj, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof RangeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+        
+        var obj = {};
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new RangeError();
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(obj, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof RangeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-3.js
index 6b646e64d..1d75def54 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-3.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-3.js

- * @description Array.prototype.indexOf when fromIndex is boolean

- */

-

-

-function testcase() {

-  var a = [1,2,3];

-  if (a.indexOf(1,true) === -1 &&        // true resolves to 1

-     a.indexOf(1,false) === 0 ) {       // false resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf when fromIndex is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [1,2,3];
+  if (a.indexOf(1,true) === -1 &&        // true resolves to 1
+     a.indexOf(1,false) === 0 ) {       // false resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-30.js
index 8724c75c0..f6d8848ba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-30.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-30.js

- * @description Array.prototype.indexOf - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-

-        var obj = {};

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    valueOf: function () {

-                        throw new TypeError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.indexOf.call(obj, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+
+        var obj = {};
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    valueOf: function () {
+                        throw new TypeError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.indexOf.call(obj, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-31.js
index 3caf29be4..e6be2099c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-31.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-31.js

- * @description Array.prototype.indexOf - 'fromIndex' is a positive non-integer, verify truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, 2].indexOf(targetObj, 2.5) === -1 &&

-            [0, 1, targetObj].indexOf(targetObj, 2.5) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'fromIndex' is a positive non-integer,
+    verify truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, 2].indexOf(targetObj, 2.5) === -1 &&
+            [0, 1, targetObj].indexOf(targetObj, 2.5) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-32.js
index 66a164321..750aea7ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-32.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-32.js

- * @description Array.prototype.indexOf - 'fromIndex' is a negative non-integer, verify truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, 2].indexOf(targetObj, -1.5) === -1 &&

-            [0, 1, targetObj].indexOf(targetObj, -1.5) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - 'fromIndex' is a negative non-integer,
+    verify truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, 2].indexOf(targetObj, -1.5) === -1 &&
+            [0, 1, targetObj].indexOf(targetObj, -1.5) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-33.js
index 965c2cee3..44231f8a6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-33.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-33.js

- * @description Array.prototype.indexOf match on the first element, a middle element and the last element when 'fromIndex' is passed

- */

-

-

-function testcase() {

-

-        return [0, 1, 2, 3, 4].indexOf(0, 0) === 0 &&

-            [0, 1, 2, 3, 4].indexOf(2, 1) === 2 &&

-            [0, 1, 2, 3, 4].indexOf(2, 2) === 2 &&

-            [0, 1, 2, 3, 4].indexOf(4, 2) === 4 &&

-            [0, 1, 2, 3, 4].indexOf(4, 4) === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf match on the first element, a middle
+    element and the last element when 'fromIndex' is passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, 1, 2, 3, 4].indexOf(0, 0) === 0 &&
+            [0, 1, 2, 3, 4].indexOf(2, 1) === 2 &&
+            [0, 1, 2, 3, 4].indexOf(2, 2) === 2 &&
+            [0, 1, 2, 3, 4].indexOf(4, 2) === 4 &&
+            [0, 1, 2, 3, 4].indexOf(4, 4) === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-4.js
index e9a9b1c96..af15b1d46 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-4.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-4.js

- * @description Array.prototype.indexOf returns 0 if fromIndex is 'undefined'

- */

-

-

-function testcase() {

-  var a = [1,2,3];

-  if (a.indexOf(1,undefined) === 0) {    // undefined resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf returns 0 if fromIndex is 'undefined'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [1,2,3];
+  if (a.indexOf(1,undefined) === 0) {    // undefined resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-5.js
index 55abcec91..1759f60aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-5.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-5.js

- * @description Array.prototype.indexOf returns 0 if fromIndex is null

- */

-

-

-function testcase() {

-  var a = [1,2,3];

-  if (a.indexOf(1,null) === 0 ) {       // null resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf returns 0 if fromIndex is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [1,2,3];
+  if (a.indexOf(1,null) === 0 ) {       // null resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-6.js
index 7d3dae256..2893fe8c1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-6.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-6.js

- * @description Array.prototype.indexOf - 'fromIndex' isn't passed

- */

-

-

-function testcase() {

-        var arr = [0, 1, 2, 3, 4];

-        //'fromIndex' will be set as 0 if not passed by default

-        return arr.indexOf(0) === arr.indexOf(0, 0) &&

-            arr.indexOf(2) === arr.indexOf(2, 0) &&

-            arr.indexOf(4) === arr.indexOf(4, 0); 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - 'fromIndex' isn't passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [0, 1, 2, 3, 4];
+        //'fromIndex' will be set as 0 if not passed by default
+        return arr.indexOf(0) === arr.indexOf(0, 0) &&
+            arr.indexOf(2) === arr.indexOf(2, 0) &&
+            arr.indexOf(4) === arr.indexOf(4, 0); 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-7.js
index dcb784bea..a1fbbb9cd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-7.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-7.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, 0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, 0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-8.js
index 47aebb3fc..571c6cd63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-8.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-8.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, +0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, +0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-9.js
index 268569f93..01b310d40 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-9.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-5-9.js

- * @description Array.prototype.indexOf - value of 'fromIndex' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        return [true].indexOf(true, -0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - value of 'fromIndex' is a number (value
+    is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].indexOf(true, -0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-6-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-6-1.js
index d21c122b5..50aa35884 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-6-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-6-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-6-1.js

- * @description Array.prototype.indexOf returns -1 if fromIndex is greater than Array length

- */

-

-

-function testcase() {

-  var a = [1,2,3];

-  if (a.indexOf(1,5) === -1 &&  

-     a.indexOf(1,3) === -1  &&

-     [ ].indexOf(1,0) === -1  ){

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 if fromIndex is greater than
+    Array length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [1,2,3];
+  if (a.indexOf(1,5) === -1 &&  
+     a.indexOf(1,3) === -1  &&
+     [ ].indexOf(1,0) === -1  ){
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-1.js
index c641b2d7f..5e36d9b9f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-1.js

- * @description Array.prototype.indexOf returns -1 when 'fromIndex' is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].indexOf(1, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 when 'fromIndex' is length of
+    array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].indexOf(1, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-2.js
index f701c93a4..42f3e0436 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-2.js

- * @description Array.prototype.indexOf returns correct index when 'fromIndex' is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].indexOf(3, 2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns correct index when 'fromIndex' is
+    length of array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].indexOf(3, 2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-3.js
index 36178b585..6c5010f4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-3.js

- * @description Array.prototype.indexOf returns -1 when 'fromIndex' and 'length' are both 0

- */

-

-

-function testcase() {

-

-        return [].indexOf(1, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 when 'fromIndex' and 'length'
+    are both 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [].indexOf(1, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-4.js
index fea341fdd..ff48872eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-4.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-4.js

- * @description Array.prototype.indexOf returns -1 when 'fromIndex' is 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].indexOf(1, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf returns -1 when 'fromIndex' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].indexOf(1, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-5.js
index 0036b298b..0428f5fbd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-5.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-7-5.js

- * @description Array.prototype.indexOf returns correct index when 'fromIndex' is 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].indexOf(2, 1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf returns correct index when 'fromIndex' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].indexOf(2, 1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-1.js
index 8e00f731d..f7b9ba2ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-1.js

- * @description Array.prototype.indexOf with negative fromIndex

- */

-

-

-function testcase() {

-  var a = new Array(1,2,3);

-  

-  if (a.indexOf(2,-1) === -1 &&  

-      a.indexOf(2,-2) === 1 &&  

-      a.indexOf(1,-3) === 0 &&  

-      a.indexOf(1,-5.3) === 0 ) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf with negative fromIndex
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,3);
+  
+  if (a.indexOf(2,-1) === -1 &&  
+      a.indexOf(2,-2) === 1 &&  
+      a.indexOf(1,-3) === 0 &&  
+      a.indexOf(1,-5.3) === 0 ) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-2.js
index d749ecc7d..dcaf435d9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-2.js

- * @description Array.prototype.indexOf returns correct index when 'fromIndex' is -1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].indexOf(4, -1) === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns correct index when 'fromIndex' is
+    -1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].indexOf(4, -1) === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-3.js
index 09155bb00..ab1c88cb1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-3.js

- * @description Array.prototype.indexOf returns -1 when abs('fromIndex') is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].indexOf(1, -3) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 when abs('fromIndex') is length
+    of array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].indexOf(1, -3) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-4.js
index 188aa57ee..189ae4a69 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-4.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-8-4.js

- * @description Array.prototype.indexOf returns -1 when abs('fromIndex') is length of array

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].indexOf(0, -4) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf returns -1 when abs('fromIndex') is length
+    of array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].indexOf(0, -4) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-1.js
index 07c3fa630..5a7383e9d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-1.js

- * @description Array.prototype.indexOf must return correct index (boolean)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return true}};

-  var _false = false;

-  var a = [obj,"true", undefined,0,_false,null,1,"str",0,1,true,false,true,false];

-  if (a.indexOf(true) === 10 &&  //a[10]=true

-      a.indexOf(false) === 4)    //a[4] =_false

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return true}};
+  var _false = false;
+  var a = [obj,"true", undefined,0,_false,null,1,"str",0,1,true,false,true,false];
+  if (a.indexOf(true) === 10 &&  //a[10]=true
+      a.indexOf(false) === 4)    //a[4] =_false
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-10.js
index 9147f4a09..fa24b0c49 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-10.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * note that prior to the finally ES5 draft SameValue was used for comparisions

- * and hence NaNs could be found using indexOf *

- *

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-10.js

- * @description Array.prototype.indexOf must return correct index (NaN)

- */

-

-

-function testcase() {

-  var _NaN = NaN;

-  var a = new Array("NaN",undefined,0,false,null,{toString:function (){return NaN}},"false",_NaN,NaN);

-  if (a.indexOf(NaN) === -1)  // NaN is equal to nothing, including itself.

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    note that prior to the finally ES5 draft SameValue was used for comparisions
+    and hence NaNs could be found using indexOf *
+description: Array.prototype.indexOf must return correct index (NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _NaN = NaN;
+  var a = new Array("NaN",undefined,0,false,null,{toString:function (){return NaN}},"false",_NaN,NaN);
+  if (a.indexOf(NaN) === -1)  // NaN is equal to nothing, including itself.
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-11.js
index 82b0b08fa..f6996f129 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-11.js

- * @description Array.prototype.indexOf - the length of iteration isn't changed by adding elements to the array during iteration

- */

-

-

-function testcase() {

-

-        var arr = [20];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr[1] = 1;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.indexOf(1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - the length of iteration isn't changed by
+    adding elements to the array during iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [20];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr[1] = 1;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.indexOf(1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-2.js
index 688093ce9..0b7f6c335 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-2.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-2.js

- * @description Array.prototype.indexOf must return correct index (Number)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return 0}};

-  var one = 1;

-  var _float = -(4/3);

-  var a = new Array(false,undefined,null,"0",obj,-1.3333333333333, "str",-0,true,+0, one, 1,0, false, _float, -(4/3));

-  if (a.indexOf(-(4/3)) === 14 &&      // a[14]=_float===-(4/3)

-      a.indexOf(0) === 7      &&       // a[7] = +0, 0===+0

-      a.indexOf(-0) === 7      &&     // a[7] = +0, -0===+0

-      a.indexOf(1) === 10 )            // a[10] =one=== 1

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return 0}};
+  var one = 1;
+  var _float = -(4/3);
+  var a = new Array(false,undefined,null,"0",obj,-1.3333333333333, "str",-0,true,+0, one, 1,0, false, _float, -(4/3));
+  if (a.indexOf(-(4/3)) === 14 &&      // a[14]=_float===-(4/3)
+      a.indexOf(0) === 7      &&       // a[7] = +0, 0===+0
+      a.indexOf(-0) === 7      &&     // a[7] = +0, -0===+0
+      a.indexOf(1) === 10 )            // a[10] =one=== 1
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-3.js
index 47ab35477..8358d3930 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-3.js

- * @description Array.prototype.indexOf must return correct index(string)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return "false"}};

-  var szFalse = "false";

-  var a = new Array("false1",undefined,0,false,null,1,obj,0,szFalse, "false");

-  if (a.indexOf("false") === 8)  //a[8]=szFalse

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index(string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return "false"}};
+  var szFalse = "false";
+  var a = new Array("false1",undefined,0,false,null,1,obj,0,szFalse, "false");
+  if (a.indexOf("false") === 8)  //a[8]=szFalse
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-4.js
index 8dbf466b1..75b73f32b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-4.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-4.js

- * @description Array.prototype.indexOf must return correct index(undefined)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return undefined;}};

-  var _undefined1 = undefined;

-  var _undefined2;

-  var a = new Array(true,0,false,null,1,"undefined",obj,1,_undefined2,_undefined1,undefined);

-  if (a.indexOf(undefined) === 8) //a[8]=_undefined2

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index(undefined)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return undefined;}};
+  var _undefined1 = undefined;
+  var _undefined2;
+  var a = new Array(true,0,false,null,1,"undefined",obj,1,_undefined2,_undefined1,undefined);
+  if (a.indexOf(undefined) === 8) //a[8]=_undefined2
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-5.js
index c54e53629..726536dc8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-5.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-5.js

- * @description Array.prototype.indexOf must return correct index (Object)

- */

-

-

-function testcase() {

-  var obj1 = {toString:function (){return "false"}};

-  var obj2 = {toString:function (){return "false"}};

-  var obj3 = obj1;

-  var a = new Array(false,undefined,0,false,null,{toString:function (){return "false"}},"false",obj2,obj1,obj3);

-  if (a.indexOf(obj3) === 8)  //a[8] = obj1;

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj1 = {toString:function (){return "false"}};
+  var obj2 = {toString:function (){return "false"}};
+  var obj3 = obj1;
+  var a = new Array(false,undefined,0,false,null,{toString:function (){return "false"}},"false",obj2,obj1,obj3);
+  if (a.indexOf(obj3) === 8)  //a[8] = obj1;
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-6.js
index 7fd3f5b5e..6010f4b87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-6.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-6.js

- * @description Array.prototype.indexOf must return correct index(null)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return null}};

-  var _null = null;

-  var a = new Array(true,undefined,0,false,_null,1,"str",0,1,obj,true,false,null);

-  if (a.indexOf(null) === 4 )  //a[4]=_null

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index(null)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return null}};
+  var _null = null;
+  var a = new Array(true,undefined,0,false,_null,1,"str",0,1,obj,true,false,null);
+  if (a.indexOf(null) === 4 )  //a[4]=_null
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-7.js
index d91e3d086..bebd58d56 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-7.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-7.js

- * @description Array.prototype.indexOf must return correct index (self reference)

- */

-

-

-function testcase() {

-  var a = new Array(0,1,2,3);  

-  a[2] = a;

-  if (a.indexOf(a) === 2 &&  

-      a.indexOf(3) === 3 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (self reference)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(0,1,2,3);  
+  a[2] = a;
+  if (a.indexOf(a) === 2 &&  
+      a.indexOf(3) === 3 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-8.js
index 7dd751c78..b04bba42d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-8.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-8.js

- * @description Array.prototype.indexOf must return correct index (Array)

- */

-

-

-function testcase() {

-  var b = new Array("0,1");  

-  var a = new Array(0,b,"0,1",3);  

-  if (a.indexOf(b.toString()) === 2 &&  

-      a.indexOf("0,1") === 2 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = new Array("0,1");  
+  var a = new Array(0,b,"0,1",3);  
+  if (a.indexOf(b.toString()) === 2 &&  
+      a.indexOf("0,1") === 2 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-9.js
index bd811ae03..ee1c78ab4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-9.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-9.js

- * @description Array.prototype.indexOf must return correct index (Sparse Array)

- */

-

-

-function testcase() {

-  var a = new Array(0,1);  

-  a[4294967294] = 2;          // 2^32-2 - is max array element

-  a[4294967295] = 3;          // 2^32-1 added as non-array element property

-  a[4294967296] = 4;          // 2^32   added as non-array element property

-  a[4294967297] = 5;          // 2^32+1 added as non-array element property

-

-  // start searching near the end so in case implementation actually tries to test all missing elements!!

-  return (a.indexOf(2,4294967290 ) === 4294967294 &&    

-      a.indexOf(3,4294967290) === -1 &&   

-      a.indexOf(4,4294967290) === -1 &&  

-      a.indexOf(5,4294967290) === -1   ) ;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf must return correct index (Sparse Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(0,1);  
+  a[4294967294] = 2;          // 2^32-2 - is max array element
+  a[4294967295] = 3;          // 2^32-1 added as non-array element property
+  a[4294967296] = 4;          // 2^32   added as non-array element property
+  a[4294967297] = 5;          // 2^32+1 added as non-array element property
+
+  // start searching near the end so in case implementation actually tries to test all missing elements!!
+  return (a.indexOf(2,4294967290 ) === 4294967294 &&    
+      a.indexOf(3,4294967290) === -1 &&   
+      a.indexOf(4,4294967290) === -1 &&  
+      a.indexOf(5,4294967290) === -1   ) ;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-1.js
index 54c7923bd..b05853d15 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-1.js

- * @description Array.prototype.indexOf - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var arr = { };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                arr[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return 2 === Array.prototype.indexOf.call(arr, "length");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - added properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                arr[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return 2 === Array.prototype.indexOf.call(arr, "length");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-10.js
index acc2ebc4c..7ad43af7c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-10.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-10.js

- * @description Array.prototype.indexOf - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return arr.indexOf(6.99) === 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - properties can be added to prototype
+    after current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return arr.indexOf(6.99) === 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-11.js
index 66126dc25..83146efbe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-11.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-11.js

- * @description Array.prototype.indexOf - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === Array.prototype.indexOf.call(arr, 6.99);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting own property causes index
+    property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === Array.prototype.indexOf.call(arr, 6.99);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-12.js
index 256ad2671..6efe02c52 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-12.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-12.js

- * @description Array.prototype.indexOf - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === arr.indexOf("6.99");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting own property causes index
+    property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === arr.indexOf("6.99");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-13.js
index 33f4f928d..db597955d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-13.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-13.js

- * @description Array.prototype.indexOf - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var arr = { 2: 2, length: 20 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return -1 === Array.prototype.indexOf.call(arr, 1);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 2: 2, length: 20 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return -1 === Array.prototype.indexOf.call(arr, 1);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-14.js
index 2761b6a99..e742b2bf3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-14.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-14.js

- * @description Array.prototype.indexOf - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return -1 === arr.indexOf(1);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return -1 === arr.indexOf(1);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-15.js
index 6aee39a24..e492ebd1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-15.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-15.js

- * @description Array.prototype.indexOf - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };

-        

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return 1 === Array.prototype.indexOf.call(arr, 1);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };
+        
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return 1 === Array.prototype.indexOf.call(arr, 1);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-16.js
index 23696e159..8cb24c817 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-16.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-16.js

- * @description Array.prototype.indexOf - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, 111, 2]; 

-        

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return 1 === arr.indexOf(1);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 111, 2]; 
+        
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return 1 === arr.indexOf(1);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-17.js
index cbf849792..f1b062895 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-17.js

- * @description Array.prototype.indexOf - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === arr.indexOf("last");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === arr.indexOf("last");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-18.js
index dae72c99f..bdfde4242 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-18.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-18.js

- * @description Array.prototype.indexOf - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            return 2 === arr.indexOf("prototype");

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - decreasing length of array with
+    prototype property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            return 2 === arr.indexOf("prototype");
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-19.js
index bb919355f..dcf6266dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-19.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-19.js

- * @description Array.prototype.indexOf - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-        

-        return 2 === arr.indexOf("unconfigurable");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+        
+        return 2 === arr.indexOf("unconfigurable");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-2.js
index fe4c97ecd..db6f90286 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-2.js

- * @description Array.prototype.indexOf - added properties in step 5 are visible here on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 30 };

-        var targetObj = function () { };

-

-        var fromIndex = {

-            valueOf: function () {

-                arr[4] = targetObj;

-                return 3;

-            }

-        };

-        

-        return 4 === Array.prototype.indexOf.call(arr, targetObj, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - added properties in step 5 are visible
+    here on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 30 };
+        var targetObj = function () { };
+
+        var fromIndex = {
+            valueOf: function () {
+                arr[4] = targetObj;
+                return 3;
+            }
+        };
+        
+        return 4 === Array.prototype.indexOf.call(arr, targetObj, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-3.js
index 510a09134..a4c8a2099 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-3.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-3.js

- * @description Array.prototype.indexOf - added properties in step 5 are visible here on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        arr.length = 30;

-        var targetObj = function () { };

-

-        var fromIndex = {

-            valueOf: function () {

-                arr[4] = targetObj;

-                return 3;

-            }

-        };

-

-        return 4 === arr.indexOf(targetObj, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - added properties in step 5 are visible
+    here on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        arr.length = 30;
+        var targetObj = function () { };
+
+        var fromIndex = {
+            valueOf: function () {
+                arr[4] = targetObj;
+                return 3;
+            }
+        };
+
+        return 4 === arr.indexOf(targetObj, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-4.js
index 8518f8cba..25f33503d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-4.js

- * @description Array.prototype.indexOf - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var arr = { 2: 6.99 };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                delete arr[2];

-                return 3;

-            },

-            configurable: true

-        });

-

-        return -1 === Array.prototype.indexOf.call(arr, 6.99);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 2: 6.99 };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                delete arr[2];
+                return 3;
+            },
+            configurable: true
+        });
+
+        return -1 === Array.prototype.indexOf.call(arr, 6.99);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-5.js
index 5a49af4d2..a9b654bad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-5.js

- * @description Array.prototype.indexOf - deleted properties in step 5 are visible here on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { 10: false, length: 30 };

-

-        var fromIndex = {

-            valueOf: function () {

-                delete arr[10];

-                return 3;

-            }

-        };

-

-        return -1 === Array.prototype.indexOf.call(arr, false, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleted properties in step 5 are visible
+    here on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 10: false, length: 30 };
+
+        var fromIndex = {
+            valueOf: function () {
+                delete arr[10];
+                return 3;
+            }
+        };
+
+        return -1 === Array.prototype.indexOf.call(arr, false, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-6.js
index 51d633b34..0575e20d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-6.js

- * @description Array.prototype.indexOf - deleted properties in step 5 are visible here on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        arr[10] = "10";

-        arr.length = 20;

-

-        var fromIndex = {

-            valueOf: function () {

-                delete arr[10];

-                return 3;

-            }

-        };

-

-        return -1 === arr.indexOf("10", fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - deleted properties in step 5 are visible
+    here on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        arr[10] = "10";
+        arr.length = 20;
+
+        var fromIndex = {
+            valueOf: function () {
+                delete arr[10];
+                return 3;
+            }
+        };
+
+        return -1 === arr.indexOf("10", fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-7.js
index 736e10843..512abbeb5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-7.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-7.js

- * @description Array.prototype.indexOf - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-    

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(arr, 1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(arr, 1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-8.js
index f4f6c3e0c..67fdc3ddd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-8.js

- * @description Array.prototype.indexOf - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.indexOf(1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.indexOf(1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-9.js
index c2b57d402..cd87f5a1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-9.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-a-9.js

- * @description Array.prototype.indexOf - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return Array.prototype.indexOf.call(arr, 6.99) === 1;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - properties can be added to prototype
+    after current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return Array.prototype.indexOf.call(arr, 6.99) === 1;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-1.js
index 70d59948f..22a0ebd75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-1.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-1.js

- * @description Array.prototype.indexOf - non-existent property wouldn't be called

- */

-

-

-function testcase() {

-

-        return [0, , 2].indexOf(undefined) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - non-existent property wouldn't be called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, , 2].indexOf(undefined) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-1.js
index 57aea0a34..8d2046ad7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-1.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-        var obj = { 0: 0, 1: 1, 2: 2, length: 3 };

-        return Array.prototype.indexOf.call(obj, 0) === 0 &&

-            Array.prototype.indexOf.call(obj, 1) === 1 &&

-            Array.prototype.indexOf.call(obj, 2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 0: 0, 1: 1, 2: 2, length: 3 };
+        return Array.prototype.indexOf.call(obj, 0) === 0 &&
+            Array.prototype.indexOf.call(obj, 1) === 1 &&
+            Array.prototype.indexOf.call(obj, 2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-10.js
index 7fa23f0c8..95d42dd5c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-10.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-10.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 3 };

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return 0 === Array.prototype.indexOf.call(obj, 0) &&

-            1 === Array.prototype.indexOf.call(obj, 1) &&

-            2 === Array.prototype.indexOf.call(obj, 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 3 };
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return 0 === Array.prototype.indexOf.call(obj, 0) &&
+            1 === Array.prototype.indexOf.call(obj, 1) &&
+            2 === Array.prototype.indexOf.call(obj, 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-11.js
index ac64a33c3..5a11c0c45 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-11.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-11.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Array.prototype[0] = false;

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === arr.indexOf(true);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Array.prototype[0] = false;
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === arr.indexOf(true);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-12.js
index 5e268ce32..a09ef5444 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-12.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-12.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        var obj = { length: 1 };

-

-        try {

-            Object.prototype[0] = false;

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.indexOf.call(obj, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { length: 1 };
+
+        try {
+            Object.prototype[0] = false;
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.indexOf.call(obj, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-13.js
index 06450b83e..fe76f0733 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-13.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-13.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === arr.indexOf(true);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === arr.indexOf(true);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-14.js
index 72417e9ff..10f7c94ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-14.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-14.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 1 };

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.indexOf.call(obj, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 1 };
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.indexOf.call(obj, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-15.js
index 9093071c3..af124ec94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-15.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-15.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return 30;

-                },

-                configurable: true

-            });

-

-            return 0 === [, , , ].indexOf(10) &&

-                1 === [, , , ].indexOf(20) && 

-                2 === [, , , ].indexOf(30);

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1]; 

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return 30;
+                },
+                configurable: true
+            });
+
+            return 0 === [, , , ].indexOf(10) &&
+                1 === [, , , ].indexOf(20) && 
+                2 === [, , , ].indexOf(30);
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1]; 
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-16.js
index 64e58f666..112bd12b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-16.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-16.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Object.prototype, "1", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Object.prototype, "2", {

-                get: function () {

-                    return 30;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.indexOf.call({ length: 3 }, 10) &&

-                1 === Array.prototype.indexOf.call({ length: 3 }, 20) &&

-                2 === Array.prototype.indexOf.call({ length: 3 }, 30);

-        } finally {

-            delete Object.prototype[0];

-            delete Object.prototype[1];

-            delete Object.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Object.prototype, "1", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Object.prototype, "2", {
+                get: function () {
+                    return 30;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.indexOf.call({ length: 3 }, 10) &&
+                1 === Array.prototype.indexOf.call({ length: 3 }, 20) &&
+                2 === Array.prototype.indexOf.call({ length: 3 }, 30);
+        } finally {
+            delete Object.prototype[0];
+            delete Object.prototype[1];
+            delete Object.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-17.js
index 58fef54ff..20ba76dff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-17.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-17.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return arr.indexOf(undefined) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return arr.indexOf(undefined) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-18.js
index 8912be8ee..9a5bde6ad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-18.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-18.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 1 };

-        Object.defineProperty(obj, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return 0 === Array.prototype.indexOf.call(obj, undefined);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 1 };
+        Object.defineProperty(obj, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return 0 === Array.prototype.indexOf.call(obj, undefined);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-19.js
index 369476570..153e8929f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-19.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-19.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            return arr.indexOf(undefined) === 0;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            return arr.indexOf(undefined) === 0;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-2.js
index b74ea0e08..15e71a186 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-2.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-        return [true, true, true].indexOf(true) === 0 &&

-            [false, true, true].indexOf(true) === 1 &&

-            [false, false, true].indexOf(true) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return [true, true, true].indexOf(true) === 0 &&
+            [false, true, true].indexOf(true) === 1 &&
+            [false, false, true].indexOf(true) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-20.js
index 865d0cb0d..b38a647af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-20.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-20.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 1;

-

-        Object.defineProperty(child, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(child, undefined) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 1;
+
+        Object.defineProperty(child, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(child, undefined) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-21.js
index b58131bf5..ed5d2ebdf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-21.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-21.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-            return 0 === [, ].indexOf(undefined);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+            return 0 === [, ].indexOf(undefined);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-22.js
index 418abf42b..a2261a5a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-22.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-22.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-            return 0 === Array.prototype.indexOf.call({ length: 1 }, undefined);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+            return 0 === Array.prototype.indexOf.call({ length: 1 }, undefined);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-23.js
index 624c2ea43..6c2398ac1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-23.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-23.js

- * @description Array.prototype.indexOf - This object is the global object

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = targetObj;

-            fnGlobalObject()[100] = "100";

-            fnGlobalObject()[200] = "200";

-            fnGlobalObject().length = 200;

-            return 0 === Array.prototype.indexOf.call(fnGlobalObject(), targetObj) &&

-                100 === Array.prototype.indexOf.call(fnGlobalObject(), "100") &&

-                -1 === Array.prototype.indexOf.call(fnGlobalObject(), "200");

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[100];

-            delete fnGlobalObject()[200];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - This object is the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = targetObj;
+            fnGlobalObject()[100] = "100";
+            fnGlobalObject()[200] = "200";
+            fnGlobalObject().length = 200;
+            return 0 === Array.prototype.indexOf.call(fnGlobalObject(), targetObj) &&
+                100 === Array.prototype.indexOf.call(fnGlobalObject(), "100") &&
+                -1 === Array.prototype.indexOf.call(fnGlobalObject(), "200");
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[100];
+            delete fnGlobalObject()[200];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-25.js
index c42475ef8..6244fce24 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-25.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-25.js

- * @description Array.prototype.indexOf applied to Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&

-            -1 === Array.prototype.indexOf.call(arguments, arguments[1]);

-        };

-

-        return func(true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&
+            -1 === Array.prototype.indexOf.call(arguments, arguments[1]);
+        };
+
+        return func(true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-26.js
index 1dd42a99c..6d1a797db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-26.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-26.js

- * @description Array.prototype.indexOf applied to Arguments object which implements its own property get method (number of arguments equals to number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&

-            1 === Array.prototype.indexOf.call(arguments, arguments[1]) &&

-            -1 === Array.prototype.indexOf.call(arguments, arguments[2]);

-        };

-

-        return func(0, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to Arguments object which
+    implements its own property get method (number of arguments equals
+    to number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&
+            1 === Array.prototype.indexOf.call(arguments, arguments[1]) &&
+            -1 === Array.prototype.indexOf.call(arguments, arguments[2]);
+        };
+
+        return func(0, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-27.js
index 52097dffa..fc1949d1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-27.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-27.js

- * @description Array.prototype.indexOf applied to Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&

-            3 === Array.prototype.indexOf.call(arguments, arguments[3]) &&

-            -1 === Array.prototype.indexOf.call(arguments, arguments[4]);

-        };

-

-        return func(0, false, 0, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf applied to Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 0 === Array.prototype.indexOf.call(arguments, arguments[0]) &&
+            3 === Array.prototype.indexOf.call(arguments, arguments[3]) &&
+            -1 === Array.prototype.indexOf.call(arguments, arguments[4]);
+        };
+
+        return func(0, false, 0, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-28.js
index 554516c25..6672dc44d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-28.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-28.js

- * @description Array.prototype.indexOf - side-effects are visible in subsequent iterations on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return false;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return true;

-                } else {

-                    return false;

-                }

-            },

-            configurable: true

-        });

-

-        return arr.indexOf(true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side-effects are visible in subsequent
+    iterations on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return false;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+            configurable: true
+        });
+
+        return arr.indexOf(true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-29.js
index bef85f25c..fcd79d7ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-29.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-29.js

- * @description Array.prototype.indexOf - side-effects are visible in subsequent iterations on an Array-like object

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return false;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return true;

-                } else {

-                    return false;

-                }

-            },

-            configurable: true

-        });

-

-        return Array.prototype.indexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - side-effects are visible in subsequent
+    iterations on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return false;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+            configurable: true
+        });
+
+        return Array.prototype.indexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-3.js
index 0c453edfe..01c9129cb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-3.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        try {

-            Array.prototype[0] = false;

-            return [true].indexOf(true) === 0;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype[0] = false;
+            return [true].indexOf(true) === 0;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-30.js
index 20c2f0fef..2dc6def72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-30.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-30.js

- * @description Array.prototype.indexOf - terminates iteration on unhandled exception on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                throw new TypeError();

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                accessed = true;

-                return true;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.indexOf(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - terminates iteration on unhandled
+    exception on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                throw new TypeError();
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                accessed = true;
+                return true;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.indexOf(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-31.js
index 5ac4092d5..8f4e5a2bb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-31.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-31.js

- * @description Array.prototype.indexOf - terminates iteration on unhandled exception on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                throw new TypeError();

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                accessed = true;

-                return true;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.indexOf.call(obj, true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !accessed;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - terminates iteration on unhandled
+    exception on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                throw new TypeError();
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                accessed = true;
+                return true;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.indexOf.call(obj, true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !accessed;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-4.js
index c02809cb0..60e85ff2e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-4.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-4.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.prototype[0] = false;

-            return 0 === Array.prototype.indexOf.call({ 0: true, 1: 1, length: 2 }, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.prototype[0] = false;
+            return 0 === Array.prototype.indexOf.call({ 0: true, 1: 1, length: 2 }, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-5.js
index 921a001c6..baaaf396a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-5.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-            return 0 === [true].indexOf(true);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+            return 0 === [true].indexOf(true);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-6.js
index 97710df6c..d55e38499 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-6.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-6.js

- * @description Array.prototype.indexOf - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-            return 0 === Array.prototype.indexOf.call({ 0: true, 1: 1, length: 2 }, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+            return 0 === Array.prototype.indexOf.call({ 0: true, 1: 1, length: 2 }, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-7.js
index 4b320c21d..431744ff1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-7.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-        try {

-            Array.prototype[0] = true;

-            Array.prototype[1] = false;

-            Array.prototype[2] = "true";

-            return 0 === [, , , ].indexOf(true) &&

-                1 === [, , , ].indexOf(false) &&

-                2 === [, , , ].indexOf("true");

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype[0] = true;
+            Array.prototype[1] = false;
+            Array.prototype[2] = "true";
+            return 0 === [, , , ].indexOf(true) &&
+                1 === [, , , ].indexOf(false) &&
+                2 === [, , , ].indexOf("true");
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-8.js
index 82cf0242e..e70ca50e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-8.js

- * @description Array.prototype.indexOf - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.prototype[0] = true;

-            Object.prototype[1] = false;

-            Object.prototype[2] = "true";

-            return 0 === Array.prototype.indexOf.call({ length: 3 }, true) &&

-                1 === Array.prototype.indexOf.call({ length: 3 }, false) &&

-                2 === Array.prototype.indexOf.call({ length: 3 }, "true");

-        } finally {

-            delete Object.prototype[0];

-            delete Object.prototype[1];

-            delete Object.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is inherited
+    data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.prototype[0] = true;
+            Object.prototype[1] = false;
+            Object.prototype[2] = "true";
+            return 0 === Array.prototype.indexOf.call({ length: 3 }, true) &&
+                1 === Array.prototype.indexOf.call({ length: 3 }, false) &&
+                2 === Array.prototype.indexOf.call({ length: 3 }, "true");
+        } finally {
+            delete Object.prototype[0];
+            delete Object.prototype[1];
+            delete Object.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-9.js
index f25525686..1b991a52c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-9.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-i-9.js

- * @description Array.prototype.indexOf - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [, , , ];

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-        

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return arr.indexOf(0) === 0 && arr.indexOf(1) === 1 && arr.indexOf(2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [, , , ];
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+        
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return arr.indexOf(0) === 0 && arr.indexOf(1) === 1 && arr.indexOf(2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-1.js
index 40130e6c2..dc9ee02d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-1.js

- * @description Array.prototype.indexOf - type of array element is different from type of search element

- */

-

-

-function testcase() {

-

-        return ["true"].indexOf(true) === -1 &&

-            ["0"].indexOf(0) === -1 &&

-            [false].indexOf(0) === -1 &&

-            [undefined].indexOf(0) === -1 &&

-            [null].indexOf(0) === -1 &&

-            [[]].indexOf(0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - type of array element is different from
+    type of search element
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return ["true"].indexOf(true) === -1 &&
+            ["0"].indexOf(0) === -1 &&
+            [false].indexOf(0) === -1 &&
+            [undefined].indexOf(0) === -1 &&
+            [null].indexOf(0) === -1 &&
+            [[]].indexOf(0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-10.js
index 4434cc59b..ae9f136c2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-10.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-10.js

- * @description Array.prototype.indexOf - both array element and search element are Boolean type, and they have same value

- */

-

-

-function testcase() {

-

-        return [false, true].indexOf(true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both array element and search element
+    are Boolean type, and they have same value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [false, true].indexOf(true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-11.js
index 835f5859d..82f785122 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-11.js

- * @description Array.prototype.indexOf - both array element and search element are Object type, and they refer to the same object

- */

-

-

-function testcase() {

-

-        var obj1 = {};

-        var obj2 = {};

-        var obj3 = obj2;

-        return [{}, obj1, obj2].indexOf(obj3) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both array element and search element
+    are Object type, and they refer to the same object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj1 = {};
+        var obj2 = {};
+        var obj3 = obj2;
+        return [{}, obj1, obj2].indexOf(obj3) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-2.js
index b6d245e6e..c0dadc3ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-2.js

- * @description Array.prototype.indexOf - both type of array element and type of search element are Undefined

- */

-

-

-function testcase() {

-

-        return [undefined].indexOf() === 0 && [undefined].indexOf(undefined) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both type of array element and type of
+    search element are Undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [undefined].indexOf() === 0 && [undefined].indexOf(undefined) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-3.js
index 4468c69e0..28bf65c33 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-3.js

- * @description Array.prototype.indexOf - both type of array element and type of search element are null

- */

-

-

-function testcase() {

-

-        return [null].indexOf(null) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both type of array element and type of
+    search element are null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [null].indexOf(null) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-4.js
index 1c02cef3e..303018e50 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-4.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-4.js

- * @description Array.prototype.indexOf - search element is NaN

- */

-

-

-function testcase() {

-

-        return [+NaN, NaN, -NaN].indexOf(NaN) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - search element is NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [+NaN, NaN, -NaN].indexOf(NaN) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-5.js
index 3727b5289..b90747588 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-5.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-5.js

- * @description Array.prototype.indexOf - search element is -NaN

- */

-

-

-function testcase() {

-

-        return [+NaN, NaN, -NaN].indexOf(-NaN) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.indexOf - search element is -NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [+NaN, NaN, -NaN].indexOf(-NaN) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-6.js
index bcb7d59af..ee01067d7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-6.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-6.js

- * @description Array.prototype.indexOf - array element is +0 and search element is -0

- */

-

-

-function testcase() {

-

-        return [+0].indexOf(-0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - array element is +0 and search element
+    is -0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [+0].indexOf(-0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-7.js
index e85a7b228..7dcec9abc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-7.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-7.js

- * @description Array.prototype.indexOf - array element is -0 and search element is +0

- */

-

-

-function testcase() {

-

-        return [-0].indexOf(+0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - array element is -0 and search element
+    is +0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [-0].indexOf(+0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-8.js
index eecaaa28d..7e9805a83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-8.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-8.js

- * @description Array.prototype.indexOf - both array element and search element are Number, and they have same value

- */

-

-

-function testcase() {

-

-        return [-1, 0, 1].indexOf(1) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both array element and search element
+    are Number, and they have same value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [-1, 0, 1].indexOf(1) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-9.js
index b6a72a373..cf49ade9e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-9.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-ii-9.js

- * @description Array.prototype.indexOf - both array element and search element are String, and they have exactly the same sequence of characters

- */

-

-

-function testcase() {

-

-        return ["", "ab", "bca", "abc"].indexOf("abc") === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - both array element and search element
+    are String, and they have exactly the same sequence of characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return ["", "ab", "bca", "abc"].indexOf("abc") === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-1.js
index 78a042b12..211b4ae10 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-1.js

- * @description Array.prototype.indexOf - returns index of last one when more than two elements in array are eligible

- */

-

-

-function testcase() {

-

-        return [1, 2, 2, 1, 2].indexOf(2) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - returns index of last one when more than
+    two elements in array are eligible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 2, 1, 2].indexOf(2) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-2.js
index 6c7b3e617..13ed62ac9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-2.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.14/15.4.4.14-9-b-iii-2.js

- * @description Array.prototype.indexOf - returns without visiting subsequent element once search value is found

- */

-

-

-function testcase() {

-        var arr = [1, 2, , 1, 2];

-        var elementThirdAccessed = false;

-        var elementFifthAccessed = false;

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                elementThirdAccessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                elementFifthAccessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        arr.indexOf(2);

-        return !elementThirdAccessed && !elementFifthAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.indexOf - returns without visiting subsequent
+    element once search value is found
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [1, 2, , 1, 2];
+        var elementThirdAccessed = false;
+        var elementFifthAccessed = false;
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                elementThirdAccessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                elementFifthAccessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        arr.indexOf(2);
+        return !elementThirdAccessed && !elementFifthAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-1.js
index 90f3b8f8b..64371f367 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-1.js

- * @description Array.prototype.lastIndexOf must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.lastIndexOf;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.lastIndexOf;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-2.js
index baf04e91e..bdff5303f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-0-2.js

- * @description Array.prototype.lastIndexOf has a length property whose value is 1.

- */

-

-

-function testcase() {

-  if (Array.prototype.lastIndexOf.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf has a length property whose value is 1.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.lastIndexOf.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-1.js
index c80cb0548..b13ee11f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-1.js

- * @description Array.prototype.lastIndexOf applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-

-        try {

-            Array.prototype.lastIndexOf.call(undefined);

-            return false;

-        } catch (e) {

-            if (e instanceof TypeError) {

-                return true;

-            }

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Array.prototype.lastIndexOf.call(undefined);
+            return false;
+        } catch (e) {
+            if (e instanceof TypeError) {
+                return true;
+            }
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-10.js
index 17f2838b5..d1be8ebb6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-10.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-10.js

- * @description Array.prototype.lastIndexOf applied to the Math object

- */

-

-

-function testcase() {

-    

-        try {

-            Math.length = 2;

-            Math[1] = 100;

-            return 1 === Array.prototype.lastIndexOf.call(Math, 100);

-        } finally {

-            delete Math.length;

-            delete Math[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        try {
+            Math.length = 2;
+            Math[1] = 100;
+            return 1 === Array.prototype.lastIndexOf.call(Math, 100);
+        } finally {
+            delete Math.length;
+            delete Math[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-11.js
index 5492798c9..3577ee93d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-11.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-11.js

- * @description Array.prototype.lastIndexOf applied to Date object

- */

-

-

-function testcase() {

-

-        var obj = new Date();

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Date();
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-12.js
index 55949f407..f3cd78438 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-12.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-12.js

- * @description Array.prototype.lastIndexOf applied to RegExp object

- */

-

-

-function testcase() {

-

-        var obj = new RegExp("afdasf");

-        obj.length = 100;

-        obj[1] = "afdasf";

-

-        return Array.prototype.lastIndexOf.call(obj, "afdasf") === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new RegExp("afdasf");
+        obj.length = 100;
+        obj[1] = "afdasf";
+
+        return Array.prototype.lastIndexOf.call(obj, "afdasf") === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-13.js
index 35e6aff51..58cc6773c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-13.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-13.js

- * @description Array.prototype.lastIndexOf applied to the JSON object

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        try {

-            JSON[3] = targetObj;

-            JSON.length = 5;

-            return 3 === Array.prototype.lastIndexOf.call(JSON, targetObj);

-        } finally {

-            delete JSON[3];

-            delete JSON.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        try {
+            JSON[3] = targetObj;
+            JSON.length = 5;
+            return 3 === Array.prototype.lastIndexOf.call(JSON, targetObj);
+        } finally {
+            delete JSON[3];
+            delete JSON.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-14.js
index 82278e2bd..6d542bdf1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-14.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-14.js

- * @description Array.prototype.lastIndexOf applied to Error object

- */

-

-

-function testcase() {

-

-        var obj = new SyntaxError();

-        obj.length = 2;

-        obj[1] = Infinity;

-

-        return Array.prototype.lastIndexOf.call(obj, Infinity) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new SyntaxError();
+        obj.length = 2;
+        obj[1] = Infinity;
+
+        return Array.prototype.lastIndexOf.call(obj, Infinity) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-15.js
index 0b1eedb59..14806caa8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-15.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-15.js

- * @description Array.prototype.lastIndexOf applied to the Arguments object

- */

-

-

-function testcase() {

-

-        var obj = (function fun() {

-            return arguments;

-        }(1, 2, 3));

-

-        return Array.prototype.lastIndexOf.call(obj, 2) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = (function fun() {
+            return arguments;
+        }(1, 2, 3));
+
+        return Array.prototype.lastIndexOf.call(obj, 2) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-17.js
index da75a413e..868960034 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-17.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-17.js

- * @description Array.prototype.lastIndexOf applied to the global object

- */

-

-

-function testcase() {

-        var targetObj = ["global"];

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[1] = targetObj;

-            fnGlobalObject().length = 3;

-            return 1 === Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj);

-        } finally {

-            delete fnGlobalObject()[1];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var targetObj = ["global"];
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[1] = targetObj;
+            fnGlobalObject().length = 3;
+            return 1 === Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj);
+        } finally {
+            delete fnGlobalObject()[1];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-2.js
index 5365ac0da..36c810e2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-2.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-2.js

- * @description Array.prototype.lastIndexOf applied to null throws a TypeError

- */

-

-

-function testcase() {

-

-        try {

-            Array.prototype.lastIndexOf.call(null);

-            return false;

-        } catch (e) {

-            if (e instanceof TypeError) {

-                return true;

-            }

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Array.prototype.lastIndexOf.call(null);
+            return false;
+        } catch (e) {
+            if (e instanceof TypeError) {
+                return true;
+            }
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-3.js
index 6a050fd2a..26d3705af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-3.js

- * @description Array.prototype.lastIndexOf applied to boolean primitive

- */

-

-

-function testcase() {

-

-        try {

-            Boolean.prototype[1] = true;

-            Boolean.prototype.length = 2;

-

-            return 1 === Array.prototype.lastIndexOf.call(true, true);

-        } finally {

-            delete Boolean.prototype[1];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Boolean.prototype[1] = true;
+            Boolean.prototype.length = 2;
+
+            return 1 === Array.prototype.lastIndexOf.call(true, true);
+        } finally {
+            delete Boolean.prototype[1];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-4.js
index 6112e7830..bc672cade 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-4.js

- * @description Array.prototype.lastIndexOf applied to Boolean object

- */

-

-

-function testcase() {

-

-        var obj = new Boolean(false);

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Boolean(false);
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-5.js
index 4adfdb470..6a20348ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-5.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-5.js

- * @description Array.prototype.lastIndexOf applied to number primitive

- */

-

-

-function testcase() {

-

-        try {

-                Number.prototype[1] = isNaN;

-                Number.prototype.length = 2;

-                return 1 === Array.prototype.lastIndexOf.call(5, isNaN);

-            } finally {

-                delete Number.prototype[1];

-                delete Number.prototype.length;

-            }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+                Number.prototype[1] = isNaN;
+                Number.prototype.length = 2;
+                return 1 === Array.prototype.lastIndexOf.call(5, isNaN);
+            } finally {
+                delete Number.prototype[1];
+                delete Number.prototype.length;
+            }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-6.js
index 33e2791df..4274a80dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-6.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-6.js

- * @description Array.prototype.lastIndexOf applied to Number object

- */

-

-

-function testcase() {

-

-        var obj = new Number(-3);

-        obj.length = 2;

-        obj[1] = true;

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Number(-3);
+        obj.length = 2;
+        obj[1] = true;
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-7.js
index 8d0b871dc..19b75c63f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-7.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-7.js

- * @description Array.prototype.lastIndexOf applied to string primitive

- */

-

-

-function testcase() {

-

-        return Array.prototype.lastIndexOf.call("abc", "c") === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return Array.prototype.lastIndexOf.call("abc", "c") === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-8.js
index 70b73d38b..dbf90cddf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-8.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-8.js

- * @description Array.prototype.lastIndexOf applied to String object

- */

-

-

-function testcase() {

-

-        var obj = new String("undefined");

-

-        return Array.prototype.lastIndexOf.call(obj, "f") === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new String("undefined");
+
+        return Array.prototype.lastIndexOf.call(obj, "f") === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-9.js
index df55f36e8..178762689 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-9.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-1-9.js

- * @description Array.prototype.lastIndexOf applied to Function object

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[1] = true;

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[1] = true;
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-1.js
index 102b1d1ca..3dfbcfb51 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-1.js

- * @description Array.prototype.lastIndexOf - 'length' is own data property on an Array-like object

- */

-

-

-function testcase() {

-        var obj = { 1: null, 2: undefined, length: 2 };

-

-        return Array.prototype.lastIndexOf.call(obj, null) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, undefined) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 1: null, 2: undefined, length: 2 };
+
+        return Array.prototype.lastIndexOf.call(obj, null) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, undefined) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-10.js
index 935c5ba71..e8c974c71 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-10.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-10.js

- * @description Array.prototype.lastIndexOf - 'length' is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = 1;

-        child[2] = 2;

-

-        return Array.prototype.lastIndexOf.call(child, 1) === 1 &&

-            Array.prototype.lastIndexOf.call(child, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is inherited accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = 1;
+        child[2] = 2;
+
+        return Array.prototype.lastIndexOf.call(child, 1) === 1 &&
+            Array.prototype.lastIndexOf.call(child, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-11.js
index 37247be7d..c8135f76c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-11.js

- * @description Array.prototype.lastIndexOf - 'length' is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 0: 1 };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(obj, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own accessor property
+    without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 1 };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(obj, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-12.js
index 3df74f606..5d4fc8b95 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-12.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-12.js

- * @description Array.prototype.lastIndexOf - 'length' is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            var obj = { 1: 1 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return Array.prototype.lastIndexOf.call(obj, 1) === -1;

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own accessor property
+    without a get function that overrides an inherited accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            var obj = { 1: 1 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return Array.prototype.lastIndexOf.call(obj, 1) === -1;
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-13.js
index ff0aab23c..6b2a14c8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-13.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-13.js

- * @description Array.prototype.lastIndexOf - 'length' is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = true;

-

-        return Array.prototype.lastIndexOf.call(child, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is inherited accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = true;
+
+        return Array.prototype.lastIndexOf.call(child, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-14.js
index 5ad1375b2..da1654cb2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-14.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-14.js

- * @description Array.prototype.lastIndexOf - 'length' is undefined property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 0: null, 1: undefined };

-

-        return Array.prototype.lastIndexOf.call(obj, null) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is undefined property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: null, 1: undefined };
+
+        return Array.prototype.lastIndexOf.call(obj, null) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-15.js
index 5f50bfff6..0c9089495 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-15.js
@@ -1,33 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-15.js

- * @description Array.prototype.lastIndexOf - 'length' is property of the global object

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject().length = 2;

-

-            fnGlobalObject()[1] = targetObj;

-            if (Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) !== 1) {

-                return false;

-            }

-

-            fnGlobalObject()[1] = {};

-            fnGlobalObject()[2] = targetObj;

-

-            return Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) === -1;

-        } finally {

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is property of the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject().length = 2;
+
+            fnGlobalObject()[1] = targetObj;
+            if (Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) !== 1) {
+                return false;
+            }
+
+            fnGlobalObject()[1] = {};
+            fnGlobalObject()[2] = targetObj;
+
+            return Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) === -1;
+        } finally {
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-17.js
index 2a910d8d4..074d3b99f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-17.js

- * @description Array.prototype.lastIndexOf applied to Arguments object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var targetObj = function () { };

-        var func = function (a, b) {

-            arguments[2] = function () { };

-            return Array.prototype.lastIndexOf.call(arguments, targetObj) === 1 &&

-                Array.prototype.lastIndexOf.call(arguments, arguments[2]) === -1;

-        };

-

-        return func(0, targetObj);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to Arguments object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = function () { };
+        var func = function (a, b) {
+            arguments[2] = function () { };
+            return Array.prototype.lastIndexOf.call(arguments, targetObj) === 1 &&
+                Array.prototype.lastIndexOf.call(arguments, arguments[2]) === -1;
+        };
+
+        return func(0, targetObj);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-18.js
index 1608f1b39..97faba2ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-18.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-18.js

- * @description Array.prototype.lastIndexOf applied to String object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var str = new String("012");

-        try {

-            String.prototype[3] = "3";

-            return Array.prototype.lastIndexOf.call(str, "2") === 2 &&

-                Array.prototype.lastIndexOf.call(str, "3") === -1;

-        } finally {

-            delete String.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to String object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = new String("012");
+        try {
+            String.prototype[3] = "3";
+            return Array.prototype.lastIndexOf.call(str, "2") === 2 &&
+                Array.prototype.lastIndexOf.call(str, "3") === -1;
+        } finally {
+            delete String.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-19.js
index 35a7b79bb..1582d417d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-19.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-19.js

- * @description Array.prototype.lastIndexOf applied to String object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[1] = "b";

-        obj[2] = "c";

-

-        return Array.prototype.lastIndexOf.call(obj, obj[1]) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, obj[2]) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to String object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[1] = "b";
+        obj[2] = "c";
+
+        return Array.prototype.lastIndexOf.call(obj, obj[1]) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, obj[2]) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-2.js
index f8e4c834e..e957abdef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-2.js

- * @description Array.prototype.lastIndexOf - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        var targetObj = {};

-        try {

-            Array.prototype[2] = targetObj;

-

-            return [0, targetObj].lastIndexOf(targetObj) === 1 &&

-                [0, 1].lastIndexOf(targetObj) === -1;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        try {
+            Array.prototype[2] = targetObj;
+
+            return [0, targetObj].lastIndexOf(targetObj) === 1 &&
+                [0, 1].lastIndexOf(targetObj) === -1;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-3.js
index 97b8b2b41..f9a64df6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-3.js

- * @description Array.prototype.lastIndexOf - 'length' is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = {length: 0};

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[1] = child;

-

-        return Array.prototype.lastIndexOf.call(child, child) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own data property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = {length: 0};
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[1] = child;
+
+        return Array.prototype.lastIndexOf.call(child, child) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-4.js
index 6b32c7ba7..a0a3990ad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-4.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-4.js

- * @description Array.prototype.lastIndexOf when 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        var arrProtoLen;

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            return [0, targetObj, 2].lastIndexOf(targetObj) === 1;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf when 'length' is own data property
+    that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        var arrProtoLen;
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            return [0, targetObj, 2].lastIndexOf(targetObj) === 1;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-5.js
index 79da9a467..a7cbea78b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-5.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-5.js

- * @description Array.prototype.lastIndexOf - 'length' is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[1] = null;

-

-        return Array.prototype.lastIndexOf.call(child, null) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own data property that
+    overrides an inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[1] = null;
+
+        return Array.prototype.lastIndexOf.call(child, null) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-6.js
index 98caba2ee..dc9e2b119 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-6.js

- * @description Array.prototype.lastIndexOf - 'length' is an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = { length: 2 };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = "x";

-        child[2] = "y";

-

-        return Array.prototype.lastIndexOf.call(child, "x") === 1 &&

-             Array.prototype.lastIndexOf.call(child, "y") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is an inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { length: 2 };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = "x";
+        child[2] = "y";
+
+        return Array.prototype.lastIndexOf.call(child, "x") === 1 &&
+             Array.prototype.lastIndexOf.call(child, "y") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-7.js
index d5320c3d5..0010d7255 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-7.js

- * @description Array.prototype.lastIndexOf - 'length' is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 1: true, 2: false };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own accessor property on
+    an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true, 2: false };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-8.js
index 4948d4c43..79bc1099e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-8.js

- * @description Array.prototype.lastIndexOf - 'length' is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var proto = { length: 0 };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = eval;

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(child, eval) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own accessor property
+    that overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var proto = { length: 0 };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = eval;
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(child, eval) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-9.js
index 2fc602265..42c2e5135 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-9.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-2-9.js

- * @description Array.prototype.lastIndexOf - 'length' is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = true;

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(child, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is own accessor property
+    that overrides an inherited accessor property on an Array-like
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = true;
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(child, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-1.js
index 5d08d458a..d00a3caad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-1.js

- * @description Array.prototype.lastIndexOf - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var obj = { 0: 1, 1: 1, length: undefined };

-

-        return Array.prototype.lastIndexOf.call(obj, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 1, 1: 1, length: undefined };
+
+        return Array.prototype.lastIndexOf.call(obj, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-10.js
index 4b680a5a4..b3268ab38 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-10.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-10.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: NaN };

-

-        return Array.prototype.lastIndexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: NaN };
+
+        return Array.prototype.lastIndexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-11.js
index 38c8861d6..f27861957 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-11.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing positive number

- */

-

-

-function testcase() {

-

-        var obj = {1: true, 2: false, length: "2"};

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {1: true, 2: false, length: "2"};
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-12.js
index c8f5ea3e0..500f5f1ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-12.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-12.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing negative number

- */

-

-

-function testcase() {

-

-        var obj = {1: null, 2: undefined, length: "-4294967294"};

-

-        return Array.prototype.lastIndexOf.call(obj, null) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, undefined) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {1: null, 2: undefined, length: "-4294967294"};
+
+        return Array.prototype.lastIndexOf.call(obj, null) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, undefined) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-13.js
index 00bd45fbd..40996acdc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-13.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-13.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        var obj = { 4: 4, 5: 5, length: "5.512345" };

-

-        return Array.prototype.lastIndexOf.call(obj, 4) === 4 &&

-            Array.prototype.lastIndexOf.call(obj, 5) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing a decimal number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 4: 4, 5: 5, length: "5.512345" };
+
+        return Array.prototype.lastIndexOf.call(obj, 4) === 4 &&
+            Array.prototype.lastIndexOf.call(obj, 5) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-14.js
index e75f1cbac..517ff7378 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-14.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-14.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var objOne = { 0: true, 1: true, length: "Infinity" };

-        var objTwo = { 0: true, 1: true, length: "+Infinity" };

-        var objThree = { 0: true, 1: true, length: "-Infinity" };

-

-        return Array.prototype.lastIndexOf.call(objOne, true) === -1 &&

-            Array.prototype.lastIndexOf.call(objTwo, true) === -1 &&

-            Array.prototype.lastIndexOf.call(objThree, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objOne = { 0: true, 1: true, length: "Infinity" };
+        var objTwo = { 0: true, 1: true, length: "+Infinity" };
+        var objThree = { 0: true, 1: true, length: "-Infinity" };
+
+        return Array.prototype.lastIndexOf.call(objOne, true) === -1 &&
+            Array.prototype.lastIndexOf.call(objTwo, true) === -1 &&
+            Array.prototype.lastIndexOf.call(objThree, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-15.js
index a2a8e3cbc..83a5d8672 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-15.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-15.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        var obj = {229: 229, 230: 2.3E2, length: "2.3E2"};

-

-        return Array.prototype.lastIndexOf.call(obj, 229) === 229 &&

-            Array.prototype.lastIndexOf.call(obj, 2.3E2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing an exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {229: 229, 230: 2.3E2, length: "2.3E2"};
+
+        return Array.prototype.lastIndexOf.call(obj, 229) === 229 &&
+            Array.prototype.lastIndexOf.call(obj, 2.3E2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-16.js
index ddee9b916..afacbf865 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-16.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-16.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string which is able to be converted into hex number

- */

-

-

-function testcase() {

-

-        var obj = { 2573: 2573, 2574: 0x000A0E, length: "0x000A0E" };

-

-        return Array.prototype.lastIndexOf.call(obj, 2573) === 2573 &&

-            Array.prototype.lastIndexOf.call(obj, 0x000A0E) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string which
+    is able to be converted into hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 2573: 2573, 2574: 0x000A0E, length: "0x000A0E" };
+
+        return Array.prototype.lastIndexOf.call(obj, 2573) === 2573 &&
+            Array.prototype.lastIndexOf.call(obj, 0x000A0E) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-17.js
index 8c19a878a..645121bfc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-17.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-17.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        var obj = { 1: 1, 2: 2, length: "0002.0" };

-

-        return Array.prototype.lastIndexOf.call(obj, 1) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string
+    containing a number with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: 1, 2: 2, length: "0002.0" };
+
+        return Array.prototype.lastIndexOf.call(obj, 1) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-18.js
index 6bca43644..b946d3f1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-18.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-18.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-        var targetObj = new String("123abc123");

-        var obj = { 0: targetObj, length: "123abc123" };

-

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a string that
+    can't convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = new String("123abc123");
+        var obj = { 0: targetObj, length: "123abc123" };
+
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-19.js
index 970f8c5d1..6c5b4ec9d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-19.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-19.js

- * @description Array.prototype.lastIndexOf - value of 'length' is an Object which has an own toString method

- */

-

-

-function testcase() {

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-

-        var targetObj = fnGlobalObject();

-        var obj = {

-            1: targetObj,

-            2: 2,

-

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is an Object which
+    has an own toString method
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+
+        var targetObj = fnGlobalObject();
+        var obj = {
+            1: targetObj,
+            2: 2,
+
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-2.js
index eb1f473b8..54010a101 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-2.js

- * @description Array.prototype.lastIndexOf return -1 when value of 'length' is a boolean (value is true)

- */

-

-

-function testcase() {

-        var obj = { 0: 0, 1: 1, length: true };

-        return Array.prototype.lastIndexOf.call(obj, 0) === 0 &&

-            Array.prototype.lastIndexOf.call(obj, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf return -1 when value of 'length' is a
+    boolean (value is true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 0: 0, 1: 1, length: true };
+        return Array.prototype.lastIndexOf.call(obj, 0) === 0 &&
+            Array.prototype.lastIndexOf.call(obj, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-20.js
index 51add47e6..faf9b2bf0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-20.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-20.js

- * @description Array.prototype.lastIndexOf - value of 'length' is an Object which has an own valueOf method

- */

-

-

-function testcase() {

-

-        //valueOf method will be invoked first, since hint is Number

-        var obj = {

-            1: true,

-            2: 2,

-

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, 2) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is an Object which
+    has an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        //valueOf method will be invoked first, since hint is Number
+        var obj = {
+            1: true,
+            2: 2,
+
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, 2) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-21.js
index 8dc121efc..24e3ef1c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-21.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-21.js

- * @description Array.prototype.lastIndexOf - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var targetObj = this;

-        var obj = {

-            1: targetObj,

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '3';

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === 1 && toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'length' is an object that has an
+    own valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var targetObj = this;
+        var obj = {
+            1: targetObj,
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '3';
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === 1 && toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-22.js
index ae009540e..1873c1d8c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-22.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-22.js

- * @description Array.prototype.lastIndexOf throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            1: true,

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                },

-

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, true);

-            return false;

-        } catch (e) {

-            return toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf throws TypeError exception when
+    'length' is an object with toString and valueOf methods that don�t
+    return primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            1: true,
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                },
+
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, true);
+            return false;
+        } catch (e) {
+            return toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-23.js
index fce75d9f2..2bee01fe2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-23.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-23.js

- * @description Array.prototype.lastIndexOf uses inherited valueOf method when 'length' is an object with an own toString and an inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.toString = function () {

-            toStringAccessed = true;

-            return 2;

-        };

-

-        var obj = {

-            1: child,

-            length: child

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, child) === 1 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf uses inherited valueOf method when
+    'length' is an object with an own toString and an inherited
+    valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.toString = function () {
+            toStringAccessed = true;
+            return 2;
+        };
+
+        var obj = {
+            1: child,
+            length: child
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, child) === 1 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-24.js
index f3f94d3fb..8ea7809c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-24.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-24.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var obj = { 122: true, 123: false, length: 123.5 };

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 122 &&

-            Array.prototype.lastIndexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 122: true, 123: false, length: 123.5 };
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 122 &&
+            Array.prototype.lastIndexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-25.js
index c15573aa4..1cd08fd85 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-25.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-25.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var obj = { 1: true, 2: false, length: -4294967294.5 };

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, false) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: true, 2: false, length: -4294967294.5 };
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, false) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-28.js
index a893151b4..e7008eda6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-28.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-28.js

- * @description Array.prototype.lastIndexOf - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        var obj = {

-            0: targetObj,

-            4294967294: targetObj,

-            4294967295: targetObj,

-            length: 4294967296

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1; //verify length is 0 finally

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is boundary value
+    (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        var obj = {
+            0: targetObj,
+            4294967294: targetObj,
+            4294967295: targetObj,
+            length: 4294967296
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1; //verify length is 0 finally
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-29.js
index c0fd45ece..e7cbb10ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-29.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-29.js

- * @description Array.prototype.lastIndexOf - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        var obj = {

-            0: targetObj,

-            1: 4294967297,

-            length: 4294967297

-        };

-

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === 0 &&

-            Array.prototype.lastIndexOf.call(obj, 4294967297) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is boundary value
+    (2^32 + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        var obj = {
+            0: targetObj,
+            1: 4294967297,
+            length: 4294967297
+        };
+
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === 0 &&
+            Array.prototype.lastIndexOf.call(obj, 4294967297) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-3.js
index 9e0186af9..33dceab3d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-3.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-3.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: "undefined", length: 0 };

-

-        return Array.prototype.lastIndexOf.call(obj, "undefined") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: "undefined", length: 0 };
+
+        return Array.prototype.lastIndexOf.call(obj, "undefined") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-4.js
index 0f1c2bbff..e746679a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-4.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-4.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: true, length: -0 };

-

-        return Array.prototype.lastIndexOf.call(obj, true) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: true, length: -0 };
+
+        return Array.prototype.lastIndexOf.call(obj, true) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-5.js
index d6031ef6e..11adf1d5d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-5.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-5.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var obj = { 0: +0, length: +0 };

-

-        return Array.prototype.lastIndexOf.call(obj, +0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: +0, length: +0 };
+
+        return Array.prototype.lastIndexOf.call(obj, +0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-6.js
index ed166929e..288924a50 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-6.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-6.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is a positive number)

- */

-

-

-function testcase() {

-

-        var obj = { 99: true, 100: 100, length: 100 };

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 99 &&

-            Array.prototype.lastIndexOf.call(obj, 100) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is a positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 99: true, 100: 100, length: 100 };
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 99 &&
+            Array.prototype.lastIndexOf.call(obj, 100) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-7.js
index 995d60ec7..18460fc3e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-7.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is a negative number)

- */

-

-

-function testcase() {

-

-        var obj = { 4: -Infinity, 5: Infinity, length: 5 - Math.pow(2, 32) };

-

-        return Array.prototype.lastIndexOf.call(obj, -Infinity) === 4 &&

-            Array.prototype.lastIndexOf.call(obj, Infinity) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is a negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 4: -Infinity, 5: Infinity, length: 5 - Math.pow(2, 32) };
+
+        return Array.prototype.lastIndexOf.call(obj, -Infinity) === 4 &&
+            Array.prototype.lastIndexOf.call(obj, Infinity) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-8.js
index 62daa6fda..740b3aa9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-8.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-8.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: Infinity };

-

-        return Array.prototype.lastIndexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: Infinity };
+
+        return Array.prototype.lastIndexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-9.js
index 514b1753b..473a5cb4f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-9.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-3-9.js

- * @description Array.prototype.lastIndexOf - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, length: -Infinity };

-

-        return Array.prototype.lastIndexOf.call(obj, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'length' is a number (value
+    is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, length: -Infinity };
+
+        return Array.prototype.lastIndexOf.call(obj, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-1.js
index c80d4b4c1..a1fe7bc83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-1.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  var i = [].lastIndexOf(42);

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 (empty
+    array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var i = [].lastIndexOf(42);
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-10.js
index 252d68448..bcdf24aee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-10.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-10.js

- * @description Array.prototype.lastIndexOf - 'length' is a number of value -6e-1

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: -6e-1 };

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - 'length' is a number of value -6e-1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: -6e-1 };
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-11.js
index c8148f6ab..194232865 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-11.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-11.js

- * @description Array.prototype.lastIndexOf - 'length' is an empty string

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: "" };

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - 'length' is an empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: "" };
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-2.js
index 596c72444..ca775ba91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-2.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  

-  var i = Array.prototype.lastIndexOf.call({length: null}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length
+    overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  var i = Array.prototype.lastIndexOf.call({length: null}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-3.js
index d2684a546..d64cbbffe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-3.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 (length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.lastIndexOf.call({length: false}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 (length
+    overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.lastIndexOf.call({length: false}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-4.js
index d1e98e2cf..f1d32a462 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-4.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-4.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 (generic 'array' with length 0 )

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

- var i = Array.prototype.lastIndexOf.call({length: 0}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 (generic
+    'array' with length 0 )
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+ var i = Array.prototype.lastIndexOf.call({length: 0}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-5.js
index 8a8076b1a..4fd8a09c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-5.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-5.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.lastIndexOf.call({length: '0'}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length
+    overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.lastIndexOf.call({length: '0'}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-6.js
index de4dd5de7..392ba313a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-6.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-6.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  

- var i = Array.prototype.lastIndexOf.call({length: { valueOf: function () { return 0;}}}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+ var i = Array.prototype.lastIndexOf.call({length: { valueOf: function () { return 0;}}}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-7.js
index afdb47845..f00fa6b26 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-7.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-7.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length is object overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

- var i = Array.prototype.lastIndexOf.call({length: { toString: function () { return '0';}}}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 ( length
+    is object overridden with obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+ var i = Array.prototype.lastIndexOf.call({length: { toString: function () { return '0';}}}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-8.js
index ddff751ee..29fd98253 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-8.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 (length is an empty array)

- */

-

-

-function testcase() {

-

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

- var i = Array.prototype.lastIndexOf.call({length: [ ]}, 1);

-  

-  if (i === -1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 (length is
+    an empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+ var i = Array.prototype.lastIndexOf.call({length: [ ]}, 1);
+  
+  if (i === -1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-9.js
index 64b26786f..a2424a9dd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-9.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-4-9.js

- * @description Array.prototype.lastIndexOf - 'length' is a number of value 0.1

- */

-

-

-function testcase() {

-        var targetObj = [];

-        var obj = { 0: targetObj, 100: targetObj, length: 0.1 };

-        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - 'length' is a number of value 0.1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = [];
+        var obj = { 0: targetObj, 100: targetObj, length: 0.1 };
+        return Array.prototype.lastIndexOf.call(obj, targetObj) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-1.js
index b62f17339..3b0323f1d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-1.js

- * @description Array.prototype.lastIndexOf when fromIndex is string

- */

-

-

-function testcase() {

-  var a = new Array(0,1,1);

-  if (a.lastIndexOf(1,"1") === 1 &&          // "1" resolves to 1

-      a.lastIndexOf(1,"one") === -1) {       // NaN string resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when fromIndex is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(0,1,1);
+  if (a.lastIndexOf(1,"1") === 1 &&          // "1" resolves to 1
+      a.lastIndexOf(1,"one") === -1) {       // NaN string resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-10.js
index a25194604..67615ca8f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-10.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-10.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is positive number)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, true].lastIndexOf(targetObj, 1.5) === 1 &&

-            [0, true, targetObj].lastIndexOf(targetObj, 1.5) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, true].lastIndexOf(targetObj, 1.5) === 1 &&
+            [0, true, targetObj].lastIndexOf(targetObj, 1.5) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-11.js
index 466cabd3a..8d88fa6b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-11.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-11.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is negative number)

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, true].lastIndexOf(targetObj, -2.5) === 1 &&

-            [0, true, targetObj].lastIndexOf(targetObj, -2.5) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, true].lastIndexOf(targetObj, -2.5) === 1 &&
+            [0, true, targetObj].lastIndexOf(targetObj, -2.5) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-12.js
index 5a1109638..5f7fb9acb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-12.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-12.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is Infinity)

- */

-

-

-function testcase() {

-        var arr = [];

-        arr[Math.pow(2, 32) - 2] = null; // length is the max value of Uint type

-        return arr.lastIndexOf(null, Infinity) === (Math.pow(2, 32) - 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        arr[Math.pow(2, 32) - 2] = null; // length is the max value of Uint type
+        return arr.lastIndexOf(null, Infinity) === (Math.pow(2, 32) - 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-13.js
index ca513c6ec..c3b00b588 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-13.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-13.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        return [true].lastIndexOf(true, -Infinity) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].lastIndexOf(true, -Infinity) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-14.js
index 7941302bb..717a8e549 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-14.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-14.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        return [0, true].lastIndexOf(true, NaN) === -1 && // from Index will be convert to +0

-            [true, 0].lastIndexOf(true, NaN) === 0 &&

-            [0, true].lastIndexOf(true, -NaN) === -1 &&

-            [true, 0].lastIndexOf(true, -NaN) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, true].lastIndexOf(true, NaN) === -1 && // from Index will be convert to +0
+            [true, 0].lastIndexOf(true, NaN) === 0 &&
+            [0, true].lastIndexOf(true, -NaN) === -1 &&
+            [true, 0].lastIndexOf(true, -NaN) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-15.js
index 9c6c39197..87adc7308 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-15.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-15.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        return [0, "-2", 2].lastIndexOf("-2", "-2") === 1 &&

-            [0, 2, "-2"].lastIndexOf("-2", "-2") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a string
+    containing a negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, "-2", 2].lastIndexOf("-2", "-2") === 1 &&
+            [0, 2, "-2"].lastIndexOf("-2", "-2") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-16.js
index c3c9b82a0..3e6ed875d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-16.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-16.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a string containing Infinity

- */

-

-

-function testcase() {

-        var arr = [];

-        arr[Math.pow(2, 32) - 2] = true; // length is the max value of Uint type

-        return arr.lastIndexOf(true, "Infinity") === (Math.pow(2, 32) - 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a string
+    containing Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [];
+        arr[Math.pow(2, 32) - 2] = true; // length is the max value of Uint type
+        return arr.lastIndexOf(true, "Infinity") === (Math.pow(2, 32) - 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-17.js
index 7b963a75a..f6c368c83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-17.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-17.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a string containing -Infinity

- */

-

-

-function testcase() {

-

-        return [true].lastIndexOf(true, "-Infinity") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a string
+    containing -Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [true].lastIndexOf(true, "-Infinity") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-18.js
index 0140305e2..c729aab8e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-18.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-18.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a string containing an exponential number

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, NaN, targetObj, 3, false].lastIndexOf(targetObj, "2E0") === 2 &&

-            [0, NaN, 3, targetObj, false].lastIndexOf(targetObj, "2E0") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a string
+    containing an exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, NaN, targetObj, 3, false].lastIndexOf(targetObj, "2E0") === 2 &&
+            [0, NaN, 3, targetObj, false].lastIndexOf(targetObj, "2E0") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-19.js
index 797e6e07b..605362243 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-19.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-19.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a string containing a hex number

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, "0x0002") === 2 &&

-            [0, true, 3, targetObj, false].lastIndexOf(targetObj, "0x0002") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a string
+    containing a hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, "0x0002") === 2 &&
+            [0, true, 3, targetObj, false].lastIndexOf(targetObj, "0x0002") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-2.js
index 309f0e500..3a35e0d4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-2.js

- * @description Array.prototype.lastIndexOf when fromIndex is floating point number

- */

-

-

-function testcase() {

-  var a = new Array(1,2,1);

-  if (a.lastIndexOf(2,1.49) === 1 &&    // 1.49 resolves to 1

-      a.lastIndexOf(2,0.51) === -1 &&    // 0.51 resolves to 0

-      a.lastIndexOf(1,0.51) === 0){      // 0.51 resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when fromIndex is floating point number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,1);
+  if (a.lastIndexOf(2,1.49) === 1 &&    // 1.49 resolves to 1
+      a.lastIndexOf(2,0.51) === -1 &&    // 0.51 resolves to 0
+      a.lastIndexOf(1,0.51) === 0){      // 0.51 resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-20.js
index a7a265e8a..78494d315 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-20.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-20.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' which is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, "0002.10") === 2 &&

-            [0, true, 3, targetObj, false].lastIndexOf(targetObj, "0002.10") === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' which is a
+    string containing a number with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, "0002.10") === 2 &&
+            [0, true, 3, targetObj, false].lastIndexOf(targetObj, "0002.10") === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-21.js
index db0abbc9f..53f45ebee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-21.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-21.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' which is an Object, and has an own toString method

- */

-

-

-function testcase() {

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-        var fromIndex = {

-            toString: function () {

-                return '2';

-            }

-        };

-        var targetObj = new RegExp();

-

-        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, fromIndex) === 2 &&

-        [0, true, 3, targetObj, false].lastIndexOf(targetObj, fromIndex) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' which is an
+    Object, and has an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+        var fromIndex = {
+            toString: function () {
+                return '2';
+            }
+        };
+        var targetObj = new RegExp();
+
+        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, fromIndex) === 2 &&
+        [0, true, 3, targetObj, false].lastIndexOf(targetObj, fromIndex) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-22.js
index a8a1cbf9e..d6e8dc7ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-22.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-22.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' which is an object, and has an own valueOf method

- */

-

-

-function testcase() {

-

-        var fromIndex = {

-            valueOf: function () {

-                return 2;

-            }

-        };

-

-        var targetObj = function () {};

-        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, fromIndex) === 2 &&

-        [0, true, 3, targetObj, false].lastIndexOf(targetObj, fromIndex) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' which is an
+    object, and has an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fromIndex = {
+            valueOf: function () {
+                return 2;
+            }
+        };
+
+        var targetObj = function () {};
+        return [0, true, targetObj, 3, false].lastIndexOf(targetObj, fromIndex) === 2 &&
+        [0, true, 3, targetObj, false].lastIndexOf(targetObj, fromIndex) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-23.js
index 913d37aba..74588ada5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-23.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-23.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var fromIndex = {

-            toString: function () {

-                toStringAccessed = true;

-                return '1';

-            },

-

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-

-        return [0, true].lastIndexOf(true, fromIndex) === 1 && toStringAccessed && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is an object
+    that has an own valueOf method that returns an object and toString
+    method that returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var fromIndex = {
+            toString: function () {
+                toStringAccessed = true;
+                return '1';
+            },
+
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+
+        return [0, true].lastIndexOf(true, fromIndex) === 1 && toStringAccessed && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-24.js
index 5e71efdaf..31998c9ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-24.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-24.js

- * @description Array.prototype.lastIndexOf throws TypeError exception when value of 'fromIndex' is an object that both toString and valueOf methods than don't return primitive value

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var fromIndex = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-

-        try {

-            [0, null].lastIndexOf(null, fromIndex);

-            return false;

-        } catch (e) {

-            return toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf throws TypeError exception when value
+    of 'fromIndex' is an object that both toString and valueOf methods
+    than don't return primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var fromIndex = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+
+        try {
+            [0, null].lastIndexOf(null, fromIndex);
+            return false;
+        } catch (e) {
+            return toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-25.js
index ccb155fad..8bd166edb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-25.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-25.js

- * @description Array.prototype.lastIndexOf use inherited valueOf method when value of 'fromIndex' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 1;

-            }

-        };

-

-        var Con = function () {};

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.toString = function () {

-            toStringAccessed = true;

-            return 1;

-        };

-

-        return [0, true].lastIndexOf(true, child) === 1 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf use inherited valueOf method when
+    value of 'fromIndex' is an object with an own toString and
+    inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 1;
+            }
+        };
+
+        var Con = function () {};
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.toString = function () {
+            toStringAccessed = true;
+            return 1;
+        };
+
+        return [0, true].lastIndexOf(true, child) === 1 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-26.js
index d46a21b05..df459ca8f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-26.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-26.js

- * @description Array.prototype.lastIndexOf - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepTwoOccurs = false;

-        var stepFiveOccurs = false;

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                stepTwoOccurs = true;

-                if (stepFiveOccurs) {

-                    throw new Error("Step 5 occurred out of order");

-                }

-                return 20;

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);

-            return stepTwoOccurs && stepFiveOccurs;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepTwoOccurs = false;
+        var stepFiveOccurs = false;
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                stepTwoOccurs = true;
+                if (stepFiveOccurs) {
+                    throw new Error("Step 5 occurred out of order");
+                }
+                return 20;
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);
+            return stepTwoOccurs && stepFiveOccurs;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-27.js
index 60c5c74d0..e48b1540d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-27.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-27.js

- * @description Array.prototype.lastIndexOf - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepThreeOccurs = false;

-        var stepFiveOccurs = false;

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    valueOf: function () {

-                        stepThreeOccurs = true;

-                        if (stepFiveOccurs) {

-                            throw new Error("Step 5 occurred out of order");

-                        }

-                        return 20;

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);

-            return stepThreeOccurs && stepFiveOccurs;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepThreeOccurs = false;
+        var stepFiveOccurs = false;
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    valueOf: function () {
+                        stepThreeOccurs = true;
+                        if (stepFiveOccurs) {
+                            throw new Error("Step 5 occurred out of order");
+                        }
+                        return 20;
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);
+            return stepThreeOccurs && stepFiveOccurs;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-28.js
index ca77bf187..62d4cf5fd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-28.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-28.js

- * @description Array.prototype.lastIndexOf - side effects produced by step 1 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(undefined, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side effects produced by step 1 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(undefined, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-29.js
index ef395c6f1..34b895e03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-29.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-29.js

- * @description Array.prototype.lastIndexOf - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-

-        var obj = {};

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new RangeError();

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof RangeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+
+        var obj = {};
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new RangeError();
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof RangeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-3.js
index ec34d4e70..466fa94aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-3.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-3.js

- * @description Array.prototype.lastIndexOf when fromIndex is boolean

- */

-

-

-function testcase() {

-  var a = new Array(1,2,1);

-  if (a.lastIndexOf(2,true) === 1 &&        // true resolves to 1

-     a.lastIndexOf(2,false) === -1 ) {      // false resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when fromIndex is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,1);
+  if (a.lastIndexOf(2,true) === 1 &&        // true resolves to 1
+     a.lastIndexOf(2,false) === -1 ) {      // false resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-30.js
index d64eb33e8..bc9e32345 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-30.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-30.js

- * @description Array.prototype.lastIndexOf - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var stepFiveOccurs = false;

-

-        var obj = {};

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    valueOf: function () {

-                        throw new TypeError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        var fromIndex = {

-            valueOf: function () {

-                stepFiveOccurs = true;

-                return 0;

-            }

-        };

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !stepFiveOccurs;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var stepFiveOccurs = false;
+
+        var obj = {};
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    valueOf: function () {
+                        throw new TypeError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        var fromIndex = {
+            valueOf: function () {
+                stepFiveOccurs = true;
+                return 0;
+            }
+        };
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, undefined, fromIndex);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !stepFiveOccurs;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-31.js
index 9788dd52a..5c174f19f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-31.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-31.js

- * @description Array.prototype.lastIndexOf - 'fromIndex' is a positive non-integer, verify truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, true].lastIndexOf(targetObj, 1.5) === 1 &&

-            [0, true, targetObj].lastIndexOf(targetObj, 1.5) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'fromIndex' is a positive
+    non-integer, verify truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, true].lastIndexOf(targetObj, 1.5) === 1 &&
+            [0, true, targetObj].lastIndexOf(targetObj, 1.5) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-32.js
index e2fa1284e..b55a85b62 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-32.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-32.js

- * @description Array.prototype.lastIndexOf - 'fromIndex' is a negative non-integer, verify truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        var targetObj = {};

-        return [0, targetObj, true].lastIndexOf(targetObj, -2.5) === 1 &&

-            [0, true, targetObj].lastIndexOf(targetObj, -2.5) === -1;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - 'fromIndex' is a negative
+    non-integer, verify truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var targetObj = {};
+        return [0, targetObj, true].lastIndexOf(targetObj, -2.5) === 1 &&
+            [0, true, targetObj].lastIndexOf(targetObj, -2.5) === -1;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-33.js
index 3db396c41..c6cd3e42c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-33.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-33.js

- * @description Array.prototype.lastIndexOf - match on the first element, a middle element and the last element when 'fromIndex' is passed

- */

-

-

-function testcase() {

-

-        return [0, 1, 2, 3, 4].lastIndexOf(0, 0) === 0 &&

-            [0, 1, 2, 3, 4].lastIndexOf(0, 2) === 0 &&

-            [0, 1, 2, 3, 4].lastIndexOf(2, 2) === 2 &&

-            [0, 1, 2, 3, 4].lastIndexOf(2, 4) === 2 &&

-            [0, 1, 2, 3, 4].lastIndexOf(4, 4) === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - match on the first element, a middle
+    element and the last element when 'fromIndex' is passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, 1, 2, 3, 4].lastIndexOf(0, 0) === 0 &&
+            [0, 1, 2, 3, 4].lastIndexOf(0, 2) === 0 &&
+            [0, 1, 2, 3, 4].lastIndexOf(2, 2) === 2 &&
+            [0, 1, 2, 3, 4].lastIndexOf(2, 4) === 2 &&
+            [0, 1, 2, 3, 4].lastIndexOf(4, 4) === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-4.js
index fcbae77c2..cbf5c96b0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-4.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-4.js

- * @description Array.prototype.lastIndexOf when fromIndex is undefined

- */

-

-

-function testcase() {

-  var a = new Array(1,2,1);

-  if (a.lastIndexOf(2,undefined) === -1 &&

-      a.lastIndexOf(1,undefined) === 0  &&

-      a.lastIndexOf(1) === 2)   {    // undefined resolves to 0, no second argument resolves to len

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when fromIndex is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,1);
+  if (a.lastIndexOf(2,undefined) === -1 &&
+      a.lastIndexOf(1,undefined) === 0  &&
+      a.lastIndexOf(1) === 2)   {    // undefined resolves to 0, no second argument resolves to len
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-5.js
index b9ac2cc15..fb55edf72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-5.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-5.js

- * @description Array.prototype.lastIndexOf when fromIndex is null

- */

-

-

-function testcase() {

-  var a = new Array(1,2,1);

-  if (a.lastIndexOf(2,null) === -1 && a.lastIndexOf(1,null) === 0) {       // null resolves to 0

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when fromIndex is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,1);
+  if (a.lastIndexOf(2,null) === -1 && a.lastIndexOf(1,null) === 0) {       // null resolves to 0
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-6.js
index 87247f208..2a767eeca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-6.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-6.js

- * @description Array.prototype.lastIndexOf when 'fromIndex' isn't passed

- */

-

-

-function testcase() {

-        var arr = [0, 1, 2, 3, 4];

-        //'fromIndex' will be set as 4 if not passed by default

-        return arr.lastIndexOf(0) === arr.lastIndexOf(0, 4) &&

-            arr.lastIndexOf(2) === arr.lastIndexOf(2, 4) &&

-            arr.lastIndexOf(4) === arr.lastIndexOf(4, 4);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf when 'fromIndex' isn't passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [0, 1, 2, 3, 4];
+        //'fromIndex' will be set as 4 if not passed by default
+        return arr.lastIndexOf(0) === arr.lastIndexOf(0, 4) &&
+            arr.lastIndexOf(2) === arr.lastIndexOf(2, 4) &&
+            arr.lastIndexOf(4) === arr.lastIndexOf(4, 4);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-7.js
index 204f02d4c..cb0575c88 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-7.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-7.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        return [0, 100].lastIndexOf(100, 0) === -1 && // verify fromIndex is not more than 0

-            [200, 0].lastIndexOf(200, 0) === 0; // verify fromIndex is not less than 0

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, 100].lastIndexOf(100, 0) === -1 && // verify fromIndex is not more than 0
+            [200, 0].lastIndexOf(200, 0) === 0; // verify fromIndex is not less than 0
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-8.js
index dde37f435..d2f5f45e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-8.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-8.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        return [0, true].lastIndexOf(true, +0) === -1 &&

-            [true, 0].lastIndexOf(true, +0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, true].lastIndexOf(true, +0) === -1 &&
+            [true, 0].lastIndexOf(true, +0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-9.js
index be6bb788b..347a109ff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-9.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-5-9.js

- * @description Array.prototype.lastIndexOf - value of 'fromIndex' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        return [0, true].lastIndexOf(true, -0) === -1 &&

-            [true, 0].lastIndexOf(true, -0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - value of 'fromIndex' is a number
+    (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, true].lastIndexOf(true, -0) === -1 &&
+            [true, 0].lastIndexOf(true, -0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-1.js
index dd686d1e3..5a612b3d7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-1.js

- * @description Array.prototype.lastIndexOf when fromIndex greater than Array.length

- */

-

-

-function testcase() {

-  var a = new Array(1,2,3);

-  if (a.lastIndexOf(3,5.4) === 2 &&  

-     a.lastIndexOf(3,3.1) === 2 ) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf when fromIndex greater than
+    Array.length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,3);
+  if (a.lastIndexOf(3,5.4) === 2 &&  
+     a.lastIndexOf(3,3.1) === 2 ) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-2.js
index a27e2b7dc..c200191c6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-2.js

- * @description Array.prototype.lastIndexOf returns correct index when 'fromIndex' is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].lastIndexOf(3, 2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns correct index when 'fromIndex'
+    is length of array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].lastIndexOf(3, 2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-3.js
index b53095476..df2292d2a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-3.js

- * @description Array.prototype.lastIndexOf returns -1 when 'fromIndex' is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].lastIndexOf(3, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 when 'fromIndex' is length
+    of array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].lastIndexOf(3, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-4.js
index 2cc5c1f19..570118688 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-4.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-4.js

- * @description Array.prototype.lastIndexOf returns -1 when 'fromIndex' and 'length' are both 0

- */

-

-

-function testcase() {

-

-        return [].lastIndexOf(1, 0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 when 'fromIndex' and
+    'length' are both 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [].lastIndexOf(1, 0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-5.js
index f4de9a7f7..11356448b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-5.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-5.js

- * @description Array.prototype.lastIndexOf returns -1 when 'fromIndex' is 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].lastIndexOf(3, 1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf returns -1 when 'fromIndex' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].lastIndexOf(3, 1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-6.js
index 3f39207a1..53a8677fe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-6.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-6-6.js

- * @description Array.prototype.lastIndexOf returns correct index when 'fromIndex' is 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3].lastIndexOf(2, 1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns correct index when 'fromIndex'
+    is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3].lastIndexOf(2, 1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-1.js
index adfb892f4..69e05c6fe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-1.js

- * @description Array.prototype.lastIndexOf with negative fromIndex 

- */

-

-

-function testcase() {

-  var a = new Array(1,2,3);

-  

-  if (a.lastIndexOf(2,-2) === 1 &&  

-      a.lastIndexOf(2,-3) === -1 &&  

-      a.lastIndexOf(1,-5.3) === -1 ) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf with negative fromIndex
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(1,2,3);
+  
+  if (a.lastIndexOf(2,-2) === 1 &&  
+      a.lastIndexOf(2,-3) === -1 &&  
+      a.lastIndexOf(1,-5.3) === -1 ) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-2.js
index 7c886f80e..e9b92427d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-2.js

- * @description Array.prototype.lastIndexOf returns correct index when 'fromIndex' is -1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].lastIndexOf(4, -1) === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns correct index when 'fromIndex'
+    is -1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].lastIndexOf(4, -1) === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-3.js
index 2b8d631eb..f49077954 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-3.js

- * @description Array.prototype.lastIndexOf returns -1 when abs('fromIndex') is length of array - 1

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].lastIndexOf(3, -3) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 when abs('fromIndex') is
+    length of array - 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].lastIndexOf(3, -3) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-4.js
index cfb2247d0..efc2c1535 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-4.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-7-4.js

- * @description Array.prototype.lastIndexOf returns -1 when abs('fromIndex') is length of array

- */

-

-

-function testcase() {

-

-        return [1, 2, 3, 4].lastIndexOf(2, -4) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 when abs('fromIndex') is
+    length of array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [1, 2, 3, 4].lastIndexOf(2, -4) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-1.js
index e53e1a979..5751e9640 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-1.js

- * @description Array.prototype.lastIndexOf must return correct index(boolean)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return true}};

-  var _false = false;

-  var a = new Array(false,true,false,obj,_false,true,"true", undefined,0,null,1,"str",0,1);

-  if (a.lastIndexOf(true) === 5 &&  //a[5]=true

-      a.lastIndexOf(false) === 4)    //a[4] =_false

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return true}};
+  var _false = false;
+  var a = new Array(false,true,false,obj,_false,true,"true", undefined,0,null,1,"str",0,1);
+  if (a.lastIndexOf(true) === 5 &&  //a[5]=true
+      a.lastIndexOf(false) === 4)    //a[4] =_false
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-10.js
index 0032bd3f0..4fa86e05a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-10.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * note that prior to the finally ES5 draft SameValue was used for comparisions

- * and hence NaNs could be found using lastIndexOf *

- *

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-10.js

- * @description Array.prototype.lastIndexOf must return correct index (NaN)

- */

-

-

-function testcase() {

-  var _NaN = NaN;

-  var a = new Array("NaN",_NaN,NaN, undefined,0,false,null,{toString:function (){return NaN}},"false");

-  if (a.lastIndexOf(NaN) === -1)  // NaN matches nothing, not even itself

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    note that prior to the finally ES5 draft SameValue was used for comparisions
+    and hence NaNs could be found using lastIndexOf *
+description: Array.prototype.lastIndexOf must return correct index (NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _NaN = NaN;
+  var a = new Array("NaN",_NaN,NaN, undefined,0,false,null,{toString:function (){return NaN}},"false");
+  if (a.lastIndexOf(NaN) === -1)  // NaN matches nothing, not even itself
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-11.js
index 7b300fa0b..3cb7efdab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-11.js

- * @description Array.prototype.lastIndexOf - the length of iteration isn't changed by adding elements to the array during iteration

- */

-

-

-function testcase() {

-

-        var arr = [20];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr[1] = 1;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.lastIndexOf(1) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - the length of iteration isn't
+    changed by adding elements to the array during iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [20];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr[1] = 1;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.lastIndexOf(1) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-2.js
index 384aef3b1..6c6476985 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-2.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-2.js

- * @description Array.prototype.lastIndexOf must return correct index(Number)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return 0}};

-  var one = 1;

-  var _float = -(4/3);

-  var a = new Array(+0,true,0,-0, false,undefined,null,"0",obj, _float,-(4/3),-1.3333333333333,"str",one, 1, false);

-  if (a.lastIndexOf(-(4/3)) === 10 &&      // a[10]=-(4/3)

-      a.lastIndexOf(0) === 3       &&       // a[3] = -0, but using === -0 and 0 are equal

-      a.lastIndexOf(-0) ===3       &&      // a[3] = -0

-      a.lastIndexOf(1) === 14 )            // a[14] = 1

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return 0}};
+  var one = 1;
+  var _float = -(4/3);
+  var a = new Array(+0,true,0,-0, false,undefined,null,"0",obj, _float,-(4/3),-1.3333333333333,"str",one, 1, false);
+  if (a.lastIndexOf(-(4/3)) === 10 &&      // a[10]=-(4/3)
+      a.lastIndexOf(0) === 3       &&       // a[3] = -0, but using === -0 and 0 are equal
+      a.lastIndexOf(-0) ===3       &&      // a[3] = -0
+      a.lastIndexOf(1) === 14 )            // a[14] = 1
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-3.js
index ceedbf100..b365e1754 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-3.js

- * @description Array.prototype.lastIndexOf must return correct index(string)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return "false"}};

-  var szFalse = "false";

-  var a = new Array(szFalse, "false","false1",undefined,0,false,null,1,obj,0);

-  if (a.lastIndexOf("false") === 1) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return "false"}};
+  var szFalse = "false";
+  var a = new Array(szFalse, "false","false1",undefined,0,false,null,1,obj,0);
+  if (a.lastIndexOf("false") === 1) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-4.js
index 8c86d3be5..4a9c35fe6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-4.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-4.js

- * @description Array.prototype.lastIndexOf must return correct index(undefined)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return undefined;}};

-  var _undefined1 = undefined;

-  var _undefined2;

-  var a = new Array(_undefined1,_undefined2,undefined,true,0,false,null,1,"undefined",obj,1);

-  if (a.lastIndexOf(undefined) === 2) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(undefined)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return undefined;}};
+  var _undefined1 = undefined;
+  var _undefined2;
+  var a = new Array(_undefined1,_undefined2,undefined,true,0,false,null,1,"undefined",obj,1);
+  if (a.lastIndexOf(undefined) === 2) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-5.js
index cc4db92ef..8d5dd93ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-5.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-5.js

- * @description Array.prototype.lastIndexOf must return correct index(Object)

- */

-

-

-function testcase() {

-  var obj1 = {toString:function (){return "false"}};

-  var obj2 = {toString:function (){return "false"}};

-  var obj3 = obj1;

-  var a = new Array(obj2,obj1,obj3,false,undefined,0,false,null,{toString:function (){return "false"}},"false");

-  if (a.lastIndexOf(obj3) === 2) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj1 = {toString:function (){return "false"}};
+  var obj2 = {toString:function (){return "false"}};
+  var obj3 = obj1;
+  var a = new Array(obj2,obj1,obj3,false,undefined,0,false,null,{toString:function (){return "false"}},"false");
+  if (a.lastIndexOf(obj3) === 2) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-6.js
index 6cbde571e..adf207420 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-6.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-6.js

- * @description Array.prototype.lastIndexOf must return correct index(null)

- */

-

-

-function testcase() {

-  var obj = {toString:function (){return null}};

-  var _null = null;

-  var a = new Array(true,undefined,0,false,null,1,"str",0,1,null,true,false,undefined,_null,"null",undefined,"str",obj);

-  if (a.lastIndexOf(null) === 13 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index(null)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var obj = {toString:function (){return null}};
+  var _null = null;
+  var a = new Array(true,undefined,0,false,null,1,"str",0,1,null,true,false,undefined,_null,"null",undefined,"str",obj);
+  if (a.lastIndexOf(null) === 13 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-7.js
index 9f2d329e6..a8f2799eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-7.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-7.js

- * @description Array.prototype.lastIndexOf must return correct index (self reference)

- */

-

-

-function testcase() {

-  var a = new Array(0,1,2,3);  

-  a[2] = a;

-  if (a.lastIndexOf(a) === 2 &&  

-      a.lastIndexOf(3) === 3 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf must return correct index (self
+    reference)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(0,1,2,3);  
+  a[2] = a;
+  if (a.lastIndexOf(a) === 2 &&  
+      a.lastIndexOf(3) === 3 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-8.js
index d2dafcf11..b0311d5e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-8.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-8.js

- * @description Array.prototype.lastIndexOf must return correct index (Array)

- */

-

-

-function testcase() {

-  var b = new Array("0,1");  

-  var a = new Array(0,b,"0,1",3);  

-  if (a.lastIndexOf(b.toString()) === 2 &&  

-      a.lastIndexOf("0,1") === 2 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf must return correct index (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var b = new Array("0,1");  
+  var a = new Array(0,b,"0,1",3);  
+  if (a.lastIndexOf(b.toString()) === 2 &&  
+      a.lastIndexOf("0,1") === 2 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-9.js
index f4bfc196a..eb33cc4d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-9.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-9.js

- * @description Array.prototype.lastIndexOf must return correct index (Sparse Array)

- */

-

-

-function testcase() {

-  var a = new Array(0,1);  

-  a[4294967294] = 2;          // 2^32-2 - is max array element index

-  a[4294967295] = 3;          // 2^32-1 added as non-array element property

-  a[4294967296] = 4;          // 2^32   added as non-array element property

-  a[4294967297] = 5;          // 2^32+1 added as non-array element property

-  // stop searching near the end in case implementation actually tries to test all missing elements!!

-  a[4294967200] = 3;          

-  a[4294967201] = 4;         

-  a[4294967202] = 5;         

-

-

-  return (a.lastIndexOf(2) === 4294967294 &&    

-      a.lastIndexOf(3) === 4294967200 &&

-      a.lastIndexOf(4) === 4294967201 &&

-      a.lastIndexOf(5) === 4294967202) ;

-   }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf must return correct index (Sparse
+    Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array(0,1);  
+  a[4294967294] = 2;          // 2^32-2 - is max array element index
+  a[4294967295] = 3;          // 2^32-1 added as non-array element property
+  a[4294967296] = 4;          // 2^32   added as non-array element property
+  a[4294967297] = 5;          // 2^32+1 added as non-array element property
+  // stop searching near the end in case implementation actually tries to test all missing elements!!
+  a[4294967200] = 3;          
+  a[4294967201] = 4;         
+  a[4294967202] = 5;         
+
+
+  return (a.lastIndexOf(2) === 4294967294 &&    
+      a.lastIndexOf(3) === 4294967200 &&
+      a.lastIndexOf(4) === 4294967201 &&
+      a.lastIndexOf(5) === 4294967202) ;
+   }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-1.js
index 571d687db..7e20fd837 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-1.js

- * @description Array.prototype.lastIndexOf - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var arr = { };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                arr[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return 2 === Array.prototype.lastIndexOf.call(arr, "length");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - added properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                arr[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return 2 === Array.prototype.lastIndexOf.call(arr, "length");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-10.js
index 885f57487..064405d96 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-10.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-10.js

- * @description Array.prototype.lastIndexOf - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return arr.lastIndexOf(6.99) === 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - properties can be added to prototype
+    after current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return arr.lastIndexOf(6.99) === 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-11.js
index 301f4c0b6..3220e4865 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-11.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-11.js

- * @description Array.prototype.lastIndexOf - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 200 };

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "100", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === Array.prototype.lastIndexOf.call(arr, 6.99);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - deleting own property causes index
+    property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 200 };
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "100", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === Array.prototype.lastIndexOf.call(arr, 6.99);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-12.js
index 52ca2b2fd..92bfd4bea 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-12.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-12.js

- * @description Array.prototype.lastIndexOf - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [1, 2, 3, 4];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === arr.lastIndexOf("6.99");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - deleting own property causes index
+    property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [1, 2, 3, 4];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === arr.lastIndexOf("6.99");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-13.js
index 057e1d1d6..9d69f82d6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-13.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-13.js

- * @description Array.prototype.lastIndexOf -  deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var arr = { 2: 2, length: 20 };

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return -1 === Array.prototype.lastIndexOf.call(arr, 1);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleting property of prototype
+    causes prototype index property not to be visited on an Array-like
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 2: 2, length: 20 };
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return -1 === Array.prototype.lastIndexOf.call(arr, 1);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-14.js
index 85f549919..27ec13fe1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-14.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-14.js

- * @description Array.prototype.lastIndexOf -  deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "20", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return -1 === arr.lastIndexOf(1);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleting property of prototype
+    causes prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "20", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return -1 === arr.lastIndexOf(1);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-15.js
index c88fa8629..57248b94c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-15.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-15.js

- * @description Array.prototype.lastIndexOf -  deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };

-        

-        Object.defineProperty(arr, "6", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return 1 === Array.prototype.lastIndexOf.call(arr, 1);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleting own property with
+    prototype property causes prototype index property to be visited
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };
+        
+        Object.defineProperty(arr, "6", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return 1 === Array.prototype.lastIndexOf.call(arr, 1);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-16.js
index 51488600e..2c5eb8653 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-16.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-16.js

- * @description Array.prototype.lastIndexOf -  deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, 111, 2]; 

-        

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return 1 === arr.lastIndexOf(1);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleting own property with
+    prototype property causes prototype index property to be visited
+    on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 111, 2]; 
+        
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return 1 === arr.lastIndexOf(1);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-17.js
index 4cdf2cbda..4f546d7d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-17.js

- * @description Array.prototype.lastIndexOf -  decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, "last", 4];

-

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return -1 === arr.lastIndexOf("last");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  decreasing length of array causes
+    index property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, "last", 4];
+
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return -1 === arr.lastIndexOf("last");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-18.js
index 5a7bcdc88..6151f55e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-18.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-18.js

- * @description Array.prototype.lastIndexOf -  decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "3", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            return 2 === arr.lastIndexOf("prototype");

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  decreasing length of array with
+    prototype property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "3", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            return 2 === arr.lastIndexOf("prototype");
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-19.js
index 785ec810d..b6cedcf8a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-19.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-19.js

- * @description Array.prototype.lastIndexOf -  decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        return 2 === arr.lastIndexOf("unconfigurable");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        return 2 === arr.lastIndexOf("unconfigurable");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-2.js
index 18006bb77..4c4ea244c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-2.js

- * @description Array.prototype.lastIndexOf -  added properties in step 5 are visible here on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 30 };

-        var targetObj = function () { };

-

-        var fromIndex = {

-            valueOf: function () {

-                arr[4] = targetObj;

-                return 10;

-            }

-        };

-        

-        return 4 === Array.prototype.lastIndexOf.call(arr, targetObj, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  added properties in step 5 are
+    visible here on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 30 };
+        var targetObj = function () { };
+
+        var fromIndex = {
+            valueOf: function () {
+                arr[4] = targetObj;
+                return 10;
+            }
+        };
+        
+        return 4 === Array.prototype.lastIndexOf.call(arr, targetObj, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-3.js
index bad040b18..aa2f7287c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-3.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-3.js

- * @description Array.prototype.lastIndexOf -  added properties in step 5 are visible here on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        arr.length = 30;

-        var targetObj = function () { };

-

-        var fromIndex = {

-            valueOf: function () {

-                arr[4] = targetObj;

-                return 11;

-            }

-        };

-

-        return 4 === arr.lastIndexOf(targetObj, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  added properties in step 5 are
+    visible here on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        arr.length = 30;
+        var targetObj = function () { };
+
+        var fromIndex = {
+            valueOf: function () {
+                arr[4] = targetObj;
+                return 11;
+            }
+        };
+
+        return 4 === arr.lastIndexOf(targetObj, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-4.js
index 3e99faeb1..427fc5eef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-4.js

- * @description Array.prototype.lastIndexOf -  deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var arr = { 2: 6.99 };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                delete arr[2];

-                return 3;

-            },

-            configurable: true

-        });

-

-        return -1 === Array.prototype.lastIndexOf.call(arr, 6.99);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleted properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 2: 6.99 };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                delete arr[2];
+                return 3;
+            },
+            configurable: true
+        });
+
+        return -1 === Array.prototype.lastIndexOf.call(arr, 6.99);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-5.js
index 2892d1475..93b8f4bf9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-5.js

- * @description Array.prototype.lastIndexOf -  deleted properties of step 5 are visible here on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { 10: false, length: 30 };

-

-        var fromIndex = {

-            valueOf: function () {

-                delete arr[10];

-                return 15;

-            }

-        };

-

-        return -1 === Array.prototype.lastIndexOf.call(arr, false, fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleted properties of step 5 are
+    visible here on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { 10: false, length: 30 };
+
+        var fromIndex = {
+            valueOf: function () {
+                delete arr[10];
+                return 15;
+            }
+        };
+
+        return -1 === Array.prototype.lastIndexOf.call(arr, false, fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-6.js
index 1fc4c98c1..0e28c0184 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-6.js

- * @description Array.prototype.lastIndexOf -  deleted properties of step 5 are visible here on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        arr[10] = "10";

-        arr.length = 20;

-

-        var fromIndex = {

-            valueOf: function () {

-                delete arr[10];

-                return 11;

-            }

-        };

-

-        return -1 === arr.lastIndexOf("10", fromIndex);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  deleted properties of step 5 are
+    visible here on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        arr[10] = "10";
+        arr.length = 20;
+
+        var fromIndex = {
+            valueOf: function () {
+                delete arr[10];
+                return 11;
+            }
+        };
+
+        return -1 === arr.lastIndexOf("10", fromIndex);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-7.js
index 1c14fd2fd..d325cc618 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-7.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-7.js

- * @description Array.prototype.lastIndexOf -  properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-    

-        var arr = { length: 8 };

-

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(arr, 1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  properties added into own object
+    after current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var arr = { length: 8 };
+
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(arr, 1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-8.js
index 3564e0488..f370321b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-8.js

- * @description Array.prototype.lastIndexOf -  properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.lastIndexOf(1) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  properties added into own object
+    after current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.lastIndexOf(1) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-9.js
index a86244a21..7f3f6ee07 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-9.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-a-9.js

- * @description Array.prototype.lastIndexOf -  properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var arr = { length: 9 };

-

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return Infinity;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return Array.prototype.lastIndexOf.call(arr, Infinity) === 1;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf -  properties can be added to
+    prototype after current position are visited on an Array-like
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = { length: 9 };
+
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return Infinity;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return Array.prototype.lastIndexOf.call(arr, Infinity) === 1;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-1.js
index 12d549640..2c770c88d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-1.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-1.js

- * @description Array.prototype.lastIndexOf - undefined property wouldn't be called

- */

-

-

-function testcase() {

-

-        return [0, , 2].lastIndexOf(undefined) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - undefined property wouldn't be called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [0, , 2].lastIndexOf(undefined) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-1.js
index 2fdce2c32..b6150acb7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-1.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 0: 0, 1: 1, 2: 2, length: 3 };

-

-        return Array.prototype.lastIndexOf.call(obj, 0) === 0 &&

-            Array.prototype.lastIndexOf.call(obj, 1) === 1 &&

-            Array.prototype.lastIndexOf.call(obj, 2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 0, 1: 1, 2: 2, length: 3 };
+
+        return Array.prototype.lastIndexOf.call(obj, 0) === 0 &&
+            Array.prototype.lastIndexOf.call(obj, 1) === 1 &&
+            Array.prototype.lastIndexOf.call(obj, 2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-10.js
index 9fb425002..8e8bcd1cf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-10.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-10.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 3 };

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return 0 === Array.prototype.lastIndexOf.call(obj, 0) &&

-            1 === Array.prototype.lastIndexOf.call(obj, 1) &&

-            2 === Array.prototype.lastIndexOf.call(obj, 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 3 };
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return 0 === Array.prototype.lastIndexOf.call(obj, 0) &&
+            1 === Array.prototype.lastIndexOf.call(obj, 1) &&
+            2 === Array.prototype.lastIndexOf.call(obj, 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-11.js
index 1d0e5458a..5275a2118 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-11.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-11.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Array.prototype[0] = false;

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === arr.lastIndexOf(true);

-        } finally {

-            delete Array.prototype[0]; 

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Array.prototype[0] = false;
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === arr.lastIndexOf(true);
+        } finally {
+            delete Array.prototype[0]; 
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-12.js
index 8698c16e9..277875d89 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-12.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-12.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        var obj = { length: 1 };

-

-        try {

-            Object.prototype[0] = false;

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.lastIndexOf.call(obj, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { length: 1 };
+
+        try {
+            Object.prototype[0] = false;
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.lastIndexOf.call(obj, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-13.js
index 682098e31..fb95b7d8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-13.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-13.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === arr.lastIndexOf(true);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === arr.lastIndexOf(true);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-14.js
index d7d9d9c6a..63a7cc9a6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-14.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-14.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 1 };

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    return true;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.lastIndexOf.call(obj, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 1 };
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    return true;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.lastIndexOf.call(obj, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-15.js
index 6c489a8ca..6d2cc034c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-15.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-15.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return 30;

-                },

-                configurable: true

-            });

-

-            return 0 === [, , , ].lastIndexOf(10) &&

-                1 === [, , , ].lastIndexOf(20) &&

-                2 === [, , , ].lastIndexOf(30);

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return 30;
+                },
+                configurable: true
+            });
+
+            return 0 === [, , , ].lastIndexOf(10) &&
+                1 === [, , , ].lastIndexOf(20) &&
+                2 === [, , , ].lastIndexOf(30);
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-16.js
index 5e147f31a..fd28d83c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-16.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-16.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Object.prototype, "1", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(Object.prototype, "2", {

-                get: function () {

-                    return 30;

-                },

-                configurable: true

-            });

-

-            return 0 === Array.prototype.lastIndexOf.call({ length: 3 }, 10) &&

-                1 === Array.prototype.lastIndexOf.call({ length: 3 }, 20) &&

-                2 === Array.prototype.lastIndexOf.call({ length: 3 }, 30);

-        } finally {

-            delete Object.prototype[0];

-            delete Object.prototype[1];

-            delete Object.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Object.prototype, "1", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(Object.prototype, "2", {
+                get: function () {
+                    return 30;
+                },
+                configurable: true
+            });
+
+            return 0 === Array.prototype.lastIndexOf.call({ length: 3 }, 10) &&
+                1 === Array.prototype.lastIndexOf.call({ length: 3 }, 20) &&
+                2 === Array.prototype.lastIndexOf.call({ length: 3 }, 30);
+        } finally {
+            delete Object.prototype[0];
+            delete Object.prototype[1];
+            delete Object.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-17.js
index 1d946ca4b..5d9817190 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-17.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-17.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var arr = [];

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return arr.lastIndexOf(undefined) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [];
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return arr.lastIndexOf(undefined) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-18.js
index 641652241..e7aeb80e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-18.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-18.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 1 };

-        Object.defineProperty(obj, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return 0 === Array.prototype.lastIndexOf.call(obj, undefined);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 1 };
+        Object.defineProperty(obj, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return 0 === Array.prototype.lastIndexOf.call(obj, undefined);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-19.js
index 46600cc57..9e7f7ebc1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-19.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-19.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { length: 1 };

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return 20;

-                },

-                configurable: true

-            });

-            Object.defineProperty(obj, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            return obj.hasOwnProperty(0) && 0 === Array.prototype.lastIndexOf.call(obj, undefined);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { length: 1 };
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return 20;
+                },
+                configurable: true
+            });
+            Object.defineProperty(obj, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            return obj.hasOwnProperty(0) && 0 === Array.prototype.lastIndexOf.call(obj, undefined);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-2.js
index 01e66dc81..568624953 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-2.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-        return [true, true, true].lastIndexOf(true) === 2 &&

-            [true, true, false].lastIndexOf(true) === 1 &&

-            [true, false, false].lastIndexOf(true) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return [true, true, true].lastIndexOf(true) === 2 &&
+            [true, true, false].lastIndexOf(true) === 1 &&
+            [true, false, false].lastIndexOf(true) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-20.js
index 58952fa4e..df3be1e14 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-20.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-20.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is an own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [, 1];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 100;

-                },

-                configurable: true

-            });

-            Object.defineProperty(arr, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            return arr.hasOwnProperty(0) && arr.lastIndexOf(undefined) === 0;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is an own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [, 1];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 100;
+                },
+                configurable: true
+            });
+            Object.defineProperty(arr, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            return arr.hasOwnProperty(0) && arr.lastIndexOf(undefined) === 0;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-21.js
index 62e193fce..e21b81f94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-21.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-21.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-            return [, ].lastIndexOf(undefined) === 0;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+            return [, ].lastIndexOf(undefined) === 0;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-22.js
index b55226315..629ac7e6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-22.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-22.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-            return 0 === Array.prototype.lastIndexOf.call({ length: 1 }, undefined);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+            return 0 === Array.prototype.lastIndexOf.call({ length: 1 }, undefined);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-23.js
index 867c59185..80b2589ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-23.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-23.js

- * @description Array.prototype.lastIndexOf - This object is the global object

- */

-

-

-function testcase() {

-

-        var targetObj = {};

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = targetObj;

-            fnGlobalObject()[100] = "100";

-            fnGlobalObject()[200] = "200";

-            fnGlobalObject().length = 200;

-            return 0 === Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) &&

-                100 === Array.prototype.lastIndexOf.call(fnGlobalObject(), "100") &&

-                -1 === Array.prototype.lastIndexOf.call(fnGlobalObject(), "200");

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[100];

-            delete fnGlobalObject()[200];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - This object is the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var targetObj = {};
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = targetObj;
+            fnGlobalObject()[100] = "100";
+            fnGlobalObject()[200] = "200";
+            fnGlobalObject().length = 200;
+            return 0 === Array.prototype.lastIndexOf.call(fnGlobalObject(), targetObj) &&
+                100 === Array.prototype.lastIndexOf.call(fnGlobalObject(), "100") &&
+                -1 === Array.prototype.lastIndexOf.call(fnGlobalObject(), "200");
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[100];
+            delete fnGlobalObject()[200];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-25.js
index b33d89fd8..4a4e2b3ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-25.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-25.js

- * @description Array.prototype.lastIndexOf applied to Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 0 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&

-                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[1]);

-        };

-

-        return func(true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 0 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&
+                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[1]);
+        };
+
+        return func(true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-26.js
index 3f948599e..0d4f9fcdb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-26.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-26.js

- * @description Array.prototype.lastIndexOf applied to Arguments object which implements its own property get method (number of arguments equals to number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 0 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&

-                1 === Array.prototype.lastIndexOf.call(arguments, arguments[1]) &&

-                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[2]);

-        };

-

-        return func(0, true);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to Arguments object which
+    implements its own property get method (number of arguments equals
+    to number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 0 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&
+                1 === Array.prototype.lastIndexOf.call(arguments, arguments[1]) &&
+                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[2]);
+        };
+
+        return func(0, true);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-27.js
index b2a215213..6b775a169 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-27.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-27.js

- * @description Array.prototype.lastIndexOf applied to Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var func = function (a, b) {

-            return 2 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&

-                3 === Array.prototype.lastIndexOf.call(arguments, arguments[3]) &&

-                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[4]);

-        };

-

-        return func(0, arguments, 0, Object.prototype);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf applied to Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var func = function (a, b) {
+            return 2 === Array.prototype.lastIndexOf.call(arguments, arguments[0]) &&
+                3 === Array.prototype.lastIndexOf.call(arguments, arguments[3]) &&
+                -1 === Array.prototype.lastIndexOf.call(arguments, arguments[4]);
+        };
+
+        return func(0, arguments, 0, Object.prototype);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-28.js
index 8c4a11711..9d4c1e167 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-28.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-28.js

- * @description Array.prototype.lastIndexOf - side-effects are visible in subsequent iterations on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                preIterVisible = true;

-                return false;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return true;

-                } else {

-                    return false;

-                }

-            },

-            configurable: true

-        });

-

-        return arr.lastIndexOf(true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side-effects are visible in
+    subsequent iterations on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                preIterVisible = true;
+                return false;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+            configurable: true
+        });
+
+        return arr.lastIndexOf(true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-29.js
index fb85b2877..bf038e492 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-29.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-29.js

- * @description Array.prototype.lastIndexOf - side-effects are visible in subsequent iterations on an Array-like object

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var obj = { length: 3 };

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                preIterVisible = true;

-                return false;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return true;

-                } else {

-                    return false;

-                }

-            },

-            configurable: true

-        });

-

-        return Array.prototype.lastIndexOf.call(obj, true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - side-effects are visible in
+    subsequent iterations on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var obj = { length: 3 };
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                preIterVisible = true;
+                return false;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return true;
+                } else {
+                    return false;
+                }
+            },
+            configurable: true
+        });
+
+        return Array.prototype.lastIndexOf.call(obj, true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-3.js
index e7c20a515..7e00670c4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-3.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-3.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        try {

-            Array.prototype[0] = Object;

-            return [Object.prototype].lastIndexOf(Object.prototype) === 0;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype[0] = Object;
+            return [Object.prototype].lastIndexOf(Object.prototype) === 0;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-30.js
index fad93dcf5..c465d7e39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-30.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-30.js

- * @description Array.prototype.lastIndexOf terminates iteration on unhandled exception on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arr = [];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                throw new TypeError();

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                accessed = true;

-                return true;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.lastIndexOf(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !accessed;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf terminates iteration on unhandled
+    exception on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arr = [];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                throw new TypeError();
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                accessed = true;
+                return true;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.lastIndexOf(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !accessed;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-31.js
index fa491307f..289471163 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-31.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-31.js

- * @description Array.prototype.lastIndexOf terminates iteration on unhandled exception on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { length: 3 };

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                throw new TypeError();

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                accessed = true;

-                return true;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.lastIndexOf.call(obj, true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError) && !accessed;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf terminates iteration on unhandled
+    exception on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { length: 3 };
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                throw new TypeError();
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                accessed = true;
+                return true;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.lastIndexOf.call(obj, true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError) && !accessed;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-4.js
index 8ba62506c..efd347ddd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-4.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-4.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.prototype[0] = false;

-            return 0 === Array.prototype.lastIndexOf.call({ 0: true, 1: 1, length: 2 }, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.prototype[0] = false;
+            return 0 === Array.prototype.lastIndexOf.call({ 0: true, 1: 1, length: 2 }, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-5.js
index 4f6071186..7d99fc1c4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-5.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-            return 0 === [Number].lastIndexOf(Number);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+            return 0 === [Number].lastIndexOf(Number);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-6.js
index b087664b2..bbc1afb0a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-6.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-6.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.defineProperty(Object.prototype, "0", {

-                get: function () {

-                    return false;

-                },

-                configurable: true

-            });

-            return 0 === Array.prototype.lastIndexOf.call({ 0: true, 1: 1, length: 2 }, true);

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.defineProperty(Object.prototype, "0", {
+                get: function () {
+                    return false;
+                },
+                configurable: true
+            });
+            return 0 === Array.prototype.lastIndexOf.call({ 0: true, 1: 1, length: 2 }, true);
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-7.js
index ae582912e..ec681fef1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-7.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-7.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        try {

-            Array.prototype[0] = true;

-            Array.prototype[1] = false;

-            Array.prototype[2] = "true";

-            return 0 === [, , , ].lastIndexOf(true) &&

-                1 === [, , , ].lastIndexOf(false) &&

-                2 === [, , , ].lastIndexOf("true");

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Array.prototype[0] = true;
+            Array.prototype[1] = false;
+            Array.prototype[2] = "true";
+            return 0 === [, , , ].lastIndexOf(true) &&
+                1 === [, , , ].lastIndexOf(false) &&
+                2 === [, , , ].lastIndexOf("true");
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-8.js
index 6edfb7fcf..eb3e71f6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-8.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        try {

-            Object.prototype[0] = true;

-            Object.prototype[1] = false;

-            Object.prototype[2] = "true";

-            return 0 === Array.prototype.lastIndexOf.call({ length: 3 }, true) &&

-                1 === Array.prototype.lastIndexOf.call({ length: 3 }, false) &&

-                2 === Array.prototype.lastIndexOf.call({ length: 3 }, "true");

-        } finally {

-            delete Object.prototype[0];

-            delete Object.prototype[1];

-            delete Object.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is inherited
+    data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Object.prototype[0] = true;
+            Object.prototype[1] = false;
+            Object.prototype[2] = "true";
+            return 0 === Array.prototype.lastIndexOf.call({ length: 3 }, true) &&
+                1 === Array.prototype.lastIndexOf.call({ length: 3 }, false) &&
+                2 === Array.prototype.lastIndexOf.call({ length: 3 }, "true");
+        } finally {
+            delete Object.prototype[0];
+            delete Object.prototype[1];
+            delete Object.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-9.js
index 93137e052..c42598c91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-9.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-i-9.js

- * @description Array.prototype.lastIndexOf - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var arr = [, , , ];

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return arr.lastIndexOf(0) === 0 && arr.lastIndexOf(1) === 1 && arr.lastIndexOf(2) === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - element to be retrieved is own
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [, , , ];
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return arr.lastIndexOf(0) === 0 && arr.lastIndexOf(1) === 1 && arr.lastIndexOf(2) === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-1.js
index 120e8edc4..abe99d934 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-1.js

- * @description Array.prototype.lastIndexOf - type of array element is different from type of search element

- */

-

-

-function testcase() {

-

-        return ["true"].lastIndexOf(true) === -1 &&

-            ["0"].lastIndexOf(0) === -1 &&

-            [false].lastIndexOf(0) === -1 &&

-            [undefined].lastIndexOf(0) === -1 &&

-            [null].lastIndexOf(0) === -1 &&

-            [[]].lastIndexOf(0) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - type of array element is different
+    from type of search element
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return ["true"].lastIndexOf(true) === -1 &&
+            ["0"].lastIndexOf(0) === -1 &&
+            [false].lastIndexOf(0) === -1 &&
+            [undefined].lastIndexOf(0) === -1 &&
+            [null].lastIndexOf(0) === -1 &&
+            [[]].lastIndexOf(0) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-10.js
index 200c71805..f32aa5ad6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-10.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-10.js

- * @description Array.prototype.lastIndexOf - both array element and search element are booleans, and they have same value

- */

-

-

-function testcase() {

-

-        return [false, true].lastIndexOf(true) === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both array element and search
+    element are booleans, and they have same value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [false, true].lastIndexOf(true) === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-11.js
index 1c80e5669..e953354f0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-11.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-11.js

- * @description Array.prototype.lastIndexOf - both array element and search element are Objects, and they refer to the same object

- */

-

-

-function testcase() {

-

-        var obj1 = {};

-        var obj2 = {};

-        var obj3 = obj2;

-        return [obj2, obj1].lastIndexOf(obj3) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both array element and search
+    element are Objects, and they refer to the same object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj1 = {};
+        var obj2 = {};
+        var obj3 = obj2;
+        return [obj2, obj1].lastIndexOf(obj3) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-2.js
index 3326149bf..851de4d99 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-2.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-2.js

- * @description Array.prototype.lastIndexOf - both type of array element and type of search element are Undefined

- */

-

-

-function testcase() {

-

-        return [undefined].lastIndexOf() === 0 && [undefined].lastIndexOf(undefined) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both type of array element and type
+    of search element are Undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [undefined].lastIndexOf() === 0 && [undefined].lastIndexOf(undefined) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-3.js
index 2d029cdcc..1c62a93ea 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-3.js

- * @description Array.prototype.lastIndexOf - both type of array element and type of search element are Null

- */

-

-

-function testcase() {

-

-        return [null].lastIndexOf(null) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both type of array element and type
+    of search element are Null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [null].lastIndexOf(null) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-4.js
index 191725903..5aa30af54 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-4.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-4.js

- * @description Array.prototype.lastIndexOf - search element is NaN

- */

-

-

-function testcase() {

-

-        return [+NaN, NaN, -NaN].lastIndexOf(NaN) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - search element is NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [+NaN, NaN, -NaN].lastIndexOf(NaN) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-5.js
index fbc668f49..89ff4c486 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-5.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-5.js

- * @description Array.prototype.lastIndexOf - search element is -NaN

- */

-

-

-function testcase() {

-        return [+NaN, NaN, -NaN].lastIndexOf(-NaN) === -1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf - search element is -NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return [+NaN, NaN, -NaN].lastIndexOf(-NaN) === -1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-6.js
index 408395950..d6872e917 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-6.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-6.js

- * @description Array.prototype.lastIndexOf - array element is +0 and search element is -0

- */

-

-

-function testcase() {

-

-        return [+0].lastIndexOf(-0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - array element is +0 and search
+    element is -0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [+0].lastIndexOf(-0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-7.js
index ee2df51c0..2266cba9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-7.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-7.js

- * @description Array.prototype.lastIndexOf - array element is -0 and search element is +0

- */

-

-

-function testcase() {

-

-        return [-0].lastIndexOf(+0) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - array element is -0 and search
+    element is +0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [-0].lastIndexOf(+0) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-8.js
index bc32ceecb..697f31377 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-8.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-8.js

- * @description Array.prototype.lastIndexOf - both array element and search element are numbers, and they have same value

- */

-

-

-function testcase() {

-

-        return [-1, 0, 1].lastIndexOf(-1) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both array element and search
+    element are numbers, and they have same value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [-1, 0, 1].lastIndexOf(-1) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-9.js
index b14aec8d6..bc8fdc32c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-9.js
@@ -1,16 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-ii-9.js

- * @description Array.prototype.lastIndexOf - both array element and search element are strings, and they have exactly the same sequence of characters

- */

-

-

-function testcase() {

-

-        return ["abc", "ab", "bca", ""].lastIndexOf("abc") === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf - both array element and search
+    element are strings, and they have exactly the same sequence of
+    characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return ["abc", "ab", "bca", ""].lastIndexOf("abc") === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-1.js
index f4a690473..c38ecbafb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-1.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-1.js

- * @description Array.prototype.lastIndexOf returns index of last one when more than two elements in array are eligible

- */

-

-

-function testcase() {

-

-        return [2, 1, 2, 2, 1].lastIndexOf(2) === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns index of last one when more
+    than two elements in array are eligible
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        return [2, 1, 2, 2, 1].lastIndexOf(2) === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-2.js
index bdd887ea4..5d3594b25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-2.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-8-b-iii-2.js

- * @description Array.prototype.lastIndexOf returns without visiting subsequent element once search value is found

- */

-

-

-function testcase() {

-        var arr = [2, 1, , 1, 2];

-        var elementFirstAccessed = false;

-        var elementThirdAccessed = false;

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                elementThirdAccessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                elementFirstAccessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        arr.lastIndexOf(2);

-        return !elementThirdAccessed && !elementFirstAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns without visiting subsequent
+    element once search value is found
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [2, 1, , 1, 2];
+        var elementFirstAccessed = false;
+        var elementThirdAccessed = false;
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                elementThirdAccessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                elementFirstAccessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        arr.lastIndexOf(2);
+        return !elementThirdAccessed && !elementFirstAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-1.js
index 9aacf744b..1fc9d2166 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-1.js
@@ -1,37 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-1.js

- * @description Array.prototype.lastIndexOf returns -1 for elements not present

- */

-

-

-function testcase() {

-  var a = new Array();

-  a[100] = 1;

-  a[99999] = "";  

-  a[10] = new Object();

-  a[5555] = 5.5;

-  a[123456] = "str";

-  a[5] = 1E+309;

-  if (a.lastIndexOf(1) !== 100 ||

-      a.lastIndexOf("") !== 99999 ||

-      a.lastIndexOf("str") !== 123456 ||

-      a.lastIndexOf(5.5) !== 5555 ||

-      a.lastIndexOf(1E+309) !== 5 )      

-  {

-    return false;

-  }    

-  if (a.lastIndexOf(true) === -1 && 

-      a.lastIndexOf(5) === -1 &&

-      a.lastIndexOf("str1") === -1 &&

-      a.lastIndexOf(null) === -1  &&

-      a.lastIndexOf(new Object()) === -1 ) 

-  {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.lastIndexOf returns -1 for elements not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = new Array();
+  a[100] = 1;
+  a[99999] = "";  
+  a[10] = new Object();
+  a[5555] = 5.5;
+  a[123456] = "str";
+  a[5] = 1E+309;
+  if (a.lastIndexOf(1) !== 100 ||
+      a.lastIndexOf("") !== 99999 ||
+      a.lastIndexOf("str") !== 123456 ||
+      a.lastIndexOf(5.5) !== 5555 ||
+      a.lastIndexOf(1E+309) !== 5 )      
+  {
+    return false;
+  }    
+  if (a.lastIndexOf(true) === -1 && 
+      a.lastIndexOf(5) === -1 &&
+      a.lastIndexOf("str1") === -1 &&
+      a.lastIndexOf(null) === -1  &&
+      a.lastIndexOf(new Object()) === -1 ) 
+  {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-2.js
index a1135345c..f053ad1f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.15/15.4.4.15-9-2.js

- * @description Array.prototype.lastIndexOf returns -1 if 'length' is 0 and does not access any other properties

- */

-

-

-function testcase() {

-  var accessed = false;

-  var f = {length: 0};

-  Object.defineProperty(f,"0",{get: function () {accessed = true; return 1;}});

-  

-  var i = Array.prototype.lastIndexOf.call(f,1);

-  

-  if (i === -1 && accessed==false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.lastIndexOf returns -1 if 'length' is 0 and does
+    not access any other properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var accessed = false;
+  var f = {length: 0};
+  Object.defineProperty(f,"0",{get: function () {accessed = true; return 1;}});
+  
+  var i = Array.prototype.lastIndexOf.call(f,1);
+  
+  if (i === -1 && accessed==false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-1.js
index 202325ced..74884969a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-1.js

- * @description Array.prototype.every must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.every;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.every;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-2.js
index 89356994b..2b5179edc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-0-2.js

- * @description Array.prototype.every.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.every.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.every.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-1.js
index e00a61f35..c1179f753 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-1.js

- * @description Array.prototype.every applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.every.call(undefined); // TypeError is thrown if value is undefined

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.every.call(undefined); // TypeError is thrown if value is undefined
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-10.js
index 1d8467b7c..d30db650c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-10.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-10.js

- * @description Array.prototype.every applied to the Math object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object Math]' !== Object.prototype.toString.call(obj));

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            return !Array.prototype.every.call(Math, callbackfn);

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object Math]' !== Object.prototype.toString.call(obj));
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            return !Array.prototype.every.call(Math, callbackfn);
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-11.js
index d56160721..1127edbf0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-11.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-11.js

- * @description Array.prototype.every applied to Date object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof Date);

-        }

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof Date);
+        }
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-12.js
index 111d4213b..1c8254325 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-12.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-12.js

- * @description Array.prototype.every applied to RegExp object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof RegExp);

-        }

-

-        var obj = new RegExp();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof RegExp);
+        }
+
+        var obj = new RegExp();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-13.js
index 1d7e4c66a..29e85d28f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-13.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-13.js

- * @description Array.prototype.every applied to the JSON object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object JSON]' !== Object.prototype.toString.call(obj));

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            return !Array.prototype.every.call(JSON, callbackfn);

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object JSON]' !== Object.prototype.toString.call(obj));
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            return !Array.prototype.every.call(JSON, callbackfn);
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-14.js
index d5a43740c..5984a6106 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-14.js

- * @description Array.prototype.every applied to Error object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof Error);

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof Error);
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-15.js
index 3a6d4257c..e383fba12 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-15.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-15.js

- * @description Array.prototype.every applied to the Arguments object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object Arguments]' !== Object.prototype.toString.call(obj));

-        }

-

-        var obj = (function fun() {

-            return arguments;

-        }("a", "b"));

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object Arguments]' !== Object.prototype.toString.call(obj));
+        }
+
+        var obj = (function fun() {
+            return arguments;
+        }("a", "b"));
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-2.js
index a3f519be6..d62306578 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-2.js

- * @description Array.prototype.every applied to null throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.every.call(null); // TypeError is thrown if value is null

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.every.call(null); // TypeError is thrown if value is null
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-3.js
index fdf5a733d..e68dac0ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-3.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-3.js

- * @description Array.prototype.every applied to boolean primitive

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = 1;

-            Boolean.prototype.length = 1;

-            return Array.prototype.every.call(false, callbackfn) && accessed;

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = 1;
+            Boolean.prototype.length = 1;
+            return Array.prototype.every.call(false, callbackfn) && accessed;
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-4.js
index dc14e9db8..613a8fcd8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-4.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-4.js

- * @description Array.prototype.every applied to Boolean object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-5.js
index 648f52179..c829b43a1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-5.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-5.js

- * @description Array.prototype.every applied to number primitive

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-            return Array.prototype.every.call(2.5, callbackfn) && accessed;

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+            return Array.prototype.every.call(2.5, callbackfn) && accessed;
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-6.js
index e65991479..c1953f325 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-6.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-6.js

- * @description Array.prototype.every applied to Number object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-7.js
index 12f4f13a6..e9b4d4f26 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-7.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-7.js

- * @description Array.prototype.every applied to string primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof String);

-        }

-

-        return !Array.prototype.every.call("hello\nworld\\!", callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof String);
+        }
+
+        return !Array.prototype.every.call("hello\nworld\\!", callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-8.js
index a9bc6bbd6..944855916 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-8.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-8.js

- * @description Array.prototype.every applied to String object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof String);

-        }

-

-        var obj = new String("hello\nworld\\!");

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof String);
+        }
+
+        var obj = new String("hello\nworld\\!");
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-9.js
index af993b24a..9cc026398 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-9.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-1-9.js

- * @description Array.prototype.every applied to Function object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return !(obj instanceof Function);

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return !(obj instanceof Function);
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-1.js
index 96ba5b09b..98ef528a4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-1.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own data property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-10.js
index fb95486d0..c9e27c72a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-10.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-10.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { };

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { };
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-11.js
index b732044af..f4991c5f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-11.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-11.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 9,

-            1: 8

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 9,
+            1: 8
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-12.js
index b3e31392f..4b22b637c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-12.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-12.js

- * @description Array.prototype.every - 'length' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 9, 1: 8 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return Array.prototype.every.call(obj, callbackfn) && !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is own accessor property without
+    a get function that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 9, 1: 8 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return Array.prototype.every.call(obj, callbackfn) && !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-13.js
index ca6752a87..4c78b752b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-13.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-13.js

- * @description Array.prototype.every applied to the Array-like object that 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 9;

-        child[1] = 8;

-

-        return Array.prototype.every.call(child, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to the Array-like object that
+    'length' is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 9;
+        child[1] = 8;
+
+        return Array.prototype.every.call(child, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-14.js
index 00440e9d9..d8fc9301c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-14.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-14.js

- * @description Array.prototype.every applied to the Array-like object that 'length' property doesn't exist

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to the Array-like object that
+    'length' property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-15.js
index 88302b28b..286f53854 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-15.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-15.js

- * @description Array.prototype.every - 'length' is property of the global object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            return Array.prototype.every.call(fnGlobalObject(), callbackfn1) &&

-                !Array.prototype.every.call(fnGlobalObject(), callbackfn2);

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            return Array.prototype.every.call(fnGlobalObject(), callbackfn1) &&
+                !Array.prototype.every.call(fnGlobalObject(), callbackfn2);
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-17.js
index 14335ecc4..fcdcacdb2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-17.js

- * @description Array.prototype.every applied to the Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var func = function (a, b) {

-            arguments[2] = 9;

-            return Array.prototype.every.call(arguments, callbackfn1) &&

-                !Array.prototype.every.call(arguments, callbackfn2);

-        };

-

-        return func(12, 11);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to the Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var func = function (a, b) {
+            arguments[2] = 9;
+            return Array.prototype.every.call(arguments, callbackfn1) &&
+                !Array.prototype.every.call(arguments, callbackfn2);
+        };
+
+        return func(12, 11);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-18.js
index 467d05ef2..f082bec1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-18.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-18.js

- * @description Array.prototype.every applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return parseInt(val, 10) > 1;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return parseInt(val, 10) > 2;

-        }

-

-        var str = new String("432");

-        try {

-            String.prototype[3] = "1";

-            return Array.prototype.every.call(str, callbackfn1) &&

-            !Array.prototype.every.call(str, callbackfn2);

-        } finally {

-            delete String.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return parseInt(val, 10) > 1;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return parseInt(val, 10) > 2;
+        }
+
+        var str = new String("432");
+        try {
+            String.prototype[3] = "1";
+            return Array.prototype.every.call(str, callbackfn1) &&
+            !Array.prototype.every.call(str, callbackfn2);
+        } finally {
+            delete String.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-19.js
index 78513f58a..b3cfb7463 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-19.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-19.js

- * @description Array.prototype.every applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        return Array.prototype.every.call(fun, callbackfn1) &&

-            !Array.prototype.every.call(fun, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Function object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        return Array.prototype.every.call(fun, callbackfn1) &&
+            !Array.prototype.every.call(fun, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-2.js
index ec89f5c37..7f0a7c880 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-2.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-2.js

- * @description Array.prototype.every - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            Array.prototype[2] = 9;

-

-            return [12, 11].every(callbackfn1) &&

-                ![12, 11].every(callbackfn2);

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            Array.prototype[2] = 9;
+
+            return [12, 11].every(callbackfn1) &&
+                ![12, 11].every(callbackfn2);
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-3.js
index 58e7cbd38..040ce29a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-3.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-3.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own data property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-4.js
index 094f388cc..d058f5122 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-4.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-4.js

- * @description Array.prototype.every - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        var arrProtoLen = 0;

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            Array.prototype[2] = 9;

-

-            return [12, 11].every(callbackfn1) &&

-                ![12, 11].every(callbackfn2);

-        } finally {

-            Array.prototype.length = arrProtoLen;

-            delete Array.prototype[2];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrProtoLen = 0;
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            Array.prototype[2] = 9;
+
+            return [12, 11].every(callbackfn1) &&
+                ![12, 11].every(callbackfn2);
+        } finally {
+            Array.prototype.length = arrProtoLen;
+            delete Array.prototype[2];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-5.js
index fb1ccb7d1..808cfa431 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-5.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-5.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { };

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own data property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { };
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-6.js
index f865dbc61..a277f1a56 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-6.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-6.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-7.js
index 8f96e425b..05995a52c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-7.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-7.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-8.js
index cc1374c6c..35e517721 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-8.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-8.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own accessor property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-9.js
index 0bcdd9417..b4881d344 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-9.js
@@ -1,49 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-2-9.js

- * @description Array.prototype.every applied to Array-like object, 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.every.call(child, callbackfn1) &&

-            !Array.prototype.every.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every applied to Array-like object, 'length' is an
+    own accessor property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.every.call(child, callbackfn1) &&
+            !Array.prototype.every.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-1.js
index e7602a359..968d6691e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-1.js

- * @description Array.prototype.every - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: undefined };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: undefined };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-10.js
index bc14649dc..5d884112e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-10.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-10.js

- * @description Array.prototype.every - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a number (value is
+    NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-11.js
index b720970d9..f91c56d01 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-11.js

- * @description Array.prototype.every - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing a positive
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-12.js
index 9eac9bcf9..a9f197522 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-12.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-12.js

- * @description Array.prototype.every - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 11, 1: 12, 2: 9, length: "-4294967294" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing a negative
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 11, 1: 12, 2: 9, length: "-4294967294" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-13.js
index eb93388d0..e7f1b12c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-13.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-13.js

- * @description Array.prototype.every - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2.5" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing a decimal
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2.5" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-14.js
index 4466ce736..444b578ba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-14.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-14.js

- * @description Array.prototype.every - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var objOne = { 0: 9, length: "Infinity" };

-        var objTwo = { 0: 9, length: "+Infinity" };

-        var objThree = { 0: 9, length: "-Infinity" };

-

-        return Array.prototype.every.call(objOne, callbackfn) &&

-            Array.prototype.every.call(objTwo, callbackfn) &&

-            Array.prototype.every.call(objThree, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - 'length' is a string containing +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var objOne = { 0: 9, length: "Infinity" };
+        var objTwo = { 0: 9, length: "+Infinity" };
+        var objThree = { 0: 9, length: "-Infinity" };
+
+        return Array.prototype.every.call(objOne, callbackfn) &&
+            Array.prototype.every.call(objTwo, callbackfn) &&
+            Array.prototype.every.call(objThree, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-15.js
index 39691c69d..20961772b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-15.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-15.js

- * @description Array.prototype.every - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2E0" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2E0" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-16.js
index dd5d83a60..a2b0068fd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-16.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-16.js

- * @description Array.prototype.every - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "0x0002" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing a hex
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "0x0002" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-17.js
index 5ffbd5764..b5dc5515a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-17.js

- * @description Array.prototype.every - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "0002.00" };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "0002.00" };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-18.js
index ea4e188b8..256b08cf1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-18.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-18.js

- * @description Array.prototype.every - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, 1: 8, length: "two" };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, 1: 8, length: "two" };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-19.js
index 2d802f9c4..c82d31476 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-19.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-19.js

- * @description Array.prototype.every - value of 'length' is an Object which has an own toString method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var toStringAccessed = false;

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2) && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is an Object which has
+    an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var toStringAccessed = false;
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2) && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-2.js
index 182e4fcc6..c43686d26 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-2.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-2.js

- * @description Array.prototype.every on an Array-like object if 'length' is 1 (length overridden to true(type conversion))

- */

-

-

-function testcase() {

-

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 11, 1: 9, length: true };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every on an Array-like object if 'length' is 1
+    (length overridden to true(type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 11, 1: 9, length: true };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-20.js
index 8561a55f5..6d06fdde5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-20.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-20.js

- * @description Array.prototype.every - value of 'length' is an Object which has an own valueOf method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return 2;

-                }

-            }

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2) && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is an Object which has
+    an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return 2;
+                }
+            }
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2) && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-21.js
index d1584c989..50c761468 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-21.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-21.js

- * @description Array.prototype.every - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2) &&

-            valueOfAccessed && 

-            toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2) &&
+            valueOfAccessed && 
+            toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-22.js
index 89125fc38..9a33b5afd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-22.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-22.js

- * @description Array.prototype.every throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var callbackfnAccessed = false;

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        function callbackfn(val, idx, obj) {

-            callbackfnAccessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12,

-

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.every.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !callbackfnAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every throws TypeError exception when 'length' is
+    an object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var callbackfnAccessed = false;
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        function callbackfn(val, idx, obj) {
+            callbackfnAccessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12,
+
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.every.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !callbackfnAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-23.js
index ecbd5f7fb..b7796d2f9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-23.js
@@ -1,53 +1,55 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-23.js

- * @description Array.prototype.every uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: child

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2) &&

-            valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every uses inherited valueOf method when 'length'
+    is an object with an own toString and inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: child
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2) &&
+            valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-24.js
index af70d8aef..298737d08 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-24.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-24.js

- * @description Array.prototype.every - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: 2.685 };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: 2.685 };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-25.js
index 456513fc6..ce15741fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-25.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-25.js

- * @description Array.prototype.every - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: -4294967294.5

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: -4294967294.5
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-28.js
index bda837ad7..85695a655 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-28.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-28.js

- * @description Array.prototype.every - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - value of 'length' is boundary value (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-29.js
index 38e4125c0..e104ce1f5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-29.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-29.js

- * @description Array.prototype.every - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is boundary value (2^32
+    + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-3.js
index f8b8d670f..f14dd0efd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-3.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-3.js

- * @description Array.prototype.every - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: 0 };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - value of 'length' is a number (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: 0 };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-4.js
index 1e38fee96..a12ca6d63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-4.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-4.js

- * @description Array.prototype.every - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: +0 };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - value of 'length' is a number (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: +0 };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-5.js
index ec1f85f0b..f263a017a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-5.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-5.js

- * @description Array.prototype.every - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: -0 };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - value of 'length' is a number (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: -0 };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-6.js
index a6b3529cf..2b6d764df 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-6.js

- * @description Array.prototype.every - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: 2 };

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: 2 };
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-7.js
index fb37633ff..74728cf20 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-7.js

- * @description Array.prototype.every - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: -4294967294 }; //length used to exec while loop is 2

-

-        return Array.prototype.every.call(obj, callbackfn1) &&

-            !Array.prototype.every.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: -4294967294 }; //length used to exec while loop is 2
+
+        return Array.prototype.every.call(obj, callbackfn1) &&
+            !Array.prototype.every.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-8.js
index 3bd8e4e07..b5be34af1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-8.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-8.js

- * @description Array.prototype.every - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-9.js
index c55c0ba9c..1a3587445 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-9.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-3-9.js

- * @description Array.prototype.every - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-1.js
index 6a4b59793..c5963a3a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-1.js

- * @description Array.prototype.every throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-10.js
index 90914dacb..6632f72c3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-10.js

- * @description Array.prototype.every - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-11.js
index 6c3ab2f11..1c6d19781 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-11.js

- * @description Array.prototype.every - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-12.js
index ce9f3f2b4..756292798 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-12.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-12.js

- * @description Array.prototype.every - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        return ![11, 9].every(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        return ![11, 9].every(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-15.js
index 6dd27eb72..4353ef39d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-15.js

- * @description Array.prototype.every - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - calling with no callbackfn is the same as
+    passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-3.js
index 25a7528e2..ddb53db12 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-3.js

- * @description Array.prototype.every throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-4.js
index 3aff4785f..a8f1203b5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-4.js

- * @description Array.prototype.every throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-5.js
index df3bae0ee..a479db9a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-5.js

- * @description Array.prototype.every throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-6.js
index e6d43f384..c33a3f928 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-6.js

- * @description Array.prototype.every throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-7.js
index 5985e97fa..d4d44966c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-7.js

- * @description Array.prototype.every throws TypeError if callbackfn is Object without a Call internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.every( {} );    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every throws TypeError if callbackfn is Object
+    without a Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.every( {} );    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-8.js
index 29eba260b..5b3c7e790 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-8.js

- * @description Array.prototype.every - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-9.js
index 636b911e9..02f097d49 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-4-9.js

- * @description Array.prototype.every - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1-s.js
index df1adeb1f..efdd8cb1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1-s.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1-s.js

- * @description Array.prototype.every - thisArg not passed to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() {

-  var innerThisCorrect = false;

-

-  function callbackfn(val, idx, obj) {

-    "use strict";

-    innerThisCorrect = this===undefined;

-    return true;

-  }

-

-  [1].every(callbackfn);

-  return innerThisCorrect;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg not passed to strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var innerThisCorrect = false;
+
+  function callbackfn(val, idx, obj) {
+    "use strict";
+    innerThisCorrect = this===undefined;
+    return true;
+  }
+
+  [1].every(callbackfn);
+  return innerThisCorrect;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1.js
index 5cce3ee95..e9e2a477b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-1.js

- * @description Array.prototype.every - thisArg not passed

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return this === fnGlobalObject();

-  }

-

-  var arr = [1];

-  if(arr.every(callbackfn) === true)

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg not passed
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return this === fnGlobalObject();
+  }
+
+  var arr = [1];
+  if(arr.every(callbackfn) === true)
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-10.js
index 4298dfbf4..4877cd10d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-10.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-10.js

- * @description Array.prototype.every - Array Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objArray = [];

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objArray;

-        }

-

-

-

-        return [11].every(callbackfn, objArray) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Array Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objArray = [];
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objArray;
+        }
+
+
+
+        return [11].every(callbackfn, objArray) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-11.js
index 0e5e3c0f5..002028f87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-11.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-11.js

- * @description Array.prototype.every - String Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objString = new String();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objString;

-        }

-

-        

-

-        return [11].every(callbackfn, objString) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - String Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objString = new String();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objString;
+        }
+
+        
+
+        return [11].every(callbackfn, objString) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-12.js
index 3b184dccc..731dcf219 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-12.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-12.js

- * @description Array.prototype.every - Boolean Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objBoolean = new Boolean();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objBoolean;

-        }

-

-       

-

-        return [11].every(callbackfn, objBoolean) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Boolean Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objBoolean = new Boolean();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objBoolean;
+        }
+
+       
+
+        return [11].every(callbackfn, objBoolean) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-13.js
index 7370d6a96..a80c35fa0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-13.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-13.js

- * @description Array.prototype.every - Number Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objNumber = new Number();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objNumber;

-        }

-

-        return [11].every(callbackfn, objNumber) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Number Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objNumber = new Number();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objNumber;
+        }
+
+        return [11].every(callbackfn, objNumber) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-14.js
index f48991697..3890656e2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-14.js

- * @description Array.prototype.every - the Math object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === Math;

-        }

-

-        return [11].every(callbackfn, Math) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - the Math object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === Math;
+        }
+
+        return [11].every(callbackfn, Math) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-15.js
index 2dcd9b45c..8a30c4950 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-15.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-15.js

- * @description Array.prototype.every - Date Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objDate = new Date();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objDate;

-        }

-

-        return [11].every(callbackfn, objDate) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Date Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objDate = new Date();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objDate;
+        }
+
+        return [11].every(callbackfn, objDate) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-16.js
index 278548936..2beada29f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-16.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-16.js

- * @description Array.prototype.every - RegExp Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objRegExp = new RegExp();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objRegExp;

-        }

-

-        return [11].every(callbackfn, objRegExp) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - RegExp Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objRegExp = new RegExp();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objRegExp;
+        }
+
+        return [11].every(callbackfn, objRegExp) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-17.js
index da9862f3e..87d43527f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-17.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-17.js

- * @description Array.prototype.every - the JSON object can be used as thisArg

- */

-

-

-function testcase() {

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === JSON;

-        }

-

-        return [11].every(callbackfn, JSON) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - the JSON object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === JSON;
+        }
+
+        return [11].every(callbackfn, JSON) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-18.js
index 9d52c1573..6777994a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-18.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-18.js

- * @description Array.prototype.every - Error Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objError = new RangeError();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objError;

-        }

-

-        return [11].every(callbackfn, objError) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Error Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objError = new RangeError();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objError;
+        }
+
+        return [11].every(callbackfn, objError) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-19.js
index cea453384..8337b3ede 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-19.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-19.js

- * @description Array.prototype.every - the Arguments object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arg;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === arg;

-        }

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        return [11].every(callbackfn, arg) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - the Arguments object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arg;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === arg;
+        }
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        return [11].every(callbackfn, arg) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-2.js
index 5981dcbe8..626d394e9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-2.js

- * @description Array.prototype.every - thisArg is Object

- */

-

-

-function testcase() {

-  var res = false;

-  var o = new Object();

-  o.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var arr = [1];

-  if(arr.every(callbackfn, o) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg is Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var o = new Object();
+  o.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var arr = [1];
+  if(arr.every(callbackfn, o) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-21.js
index e9c971545..4e7449d1e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-21.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-21.js

- * @description Array.prototype.every - the global object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === fnGlobalObject();

-        }

-

-        return [11].every(callbackfn, fnGlobalObject()) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - the global object can be used as thisArg
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === fnGlobalObject();
+        }
+
+        return [11].every(callbackfn, fnGlobalObject()) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-22.js
index 3023de2de..e5c55e624 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-22.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-22.js

- * @description Array.prototype.every - boolean primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === false;

-        }

-

-        return [11].every(callbackfn, false) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - boolean primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === false;
+        }
+
+        return [11].every(callbackfn, false) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-23.js
index 664f4fb37..93f4c3705 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-23.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-23.js

- * @description Array.prototype.every - number primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === 101;

-        }

-

-        return [11].every(callbackfn, 101) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - number primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === 101;
+        }
+
+        return [11].every(callbackfn, 101) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-24.js
index 064e13a33..dcd423baa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-24.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-24.js

- * @description Array.prototype.every - string primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === "abc";

-        }

-

-        return [11].every(callbackfn, "abc") && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - string primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === "abc";
+        }
+
+        return [11].every(callbackfn, "abc") && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-3.js
index 3a323cc90..8cf9125c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-3.js

- * @description Array.prototype.every - thisArg is Array

- */

-

-

-function testcase() {

-  var res = false;

-  var a = new Array();

-  a.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var arr = [1];

-

-  if(arr.every(callbackfn, a) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg is Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var a = new Array();
+  a.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var arr = [1];
+
+  if(arr.every(callbackfn, a) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-4.js
index 7031d0385..d7670dd75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-4.js

- * @description Array.prototype.every - thisArg is object from object template(prototype)

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-  

-  function foo(){}

-  foo.prototype.res = true;

-  var f = new foo();

-  var arr = [1];

-

-    if(arr.every(callbackfn,f) === true)

-      return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - thisArg is object from object
+    template(prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+  
+  function foo(){}
+  foo.prototype.res = true;
+  var f = new foo();
+  var arr = [1];
+
+    if(arr.every(callbackfn,f) === true)
+      return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-5.js
index 69db13081..0430114f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-5.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-5.js

- * @description Array.prototype.every - thisArg is object from object template

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  var f = new foo();

-  f.res = true;

-  var arr = [1];

-

-  if(arr.every(callbackfn,f) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg is object from object template
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  var f = new foo();
+  f.res = true;
+  var arr = [1];
+
+  if(arr.every(callbackfn,f) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-6.js
index af19433d2..3e9510e2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-6.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-6.js

- * @description Array.prototype.every - thisArg is function

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  foo.res = true;

-  var arr = [1];

-

-  if(arr.every(callbackfn,foo) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - thisArg is function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  foo.res = true;
+  var arr = [1];
+
+  if(arr.every(callbackfn,foo) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-7.js
index eafa339a9..7743baf61 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-7.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-7.js

- * @description Array.prototype.every - built-in functions can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === eval;

-        }

-

-        return [11].every(callbackfn, eval) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - built-in functions can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === eval;
+        }
+
+        return [11].every(callbackfn, eval) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-9.js
index aff4cbc2d..e448aa3f3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-9.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-5-9.js

- * @description Array.prototype.every - Function Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objFunction = function () { };

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objFunction;

-        }

-

-        return [11].every(callbackfn, objFunction) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - Function Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objFunction = function () { };
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objFunction;
+        }
+
+        return [11].every(callbackfn, objFunction) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-1.js
index 722bb54e6..3232abf17 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-1.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-1.js

- * @description Array.prototype.every considers new elements added to array after the call

- */

-

-

-function testcase() { 

- 

-  var calledForThree = false;

-

-  function callbackfn(val, Idx, obj)

-  {

-    arr[2] = 3;

-    if(val == 3)

-      calledForThree = true;

-    return true;

-  }

-

-  var arr = [1,2,,4,5];

-  

-  var res = arr.every(callbackfn);

-

-  return calledForThree; 

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every considers new elements added to array after
+    the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var calledForThree = false;
+
+  function callbackfn(val, Idx, obj)
+  {
+    arr[2] = 3;
+    if(val == 3)
+      calledForThree = true;
+    return true;
+  }
+
+  var arr = [1,2,,4,5];
+  
+  var res = arr.every(callbackfn);
+
+  return calledForThree; 
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-2.js
index 88ea60e71..e3f331144 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-2.js

- * @description Array.prototype.every considers new value of elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    arr[4] = 6;

-    if(val < 6)

-       return true;

-    else 

-       return false;

-  }

-

-  var arr = [1,2,3,4,5];

-  

-  if(arr.every(callbackfn) === false)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every considers new value of elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    arr[4] = 6;
+    if(val < 6)
+       return true;
+    else 
+       return false;
+  }
+
+  var arr = [1,2,3,4,5];
+  
+  if(arr.every(callbackfn) === false)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-3.js
index 8274ba648..c19b8183f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-3.js

- * @description Array.prototype.every doesn't visit deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    delete arr[2];

-    if(val == 3)

-       return false;

-    else 

-       return true;

-  }

-

-  var arr = [1,2,3,4,5];

-  

-  if(arr.every(callbackfn) === true)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every doesn't visit deleted elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    delete arr[2];
+    if(val == 3)
+       return false;
+    else 
+       return true;
+  }
+
+  var arr = [1,2,3,4,5];
+  
+  if(arr.every(callbackfn) === true)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-4.js
index 7d1be54ae..01ec382dd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-4.js

- * @description Array.prototype.every doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    arr.length = 3;

-    if(val < 4)

-       return true;

-    else 

-       return false;

-  }

-

-  var arr = [1,2,3,4,6];

-  

-  if(arr.every(callbackfn) === true)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    arr.length = 3;
+    if(val < 4)
+       return true;
+    else 
+       return false;
+  }
+
+  var arr = [1,2,3,4,6];
+  
+  if(arr.every(callbackfn) === true)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-5.js
index 903505af0..de2fa5bfc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-5.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-5.js

- * @description Array.prototype.every doesn't consider newly added elements in sparse array

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    arr[1000] = 3;

-    if(val < 3)

-       return true;

-    else 

-       return false;

-  }

-

-  var arr = new Array(10);

-  arr[1] = 1;

-  arr[2] = 2;

-  

-  if(arr.every(callbackfn) === true)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every doesn't consider newly added elements in
+    sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    arr[1000] = 3;
+    if(val < 3)
+       return true;
+    else 
+       return false;
+  }
+
+  var arr = new Array(10);
+  arr[1] = 1;
+  arr[2] = 2;
+  
+  if(arr.every(callbackfn) === true)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-6.js
index 7bafd4c2b..25444a6f0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-6.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-6.js

- * @description Array.prototype.every visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    delete arr[2];

-    if(val == 3)

-       return false;

-    else 

-       return true;

-  }

-

-  Array.prototype[2] = 3;

-  var arr = [1,2,3,4,5];

-  

-  var res = arr.every(callbackfn);

-  delete Array.prototype[2];

-

-  if(res === false)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every visits deleted element in array after the
+    call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    delete arr[2];
+    if(val == 3)
+       return false;
+    else 
+       return true;
+  }
+
+  Array.prototype[2] = 3;
+  var arr = [1,2,3,4,5];
+  
+  var res = arr.every(callbackfn);
+  delete Array.prototype[2];
+
+  if(res === false)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-7.js
index 1c403e472..3542193ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-7.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-7.js

- * @description Array.prototype.every - Deleting the array itself within the callbackfn of Array.prototype.every is successful once Array.prototype.every is called for all elements

- */

-

-

-function testcase() {

-        var o = new Object();

-        o.arr = [1, 2, 3, 4, 5];

-

-        function callbackfn(val, Idx, obj) {

-            delete o.arr;

-            if (val === Idx + 1)

-                return true;

-            else

-                return false;

-        }

-

-        return o.arr.every(callbackfn) && !o.hasOwnProperty("arr");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - Deleting the array itself within the
+    callbackfn of Array.prototype.every is successful once
+    Array.prototype.every is called for all elements
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var o = new Object();
+        o.arr = [1, 2, 3, 4, 5];
+
+        function callbackfn(val, Idx, obj) {
+            delete o.arr;
+            if (val === Idx + 1)
+                return true;
+            else
+                return false;
+        }
+
+        return o.arr.every(callbackfn) && !o.hasOwnProperty("arr");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-8.js
index aaf68c18b..ecc851a1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-8.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-8.js

- * @description Array.prototype.every - no observable effects occur if len is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 0 };

-

-        return Array.prototype.every.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - no observable effects occur if len is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 0 };
+
+        return Array.prototype.every.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-9.js
index 1455b30a7..ed56a9840 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-9.js

- * @description Array.prototype.every - modifications to length don't change number of iterations

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val > 10;

-        }

-

-        var obj = { 1: 12, 2: 9, length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                obj.length = 3;

-                return 11;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.every.call(obj, callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - modifications to length don't change
+    number of iterations
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val > 10;
+        }
+
+        var obj = { 1: 12, 2: 9, length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                obj.length = 3;
+                return 11;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.every.call(obj, callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-1.js
index fb92d17fa..013042a04 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-1.js

- * @description Array.prototype.every - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0.;

-  function callbackfn(val, Idx, obj)

-  {

-    callCnt++;

-    return true;

-  }

-

-  var arr = new Array(10);

-  arr[1] = undefined;  

-  arr.every(callbackfn);

-  if( callCnt === 1)    

-      return true;  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn not called for indexes never
+    been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0.;
+  function callbackfn(val, Idx, obj)
+  {
+    callCnt++;
+    return true;
+  }
+
+  var arr = new Array(10);
+  arr[1] = undefined;  
+  arr.every(callbackfn);
+  if( callCnt === 1)    
+      return true;  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-10.js
index 8cea83ec4..535266d4f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-10.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-10.js

- * @description Array.prototype.every - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 1;

-        }

-        var arr = { 2: 2, length: 20 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return Array.prototype.every.call(arr, callbackfn) && accessed;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 1;
+        }
+        var arr = { 2: 2, length: 20 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return Array.prototype.every.call(arr, callbackfn) && accessed;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-11.js
index e44150268..bb17d6f2a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-11.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-11.js

- * @description Array.prototype.every - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 1;

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return arr.every(callbackfn) && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 1;
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return arr.every(callbackfn) && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-12.js
index c1ab41832..578193639 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-12.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-12.js

- * @description Array.prototype.every - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return !Array.prototype.every.call(arr, callbackfn);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return !Array.prototype.every.call(arr, callbackfn);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-13.js
index a58582ac3..2670d839c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-13.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-13.js

- * @description Array.prototype.every - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, 111, 2]; 

-        

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return !arr.every(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, 111, 2]; 
+        
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return !arr.every(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-14.js
index 0651f541c..3985c8c9a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-14.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-14.js

- * @description Array.prototype.every - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 3;

-        }

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 3;
+        }
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-15.js
index 1049ebfd8..10fa04279 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-15.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-15.js

- * @description Array.prototype.every - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            return !arr.every(callbackfn);

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - decreasing length of array with prototype
+    property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            return !arr.every(callbackfn);
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-16.js
index dee1b45e3..33b3edffe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-16.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-16.js

- * @description Array.prototype.every - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        return !arr.every(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - decreasing length of array does not delete
+    non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        return !arr.every(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-2.js
index 00e669064..ecf668636 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-2.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-2.js

- * @description Array.prototype.every - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "length") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        

-        var arr = { };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                arr[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.every.call(arr, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - added properties in step 2 are visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "length") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        
+        var arr = { };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                arr[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.every.call(arr, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-3.js
index 07c640c4e..80f1e34f9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-3.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-3.js

- * @description Array.prototype.every - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 2;

-        }

-        var arr = { 2: 6.99, 8: 19};

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                delete arr[2];

-                return 10;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.every.call(arr, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 2;
+        }
+        var arr = { 2: 6.99, 8: 19};
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                delete arr[2];
+                return 10;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.every.call(arr, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-4.js
index 65968ab56..84ff29ec2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-4.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-4.js

- * @description Array.prototype.every - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.every.call(arr, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.every.call(arr, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-5.js
index 188de1c84..25826887e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-5.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-5.js

- * @description Array.prototype.every - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return !arr.every(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return !arr.every(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-6.js
index 72c7eb821..9419040bb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-6.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-6.js

- * @description Array.prototype.every - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return !Array.prototype.every.call(arr, callbackfn);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - properties can be added to prototype after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return !Array.prototype.every.call(arr, callbackfn);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-7.js
index 70545d9c2..bd594814f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-7.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-7.js

- * @description Array.prototype.every - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return !arr.every(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - properties can be added to prototype after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return !arr.every(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-8.js
index c67bc611b..6b5ded6f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-8.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-8.js

- * @description Array.prototype.every - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 1;

-        }

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting own property causes index
+    property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 1;
+        }
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-9.js
index 1f012cd38..8da4695a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-b-9.js

- * @description Array.prototype.every - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx !== 1;

-        }

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - deleting own property causes index
+    property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx !== 1;
+        }
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-1.js
index 660529b7e..7c2762703 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-1.js

- * @description Array.prototype.every - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = { };

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val !== kValue;

-            } else {

-                return true;

-            }

-        }

-

-        var obj = { 5: kValue, length: 100 };

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = { };
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val !== kValue;
+            } else {
+                return true;
+            }
+        }
+
+        var obj = { 5: kValue, length: 100 };
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-10.js
index fa9d14d37..0292c6f80 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-10.js

- * @description Array.prototype.every - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 2) {

-                return val !== 12;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-        return !arr.every(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 2) {
+                return val !== 12;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+        return !arr.every(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-11.js
index 3ad37ec43..a17bf832a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-11.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-11.js

- * @description Array.prototype.every - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 5;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = { 0: 5, 1: 6 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 5;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = { 0: 5, 1: 6 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-12.js
index c2cb3466d..fa47fee63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-12.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-12.js

- * @description  Array.prototype.every - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 10;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [];

-        try {

-            Array.prototype[0] = 10;

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 111;

-                },

-                configurable: true

-            });

-

-            return !arr.every(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 10;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [];
+        try {
+            Array.prototype[0] = 10;
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 111;
+                },
+                configurable: true
+            });
+
+            return !arr.every(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-13.js
index 8b637ebdd..e752d5256 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-13.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-13.js

- * @description Array.prototype.every - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === 6;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 6;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === 6;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 6;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-14.js
index ddfa7b28a..1a867800a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-14.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-14.js

- * @description  Array.prototype.every - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 5;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 5;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            return !arr.every(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 5;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 5;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            return !arr.every(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-15.js
index 9eee7c204..5bd1624cb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-15.js

- * @description Array.prototype.every - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val !== 11;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 20;

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val !== 11;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 20;
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-16.js
index a0097043a..65ce450d0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-16.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-16.js

- * @description Array.prototype.every - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val !== 11;

-            } else {

-                return true;

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            return ![, , , ].every(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val !== 11;
+            } else {
+                return true;
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            return ![, , , ].every(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-17.js
index 3cd607b47..2d134f724 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-17.js

- * @description Array.prototype.every - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-18.js
index 3195af8f5..3375e306e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-18.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-18.js

- * @description Array.prototype.every - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return arr.every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return arr.every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-19.js
index 644206190..6aff66d34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-19.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-19.js

- * @description Array.prototype.every - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-        try {

-            Object.prototype[1] = 10;

-            return Array.prototype.every.call(obj, callbackfn) && accessed;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+        try {
+            Object.prototype[1] = 10;
+            return Array.prototype.every.call(obj, callbackfn) && accessed;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-2.js
index 6f1140e64..437e2a8aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-2.js

- * @description Array.prototype.every - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val === 11;

-        }

-

-        return [11].every(callbackfn) && 1 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val === 11;
+        }
+
+        return [11].every(callbackfn) && 1 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-20.js
index 8d89d32a8..d75214d6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-20.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-20.js

- * @description Array.prototype.every - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[0] = 100;

-            return arr.every(callbackfn) && accessed;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[0] = 100;
+            return arr.every(callbackfn) && accessed;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-21.js
index 7f94ab642..fdf85bd21 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-21.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-21.js

- * @description Array.prototype.every - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-

-        return Array.prototype.every.call(child, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+
+        return Array.prototype.every.call(child, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-22.js
index 9e98110ee..4eaa6f30f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-22.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-22.js

- * @description Array.prototype.every - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return typeof val === "undefined";

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            return [, ].every(callbackfn) && accessed;

-        } finally {

-            delete Array.prototype[0];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return typeof val === "undefined";
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            return [, ].every(callbackfn) && accessed;
+        } finally {
+            delete Array.prototype[0];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-23.js
index 3d95484aa..6cd3e5853 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-23.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-23.js

- * @description Array.prototype.every - This object is an global object which contains index property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val !== 11;

-            } else {

-                return true;

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 11;

-            fnGlobalObject().length = 1;

-            return !Array.prototype.every.call(fnGlobalObject(), callbackfn);

-        } finally {

-            delete fnGlobalObject()[0];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - This object is an global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val !== 11;
+            } else {
+                return true;
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 11;
+            fnGlobalObject().length = 1;
+            return !Array.prototype.every.call(fnGlobalObject(), callbackfn);
+        } finally {
+            delete fnGlobalObject()[0];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-25.js
index 270449f01..db3061f85 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-25.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-25.js

- * @description Array.prototype.every - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val === 11;

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.every.call(arguments, callbackfn);

-        };

-

-        return func(11) && called === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val === 11;
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.every.call(arguments, callbackfn);
+        };
+
+        return func(11) && called === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-26.js
index 21e7ad64c..1406634d0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-26.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-26.js

- * @description Array.prototype.every - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (idx === 0) {

-                return val === 11;

-            } else if (idx === 1) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.every.call(arguments, callbackfn);

-        };

-

-        return func(11, 9) && called === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (idx === 0) {
+                return val === 11;
+            } else if (idx === 1) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.every.call(arguments, callbackfn);
+        };
+
+        return func(11, 9) && called === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-27.js
index bd09c08df..b8771c18b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-27.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-27.js

- * @description Array.prototype.every - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (idx < 2) {

-                return val > 10;

-            } else if (idx === 2) {

-                return val < 10;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.every.call(arguments, callbackfn);

-        };

-

-        return func(11, 12, 9) && called === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (idx < 2) {
+                return val > 10;
+            } else if (idx === 2) {
+                return val < 10;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.every.call(arguments, callbackfn);
+        };
+
+        return func(11, 12, 9) && called === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-28.js
index 60c27f81d..c98a84a75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-28.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-28.js

- * @description Array.prototype.every - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 11;

-                }

-            },

-            configurable: true

-        });

-

-        return !arr.every(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 11;
+                }
+            },
+            configurable: true
+        });
+
+        return !arr.every(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-29.js
index 3028f3b38..9a29966e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-29.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-29.js

- * @description Array.prototype.every - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var preIterVisible = false;

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 13;

-                }

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element changed by getter on previous
+    iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var preIterVisible = false;
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 13;
+                }
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-3.js
index 6d9cdc899..56f479b08 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-3.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-3.js

- * @description Array.prototype.every - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === 100;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = { 0: 11, 5: 100 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[5] = "abc";

-        child.length = 10;

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === 100;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = { 0: 11, 5: 100 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[5] = "abc";
+        child.length = 10;
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-30.js
index fb56eeec1..7d82308f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-30.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-30.js

- * @description Array.prototype.every - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.every.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - unnhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.every.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-31.js
index f5dd6a982..937a030ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-31.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-31.js

- * @description Array.prototype.every - unhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var arr = [];

-        arr[5] = 10;

-        arr[10] = 100;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.every(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - unhandled exceptions happened in getter
+    terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var arr = [];
+        arr[5] = 10;
+        arr[10] = 100;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.every(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-4.js
index b499215e7..7d85d4857 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-4.js

- * @description Array.prototype.every - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        var called = 0;

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val === 12;

-        }

-

-        try {

-            Array.prototype[0] = 11;

-            Array.prototype[1] = 11;

-

-            return [12, 12].every(callbackfn) && called === 2;

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val === 12;
+        }
+
+        try {
+            Array.prototype[0] = 11;
+            Array.prototype[1] = 11;
+
+            return [12, 12].every(callbackfn) && called === 2;
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-5.js
index ef1ee6ead..d9d11b160 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-5.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-5.js

- * @description Array.prototype.every - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 5;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: 11,

-            configurable: true

-        });

-        child[1] = 12;

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 5;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: 11,
+            configurable: true
+        });
+        child[1] = 12;
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-6.js
index c0e73495f..cab4ef940 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-6.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-6.js

- * @description Array.prototype.every - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val === 11;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 9;

-                },

-                configurable: true

-            });

-            return [11].every(callbackfn) && accessed;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val === 11;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 9;
+                },
+                configurable: true
+            });
+            return [11].every(callbackfn) && accessed;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-7.js
index feaab4142..bc4dcc833 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-7.js

- * @description Array.prototype.every - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = 'abc';

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val !== kValue;

-            } else {

-                return true;

-            }

-        }

-

-        var proto = { 5: kValue };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        return !Array.prototype.every.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 'abc';
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val !== kValue;
+            } else {
+                return true;
+            }
+        }
+
+        var proto = { 5: kValue };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        return !Array.prototype.every.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-8.js
index d962e92a5..d5dc20833 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-8.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-8.js

- * @description Array.prototype.every - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val !== 13;

-            } else {

-                return true;

-            }

-        }

-

-        try {

-            Array.prototype[1] = 13;

-            return ![, , , ].every(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val !== 13;
+            } else {
+                return true;
+            }
+        }
+
+        try {
+            Array.prototype[1] = 13;
+            return ![, , , ].every(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-9.js
index f033399f9..d5f590ba8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-i-9.js

- * @description Array.prototype.every - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val !== 11;

-            } else {

-                return true;

-            }

-        }

-

-        var obj = { 10: 10, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-        

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val !== 11;
+            } else {
+                return true;
+            }
+        }
+
+        var obj = { 10: 10, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+        
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-1.js
index a085be83d..b545fb595 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-1.js

- * @description Array.prototype.every - callbackfn called with correct parameters

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    if(obj[Idx] === val)

-      return true;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.every(callbackfn) === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - callbackfn called with correct parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    if(obj[Idx] === val)
+      return true;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.every(callbackfn) === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-10.js
index 1fb1fc95e..2cb0e7019 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-10.js

- * @description Array.prototype.every - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val) {

-            called++;

-            return val > 10;

-        }

-

-        return [11, 12].every(callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn is called with 1 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val) {
+            called++;
+            return val > 10;
+        }
+
+        return [11, 12].every(callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-11.js
index 82c2a1fd4..7b415354c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-11.js

- * @description Array.prototype.every - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx) {

-            called++;

-            return val > 10 && arguments[2][idx] === val;

-        }

-

-        return [11, 12].every(callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn is called with 2 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx) {
+            called++;
+            return val > 10 && arguments[2][idx] === val;
+        }
+
+        return [11, 12].every(callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-12.js
index 362a6d1c0..ee2adf17f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-12.js

- * @description Array.prototype.every - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val > 10 && obj[idx] === val;

-        }

-

-        return [11, 12, 13].every(callbackfn) && 3 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn is called with 3 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val > 10 && obj[idx] === val;
+        }
+
+        return [11, 12, 13].every(callbackfn) && 3 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-13.js
index 9f9660e84..9dcb5194d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-13.js

- * @description Array.prototype.every - callbackfn that uses arguments object to get parameter value

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn() {

-            called++;

-            return arguments[2][arguments[1]] === arguments[0];

-        }

-

-        return [11, 12].every(callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn that uses arguments object to
+    get parameter value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn() {
+            called++;
+            return arguments[2][arguments[1]] === arguments[0];
+        }
+
+        return [11, 12].every(callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-16.js
index a7f57b31c..48d91c9e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-16.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-16.js

- * @description Array.prototype.every - 'this' of 'callbackfn' is a Boolean object when T is not an object (T is a boolean primitive)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() !== false;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return !Array.prototype.every.call(obj, callbackfn, false) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'this' of 'callbackfn' is a Boolean object
+    when T is not an object (T is a boolean primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() !== false;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return !Array.prototype.every.call(obj, callbackfn, false) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-17.js
index 72c098617..68e605b1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-17.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-17.js

- * @description Array.prototype.every -'this' of 'callbackfn' is a Number object when T is not an object (T is a number primitive)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, o) {

-            accessed = true;

-            return 5 === this.valueOf();

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return Array.prototype.every.call(obj, callbackfn, 5) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every -'this' of 'callbackfn' is a Number object
+    when T is not an object (T is a number primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, o) {
+            accessed = true;
+            return 5 === this.valueOf();
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return Array.prototype.every.call(obj, callbackfn, 5) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-18.js
index 59701ad01..b0dfad805 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-18.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-18.js

- * @description Array.prototype.every - 'this' of 'callbackfn' is an String object when T is not an object (T is a string primitive)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 'hello' === this.valueOf();

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return Array.prototype.every.call(obj, callbackfn, "hello") && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - 'this' of 'callbackfn' is an String object
+    when T is not an object (T is a string primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 'hello' === this.valueOf();
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return Array.prototype.every.call(obj, callbackfn, "hello") && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-19.js
index 018764d60..b5fc2fc36 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-19.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-19.js

- * @description Array.prototype.every - non-indexed properties are not called

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val !== 8;

-        }

-

-        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };

-

-        return Array.prototype.every.call(obj, callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - non-indexed properties are not called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val !== 8;
+        }
+
+        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };
+
+        return Array.prototype.every.call(obj, callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-2.js
index 23e61035e..6978ddf4b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-2.js

- * @description Array.prototype.every - callbackfn takes 3 arguments

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, Idx, obj)

-  {

-    if(arguments.length === 3)   //verify if callbackfn was called with 3 parameters

-       return true;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  arr[999999] = -6.6;

-  

-  if(arr.every(callbackfn) === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - callbackfn takes 3 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, Idx, obj)
+  {
+    if(arguments.length === 3)   //verify if callbackfn was called with 3 parameters
+       return true;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  arr[999999] = -6.6;
+  
+  if(arr.every(callbackfn) === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-20.js
index f60cc9c27..57674cb1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-20.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-20.js

- * @description Array.prototype.every - callbackfn called with correct parameters (thisArg is correct)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 10 === this.threshold;

-        }

-

-        var thisArg = { threshold: 10 };

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.every.call(obj, callbackfn, thisArg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn called with correct parameters
+    (thisArg is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 10 === this.threshold;
+        }
+
+        var thisArg = { threshold: 10 };
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.every.call(obj, callbackfn, thisArg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-21.js
index bff61017a..3f1dba0a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-21.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-21.js

- * @description Array.prototype.every - callbackfn called with correct parameters (kValue is correct)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 0) {

-                return val === 11;

-            }

-

-            if (idx === 1) {

-                return val === 12;

-            }

-

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn called with correct parameters
+    (kValue is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 0) {
+                return val === 11;
+            }
+
+            if (idx === 1) {
+                return val === 12;
+            }
+
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-22.js
index a2a159f83..eb90053b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-22.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-22.js

- * @description Array.prototype.every - callbackfn called with correct parameters (the index k is correct)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (val === 11) {

-                return idx === 0;

-            }

-

-            if (val === 12) {

-                return idx === 1;

-            }

-

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn called with correct parameters
+    (the index k is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (val === 11) {
+                return idx === 0;
+            }
+
+            if (val === 12) {
+                return idx === 1;
+            }
+
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-23.js
index 75393fe6f..fffa46a97 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-23.js

- * @description Array.prototype.every - callbackfn called with correct parameters (this object O is correct)

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            called++;

-            return obj === o;

-        }

-

-        return Array.prototype.every.call(obj, callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn called with correct parameters
+    (this object O is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            called++;
+            return obj === o;
+        }
+
+        return Array.prototype.every.call(obj, callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-3.js
index 1eaaa8df2..85f59f00d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-3.js

- * @description Array.prototype.every immediately returns false if callbackfn returns false

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    if(idx > 5)   

-       return false;

-    else

-       return true;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.every(callbackfn) === false && callCnt === 7) 

-    return true;

-

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every immediately returns false if callbackfn
+    returns false
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    if(idx > 5)   
+       return false;
+    else
+       return true;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.every(callbackfn) === false && callCnt === 7) 
+    return true;
+
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-4.js
index 6b69fe61b..797a850c8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-4.js

- * @description Array.prototype.every - k values are passed in ascending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = 0;

-        var called = 0;

-        function callbackfn(val, idx, o) {

-            called++;

-            if (lastIdx !== idx) {

-                return false;

-            } else {

-                lastIdx++;

-                return true;

-            }

-        }

-

-        return arr.every(callbackfn) &&  arr.length === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - k values are passed in ascending numeric
+    order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = 0;
+        var called = 0;
+        function callbackfn(val, idx, o) {
+            called++;
+            if (lastIdx !== idx) {
+                return false;
+            } else {
+                lastIdx++;
+                return true;
+            }
+        }
+
+        return arr.every(callbackfn) &&  arr.length === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-5.js
index b99d6490e..8d4f5548a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-5.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-5.js

- * @description Array.prototype.every - k values are accessed during each iteration and not prior to starting the loop on an Array

- */

-

-

-function testcase() {

-        var called = 0;

-        var kIndex = [];

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            called++;

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {

-                    return false;

-                }

-                kIndex[idx] = 1;

-                return true;

-            } else {

-                return false;

-            }

-        }

-

-        return [11, 12, 13, 14].every(callbackfn, undefined) && 4 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - k values are accessed during each
+    iteration and not prior to starting the loop on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        var kIndex = [];
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            called++;
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {
+                    return false;
+                }
+                kIndex[idx] = 1;
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        return [11, 12, 13, 14].every(callbackfn, undefined) && 4 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-6.js
index 0158c684b..972eade1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-6.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-6.js

- * @description Array.prototype.every - arguments to callbackfn are self consistent

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var thisArg = {};

-        var obj = { 0: 11, length: 1 };

-

-        function callbackfn() {

-            accessed = true;

-            return this === thisArg &&

-                arguments[0] === 11 &&

-                arguments[1] === 0 &&

-                arguments[2] === obj;

-        }

-

-        return Array.prototype.every.call(obj, callbackfn, thisArg) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - arguments to callbackfn are self consistent
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var thisArg = {};
+        var obj = { 0: 11, length: 1 };
+
+        function callbackfn() {
+            accessed = true;
+            return this === thisArg &&
+                arguments[0] === 11 &&
+                arguments[1] === 0 &&
+                arguments[2] === obj;
+        }
+
+        return Array.prototype.every.call(obj, callbackfn, thisArg) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-7.js
index 8c1ded32c..371dd71d8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-7.js

- * @description Array.prototype.every - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (called === 1) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-            return true;

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.every.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return 1 === called;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - unhandled exceptions happened in
+    callbackfn terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (called === 1) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+            return true;
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.every.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return 1 === called;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-8.js
index 3b8d9a007..ee5e1eec5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-8.js

- * @description Array.prototype.every - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            if (idx === 0) {

-                obj[idx + 1] = 8;

-            }

-            return val > 10;

-        }

-

-       

-

-        return !Array.prototype.every.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - element changed by callbackfn on previous
+    iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            if (idx === 0) {
+                obj[idx + 1] = 8;
+            }
+            return val > 10;
+        }
+
+       
+
+        return !Array.prototype.every.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-9.js
index ae260680c..029d4f67c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-ii-9.js

- * @description Array.prototype.every - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn() {

-            called++;

-            return true;

-        }

-

-        return [11, 12].every(callbackfn) && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - callbackfn is called with 0 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn() {
+            called++;
+            return true;
+        }
+
+        return [11, 12].every(callbackfn) && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-1.js
index f7b5079a4..02ead71e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-1.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-1.js

- * @description Array.prototype.every - return value of callbackfn is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { 0: 11, length: 1 };

-

-        function callbackfn(val, idx, o) {

-            accessed = true;

-            return undefined;

-        }

-

-        

-

-        return !Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - return value of callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { 0: 11, length: 1 };
+
+        function callbackfn(val, idx, o) {
+            accessed = true;
+            return undefined;
+        }
+
+        
+
+        return !Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-10.js
index 40a7eea0a..4b93016d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-10.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return Infinity;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return Infinity;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-11.js
index 5d04caf7a..7b8d3c767 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-11.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return -Infinity;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return -Infinity;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-12.js
index 89c350f60..5a897af02 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-12.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return NaN;

-        }

-

-        return ![11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return NaN;
+        }
+
+        return ![11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-13.js
index eee43dc78..65900c1bd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-13.js

- * @description Array.prototype.every - return value of callbackfn is an empty string

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return "";

-        }

-

-        return ![11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is an empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return "";
+        }
+
+        return ![11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-14.js
index d0953adb8..101ac9e53 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-14.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-14.js

- * @description Array.prototype.every - return value of callbackfn is a non-empty string

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return "non-empty string";

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a non-empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return "non-empty string";
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-15.js
index 88ef24589..462bfa941 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-15.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-15.js

- * @description Array.prototype.every - return value of callbackfn is a Function object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return function () { };

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a Function
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return function () { };
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-16.js
index 94db56a59..a1caf9a85 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-16.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-16.js

- * @description Array.prototype.every - return value of callbackfn is an Array object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return [];

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is an Array
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return [];
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-17.js
index a8be539fb..29070b931 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-17.js

- * @description Array.prototype.every - return value of callbackfn is a String object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new String();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a String
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new String();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-18.js
index 6a5f5a26e..0c20c1b6a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-18.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-18.js

- * @description Array.prototype.every - return value of callbackfn is a Boolean object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new Boolean();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a Boolean
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new Boolean();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-19.js
index 9213835e1..055b785df 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-19.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-19.js

- * @description Array.prototype.every - return value of callbackfn is a Number object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new Number();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a Number
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new Number();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-2.js
index 295a48a19..1d6e67569 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-2.js

- * @description Array.prototype.every - return value of callbackfn is null

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { 0: 11, length: 1 };

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return null;

-        }

-

-        

-

-        return !Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - return value of callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { 0: 11, length: 1 };
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return null;
+        }
+
+        
+
+        return !Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-20.js
index d6be359d9..effd05dc1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-20.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-20.js

- * @description Array.prototype.every - return value of callbackfn is the Math object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return Math;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is the Math
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return Math;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-21.js
index 2a2de745c..e8dd6fbb3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-21.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-21.js

- * @description Array.prototype.every - return value of callbackfn is a Date object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new Date();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - return value of callbackfn is a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new Date();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-22.js
index 32ecf03de..e4157dde3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-22.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-22.js

- * @description Array.prototype.every - return value of callbackfn is a RegExp object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new RegExp();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a RegExp
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new RegExp();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-23.js
index a516b0328..165a4dadc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-23.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-23.js

- * @description Array.prototype.every - return value of callbackfn is the JSON object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return JSON;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is the JSON
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return JSON;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-24.js
index e156f91fd..9b84510a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-24.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-24.js

- * @description Array.prototype.every - return value of callbackfn is an Error object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new EvalError();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is an Error
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new EvalError();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-25.js
index 989d2540c..f2c64d37f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-25.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-25.js

- * @description Array.prototype.every - return value of callbackfn is the Arguments object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return arguments;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is the
+    Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return arguments;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-27.js
index be454f6e1..a554c0ec4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-27.js
@@ -1,23 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-27.js

- * @description Array.prototype.every - return value of callbackfn is the global object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return fnGlobalObject();

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return fnGlobalObject();
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-28.js
index 4fb9b1fee..59fbea2ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-28.js
@@ -1,48 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-28.js

- * @description Array.prototype.every - false prevents further side effects

- */

-

-

-function testcase() {

-

-        var result = false;

-        var obj = { length: 20 };

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                result = true;

-            }

-            return val > 10;

-        }

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 8;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                result = true;

-                return 8;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.every.call(obj, callbackfn) && !result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - false prevents further side effects
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var obj = { length: 20 };
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                result = true;
+            }
+            return val > 10;
+        }
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 8;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                result = true;
+                return 8;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.every.call(obj, callbackfn) && !result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-29.js
index 36b1cd4f0..38e388951 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-29.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-29.js

- * @description Array.prototype.every - return value (new Boolean(false)) of callbackfn is treated as true value

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return new Boolean(false);

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value (new Boolean(false)) of
+    callbackfn is treated as true value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return new Boolean(false);
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-3.js
index 1edc288b3..2933078dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-3.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-3.js

- * @description Array.prototype.every - return value of callbackfn is a boolean (value is false)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { 0: 11, length: 1 };

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return false;

-        }

-

-        return !Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a boolean
+    (value is false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { 0: 11, length: 1 };
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return false;
+        }
+
+        return !Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-4.js
index 943362a47..8ec67ac3d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-4.js

- * @description Array.prototype.every - return value of callbackfn is a boolean (value is true)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { 0: 11, length: 1 };

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-       

-

-        return Array.prototype.every.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a boolean
+    (value is true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { 0: 11, length: 1 };
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+       
+
+        return Array.prototype.every.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-5.js
index e4c77b8c2..8e4539913 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-5.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 0;

-        }

-

-        return ![11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 0;
+        }
+
+        return ![11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-6.js
index a37260d98..349cc7697 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-6.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return +0;

-        }

-

-        return ![11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return +0;
+        }
+
+        return ![11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-7.js
index df841893b..37316f5e0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-7.js

- * @description Array.prototype.every - return value of callbackfn is a nunmber (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return -0;

-        }

-

-        return ![11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a nunmber
+    (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return -0;
+        }
+
+        return ![11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-8.js
index 57ad28781..de08ade80 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-8.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is positive number)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 5;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 5;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-9.js
index 744edc241..315101f0e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-7-c-iii-9.js

- * @description Array.prototype.every - return value of callbackfn is a number (value is negative number)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return -5;

-        }

-

-        return [11].every(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every - return value of callbackfn is a number
+    (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return -5;
+        }
+
+        return [11].every(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-1.js
index d04bd3cbb..a49427b64 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-1.js

- * @description Array.prototype.every returns true if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  function cb() {}

-  var i = [].every(cb);

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every returns true if 'length' is 0 (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb() {}
+  var i = [].every(cb);
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-10.js
index 5d3f8df5d..3fbfe39c2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-10.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-10.js

- * @description Array.prototype.every - subclassed array when length is reduced

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 2;

-  

-  function cb(val)

-  {

-    if(val>2)

-      return false;

-    else

-      return true;    

-  }

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every - subclassed array when length is reduced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 2;
+  
+  function cb(val)
+  {
+    if(val>2)
+      return false;
+    else
+      return true;    
+  }
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-11.js
index 27a88b17c..90ec00600 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-11.js

- * @description Array.prototype.every returns true when all calls to callbackfn return true

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return true;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.every(callbackfn) === true && callCnt === 10) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true when all calls to callbackfn
+    return true
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return true;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.every(callbackfn) === true && callCnt === 10) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-12.js
index d83f22e68..335e7fb23 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-12.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-12.js

- * @description Array.prototype.every doesn't mutate the array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return true;

-  }

-  var arr = [1,2,3,4,5];

-  arr.every(callbackfn);

-  if(arr[0] === 1 &&

-     arr[1] === 2 &&

-     arr[2] === 3 &&

-     arr[3] === 4 &&

-     arr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every doesn't mutate the array on which it is
+    called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return true;
+  }
+  var arr = [1,2,3,4,5];
+  arr.every(callbackfn);
+  if(arr[0] === 1 &&
+     arr[1] === 2 &&
+     arr[2] === 3 &&
+     arr[3] === 4 &&
+     arr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-13.js
index 3b2738f8d..57b1d20ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-13.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-13.js

- * @description Array.prototype.every doesn't visit expandos

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return true;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  arr["i"] = 10;

-  arr[true] = 11;

-  

-  if(arr.every(callbackfn) === true && callCnt === 10) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.every doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return true;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  arr["i"] = 10;
+  arr[true] = 11;
+  
+  if(arr.every(callbackfn) === true && callCnt === 10) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-2.js
index e280084ba..0ca358c66 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-2.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-3.js
index d8cb6c054..b4cc44f8e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-3.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-4.js
index bafe6b314..0a1ca42fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-4.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-5.js
index 90c138c76..ff8c3bae9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-5.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-6.js
index 5f6eedc05..be8d35940 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-6.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-7.js
index 4ac9c094b..72e78d7b0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-7.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-7.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden with obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-8.js
index a7b560b47..9b4e20618 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-8.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.16/15.4.4.16-8-8.js

- * @description Array.prototype.every returns true if 'length' is 0 (subclassed Array, length overridden with []

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  var i = f.every(cb);

-  

-  if (i === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.every returns true if 'length' is 0 (subclassed
+    Array, length overridden with []
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  var i = f.every(cb);
+  
+  if (i === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-1.js
index d5cfd8392..9966e7679 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-1.js

- * @description Array.prototype.some must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.some;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.some;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-2.js
index 7dd7cbd4c..4cbbc2d26 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-0-2.js

- * @description Array.prototype.some.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.some.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.some.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-1.js
index 386fdaa9d..47167fcc2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-1.js

- * @description Array.prototype.some applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.some.call(undefined);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.some.call(undefined);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-10.js
index f255d37a1..1158857a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-10.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-10.js

- * @description Array.prototype.some applied to the Math object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return '[object Math]' === Object.prototype.toString.call(obj);

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            return Array.prototype.some.call(Math, callbackfn);

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return '[object Math]' === Object.prototype.toString.call(obj);
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            return Array.prototype.some.call(Math, callbackfn);
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-11.js
index 37d08eed8..3197786c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-11.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-11.js

- * @description Array.prototype.some applied to Date object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Date;

-        }

-

-        var obj = new Date();

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Date;
+        }
+
+        var obj = new Date();
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-12.js
index dc8e9aafc..77bdd2877 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-12.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-12.js

- * @description Array.prototype.some applied to RegExp object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof RegExp;

-        }

-

-        var obj = new RegExp();

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof RegExp;
+        }
+
+        var obj = new RegExp();
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-13.js
index 8f06254c2..bc463a575 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-13.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-13.js

- * @description Array.prototype.some applied to the JSON object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return '[object JSON]' === Object.prototype.toString.call(obj);

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            return Array.prototype.some.call(JSON, callbackfn);

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return '[object JSON]' === Object.prototype.toString.call(obj);
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            return Array.prototype.some.call(JSON, callbackfn);
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-14.js
index 8adadc150..587b63240 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-14.js

- * @description Array.prototype.some applied to Error object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Error;

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Error;
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-15.js
index 8edabbce6..d0ef01941 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-15.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-15.js

- * @description Array.prototype.some applied to the Arguments object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return '[object Arguments]' === Object.prototype.toString.call(obj);

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return '[object Arguments]' === Object.prototype.toString.call(obj);
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-2.js
index b9b6ace52..ec05433aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-2.js

- * @description Array.prototype.some applied to null throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.some.call(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.some.call(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-3.js
index 464db23a4..270bc1424 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-3.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-3.js

- * @description Array.prototype.some applied to boolean primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = 1;

-            Boolean.prototype.length = 1;

-            return Array.prototype.some.call(false, callbackfn);

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = 1;
+            Boolean.prototype.length = 1;
+            return Array.prototype.some.call(false, callbackfn);
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-4.js
index ea1cc1d1c..3b2172f1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-4.js

- * @description Array.prototype.some applied to Boolean object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-5.js
index 4891b48b0..4aca1b86d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-5.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-5.js

- * @description Array.prototype.some applied to number primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[1] = true;

-            Number.prototype.length = 2;

-

-            return Array.prototype.some.call(5, callbackfn);

-        } finally {

-            delete Number.prototype[1];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[1] = true;
+            Number.prototype.length = 2;
+
+            return Array.prototype.some.call(5, callbackfn);
+        } finally {
+            delete Number.prototype[1];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-6.js
index a88ffa329..ecb0fe6fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-6.js

- * @description Array.prototype.some applied to Number object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-7.js
index b516a2268..dfa230012 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-7.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-7.js

- * @description Array.prototype.some applied to applied to string primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        return Array.prototype.some.call("hello\nw_orld\\!", callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        return Array.prototype.some.call("hello\nw_orld\\!", callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-8.js
index f9dc1b2c5..753fabc3d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-8.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-8.js

- * @description Array.prototype.some applied to String object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var obj = new String("hello\nw_orld\\!");

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var obj = new String("hello\nw_orld\\!");
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-9.js
index 1009d7650..c68e1eb2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-9.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-1-9.js

- * @description Array.prototype.some applied to Function object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Function;

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Function;
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-1.js
index 1ad5c6d1e..e233cf531 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-1.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-1.js

- * @description Array.prototype.some - 'length' is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-            length: 2

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is own data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+            length: 2
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-10.js
index 89bc36615..26bdd542b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-10.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-10.js

- * @description Array.prototype.some - 'length' is an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an inherited accessor property
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-11.js
index 96bf7e815..97f64d60c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-11.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-11.js

- * @description Array.prototype.some - 'length' is an own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own accessor property
+    without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-12.js
index d0b5c31e3..e17a69e6d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-12.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-12.js

- * @description Array.prototype.some - 'length' is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 11, 1: 12 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is own accessor property without a
+    get function that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 11, 1: 12 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-13.js
index 5fc7a68da..f10bab2a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-13.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-13.js

- * @description Array.prototype.some - 'length' is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        return !Array.prototype.some.call(child, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is inherited accessor property
+    without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        return !Array.prototype.some.call(child, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-14.js
index 98e0b09bb..55e1d06c7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-14.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-14.js

- * @description Array.prototype.some - 'length' property doesn't exist on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' property doesn't exist on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-15.js
index 2b711ada2..05fa8d478 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-15.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-15.js

- * @description Array.prototype.some - 'length' is property of the global object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 9;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 12;

-            fnGlobalObject().length = 2;

-            return Array.prototype.some.call(fnGlobalObject(), callbackfn1) &&

-                !Array.prototype.some.call(fnGlobalObject(), callbackfn2);

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 9;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 12;
+            fnGlobalObject().length = 2;
+            return Array.prototype.some.call(fnGlobalObject(), callbackfn1) &&
+                !Array.prototype.some.call(fnGlobalObject(), callbackfn2);
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-17.js
index 486f6ae83..ee0d4c0a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-17.js

- * @description Array.prototype.some applied to the Arguments object which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var func = function (a, b) {

-            arguments[2] = 12;

-            return Array.prototype.some.call(arguments, callbackfn1) &&

-                !Array.prototype.some.call(arguments, callbackfn2);

-        };

-

-        return func(9, 11);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some applied to the Arguments object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var func = function (a, b) {
+            arguments[2] = 12;
+            return Array.prototype.some.call(arguments, callbackfn1) &&
+                !Array.prototype.some.call(arguments, callbackfn2);
+        };
+
+        return func(9, 11);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-18.js
index 75ceff7b8..14e45e7a6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-18.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-18.js

- * @description Array.prototype.some applied to String object which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return parseInt(val, 10) > 1;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return parseInt(val, 10) > 2;

-        }

-

-        var str = new String("12");

-        try {

-            String.prototype[2] = "3";

-            return Array.prototype.some.call(str, callbackfn1) &&

-                !Array.prototype.some.call(str, callbackfn2);

-        } finally {

-            delete String.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some applied to String object which implements its
+    own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return parseInt(val, 10) > 1;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return parseInt(val, 10) > 2;
+        }
+
+        var str = new String("12");
+        try {
+            String.prototype[2] = "3";
+            return Array.prototype.some.call(str, callbackfn1) &&
+                !Array.prototype.some.call(str, callbackfn2);
+        } finally {
+            delete String.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-19.js
index 29c3a9565..6becf0f81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-19.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-19.js

- * @description Array.prototype.some applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 9;

-        fun[1] = 11;

-        fun[2] = 12;

-

-        return Array.prototype.some.call(fun, callbackfn1) &&

-            !Array.prototype.some.call(fun, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some applied to Function object which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 9;
+        fun[1] = 11;
+        fun[2] = 12;
+
+        return Array.prototype.some.call(fun, callbackfn1) &&
+            !Array.prototype.some.call(fun, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-2.js
index 0fe733308..e8ee55e8e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-2.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-2.js

- * @description Array.prototype.some - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            Array.prototype[2] = 12;

-

-            return [9, 11].some(callbackfn1) &&

-                ![9, 11].some(callbackfn2);

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            Array.prototype[2] = 12;
+
+            return [9, 11].some(callbackfn1) &&
+                ![9, 11].some(callbackfn2);
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-3.js
index 389e73d6e..e272f1408 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-3.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-3.js

- * @description Array.prototype.some - 'length' is an own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own data property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-4.js
index 4d255e167..e9c6734a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-4.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-4.js

- * @description Array.prototype.some - 'length' is an own data property that overrides an inherited data property on an array

- */

-

-

-function testcase() {

-        var arrProtoLen = 0;

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            Array.prototype[2] = 12;

-

-            return [9, 11].some(callbackfn1) &&

-                ![9, 11].some(callbackfn2);

-        } finally {

-            Array.prototype.length = arrProtoLen;

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own data property that
+    overrides an inherited data property on an array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arrProtoLen = 0;
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            Array.prototype[2] = 12;
+
+            return [9, 11].some(callbackfn1) &&
+                ![9, 11].some(callbackfn2);
+        } finally {
+            Array.prototype.length = arrProtoLen;
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-5.js
index 99fa41506..2df4e7ce8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-5.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-5.js

- * @description Array.prototype.some - 'length' is an own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own data property that
+    overrides an inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-6.js
index faf766a32..0790b7499 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-6.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-6.js

- * @description Array.prototype.some - 'length' is an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an inherited data property on
+    an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-7.js
index c4ea2cdab..7cfc7f102 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-7.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-7.js

- * @description Array.prototype.some - 'length' is an own accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 9;

-        obj[1] = 11;

-        obj[2] = 12;

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 9;
+        obj[1] = 11;
+        obj[2] = 12;
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-8.js
index bbb7d2d56..a7dc10cab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-8.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-8.js

- * @description Array.prototype.some - 'length' is an own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own accessor property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-9.js
index bd5c17766..d83044adf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-9.js
@@ -1,49 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-2-9.js

- * @description Array.prototype.some - 'length' is an own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 9;

-        child[1] = 11;

-        child[2] = 12;

-

-        return Array.prototype.some.call(child, callbackfn1) &&

-            !Array.prototype.some.call(child, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an own accessor property that
+    overrides an inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 9;
+        child[1] = 11;
+        child[2] = 12;
+
+        return Array.prototype.some.call(child, callbackfn1) &&
+            !Array.prototype.some.call(child, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-1.js
index 7d1d42a63..88cacdf2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-1.js

- * @description Array.prototype.some - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: undefined };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: undefined };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-10.js
index d532386d6..3110add83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-10.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-10.js

- * @description Array.prototype.some - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: NaN };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is a number (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: NaN };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-11.js
index b254d22be..efa4f2852 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-11.js

- * @description Array.prototype.some - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "2" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is a string containing a positive
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "2" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-12.js
index 83d280f6d..ce8ae4685 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-12.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-12.js

- * @description Array.prototype.some - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "-4294967294" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is a string containing a negative
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "-4294967294" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-13.js
index 85c3efb6c..7a172fcd8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-13.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-13.js

- * @description Array.prototype.some - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "2.5" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is a string containing a decimal
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "2.5" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-14.js
index 4d42107cb..1ba6d027e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-14.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-14.js

- * @description Array.prototype.some - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var objOne = { 0: 11, length: "Infinity" };

-        var objTwo = { 0: 11, length: "+Infinity" };

-        var objThree = { 0: 11, length: "-Infinity" };

-

-        return !Array.prototype.some.call(objOne, callbackfn) &&

-            !Array.prototype.some.call(objTwo, callbackfn) &&

-            !Array.prototype.some.call(objThree, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - 'length' is a string containing +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var objOne = { 0: 11, length: "Infinity" };
+        var objTwo = { 0: 11, length: "+Infinity" };
+        var objThree = { 0: 11, length: "-Infinity" };
+
+        return !Array.prototype.some.call(objOne, callbackfn) &&
+            !Array.prototype.some.call(objTwo, callbackfn) &&
+            !Array.prototype.some.call(objThree, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-15.js
index fe2815d48..e0d3dae19 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-15.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-15.js

- * @description Array.prototype.some - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "2E0" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "2E0" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-16.js
index 96bf6c4e7..6ca2fccac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-16.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-16.js

- * @description Array.prototype.some - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "0x0002" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - 'length' is a string containing a hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "0x0002" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-17.js
index b620c5ee1..21b6b3d2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-17.js

- * @description Array.prototype.some - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: "0002.00" };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: "0002.00" };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-18.js
index d03e440a5..52b688a9f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-18.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-18.js

- * @description Array.prototype.some - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 21, length: "two" };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 21, length: "two" };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-19.js
index d5b69fa62..a334d65dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-19.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-19.js

- * @description Array.prototype.some - value of 'length' is an Object which has an own toString method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var toStringAccessed = false;

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2) && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is an Object which has an
+    own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var toStringAccessed = false;
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2) && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-2.js
index c72d55cd5..2c8e9e602 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-2.js

- * @description Array.prototype.some on an Array-like object if 'length' is 1 (length overridden to true(type conversion))

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-        

-        var obj = { 0: 11, 1: 12, length: true };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some on an Array-like object if 'length' is 1
+    (length overridden to true(type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+        
+        var obj = { 0: 11, 1: 12, length: true };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-20.js
index 698a10b66..96e35f194 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-20.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-20.js

- * @description Array.prototype.some - value of 'length' is an Object which has an own valueOf method

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return 2;

-                }

-            }

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2) && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is an Object which has an
+    own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return 2;
+                }
+            }
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2) && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-21.js
index b6f1f2e82..6d4cd707a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-21.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-21.js

- * @description Array.prototype.some - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2) &&

-            valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2) &&
+            valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-22.js
index e8726b572..275429850 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-22.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-22.js

- * @description Array.prototype.some throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var callbackfnAccessed = false;

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        function callbackfn(val, idx, obj) {

-            callbackfnAccessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12,

-

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.some.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !callbackfnAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some throws TypeError exception when 'length' is
+    an object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var callbackfnAccessed = false;
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        function callbackfn(val, idx, obj) {
+            callbackfnAccessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12,
+
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.some.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !callbackfnAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-23.js
index 0d3e71087..edfd1a604 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-23.js
@@ -1,52 +1,54 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-23.js

- * @description Array.prototype.some uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-            length: child

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2) &&

-            valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some uses inherited valueOf method when 'length'
+    is an object with an own toString and inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+            length: child
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2) &&
+            valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-24.js
index 412c09c02..21a817678 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-24.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-24.js

- * @description Array.prototype.some - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 9,

-            10: 11,

-            11: 12,

-            length: 11.5

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 9,
+            10: 11,
+            11: 12,
+            length: 11.5
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-25.js
index e4b327eaa..186d70f70 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-25.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-25.js

- * @description Array.prototype.some - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 9,

-            1: 11,

-            2: 12,

-            length: -4294967294.5

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 9,
+            1: 11,
+            2: 12,
+            length: -4294967294.5
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-28.js
index b32cd4b4c..6a4daa072 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-28.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-28.js

- * @description Array.prototype.some - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is boundary value (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-29.js
index 129eccf43..e4a0353e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-29.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-29.js

- * @description Array.prototype.some - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12,

-            length: 4294967297

-        };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is boundary value (2^32 +
+    1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12,
+            length: 4294967297
+        };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-3.js
index cb55d4f01..9fd8e6925 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-3.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-3.js

- * @description Array.prototype.some - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: 0 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is a number (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: 0 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-4.js
index 49e795c86..67e963db2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-4.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-4.js

- * @description Array.prototype.some - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: +0 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is a number (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: +0 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-5.js
index fb04529ff..9c8142f21 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-5.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-5.js

- * @description Array.prototype.some - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: -0 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - value of 'length' is a number (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: -0 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-6.js
index df5ae2437..0fef8ba23 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-6.js

- * @description Array.prototype.some - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: 2 };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: 2 };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-7.js
index e6d638708..d7d6d8c02 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-7.js

- * @description Array.prototype.some - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-        function callbackfn1(val, idx, obj) {

-            return val > 10;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            return val > 11;

-        }

-

-        var obj = { 0: 9, 1: 11, 2: 12, length: -4294967294 };

-

-        return Array.prototype.some.call(obj, callbackfn1) &&

-            !Array.prototype.some.call(obj, callbackfn2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn1(val, idx, obj) {
+            return val > 10;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            return val > 11;
+        }
+
+        var obj = { 0: 9, 1: 11, 2: 12, length: -4294967294 };
+
+        return Array.prototype.some.call(obj, callbackfn1) &&
+            !Array.prototype.some.call(obj, callbackfn2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-8.js
index fff966b22..2f63c0211 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-8.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-8.js

- * @description Array.prototype.some - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: Infinity };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: Infinity };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-9.js
index 88d1e3f6c..b03c751c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-9.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-3-9.js

- * @description Array.prototype.some - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: -Infinity };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: -Infinity };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-1.js
index ea7aeddad..f4a2ffece 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-1.js

- * @description Array.prototype.some throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js
index 10e455696..1b738a873 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-10.js

- * @description Array.prototype.some - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-11.js
index a25f6772b..789820796 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-11.js

- * @description Array.prototype.some - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-12.js
index 9c641109c..41026784d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-12.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-12.js

- * @description Array.prototype.some - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        return [9, 11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        return [9, 11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-15.js
index 477232ab3..9c1c405d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-15.js

- * @description Array.prototype.some - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-        var obj = { };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - calling with no callbackfn is the same as
+    passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-2.js
index c2f9ec7b0..07625dbaa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-2.js

- * @description Array.prototype.some throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-3.js
index 2d38ca538..771e809bb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-3.js

- * @description Array.prototype.some throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-4.js
index 52f5381ba..e0aeafe4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-4.js

- * @description Array.prototype.some throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-5.js
index 6136442d4..fc99cd0c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-5.js

- * @description Array.prototype.some throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-6.js
index 7172568f9..c89a41941 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-6.js

- * @description Array.prototype.some throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-7.js
index cce973d6d..bb5c58e2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-7.js

- * @description Array.prototype.some throws TypeError if callbackfn is Object without a Call internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.some(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some throws TypeError if callbackfn is Object
+    without a Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.some(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-8.js
index d6147908d..b0c5119f1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-8.js

- * @description Array.prototype.some - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - side effects produced by step 2 are visible
+    when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-9.js
index 9e89187b4..ab2972bd3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-4-9.js

- * @description Array.prototype.some - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - side effects produced by step 3 are visible
+    when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1-s.js
index 336c37514..165acc6c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1-s.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1-s.js

- * @description Array.prototype.some - thisArg not passed to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() {

-  var innerThisCorrect = false;

-

-  function callbackfn(val, idx, obj) {

-    "use strict";

-    innerThisCorrect = this===undefined;

-    return true;

-  }

-

-  [1].some(callbackfn);

-  return innerThisCorrect;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg not passed to strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var innerThisCorrect = false;
+
+  function callbackfn(val, idx, obj) {
+    "use strict";
+    innerThisCorrect = this===undefined;
+    return true;
+  }
+
+  [1].some(callbackfn);
+  return innerThisCorrect;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1.js
index 9c7fe55eb..f28fa9303 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-1.js

- * @description Array.prototype.some - thisArg is passed

- */

-

-

-function testcase() {

-        this._15_4_4_17_5_1 = false;

-        var _15_4_4_17_5_1 = true;

-

-        function callbackfn(val, idx, obj) {

-            return this._15_4_4_17_5_1;

-        }

-        var arr = [1];

-        return !arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg is passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        this._15_4_4_17_5_1 = false;
+        var _15_4_4_17_5_1 = true;
+
+        function callbackfn(val, idx, obj) {
+            return this._15_4_4_17_5_1;
+        }
+        var arr = [1];
+        return !arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-10.js
index f27bb7abc..542461418 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-10.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-10.js

- * @description Array.prototype.some - Array Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objArray = [];

-

-        function callbackfn(val, idx, obj) {

-            return this === objArray;

-        }

-

-        return [11].some(callbackfn, objArray);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Array Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objArray = [];
+
+        function callbackfn(val, idx, obj) {
+            return this === objArray;
+        }
+
+        return [11].some(callbackfn, objArray);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-11.js
index 21cf5d02b..d141cd441 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-11.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-11.js

- * @description Array.prototype.some - String object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objString = new String();

-

-        function callbackfn(val, idx, obj) {

-            return this === objString;

-        }

-

-        return [11].some(callbackfn, objString);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - String object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objString = new String();
+
+        function callbackfn(val, idx, obj) {
+            return this === objString;
+        }
+
+        return [11].some(callbackfn, objString);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-12.js
index 5d168528e..1c097c95f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-12.js

- * @description Array.prototype.some - Boolean object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objBoolean = new Boolean();

-

-        function callbackfn(val, idx, obj) {

-            return this === objBoolean;

-        }

-

-        return [11].some(callbackfn, objBoolean);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Boolean object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objBoolean = new Boolean();
+
+        function callbackfn(val, idx, obj) {
+            return this === objBoolean;
+        }
+
+        return [11].some(callbackfn, objBoolean);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-13.js
index 137324384..e9440b9db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-13.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-13.js

- * @description Array.prototype.some - Number object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objNumber = new Number();

-

-        function callbackfn(val, idx, obj) {

-            return this === objNumber;

-        }

-

-        return [11].some(callbackfn, objNumber);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Number object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objNumber = new Number();
+
+        function callbackfn(val, idx, obj) {
+            return this === objNumber;
+        }
+
+        return [11].some(callbackfn, objNumber);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-14.js
index d26f0cf3f..3d9e3113e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-14.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-14.js

- * @description Array.prototype.some - the Math object can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === Math;

-        }

-

-        return [11].some(callbackfn, Math);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - the Math object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === Math;
+        }
+
+        return [11].some(callbackfn, Math);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-15.js
index cad92a2dc..c500f7bd5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-15.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-15.js

- * @description Array.prototype.some - Date object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objDate = new Date();

-

-        function callbackfn(val, idx, obj) {

-            return this === objDate;

-        }

-

-        return [11].some(callbackfn, objDate);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Date object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objDate = new Date();
+
+        function callbackfn(val, idx, obj) {
+            return this === objDate;
+        }
+
+        return [11].some(callbackfn, objDate);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-16.js
index e3fcd32cd..97c9cd9d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-16.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-16.js

- * @description Array.prototype.some - RegExp object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objRegExp = new RegExp();

-

-        function callbackfn(val, idx, obj) {

-            return this === objRegExp;

-        }

-

-        return [11].some(callbackfn, objRegExp);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - RegExp object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objRegExp = new RegExp();
+
+        function callbackfn(val, idx, obj) {
+            return this === objRegExp;
+        }
+
+        return [11].some(callbackfn, objRegExp);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-17.js
index 1c3bfd14d..fb375e29b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-17.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-17.js

- * @description Array.prototype.some - the JSON object can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === JSON;

-        }

-

-        return [11].some(callbackfn, JSON);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - the JSON object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === JSON;
+        }
+
+        return [11].some(callbackfn, JSON);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-18.js
index ff3179972..aacb61331 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-18.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-18.js

- * @description Array.prototype.some - Error object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objError = new RangeError();

-

-        function callbackfn(val, idx, obj) {

-            return this === objError;

-        }

-

-        return [11].some(callbackfn, objError);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Error object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objError = new RangeError();
+
+        function callbackfn(val, idx, obj) {
+            return this === objError;
+        }
+
+        return [11].some(callbackfn, objError);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-19.js
index 598f9e777..63521acee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-19.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-19.js

- * @description Array.prototype.some - the Arguments object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var arg;

-

-        function callbackfn(val, idx, obj) {

-            return this === arg;

-        }

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        return [11].some(callbackfn, arg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - the Arguments object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        function callbackfn(val, idx, obj) {
+            return this === arg;
+        }
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        return [11].some(callbackfn, arg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-2.js
index 1519a2f69..812945fe6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-2.js

- * @description Array.prototype.some - thisArg is Object

- */

-

-

-function testcase() {

-  var res = false;

-  var o = new Object();

-  o.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var arr = [1];

-  if(arr.some(callbackfn, o) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg is Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var o = new Object();
+  o.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var arr = [1];
+  if(arr.some(callbackfn, o) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-21.js
index d2637f05b..c34cb5e87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-21.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-21.js

- * @description Array.prototype.some - the global object can be used as thisArg

- */

-

-

-function testcase() {

-

-

-        function callbackfn(val, idx, obj) {

-            return this === fnGlobalObject();

-        }

-

-        return [11].some(callbackfn, fnGlobalObject());

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - the global object can be used as thisArg
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+
+        function callbackfn(val, idx, obj) {
+            return this === fnGlobalObject();
+        }
+
+        return [11].some(callbackfn, fnGlobalObject());
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-22.js
index 8983ffe33..ca6b9f9d5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-22.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-22.js

- * @description Array.prototype.some - boolean primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === false;

-        }

-

-        return [11].some(callbackfn, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - boolean primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === false;
+        }
+
+        return [11].some(callbackfn, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-23.js
index 9c44b2441..e827d549b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-23.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-23.js

- * @description Array.prototype.some - number primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === 101;

-        }

-

-        return [11].some(callbackfn, 101);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - number primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === 101;
+        }
+
+        return [11].some(callbackfn, 101);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-24.js
index a23fa3d17..9483a75da 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-24.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-24.js

- * @description Array.prototype.some - string primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === "abc";

-        }

-

-        return [11].some(callbackfn, "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - string primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === "abc";
+        }
+
+        return [11].some(callbackfn, "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-25.js
index 7daa878b9..008d9e517 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-25.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-25.js

- * @description Array.prototype.some - thisArg not passed

- */

-

-

-function testcase() {

-        function innerObj() {

-            this._15_4_4_17_5_25 = true;

-            var _15_4_4_17_5_25 = false;

-            

-            function callbackfn(val, idx, obj) {

-                return this._15_4_4_17_5_25;

-            }

-            var arr = [1];

-            this.retVal = !arr.some(callbackfn);

-        }

-        return new innerObj().retVal;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg not passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function innerObj() {
+            this._15_4_4_17_5_25 = true;
+            var _15_4_4_17_5_25 = false;
+            
+            function callbackfn(val, idx, obj) {
+                return this._15_4_4_17_5_25;
+            }
+            var arr = [1];
+            this.retVal = !arr.some(callbackfn);
+        }
+        return new innerObj().retVal;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-3.js
index dc0560fec..5fa5a8e27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-3.js

- * @description Array.prototype.some - thisArg is Array

- */

-

-

-function testcase() {

-  var res = false;

-  var a = new Array();

-  a.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var arr = [1];

-

-  if(arr.some(callbackfn, a) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg is Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var a = new Array();
+  a.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var arr = [1];
+
+  if(arr.some(callbackfn, a) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-4.js
index 80b7f542f..e6dac838b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-4.js

- * @description Array.prototype.some - thisArg is object from object template(prototype)

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-  

-  function foo(){}

-  foo.prototype.res = true;

-  var f = new foo();

-  var arr = [1];

-

-    if(arr.some(callbackfn,f) === true)

-      return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - thisArg is object from object
+    template(prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+  
+  function foo(){}
+  foo.prototype.res = true;
+  var f = new foo();
+  var arr = [1];
+
+    if(arr.some(callbackfn,f) === true)
+      return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-5.js
index 5cbebe892..86663ddf1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-5.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-5.js

- * @description Array.prototype.some - thisArg is object from object template

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  var f = new foo();

-  f.res = true;

-  var arr = [1];

-

-  if(arr.some(callbackfn,f) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg is object from object template
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  var f = new foo();
+  f.res = true;
+  var arr = [1];
+
+  if(arr.some(callbackfn,f) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-6.js
index 62c8f8b58..353fd8ce3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-6.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-6.js

- * @description Array.prototype.some - thisArg is function

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  foo.res = true;

-  var arr = [1];

-

-  if(arr.some(callbackfn,foo) === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - thisArg is function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  foo.res = true;
+  var arr = [1];
+
+  if(arr.some(callbackfn,foo) === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-7.js
index 3606d8912..e00b8d615 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-7.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-7.js

- * @description Array.prototype.some - built-in functions can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === eval;

-        }

-

-        return [11].some(callbackfn, eval);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - built-in functions can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === eval;
+        }
+
+        return [11].some(callbackfn, eval);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-9.js
index 45ccbf746..67a2f8132 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-9.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-5-9.js

- * @description Array.prototype.some - Function Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objFunction = function () { };

-

-        function callbackfn(val, idx, obj) {

-            return this === objFunction;

-        }

-

-        return [11].some(callbackfn, objFunction);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - Function Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objFunction = function () { };
+
+        function callbackfn(val, idx, obj) {
+            return this === objFunction;
+        }
+
+        return [11].some(callbackfn, objFunction);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-1.js
index 6917c7491..bade53fc2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-1.js

- * @description Array.prototype.some considers new elements added to array after it is called

- */

-

-

-function testcase() { 

-  var calledForThree = false;

- 

-  function callbackfn(val, idx, obj)

-  {

-    arr[2] = 3;

-    if(val !== 3)

-      calledForThree = true;

-

-    return false;

-  }

-

-  var arr = [1,2,,4,5];

-  

-  var val = arr.some(callbackfn);

-  return calledForThree;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some considers new elements added to array after
+    it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+  var calledForThree = false;
+ 
+  function callbackfn(val, idx, obj)
+  {
+    arr[2] = 3;
+    if(val !== 3)
+      calledForThree = true;
+
+    return false;
+  }
+
+  var arr = [1,2,,4,5];
+  
+  var val = arr.some(callbackfn);
+  return calledForThree;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-2.js
index 6761964aa..3eab73c7d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-2.js

- * @description Array.prototype.some considers new value of elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    arr[4] = 6;

-    if(val < 6)

-      return false;

-    else 

-      return true;

-  }

-

-  var arr = [1,2,3,4,5];

-  

-  if(arr.some(callbackfn) === true)    

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some considers new value of elements in array
+    after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    arr[4] = 6;
+    if(val < 6)
+      return false;
+    else 
+      return true;
+  }
+
+  var arr = [1,2,3,4,5];
+  
+  if(arr.some(callbackfn) === true)    
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-3.js
index 7f07194de..1f0d6125e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-3.js

- * @description Array.prototype.some doesn't visit deleted elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete arr[2];

-    if(val !== 3)

-      return false;

-    else 

-      return true;

-  }

-

-  var arr = [1,2,3,4,5];

-  

-  if(arr.some(callbackfn) === false)    

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some doesn't visit deleted elements in array after
+    it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete arr[2];
+    if(val !== 3)
+      return false;
+    else 
+      return true;
+  }
+
+  var arr = [1,2,3,4,5];
+  
+  if(arr.some(callbackfn) === false)    
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-4.js
index 32a97f5d0..b7f7873b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-4.js

- * @description Array.prototype.some doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    arr.length = 3;

-    if(val < 4)

-      return false;

-    else 

-      return true;

-  }

-  

-  var arr = [1,2,3,4,6];

-  

-  if(arr.some(callbackfn) === false)    

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    arr.length = 3;
+    if(val < 4)
+      return false;
+    else 
+      return true;
+  }
+  
+  var arr = [1,2,3,4,6];
+  
+  if(arr.some(callbackfn) === false)    
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-5.js
index 46b5f6508..8ffd95609 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-5.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-5.js

- * @description Array.prototype.some doesn't consider newly added elements in sparse array

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    arr[1000] = 5;

-    if(val < 5)

-      return false;

-    else 

-      return true;

-  }

-

-  var arr = new Array(10);

-  arr[1] = 1;

-  arr[2] = 2;

-  

-  if(arr.some(callbackfn) === false)    

-    return true;  

- 

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some doesn't consider newly added elements in
+    sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    arr[1000] = 5;
+    if(val < 5)
+      return false;
+    else 
+      return true;
+  }
+
+  var arr = new Array(10);
+  arr[1] = 1;
+  arr[2] = 2;
+  
+  if(arr.some(callbackfn) === false)    
+    return true;  
+ 
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-6.js
index 91c75fa1a..93cac5b98 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-6.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-6.js

- * @description Array.prototype.some visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete arr[4];

-    if(val < 5)

-      return false;

-    else 

-      return true;

-  }

-

-

-  Array.prototype[4] = 5;

-  var arr = [1,2,3,4,5];

-  

-  var res = arr.some(callbackfn) ;

-  delete Array.prototype[4];

-  if(res === true)    

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some visits deleted element in array after the
+    call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete arr[4];
+    if(val < 5)
+      return false;
+    else 
+      return true;
+  }
+
+
+  Array.prototype[4] = 5;
+  var arr = [1,2,3,4,5];
+  
+  var res = arr.some(callbackfn) ;
+  delete Array.prototype[4];
+  if(res === true)    
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-8.js
index 576e39f56..3a5e91a87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-8.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-8.js

- * @description Array.prototype.some - no observable effects occur if length is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 0 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - no observable effects occur if length is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 0 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-9.js
index 9e8956d27..cdec235c6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-9.js

- * @description Array.prototype.some - modifications to length don't change number of iterations

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val > 10;

-        }

-

-        var obj = { 0: 9, 2: 12, length: 3 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                obj.length = 2;

-                return 8;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(obj, callbackfn) && called === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - modifications to length don't change number
+    of iterations
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val > 10;
+        }
+
+        var obj = { 0: 9, 2: 12, length: 3 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                obj.length = 2;
+                return 8;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(obj, callbackfn) && called === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-1.js
index ea8974ec7..2b4ccf349 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-1.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-1.js

- * @description Array.prototype.some - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

-

-  var callCnt = 0; 

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return false;

-  }

-

-  var arr = new Array(10);

-  arr[1] = undefined;

-  arr.some(callbackfn);

-  if(callCnt === 1)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn not called for indexes never
+    been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+
+  var callCnt = 0; 
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return false;
+  }
+
+  var arr = new Array(10);
+  arr[1] = undefined;
+  arr.some(callbackfn);
+  if(callCnt === 1)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-10.js
index a0d895340..fcc3e6252 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-10.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-10.js

- * @description Array.prototype.some - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 1;

-        }

-        var arr = { 2: 2, length: 20 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return !Array.prototype.some.call(arr, callbackfn) && accessed;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 1;
+        }
+        var arr = { 2: 2, length: 20 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return !Array.prototype.some.call(arr, callbackfn) && accessed;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-11.js
index 756c274fb..11ee839d5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-11.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-11.js

- * @description Array.prototype.some - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 1;

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return !arr.some(callbackfn) && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 1;
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return !arr.some(callbackfn) && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-12.js
index efe23f1b3..6fe453581 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-12.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-12.js

- * @description Array.prototype.some - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };

-        

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            return Array.prototype.some.call(arr, callbackfn);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var arr = { 0: 0, 1: 111, 2: 2, length: 10 };
+        
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            return Array.prototype.some.call(arr, callbackfn);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-13.js
index fd808a240..22c0b0ee7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-13.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-13.js

- * @description Array.prototype.some - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var arr = [0, 111, 2]; 

-        

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var arr = [0, 111, 2]; 
+        
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-14.js
index cb559d484..7134bedba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-14.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-14.js

- * @description Array.prototype.some - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 3;

-        }

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        return !arr.some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 3;
+        }
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        return !arr.some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-15.js
index 045027618..a7777b039 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-15.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-15.js

- * @description Array.prototype.some - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - decreasing length of array with prototype
+    property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-16.js
index f339237a4..c32b87a54 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-16.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-16.js

- * @description Array.prototype.some - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        return arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - decreasing length of array does not delete
+    non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        return arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-2.js
index 51da53bdc..18627585a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-2.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-2.js

- * @description Array.prototype.some - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "length") {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        

-        var arr = { };

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                arr[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(arr, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - added properties in step 2 are visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "length") {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        
+        var arr = { };
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                arr[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(arr, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-3.js
index 242420ecf..e65160359 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-3.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-3.js

- * @description Array.prototype.some - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 2;

-        }

-        var arr = { 2: 6.99, 8: 19};

-

-        Object.defineProperty(arr, "length", {

-            get: function () {

-                delete arr[2];

-                return 10;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.some.call(arr, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 2;
+        }
+        var arr = { 2: 6.99, 8: 19};
+
+        Object.defineProperty(arr, "length", {
+            get: function () {
+                delete arr[2];
+                return 10;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.some.call(arr, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-4.js
index f68310245..f9fdd08ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-4.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-4.js

- * @description Array.prototype.some - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(arr, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(arr, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-5.js
index 49cae2ad6..e4e858d48 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-5.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-5.js

- * @description Array.prototype.some - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        return arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        return arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-6.js
index 5e6be5963..a70f16d4c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-6.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-6.js

- * @description Array.prototype.some - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return Array.prototype.some.call(arr, callbackfn);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - properties can be added to prototype after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return Array.prototype.some.call(arr, callbackfn);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-7.js
index 295e7cd61..efeca4e15 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-7.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-7.js

- * @description Array.prototype.some - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - properties can be added to prototype after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-8.js
index 36ffa98fd..8c7be2bf0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-8.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-8.js

- * @description Array.prototype.some - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 1;

-        }

-        var arr = { length: 2 };

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return !Array.prototype.some.call(arr, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting own property causes index property
+    not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 1;
+        }
+        var arr = { length: 2 };
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return !Array.prototype.some.call(arr, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-9.js
index 50dba00d9..93cdd434d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-b-9.js

- * @description Array.prototype.some - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return idx === 1;

-        }

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        return !arr.some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - deleting own property causes index property
+    not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return idx === 1;
+        }
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        return !arr.some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-1.js
index e066f74d7..41618dacd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-1.js

- * @description Array.prototype.some - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = {};

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var obj = { 5: kValue, length: 100 };

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var obj = { 5: kValue, length: 100 };
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-10.js
index 3fd874265..d856bb4ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-10.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-10.js

- * @description Array.prototype.some - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 10) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "10", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        return arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 10) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "10", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        return arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-11.js
index a43840438..c4cb31ca2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-11.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-11.js

- * @description Array.prototype.some - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { 1: 6 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { 1: 6 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-12.js
index 2c84c818e..b49511839 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-12.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-12.js

- * @description  Array.prototype.some - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-        

-        var arr = [];

-        try {

-            Array.prototype[1] = 100;

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return kValue;

-                },

-                configurable: true

-            });

-

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+        
+        var arr = [];
+        try {
+            Array.prototype[1] = 100;
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return kValue;
+                },
+                configurable: true
+            });
+
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-13.js
index a268dea26..338bd9d3c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-13.js
@@ -1,48 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-13.js

- * @description Array.prototype.some - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-14.js
index cc24841ee..3f78f2aca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-14.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-14.js

- * @description  Array.prototype.some - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [];

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [];
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-15.js
index 7a5d565fb..aa9a14a51 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-15.js

- * @description Array.prototype.some - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 20;

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 20;
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-16.js
index 36adbb201..ccf46806d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-16.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-16.js

- * @description Array.prototype.some - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return kValue;

-                },

-                configurable: true

-            });

-

-            return [, , ].some(callbackfn);

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return kValue;
+                },
+                configurable: true
+            });
+
+            return [, , ].some(callbackfn);
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-17.js
index d250054e9..3a207158f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-17.js

- * @description Array.prototype.some - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-18.js
index 6f99d6ff9..62b5b3401 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-18.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-18.js

- * @description Array.prototype.some - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        return arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        return arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-19.js
index 86bb7650a..c230ac72c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-19.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-19.js

- * @description Array.prototype.some - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-        try {

-            Object.prototype[1] = 10;

-            return Array.prototype.some.call(obj, callbackfn);

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+        try {
+            Object.prototype[1] = 10;
+            return Array.prototype.some.call(obj, callbackfn);
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-2.js
index dc10a8e64..139741128 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-2.js

- * @description Array.prototype.some - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = {};

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return kValue === val;

-            }

-            return false;

-        }

-

-        return [kValue].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return kValue === val;
+            }
+            return false;
+        }
+
+        return [kValue].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-20.js
index 5f4636293..3d705caa4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-20.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-20.js

- * @description Array.prototype.some - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[0] = 100;

-            return arr.some(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[0] = 100;
+            return arr.some(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-21.js
index fe9014c42..708d359f5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-21.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-21.js

- * @description Array.prototype.some - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-22.js
index 330abe746..187a918a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-22.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-22.js

- * @description Array.prototype.some - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            return [, ].some(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            return [, ].some(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-23.js
index 6c4a2eadd..e0e6e6e5a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-23.js
@@ -1,31 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-23.js

- * @description Array.prototype.some - This object is an global object which contains index property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            }

-            return false;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 11;

-            fnGlobalObject().length = 1;

-            return Array.prototype.some.call(fnGlobalObject(), callbackfn);

-        } finally {

-            delete fnGlobalObject()[0];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - This object is an global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            }
+            return false;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 11;
+            fnGlobalObject().length = 1;
+            return Array.prototype.some.call(fnGlobalObject(), callbackfn);
+        } finally {
+            delete fnGlobalObject()[0];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-25.js
index 718887e86..b05ab2a15 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-25.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-25.js

- * @description Array.prototype.some - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            }

-            return false;

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.some.call(arguments, callbackfn);

-        };

-

-        return func(11);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            }
+            return false;
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.some.call(arguments, callbackfn);
+        };
+
+        return func(11);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-26.js
index b5c29c830..431d829d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-26.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-26.js

- * @description Array.prototype.some - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var firstResult = false;

-        var secondResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                firstResult = (val === 11);

-                return false;

-            } else if (idx === 1) {

-                secondResult = (val === 9);

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.some.call(arguments, callbackfn);

-        };

-

-        return !func(11, 9) && firstResult && secondResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var firstResult = false;
+        var secondResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                firstResult = (val === 11);
+                return false;
+            } else if (idx === 1) {
+                secondResult = (val === 9);
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.some.call(arguments, callbackfn);
+        };
+
+        return !func(11, 9) && firstResult && secondResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-27.js
index d82901b60..155f00e04 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-27.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-27.js

- * @description Array.prototype.some - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var firstResult = false;

-        var secondResult = false;

-        var thirdResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                firstResult = (val === 11);

-                return false;

-            } else if (idx === 1) {

-                secondResult = (val === 12);

-                return false;

-            } else if (idx === 2) {

-                thirdResult = (val === 9);

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.some.call(arguments, callbackfn);

-        };

-

-        return !func(11, 12, 9) && firstResult && secondResult && thirdResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var firstResult = false;
+        var secondResult = false;
+        var thirdResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                firstResult = (val === 11);
+                return false;
+            } else if (idx === 1) {
+                secondResult = (val === 12);
+                return false;
+            } else if (idx === 2) {
+                thirdResult = (val === 9);
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.some.call(arguments, callbackfn);
+        };
+
+        return !func(11, 12, 9) && firstResult && secondResult && thirdResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-28.js
index 047c90172..a70db967c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-28.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-28.js

- * @description Array.prototype.some - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === 12;

-            }

-            return false;

-        }

-

-        var arr = [];

-        var helpVerifyVar = 11;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return helpVerifyVar;

-            },

-            set: function (args) {

-                helpVerifyVar = args;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr[1] = 12;

-                return 9;

-            },

-            configurable: true

-        });

-

-        return arr.some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === 12;
+            }
+            return false;
+        }
+
+        var arr = [];
+        var helpVerifyVar = 11;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return helpVerifyVar;
+            },
+            set: function (args) {
+                helpVerifyVar = args;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr[1] = 12;
+                return 9;
+            },
+            configurable: true
+        });
+
+        return arr.some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-29.js
index 8ad58b4ca..08fce5412 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-29.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-29.js

- * @description Array.prototype.some - element changed by getter on previous iterations on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === 12;

-            }

-            return false;

-        }

-

-        var obj = { length: 2 };

-        var helpVerifyVar = 11;

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return helpVerifyVar;

-            },

-            set: function (args) {

-                helpVerifyVar = args;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                obj[1] = 12;

-                return 11;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element changed by getter on previous
+    iterations on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === 12;
+            }
+            return false;
+        }
+
+        var obj = { length: 2 };
+        var helpVerifyVar = 11;
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return helpVerifyVar;
+            },
+            set: function (args) {
+                helpVerifyVar = args;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                obj[1] = 12;
+                return 11;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-3.js
index 009ec3149..f037fd351 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-3.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-3.js

- * @description Array.prototype.some - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { 5: 100 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[5] = kValue;

-        child.length = 10;

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { 5: 100 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[5] = kValue;
+        child.length = 10;
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-30.js
index 861c8fdb8..270ddcbde 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-30.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-30.js

- * @description Array.prototype.some - unhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var obj = { length: 20 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.some.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof RangeError && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - unhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var obj = { length: 20 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.some.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof RangeError && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-31.js
index 7f5e6bfab..88b9b6f0b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-31.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-31.js

- * @description Array.prototype.some - unhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 0) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var arr = [];

-        arr[10] = 100;

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.some(callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof RangeError && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - unhandled exceptions happened in getter
+    terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 0) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var arr = [];
+        arr[10] = 100;
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.some(callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof RangeError && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-4.js
index 8fe393cb3..a54e3b7d8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-4.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-4.js

- * @description Array.prototype.some - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Array.prototype[0] = 11;

-

-            return [kValue].some(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Array.prototype[0] = 11;
+
+            return [kValue].some(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-5.js
index ffd775ab8..46a24f2f3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-5.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-5.js

- * @description Array.prototype.some - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = 1000;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: kValue,

-            configurable: true

-        });

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 1000;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: kValue,
+            configurable: true
+        });
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-6.js
index 0f29ceff4..57160eacb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-6.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-6.js

- * @description Array.prototype.some - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = 1000;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 9;

-                },

-                configurable: true

-            });

-            return [kValue].some(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 1000;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 9;
+                },
+                configurable: true
+            });
+            return [kValue].some(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-7.js
index fe8d2655c..8d3faf80e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-7.js

- * @description Array.prototype.some - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = 'abc';

-

-        function callbackfn(val, idx, obj) {

-            if (5 === idx) {

-                return kValue === val;

-            }

-            return false;

-        }

-

-        var proto = { 5: kValue };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        return Array.prototype.some.call(child, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 'abc';
+
+        function callbackfn(val, idx, obj) {
+            if (5 === idx) {
+                return kValue === val;
+            }
+            return false;
+        }
+
+        var proto = { 5: kValue };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        return Array.prototype.some.call(child, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-8.js
index 05019ff47..064dab3ba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-8.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-8.js

- * @description Array.prototype.some - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = {};

-

-        function callbackfn(val, idx, obj) {

-            if (0 === idx) {

-                return kValue === val;

-            }

-            return false;

-        }

-

-        try {

-            Array.prototype[0] = kValue;

-

-            return [, ].some(callbackfn);

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+
+        function callbackfn(val, idx, obj) {
+            if (0 === idx) {
+                return kValue === val;
+            }
+            return false;
+        }
+
+        try {
+            Array.prototype[0] = kValue;
+
+            return [, ].some(callbackfn);
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-9.js
index 56968d3bd..46753dd8c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-9.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-i-9.js

- * @description Array.prototype.some - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 10) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var obj = { length: 20 };

-

-        Object.defineProperty(obj, "10", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 10) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var obj = { length: 20 };
+
+        Object.defineProperty(obj, "10", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-1.js
index 7b7034883..8dd328d77 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-1.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-1.js

- * @description Array.prototype.some - callbackfn called with correct parameters

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    if(obj[idx] === val)

-      return false;

-    else

-      return true;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.some(callbackfn) === false)

-    return true;

-

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn called with correct parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    if(obj[idx] === val)
+      return false;
+    else
+      return true;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.some(callbackfn) === false)
+    return true;
+
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-10.js
index 0ee7e2340..6a6c3b120 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-10.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-10.js

- * @description Array.prototype.some - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val) {

-            return val > 10;

-        }

-

-        return [11, 12].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn is called with 1 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val) {
+            return val > 10;
+        }
+
+        return [11, 12].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-11.js
index a519e2d09..ede414ea6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-11.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-11.js

- * @description Array.prototype.some - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-        function callbackfn(val, idx) {

-            return val > 10 && arguments[2][idx] === val;

-        }

-

-        return [9, 12].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn is called with 2 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx) {
+            return val > 10 && arguments[2][idx] === val;
+        }
+
+        return [9, 12].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-12.js
index 901055a51..cb6e2d736 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-12.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-12.js

- * @description Array.prototype.some - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10 && obj[idx] === val;

-        }

-

-        return [9, 12].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn is called with 3 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10 && obj[idx] === val;
+        }
+
+        return [9, 12].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-13.js
index bee73a081..351d5dbd0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-13.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-13.js

- * @description Array.prototype.some - callbackfn that uses arguments object to get parameter value

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return arguments[2][arguments[1]] === arguments[0];

-        }

-

-        return [9, 12].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn that uses arguments object to
+    get parameter value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return arguments[2][arguments[1]] === arguments[0];
+        }
+
+        return [9, 12].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-16.js
index a1b6579f6..419d997ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-16.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-16.js

- * @description Array.prototype.some - 'this' of 'callback' is a Boolean object when 'T' is not an object ('T' is a boolean primitive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === false;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.some.call(obj, callbackfn, false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'this' of 'callback' is a Boolean object
+    when 'T' is not an object ('T' is a boolean primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === false;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.some.call(obj, callbackfn, false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-17.js
index 68075c668..112652ede 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-17.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-17.js

- * @description Array.prototype.some - 'this' of 'callbackfn' is a Number object when T is not an object (T is a number primitive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === 5;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.some.call(obj, callbackfn, 5);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'this' of 'callbackfn' is a Number object
+    when T is not an object (T is a number primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === 5;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.some.call(obj, callbackfn, 5);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-18.js
index 48d8462e0..aa5813529 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-18.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-18.js

- * @description Array.prototype.some - 'this' of 'callbackfn' is an String object when T is not an object (T is a string primitive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === "hello!";

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-

-        return Array.prototype.some.call(obj, callbackfn, "hello!");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - 'this' of 'callbackfn' is an String object
+    when T is not an object (T is a string primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === "hello!";
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+
+        return Array.prototype.some.call(obj, callbackfn, "hello!");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-19.js
index a8b33cf01..61b2a4829 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-19.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-19.js

- * @description Array.prototype.some - non-indexed properties are not called

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val === 11;

-        }

-

-        var obj = { 0: 9, 10: 8, non_index_property: 11, length: 20 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && (2 === called);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - non-indexed properties are not called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val === 11;
+        }
+
+        var obj = { 0: 9, 10: 8, non_index_property: 11, length: 20 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && (2 === called);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-2.js
index 2d4f7318f..70029033f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-2.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-2.js

- * @description Array.prototype.some - callbackfn takes 3 arguments

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    if(arguments.length === 3)   //verify if callbackfn was called with 3 parameters

-      return false;

-    else

-      return true;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  arr[999999] = -6.6;

-  

-  if(arr.some(callbackfn) === false)

-    return true;

-

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn takes 3 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    if(arguments.length === 3)   //verify if callbackfn was called with 3 parameters
+      return false;
+    else
+      return true;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  arr[999999] = -6.6;
+  
+  if(arr.some(callbackfn) === false)
+    return true;
+
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-20.js
index b54dfd16e..ceb509fc6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-20.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-20.js

- * @description Array.prototype.some - callbackfn called with correct parameters (thisArg is correct)

- */

-

-

-function testcase() {

-

-        var thisArg = { threshold: 10 };

-

-        function callbackfn(val, idx, obj) {

-            return this === thisArg;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return Array.prototype.some.call(obj, callbackfn, thisArg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn called with correct parameters
+    (thisArg is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var thisArg = { threshold: 10 };
+
+        function callbackfn(val, idx, obj) {
+            return this === thisArg;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return Array.prototype.some.call(obj, callbackfn, thisArg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-21.js
index 58b33eda5..30cbe6e55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-21.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-21.js

- * @description Array.prototype.some - callbackfn called with correct parameters (kValue is correct)

- */

-

-

-function testcase() {

-

-        var firstIndex = false;

-        var secondIndex = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                firstIndex = (val === 11);

-                return false;

-            }

-            if (idx === 1) {

-                secondIndex = (val === 12);

-                return false;

-            }

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && firstIndex && secondIndex;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn called with correct parameters
+    (kValue is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var firstIndex = false;
+        var secondIndex = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                firstIndex = (val === 11);
+                return false;
+            }
+            if (idx === 1) {
+                secondIndex = (val === 12);
+                return false;
+            }
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && firstIndex && secondIndex;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-22.js
index 47e8f135d..f096258c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-22.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-22.js

- * @description Array.prototype.some - callbackfn called with correct parameters (the index k is correct)

- */

-

-

-function testcase() {

-

-        var firstIndex = false;

-        var secondIndex = false;

-

-        function callbackfn(val, idx, obj) {

-            if (val === 11) {

-                firstIndex = (idx === 0);

-                return false;

-            }

-            if (val === 12) {

-                secondIndex = (idx === 1);

-                return false;

-            }

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && firstIndex && secondIndex;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn called with correct parameters
+    (the index k is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var firstIndex = false;
+        var secondIndex = false;
+
+        function callbackfn(val, idx, obj) {
+            if (val === 11) {
+                firstIndex = (idx === 0);
+                return false;
+            }
+            if (val === 12) {
+                secondIndex = (idx === 1);
+                return false;
+            }
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && firstIndex && secondIndex;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-23.js
index 1a78d65aa..75a41bd46 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-23.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-23.js

- * @description Array.prototype.some - callbackfn called with correct parameters (this object O is correct)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            return obj === o;

-        }

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - callbackfn called with correct parameters
+    (this object O is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            return obj === o;
+        }
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-3.js
index 1f17b36be..0ee6556b8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-3.js

- * @description Array.prototype.some immediately returns true if callbackfn returns true

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    if(idx > 5)   

-      return true;

-    else

-      return false;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.some(callbackfn) === true && callCnt === 7) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some immediately returns true if callbackfn
+    returns true
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    if(idx > 5)   
+      return true;
+    else
+      return false;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.some(callbackfn) === true && callCnt === 7) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-4.js
index 4040c38b0..bada0d2b9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-4.js

- * @description Array.prototype.some - k values are passed in ascending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = 0;

-        var called = 0;

-

-        function callbackfn(val, idx, o) {

-            called++;

-            if (lastIdx !== idx) {

-                return true;

-            } else {

-                lastIdx++;

-                return false;

-            }

-        }

-

-        return !arr.some(callbackfn) && arr.length === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - k values are passed in ascending numeric
+    order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = 0;
+        var called = 0;
+
+        function callbackfn(val, idx, o) {
+            called++;
+            if (lastIdx !== idx) {
+                return true;
+            } else {
+                lastIdx++;
+                return false;
+            }
+        }
+
+        return !arr.some(callbackfn) && arr.length === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-5.js
index 5fe6816a6..17bd7c7b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-5.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-5.js

- * @description Array.prototype.some - k values are accessed during each iteration and not prior to starting the loop

- */

-

-

-function testcase() {

-

-        var kIndex = [];

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {

-                    return true;

-                }

-                kIndex[idx] = 1;

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        return ![11, 12, 13, 14].some(callbackfn, undefined);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - k values are accessed during each iteration
+    and not prior to starting the loop
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kIndex = [];
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {
+                    return true;
+                }
+                kIndex[idx] = 1;
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        return ![11, 12, 13, 14].some(callbackfn, undefined);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-6.js
index 00ae35c9a..c20267391 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-6.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-6.js

- * @description Array.prototype.some - arguments to callbackfn are self consistent

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, length: 1 };

-        var thisArg = {};

-

-        function callbackfn() {

-            return this === thisArg && arguments[0] === 11 && arguments[1] === 0 && arguments[2] === obj;

-        }

-

-        return Array.prototype.some.call(obj, callbackfn, thisArg);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - arguments to callbackfn are self consistent
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, length: 1 };
+        var thisArg = {};
+
+        function callbackfn() {
+            return this === thisArg && arguments[0] === 11 && arguments[1] === 0 && arguments[2] === obj;
+        }
+
+        return Array.prototype.some.call(obj, callbackfn, thisArg);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-7.js
index 0a2c1a95d..38287d7d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-7.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-7.js

- * @description Array.prototype.some - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 0) {

-                accessed = true;

-            }

-            if (idx === 0) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-            return false;

-        }

-

-        var obj = { 0: 9, 1: 100, 10: 11, length: 20 };

-

-        try {

-            Array.prototype.some.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof Error && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - unhandled exceptions happened in callbackfn
+    terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 0) {
+                accessed = true;
+            }
+            if (idx === 0) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+            return false;
+        }
+
+        var obj = { 0: 9, 1: 100, 10: 11, length: 20 };
+
+        try {
+            Array.prototype.some.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof Error && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-8.js
index 84aa687a5..0f1757d9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-8.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-8.js

- * @description Array.prototype.some - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                obj[idx + 1] = 11;

-            }

-            return val > 10;

-        }

-

-        var obj = { 0: 9, 1: 8, length: 2 };

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - element changed by callbackfn on previous
+    iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                obj[idx + 1] = 11;
+            }
+            return val > 10;
+        }
+
+        var obj = { 0: 9, 1: 8, length: 2 };
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-9.js
index bb35f76f4..cdc806659 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-9.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-ii-9.js

- * @description Array.prototype.some - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return true;

-        }

-

-        return [11, 12].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - callbackfn is called with 0 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return true;
+        }
+
+        return [11, 12].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-1.js
index 1706f71f9..59951bcdc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-1.js

- * @description Array.prototype.some - return value of callbackfn is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return undefined;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - return value of callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return undefined;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-10.js
index 37f0e47e1..402d95223 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-10.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-10.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return Infinity;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return Infinity;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-11.js
index 81cc084c3..9f8e4c485 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-11.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-11.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return -Infinity;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return -Infinity;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-12.js
index 58ba03dfe..bc6ff2af0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-12.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return NaN;

-        }

-

-        return ![11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return NaN;
+        }
+
+        return ![11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-13.js
index d22da9c92..c3b746779 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-13.js

- * @description Array.prototype.some - return value of callbackfn is an empty string

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return "";

-        }

-

-        return ![11].some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is an empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return "";
+        }
+
+        return ![11].some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-14.js
index 57d8c6464..6c5c7bb5e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-14.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-14.js

- * @description Array.prototype.some - return value of callbackfn is a non-empty string

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return "non-empty string";

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a non-empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return "non-empty string";
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-15.js
index d09eff068..b761c15fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-15.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-15.js

- * @description Array.prototype.some - return value of callbackfn is Function object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return function () { };

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is Function
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return function () { };
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-16.js
index 0a3818d5e..d9f545283 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-16.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-16.js

- * @description Array.prototype.some - return value of callbackfn is an Array object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Array(10);

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is an Array
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Array(10);
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-17.js
index 8d7517f2d..0d504a5c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-17.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-17.js

- * @description Array.prototype.some - return value of callbackfn is a String object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new String();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a String
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new String();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-18.js
index 12047df14..3487b23d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-18.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-18.js

- * @description Array.prototype.some - return value of callbackfn is a Boolean object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Boolean();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a Boolean
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Boolean();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-19.js
index a7e06bc88..f1d48c4af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-19.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-19.js

- * @description Array.prototype.some - return value of callbackfn is a Number object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Number();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a Number
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Number();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-2.js
index eb5a95822..f8600b6c6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-2.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-2.js

- * @description Array.prototype.some - return value of callbackfn is null

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return null;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - return value of callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return null;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-20.js
index 335e0dce8..cf6f9961b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-20.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-20.js

- * @description Array.prototype.some - return value of callbackfn is the Math object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return Math;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is the Math
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return Math;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-21.js
index 82b6e5f58..503b836f0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-21.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-21.js

- * @description Array.prototype.some - return value of callbackfn is a Date object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Date();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - return value of callbackfn is a Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Date();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-22.js
index 70b9f8b5e..3888aa692 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-22.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-22.js

- * @description Array.prototype.some - return value of callbackfn is a RegExp object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new RegExp();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a RegExp
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new RegExp();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-23.js
index ec6d3e9fc..c0f40fa93 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-23.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-23.js

- * @description Array.prototype.some - return value of callbackfn is the JSON object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return JSON;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is the JSON
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return JSON;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-24.js
index 69fae8870..1ebadddea 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-24.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-24.js

- * @description Array.prototype.some - return value of callbackfn is an Error object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new EvalError();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is an Error
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new EvalError();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-25.js
index 29fc84007..2a130a366 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-25.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-25.js

- * @description Array.prototype.some - return value of callbackfn is the Arguments object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return arguments;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is the Arguments
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return arguments;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-26.js
index f0e5dfe14..08cdbe012 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-26.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-26.js

- * @description Array.prototype.some - return value of callbackfn is the global object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return fnGlobalObject();

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return fnGlobalObject();
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-28.js
index 619587d69..aa30f6d0d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-28.js
@@ -1,47 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-28.js

- * @description Array.prototype.some - true prevents further side effects

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                result = true;

-            }

-            return val > 10;

-        }

-

-        var obj = { length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 8;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                result = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.some.call(obj, callbackfn) && !result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - true prevents further side effects
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                result = true;
+            }
+            return val > 10;
+        }
+
+        var obj = { length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 8;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                result = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.some.call(obj, callbackfn) && !result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-29.js
index a33b60fa4..5c17f2c43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-29.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-29.js

- * @description Array.prototype.some - return value (new Boolean(false)) of callbackfn is treated as true value

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return new Boolean(false);

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value (new Boolean(false)) of
+    callbackfn is treated as true value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return new Boolean(false);
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-3.js
index d5df0d0aa..b3ebc9d78 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-3.js

- * @description Array.prototype.some - return value of callbackfn is a boolean (value is false)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return false;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return !Array.prototype.some.call(obj, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a boolean
+    (value is false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return false;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return !Array.prototype.some.call(obj, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-4.js
index 10986750c..c45972f35 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-4.js

- * @description Array.prototype.some - return value of callbackfn is a boolean (value is true)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        return Array.prototype.some.call(obj, callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a boolean
+    (value is true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        return Array.prototype.some.call(obj, callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-5.js
index 80c690bea..0ac567fec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-5.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 0;

-        }

-

-        return ![11].some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 0;
+        }
+
+        return ![11].some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-6.js
index 15802078e..95fd916f7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-6.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return +0;

-        }

-

-        return ![11].some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return +0;
+        }
+
+        return ![11].some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-7.js
index e918f4d1a..4450627d8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-7.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return -0;

-        }

-

-        return ![11].some(callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return -0;
+        }
+
+        return ![11].some(callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-8.js
index 6e701e9b7..4694f3163 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-8.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-8.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is positive number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return 5;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return 5;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-9.js
index 3ed5dbac5..c8a3c7e63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-9.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-7-c-iii-9.js

- * @description Array.prototype.some - return value of callbackfn is a number (value is negative number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return -5;

-        }

-

-        return [11].some(callbackfn);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some - return value of callbackfn is a number
+    (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return -5;
+        }
+
+        return [11].some(callbackfn);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-1.js
index ef0929008..00865acb7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-1.js

- * @description Array.prototype.some returns false if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  function cb(){}

-  var i = [].some(cb);

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some returns false if 'length' is 0 (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  var i = [].some(cb);
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-10.js
index a15013d34..227223e36 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-10.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-10.js

- * @description Array.prototype.some - subclassed array when length is reduced

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 2;

-  

-  function cb(val)

-  {

-    if(val > 2)

-      return true;

-    else

-      return false;

-  }

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some - subclassed array when length is reduced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 2;
+  
+  function cb(val)
+  {
+    if(val > 2)
+      return true;
+    else
+      return false;
+  }
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-11.js
index 53c4ab32b..fb7aa2761 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-11.js

- * @description Array.prototype.some returns false when all calls to callbackfn return false

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return false;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  

-  if(arr.some(callbackfn) === false && callCnt === 10) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false when all calls to callbackfn
+    return false
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return false;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  
+  if(arr.some(callbackfn) === false && callCnt === 10) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-12.js
index 280406b79..50e006142 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-12.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-12.js

- * @description Array.prototype.some doesn't mutate the array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return true;

-  }

-  var arr = [1,2,3,4,5];

-  arr.some(callbackfn);

-  if(arr[0] === 1 &&

-     arr[1] === 2 &&

-     arr[2] === 3 &&

-     arr[3] === 4 &&

-     arr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some doesn't mutate the array on which it is
+    called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return true;
+  }
+  var arr = [1,2,3,4,5];
+  arr.some(callbackfn);
+  if(arr[0] === 1 &&
+     arr[1] === 2 &&
+     arr[2] === 3 &&
+     arr[3] === 4 &&
+     arr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-13.js
index 972789a39..49965ddfc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-13.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-13.js

- * @description Array.prototype.some doesn't visit expandos

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return false;

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  arr["i"] = 10;

-  arr[true] = 11;

-  

-  if(arr.some(callbackfn) === false && callCnt === 10) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.some doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return false;
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  arr["i"] = 10;
+  arr[true] = 11;
+  
+  if(arr.some(callbackfn) === false && callCnt === 10) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-2.js
index 5d614112d..254f23a72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-2.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-3.js
index 2a94bd8ed..45a3b5a02 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-3.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-4.js
index db7ee0b41..3513777f7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-4.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-5.js
index dda22dd23..741ff3a9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-5.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-6.js
index 6075d269f..1130b23c6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-6.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-7.js
index 6a060f577..a8565349d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-7.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden with obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-8.js
index 92463fb48..5ed5701a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-8.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.17/15.4.4.17-8-8.js

- * @description Array.prototype.some returns false if 'length' is 0 (subclassed Array, length overridden with []

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  var i = f.some(cb);

-  

-  if (i === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.some returns false if 'length' is 0 (subclassed
+    Array, length overridden with []
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  var i = f.some(cb);
+  
+  if (i === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-1.js
index aaace70cd..9e159e691 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-1.js

- * @description Array.prototype.forEach must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.forEach;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.forEach;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-2.js
index 0eb353f2b..4999b2b6b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-0-2.js

- * @description Array.prototype.forEach.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.forEach.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.forEach.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-1.js
index 286dbc412..12fdda9df 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-1.js

- * @description Array.prototype.forEach applied to undefined

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.forEach.call(undefined); // TypeError is thrown if value is undefined

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.forEach.call(undefined); // TypeError is thrown if value is undefined
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-10.js
index b41760d9a..4913c0072 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-10.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-10.js

- * @description Array.prototype.forEach applied to the Math object

- */

-

-

-function testcase() {

-        var result = false;

-

-        function callbackfn(val, idx, obj) {

-            result = ('[object Math]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            Array.prototype.forEach.call(Math, callbackfn);

-            return result;

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+
+        function callbackfn(val, idx, obj) {
+            result = ('[object Math]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            Array.prototype.forEach.call(Math, callbackfn);
+            return result;
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-11.js
index e069be276..6cba63c14 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-11.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-11.js

- * @description Array.prototype.forEach applied to Date object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Date;

-        }

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Date;
+        }
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-12.js
index dab1e0f2b..2f8dd72b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-12.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-12.js

- * @description Array.prototype.forEach applied to RegExp object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof RegExp;

-        }

-

-        var obj = new RegExp();

-        obj.length = 1;

-        obj[0] = 1;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof RegExp;
+        }
+
+        var obj = new RegExp();
+        obj.length = 1;
+        obj[0] = 1;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-13.js
index 65b6847d7..b08446a0f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-13.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-13.js

- * @description Array.prototype.forEach applied to the JSON object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = ('[object JSON]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            Array.prototype.forEach.call(JSON, callbackfn);

-            return result;

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = ('[object JSON]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            Array.prototype.forEach.call(JSON, callbackfn);
+            return result;
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-14.js
index fd042c85f..39e4f9790 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-14.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-14.js

- * @description Array.prototype.forEach applied to Error object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Error;

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Error;
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-15.js
index ed5ac1271..93763ee79 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-15.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-15.js

- * @description Array.prototype.forEach applied to the Arguments object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = ('[object Arguments]' === Object.prototype.toString.call(obj));

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = ('[object Arguments]' === Object.prototype.toString.call(obj));
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-2.js
index e12c85e94..88962fce5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-2.js

- * @description Array.prototype.forEach applied to null

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.forEach.call(null); // TypeError is thrown if value is null

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.forEach.call(null); // TypeError is thrown if value is null
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-3.js
index 3acafbedf..0eed4fa8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-3.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-3.js

- * @description Array.prototype.forEach applied to boolean primitive

- */

-

-

-function testcase() {

-        var result = false;

-

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = true;

-            Boolean.prototype.length = 1;

-

-            Array.prototype.forEach.call(false, callbackfn);

-            return result;

-

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = true;
+            Boolean.prototype.length = 1;
+
+            Array.prototype.forEach.call(false, callbackfn);
+            return result;
+
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-4.js
index b8b20f5c2..c316d4e72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-4.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-4.js

- * @description Array.prototype.forEach applied to Boolean object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-5.js
index 277082584..88c22670a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-5.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-5.js

- * @description Array.prototype.forEach applied to number primitive

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-

-            Array.prototype.forEach.call(2.5, callbackfn);

-            return result;

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+
+            Array.prototype.forEach.call(2.5, callbackfn);
+            return result;
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-6.js
index 0e2113ef4..d4fc10657 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-6.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-6.js

- * @description Array.prototype.forEach applied to Number object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-7.js
index 5a71e0fd9..55e9dac91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-7.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-7.js

- * @description Array.prototype.forEach applied to string primitive

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof String;

-        }

-

-        Array.prototype.forEach.call("abc", callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof String;
+        }
+
+        Array.prototype.forEach.call("abc", callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-8.js
index 3264dd569..c509fa091 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-8.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-8.js

- * @description Array.prototype.forEach applied to String object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof String;

-        }

-

-        var obj = new String("abc");

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof String;
+        }
+
+        var obj = new String("abc");
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-9.js
index c5111a8de..69a2cbc43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-9.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-1-9.js

- * @description Array.prototype.forEach applied to Function object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = obj instanceof Function;

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = obj instanceof Function;
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-1.js
index bc2f65321..32c19ff63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-1.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-1.js

- * @description Array.prototype.forEach - 'length' is own data property on an Array-like object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is own data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-10.js
index a7c2799ac..24b41e749 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-10.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-10.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an inherited accessor property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-11.js
index a5bf38f41..e1499b3d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-11.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-11.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-12.js
index b5cfa8e5b..35f61584e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-12.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-12.js

- * @description Array.prototype.forEach - 'length' is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 12, 1: 11 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            Array.prototype.forEach.call(obj, callbackfn);

-            return !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is own accessor property
+    without a get function that overrides an inherited accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 12, 1: 11 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            Array.prototype.forEach.call(obj, callbackfn);
+            return !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-13.js
index 912637473..4525ee470 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-13.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-13.js

- * @description Array.prototype.forEach applied to the Array-like object that 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to the Array-like object that
+    'length' is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-14.js
index 3e49e8964..70d3aec14 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-14.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-14.js

- * @description Array.prototype.forEach applied to the Array-like object that 'length' property doesn't exist

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return !accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to the Array-like object that
+    'length' property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return !accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-15.js
index cf0c62867..a8c5a53c8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-15.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-15.js

- * @description Array.prototype.forEach - 'length' is property of the global object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);

-            return result;

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);
+            return result;
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-17.js
index 052d84dc2..78f033a96 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-17.js

- * @description Array.prototype.forEach applied to the Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var func = function (a, b) {

-            arguments[2] = 9;

-            Array.prototype.forEach.call(arguments, callbackfn);

-            return result;

-        };

-

-        return func(12, 11);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to the Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var func = function (a, b) {
+            arguments[2] = 9;
+            Array.prototype.forEach.call(arguments, callbackfn);
+            return result;
+        };
+
+        return func(12, 11);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-18.js
index 9e879953c..4be359934 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-18.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-18.js

- * @description Array.prototype.forEach applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 3);

-        }

-

-        var str = new String("012");

-

-        Array.prototype.forEach.call(str, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 3);
+        }
+
+        var str = new String("012");
+
+        Array.prototype.forEach.call(str, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-19.js
index 91a7c1933..47aaac2f8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-19.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-19.js

- * @description Array.prototype.forEach applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        Array.prototype.forEach.call(fun, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Function object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        Array.prototype.forEach.call(fun, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-2.js
index d6a859b95..d71ef253f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-2.js

- * @description Array.prototype.forEach - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        [12, 11].forEach(callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        [12, 11].forEach(callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-3.js
index 6991dc484..9286fbe74 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-3.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-3.js

- * @description Array.prototype.forEach - 'length' is an own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is an own data property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-4.js
index 1c3dda70f..e0f31c2d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-4.js

- * @description Array.prototype.forEach - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        var result = false;

-        var arrProtoLen;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            [12, 11].forEach(callbackfn);

-            return result;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        var arrProtoLen;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            [12, 11].forEach(callbackfn);
+            return result;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-5.js
index 8a84c6e76..0137d2997 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-5.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-5.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an own data property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-6.js
index 1fa7c9992..8c9ae99a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-6.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-6.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-7.js
index 1abf9a291..a476e6405 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-7.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-8.js
index 20b155cd3..3a9994e8f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-8.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-8.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an own accessor property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-9.js
index 5be4ff967..8b3804652 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-9.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-2-9.js

- * @description Array.prototype.forEach applied to Array-like object, 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        Array.prototype.forEach.call(child, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach applied to Array-like object, 'length' is
+    an own accessor property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        Array.prototype.forEach.call(child, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-1.js
index 7a90bd229..4efc21afc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-1.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-1.js

- * @description Array.prototype.forEach - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 0, 1: 1, length: undefined };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 0, 1: 1, length: undefined };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-10.js
index a9167a61f..33c10645f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-10.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-10.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-11.js
index ca8235704..62ac23a55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-11.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-11.js

- * @description Array.prototype.forEach - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing a
+    positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-12.js
index b9379bb8d..0ac8a594f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-12.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-12.js

- * @description Array.prototype.forEach - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "-4294967294" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing a
+    negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "-4294967294" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-13.js
index 13922034c..b2b963d94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-13.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-13.js

- * @description Array.prototype.forEach - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-        var obj = { 1: 11, 2: 9, length: "2.5" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing a
+    decimal number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+        var obj = { 1: 11, 2: 9, length: "2.5" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-14.js
index a3bb7e521..5763d8bae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-14.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-14.js

- * @description Array.prototype.forEach - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed1 = false;

-        var accessed2 = false;

-        var accessed3 = false;

-

-        function callbackfn1(val, idx, obj) {

-            accessed1 = true;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            accessed2 = true;

-        }

-

-        function callbackfn3(val, idx, obj) {

-            accessed3 = true;

-        }

-

-        var obj1 = { 0: 9, length: "Infinity" };

-        var obj2 = { 0: 9, length: "-Infinity" };

-        var obj3 = { 0: 9, length: "+Infinity" };

-

-        Array.prototype.forEach.call(obj1, callbackfn1);

-        Array.prototype.forEach.call(obj2, callbackfn2);

-        Array.prototype.forEach.call(obj3, callbackfn3);

-

-        return !accessed1 && !accessed2 && !accessed3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing
+    +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed1 = false;
+        var accessed2 = false;
+        var accessed3 = false;
+
+        function callbackfn1(val, idx, obj) {
+            accessed1 = true;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            accessed2 = true;
+        }
+
+        function callbackfn3(val, idx, obj) {
+            accessed3 = true;
+        }
+
+        var obj1 = { 0: 9, length: "Infinity" };
+        var obj2 = { 0: 9, length: "-Infinity" };
+        var obj3 = { 0: 9, length: "+Infinity" };
+
+        Array.prototype.forEach.call(obj1, callbackfn1);
+        Array.prototype.forEach.call(obj2, callbackfn2);
+        Array.prototype.forEach.call(obj3, callbackfn3);
+
+        return !accessed1 && !accessed2 && !accessed3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-15.js
index 824ec11ca..03bde681d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-15.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-15.js

- * @description Array.prototype.forEach - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2E0" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2E0" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-16.js
index 1c58c53b1..a36ecbfe5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-16.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-16.js

- * @description Array.prototype.forEach - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0x0002" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing a hex
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0x0002" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-17.js
index 60f9a03b2..cc7fb3919 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-17.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-17.js

- * @description Array.prototype.forEach - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0002.00" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0002.00" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-18.js
index 7db29a244..617bc84a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-18.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-18.js

- * @description Array.prototype.forEach - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: "asdf!_" };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: "asdf!_" };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-19.js
index a22d20758..576d55c2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-19.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-19.js

- * @description Array.prototype.forEach - value of 'length' is an Object which has an own toString method.

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is an Object which has
+    an own toString method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-2.js
index 93416a9c0..1ec9a2575 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-2.js

- * @description Array.prototype.forEach - value of 'length' is a boolean (value is true)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = { 0: 11, 1: 9, length: true };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a boolean (value is
+    true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = { 0: 11, 1: 9, length: true };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-20.js
index 98ae5e6a5..bb8005e9a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-20.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-20.js

- * @description Array.prototype.forEach - value of 'length' is an Object which has an own valueOf method.

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is an Object which has
+    an own valueOf method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-21.js
index 30a9dbb2b..a955956af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-21.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-21.js

- * @description Array.prototype.forEach - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var firstStepOccured = false;

-        var secondStepOccured = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    firstStepOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    secondStepOccured = true;

-                    return '2';

-                }

-            }

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult && firstStepOccured && secondStepOccured;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var firstStepOccured = false;
+        var secondStepOccured = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    firstStepOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    secondStepOccured = true;
+                    return '2';
+                }
+            }
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult && firstStepOccured && secondStepOccured;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-22.js
index 9ee0a8398..9819aef27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-22.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-22.js

- * @description Array.prototype.forEach throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var firstStepOccured = false;

-        var secondStepOccured = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 12,

-

-            length: {

-                valueOf: function () {

-                    firstStepOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    secondStepOccured = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.forEach.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach throws TypeError exception when 'length'
+    is an object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var firstStepOccured = false;
+        var secondStepOccured = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 12,
+
+            length: {
+                valueOf: function () {
+                    firstStepOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    secondStepOccured = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.forEach.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-23.js
index 0fb5185f2..8ffbc47a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-23.js
@@ -1,49 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-23.js

- * @description Array.prototype.forEach uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: child

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach uses inherited valueOf method when
+    'length' is an object with an own toString and inherited valueOf
+    methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: child
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-24.js
index 0e6996360..c1feef8f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-24.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-24.js

- * @description Array.prototype.forEach - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: 2.685

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: 2.685
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-25.js
index 61264d3ba..01dda51a6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-25.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-25.js

- * @description Array.prototype.forEach - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: -4294967294.5

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: -4294967294.5
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-28.js
index 0d20931c2..101d969c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-28.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-28.js

- * @description Array.prototype.forEach - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is boundary value
+    (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-29.js
index 5fe2138a0..c64f058cf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-29.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-29.js

- * @description Array.prototype.forEach - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult = (val > 10);

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is boundary value
+    (2^32 + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult = (val > 10);
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-3.js
index 2059b02eb..975f61ab6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-3.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 1, 1: 1, length: 0 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 1, 1: 1, length: 0 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-4.js
index 372620953..18e918034 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-4.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 11, length: +0 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 11, length: +0 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-5.js
index 471dae714..69cc786ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-5.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-5.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 11, length: -0 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 11, length: -0 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-6.js
index 96ffec650..93431221e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-6.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-

-        var testResult1 = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult1 = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult1 = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-7.js
index 255465da1..a8a325eca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-7.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-7.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-

-        var testResult1 = false;

-

-        function callbackfn(val, idx, obj) {

-            testResult1 = (val > 10);

-        }

-

-        var obj = { 1: 11, 2: 9, length: -4294967294 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = false;
+
+        function callbackfn(val, idx, obj) {
+            testResult1 = (val > 10);
+        }
+
+        var obj = { 1: 11, 2: 9, length: -4294967294 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-8.js
index 187e7af77..69037623c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-8.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-8.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-9.js
index 55a7ba6ad..bdbbface1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-9.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-3-9.js

- * @description Array.prototype.forEach - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-1.js
index 1d12e60eb..0c239b547 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-1.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-10.js
index 7cd901935..22056cc7f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-10.js

- * @description Array.prototype.forEach - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-11.js
index 11069b210..3b97e54e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-11.js

- * @description Array.prototype.forEach - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-12.js
index 3c61e06c3..e21a32287 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-12.js

- * @description Array.prototype.forEach - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        [11, 9].forEach(callbackfn);

-        return accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        [11, 9].forEach(callbackfn);
+        return accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-15.js
index 98e15b5c6..2a082adcf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-15.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-15.js

- * @description Array.prototype.forEach - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - calling with no callbackfn is the same
+    as passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-2.js
index 659651ca3..a6db6cb34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-2.js

- * @description Array.prototype.forEach throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-3.js
index 1fc8e93aa..db0651f5d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-3.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-4.js
index ab4ad4458..4344dd6e8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-4.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-5.js
index 5075cd500..a0935212b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-5.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-6.js
index 5cbc27b42..51865c285 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-6.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-7.js
index 04d5ce8d9..eb9594308 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-7.js

- * @description Array.prototype.forEach throws TypeError if callbackfn is Object without Call internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.forEach(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach throws TypeError if callbackfn is Object
+    without Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.forEach(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-8.js
index 9a6c649a0..c2816798c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-8.js

- * @description Array.prototype.forEach - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-9.js
index 0d2ae0a3e..7a1b1c31e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-4-9.js

- * @description Array.prototype.forEach - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1-s.js
index 05a592b7c..d2479d22c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1-s.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1-s.js

- * @description Array.prototype.forEach - thisArg not passed to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() {

-  var innerThisCorrect = false;

-  

-  function callbackfn(val, idx, obj) {

-    "use strict";

-    innerThisCorrect = this===undefined;

-    return true;

-  }

-

-  [1].forEach(callbackfn);

-  return innerThisCorrect;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg not passed to strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var innerThisCorrect = false;
+  
+  function callbackfn(val, idx, obj) {
+    "use strict";
+    innerThisCorrect = this===undefined;
+    return true;
+  }
+
+  [1].forEach(callbackfn);
+  return innerThisCorrect;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1.js
index d2ad769bc..67c09e63b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-1.js

- * @description Array.prototype.forEach - thisArg is passed

- */

-

-

-function testcase() {

-        this._15_4_4_18_5_1 = false;

-        var _15_4_4_18_5_1 = true;

-        var result;

-        function callbackfn(val, idx, obj) {

-            result = this._15_4_4_18_5_1;

-        }

-        var arr = [1];

-        arr.forEach(callbackfn)

-        return !result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg is passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        this._15_4_4_18_5_1 = false;
+        var _15_4_4_18_5_1 = true;
+        var result;
+        function callbackfn(val, idx, obj) {
+            result = this._15_4_4_18_5_1;
+        }
+        var arr = [1];
+        arr.forEach(callbackfn)
+        return !result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-10.js
index 59cf58961..6823ecd39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-10.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-10.js

- * @description Array.prototype.forEach - Array Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objArray = [];

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objArray);

-        }

-

-        [11].forEach(callbackfn, objArray);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Array Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objArray = [];
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objArray);
+        }
+
+        [11].forEach(callbackfn, objArray);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-11.js
index 3fce7ac5b..1fbb4acc0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-11.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-11.js

- * @description Array.prototype.forEach - String Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objString = new String();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objString);

-        }

-

-        [11].forEach(callbackfn, objString);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - String Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objString = new String();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objString);
+        }
+
+        [11].forEach(callbackfn, objString);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-12.js
index 32f66ddf9..48e72d6a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-12.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-12.js

- * @description Array.prototype.forEach - Boolean Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objBoolean = new Boolean();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objBoolean);

-        }

-

-        [11].forEach(callbackfn, objBoolean);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Boolean Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objBoolean = new Boolean();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objBoolean);
+        }
+
+        [11].forEach(callbackfn, objBoolean);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-13.js
index d16af30a7..ef8203613 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-13.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-13.js

- * @description Array.prototype.forEach - Number Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objNumber = new Number();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objNumber);

-        }

-

-        [11].forEach(callbackfn, objNumber);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Number Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objNumber = new Number();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objNumber);
+        }
+
+        [11].forEach(callbackfn, objNumber);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-14.js
index f0f3b10a3..0ec3b15d5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-14.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-14.js

- * @description Array.prototype.forEach - the Math object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this === Math);

-        }

-

-        [11].forEach(callbackfn, Math);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - the Math object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this === Math);
+        }
+
+        [11].forEach(callbackfn, Math);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-15.js
index b0f456c46..644dfe4ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-15.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-15.js

- * @description Array.prototype.forEach - Date Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objDate = new Date();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objDate);

-        }

-

-        [11].forEach(callbackfn, objDate);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Date Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objDate = new Date();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objDate);
+        }
+
+        [11].forEach(callbackfn, objDate);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-16.js
index 9d2c2e722..72c118be4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-16.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-16.js

- * @description Array.prototype.forEach - RegExp Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objRegExp = new RegExp();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objRegExp);

-        }

-

-        [11].forEach(callbackfn, objRegExp);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - RegExp Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objRegExp = new RegExp();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objRegExp);
+        }
+
+        [11].forEach(callbackfn, objRegExp);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-17.js
index b1ce03ff3..15cbd86fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-17.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-17.js

- * @description Array.prototype.forEach - the JSON object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this === JSON);

-        }

-

-        [11].forEach(callbackfn, JSON);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - the JSON object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this === JSON);
+        }
+
+        [11].forEach(callbackfn, JSON);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-18.js
index 299ee5dda..2ec5915d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-18.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-18.js

- * @description Array.prototype.forEach - Error Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objError = new RangeError();

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objError);

-        }

-

-        [11].forEach(callbackfn, objError);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Error Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objError = new RangeError();
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objError);
+        }
+
+        [11].forEach(callbackfn, objError);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-19.js
index 5f9f16050..1affe6b0a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-19.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-19.js

- * @description Array.prototype.forEach - the Arguments object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var arg;

-

-        function callbackfn(val, idx, obj) {

-            result = (this === arg);

-        }

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        [11].forEach(callbackfn, arg);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - the Arguments object can be used as
+    thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var arg;
+
+        function callbackfn(val, idx, obj) {
+            result = (this === arg);
+        }
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        [11].forEach(callbackfn, arg);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-2.js
index cb3a5df5b..af5dd7605 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-2.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-2.js

- * @description Array.prototype.forEach - thisArg is Object

- */

-

-

-function testcase() {

-  var res = false;

-  var o = new Object();

-  o.res = true;

-  var result;

-  function callbackfn(val, idx, obj)

-  {

-    result = this.res;

-  }

-

-  var arr = [1];

-  arr.forEach(callbackfn,o)

-  if( result === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg is Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var o = new Object();
+  o.res = true;
+  var result;
+  function callbackfn(val, idx, obj)
+  {
+    result = this.res;
+  }
+
+  var arr = [1];
+  arr.forEach(callbackfn,o)
+  if( result === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-21.js
index 397b4bec7..260a2d10e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-21.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-21.js

- * @description Array.prototype.forEach - the global object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this === fnGlobalObject());

-        }

-

-        [11].forEach(callbackfn, fnGlobalObject());

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - the global object can be used as thisArg
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this === fnGlobalObject());
+        }
+
+        [11].forEach(callbackfn, fnGlobalObject());
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-22.js
index f53a9402e..a8fc7de88 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-22.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-22.js

- * @description Array.prototype.forEach - boolean primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-

-        function callbackfn(val, idx, obj) {

-            result = (this.valueOf() === false);

-        }

-

-        [11].forEach(callbackfn, false);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - boolean primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+
+        function callbackfn(val, idx, obj) {
+            result = (this.valueOf() === false);
+        }
+
+        [11].forEach(callbackfn, false);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-23.js
index aa162bc93..78be66e48 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-23.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-23.js

- * @description Array.prototype.forEach - number primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this.valueOf() === 101);

-        }

-

-        [11].forEach(callbackfn, 101);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - number primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this.valueOf() === 101);
+        }
+
+        [11].forEach(callbackfn, 101);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-24.js
index 24ae537d3..e282bbb38 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-24.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-24.js

- * @description Array.prototype.forEach - string primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this.valueOf() === "abc");

-        }

-

-        [11].forEach(callbackfn, "abc");

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - string primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this.valueOf() === "abc");
+        }
+
+        [11].forEach(callbackfn, "abc");
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-25.js
index 809c940d2..85f2f1312 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-25.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-25.js

- * @description Array.prototype.forEach - thisArg not passed

- */

-

-

-function testcase() {

-        function innerObj() {

-            this._15_4_4_18_5_25 = true;

-            var _15_4_4_18_5_25 = false;

-            var result;

-            function callbackfn(val, idx, obj) {

-                result = this._15_4_4_18_5_25;

-            }

-            var arr = [1];

-            arr.forEach(callbackfn)

-            this.retVal = !result;

-        }

-        return new innerObj().retVal;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg not passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function innerObj() {
+            this._15_4_4_18_5_25 = true;
+            var _15_4_4_18_5_25 = false;
+            var result;
+            function callbackfn(val, idx, obj) {
+                result = this._15_4_4_18_5_25;
+            }
+            var arr = [1];
+            arr.forEach(callbackfn)
+            this.retVal = !result;
+        }
+        return new innerObj().retVal;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-3.js
index 5d3b224ad..927c2cf8f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-3.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-3.js

- * @description Array.prototype.forEach - thisArg is Array

- */

-

-

-function testcase() {

-  var res = false;

-  var a = new Array();

-  a.res = true;

-  var result;

-  function callbackfn(val, idx, obj)

-  {

-    result = this.res;

-  }

-

-  var arr = [1];

-  arr.forEach(callbackfn,a)

-  if( result === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg is Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var a = new Array();
+  a.res = true;
+  var result;
+  function callbackfn(val, idx, obj)
+  {
+    result = this.res;
+  }
+
+  var arr = [1];
+  arr.forEach(callbackfn,a)
+  if( result === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-4.js
index 02f578a9c..d3940805c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-4.js

- * @description Array.prototype.forEach - thisArg is object from object template(prototype)

- */

-

-

-function testcase() {

-  var res = false;

-  var result;

-  function callbackfn(val, idx, obj)

-  {

-    result = this.res;

-  }

-  

-  function foo(){}

-  foo.prototype.res = true;

-  var f = new foo();

-  var arr = [1];

-  arr.forEach(callbackfn,f)

-  if( result === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - thisArg is object from object
+    template(prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var result;
+  function callbackfn(val, idx, obj)
+  {
+    result = this.res;
+  }
+  
+  function foo(){}
+  foo.prototype.res = true;
+  var f = new foo();
+  var arr = [1];
+  arr.forEach(callbackfn,f)
+  if( result === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-5.js
index d3f60de44..cf8a203fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-5.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-5.js

- * @description Array.prototype.forEach - thisArg is object from object template

- */

-

-

-function testcase() {

-  var res = false;

-  var result;

-  function callbackfn(val, idx, obj)

-  {

-    result = this.res;

-  }

-

-  function foo(){}

-  var f = new foo();

-  f.res = true;

-  

-  var arr = [1];

-  arr.forEach(callbackfn,f)

-  if( result === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg is object from object template
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var result;
+  function callbackfn(val, idx, obj)
+  {
+    result = this.res;
+  }
+
+  function foo(){}
+  var f = new foo();
+  f.res = true;
+  
+  var arr = [1];
+  arr.forEach(callbackfn,f)
+  if( result === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-6.js
index 61e45d230..63127f484 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-6.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-6.js

- * @description Array.prototype.forEach - thisArg is function

- */

-

-

-function testcase() {

-  var res = false;

-  var result;

-  function callbackfn(val, idx, obj)

-  {

-    result = this.res;

-  }

-

-  function foo(){}

-  foo.res = true;

-  

-  var arr = [1];

-  arr.forEach(callbackfn,foo)

-  if( result === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - thisArg is function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var result;
+  function callbackfn(val, idx, obj)
+  {
+    result = this.res;
+  }
+
+  function foo(){}
+  foo.res = true;
+  
+  var arr = [1];
+  arr.forEach(callbackfn,foo)
+  if( result === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-7.js
index 47d7181d1..3e379d368 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-7.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-7.js

- * @description Array.prototype.forEach - built-in functions can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-

-        function callbackfn(val, idx, obj) {

-            result = (this === eval);

-        }

-

-        [11].forEach(callbackfn, eval);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - built-in functions can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+
+        function callbackfn(val, idx, obj) {
+            result = (this === eval);
+        }
+
+        [11].forEach(callbackfn, eval);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-9.js
index b0d08bc3b..f61c88c8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-9.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-5-9.js

- * @description Array.prototype.forEach - Function Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var result = false;

-        var objString = function () { };

-

-        function callbackfn(val, idx, obj) {

-            result = (this === objString);

-        }

-

-        [11].forEach(callbackfn, objString);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - Function Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var objString = function () { };
+
+        function callbackfn(val, idx, obj) {
+            result = (this === objString);
+        }
+
+        [11].forEach(callbackfn, objString);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-1.js
index 18b48d1d6..9c755a4ea 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-1.js

- * @description Array.prototype.forEach doesn't consider new elements added to array after the call

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++; 

-    arr[2] = 3;

-    arr[5] = 6;

-  }

-

-  var arr = [1,2,,4,5];

-  arr.forEach(callbackfn);

-  if( callCnt === 5)    

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't consider new elements added to
+    array after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++; 
+    arr[2] = 3;
+    arr[5] = 6;
+  }
+
+  var arr = [1,2,,4,5];
+  arr.forEach(callbackfn);
+  if( callCnt === 5)    
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-2.js
index 3363a21c6..1bd0d68ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-2.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-2.js

- * @description Array.prototype.forEach doesn't visit deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    if(callCnt == 0)

-      delete arr[3];

-    callCnt++;

-  }

-

-  var arr = [1,2,3,4,5];

-  arr.forEach(callbackfn)

-  if( callCnt === 4)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't visit deleted elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    if(callCnt == 0)
+      delete arr[3];
+    callCnt++;
+  }
+
+  var arr = [1,2,3,4,5];
+  arr.forEach(callbackfn)
+  if( callCnt === 4)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-3.js
index 9210b60e5..66fc34c7d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-3.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-3.js

- * @description Array.prototype.forEach doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    arr.length=3;

-    callCnt++;

-  }

-

-  var arr = [1,2,3,4,5];

-  arr.forEach(callbackfn);

-  if( callCnt === 3)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    arr.length=3;
+    callCnt++;
+  }
+
+  var arr = [1,2,3,4,5];
+  arr.forEach(callbackfn);
+  if( callCnt === 3)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-4.js
index 72b756f21..2aae38532 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-4.js

- * @description Array.prototype.forEach doesn't consider newly added elements in sparse array

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    arr[1000] = 3;

-    callCnt++;

-  }

-

-  var arr = new Array(10);

-  arr[1] = 1;

-  arr[2] = 2;

-  arr.forEach(callbackfn);

-  if( callCnt === 2)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't consider newly added elements in
+    sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    arr[1000] = 3;
+    callCnt++;
+  }
+
+  var arr = new Array(10);
+  arr[1] = 1;
+  arr[2] = 2;
+  arr.forEach(callbackfn);
+  if( callCnt === 2)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-5.js
index 0e503543b..9c9cdc59f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-5.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-5.js

- * @description Array.prototype.forEach visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    delete arr[4];

-    callCnt++;

-  }

-

-  Array.prototype[4] = 5;

-

-  var arr = [1,2,3,4,5];

-  arr.forEach(callbackfn)

-  delete Array.prototype[4];

-  if( callCnt === 5)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach visits deleted element in array after the
+    call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    delete arr[4];
+    callCnt++;
+  }
+
+  Array.prototype[4] = 5;
+
+  var arr = [1,2,3,4,5];
+  arr.forEach(callbackfn)
+  delete Array.prototype[4];
+  if( callCnt === 5)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-7.js
index c88e5c537..b5f5c17e3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-7.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-7.js

- * @description Array.prototype.forEach - considers new value of elements in array after the call

- */

-

-

-function testcase() {

-

-        var result = false;

-        var arr = [1, 2, 3, 4, 5];

-

-        function callbackfn(val, Idx, obj) {

-            arr[4] = 6;

-            if (val >= 6) {

-                result = true;

-            }

-        }

-

-        arr.forEach(callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - considers new value of elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var arr = [1, 2, 3, 4, 5];
+
+        function callbackfn(val, Idx, obj) {
+            arr[4] = 6;
+            if (val >= 6) {
+                result = true;
+            }
+        }
+
+        arr.forEach(callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-8.js
index 6cf913d41..99a81e1ff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-8.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-8.js

- * @description Array.prototype.forEach - no observable effects occur if len is 0

- */

-

-

-function testcase() {

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 0 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - no observable effects occur if len is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 0 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-9.js
index b5d031328..6d814c44c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-9.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-9.js

- * @description Array.prototype.forEach - modifications to length don't change number of iterations

- */

-

-

-function testcase() {

-

-        var called = 0;

-        function callbackfn(val, idx, obj) {

-            called++;

-        }

-

-        var obj = { 1: 12, 2: 9, length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                obj.length = 3;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - modifications to length don't change
+    number of iterations
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        function callbackfn(val, idx, obj) {
+            called++;
+        }
+
+        var obj = { 1: 12, 2: 9, length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                obj.length = 3;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-1.js
index 7e360a99e..551463184 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-1.js

- * @description Array.prototype.forEach - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-  }

-

-  var arr = new Array(10);

-  arr[1] = undefined;

-  arr.forEach(callbackfn);

-  if( callCnt === 1)    

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn not called for indexes never
+    been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+  }
+
+  var arr = new Array(10);
+  arr[1] = undefined;
+  arr.forEach(callbackfn);
+  if( callCnt === 1)    
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-10.js
index 3a0266cf7..850d9678e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-10.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-10.js

- * @description Array.prototype.forEach - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.forEach.call(obj, callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.forEach.call(obj, callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-11.js
index 5e6b89e1c..3ea09c3a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-11.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-11.js

- * @description Array.prototype.forEach - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, , ];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.forEach(callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, , ];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.forEach(callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-12.js
index e280b8cb6..466ee0430 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-12.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-12.js

- * @description Array.prototype.forEach - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 111, length: 10 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.forEach.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 111, length: 10 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.forEach.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-13.js
index a32bcdfd8..7df01dc33 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-13.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-13.js

- * @description Array.prototype.forEach - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-        var arr = [0, 111];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.forEach(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+        var arr = [0, 111];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.forEach(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-14.js
index f0b1b12ec..59c60dd39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-14.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-14.js

- * @description Array.prototype.forEach - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-15.js
index 6de098225..8b27761cd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-15.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-15.js

- * @description Array.prototype.forEach - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                testResult = true;

-            }

-        }

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            arr.forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - decreasing length of array with
+    prototype property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                testResult = true;
+            }
+        }
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            arr.forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-16.js
index e0464b1dc..237a71175 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-16.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-16.js

- * @description Array.prototype.forEach - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-2.js
index 7cd120006..83389f35f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-2.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-2.js

- * @description Array.prototype.forEach - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "length") {

-                testResult = true;

-            }

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - added properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "length") {
+                testResult = true;
+            }
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-3.js
index a6dcb5135..444e75526 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-3.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-3.js

- * @description Array.prototype.forEach - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 8) {

-                testResult = false;

-            }

-        }

-        var obj = { 2: 6.99, 8: 19 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[8];

-                return 10;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 8) {
+                testResult = false;
+            }
+        }
+        var obj = { 2: 6.99, 8: 19 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[8];
+                return 10;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-4.js
index 146ca7ab5..cd57adfc5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-4.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-4.js

- * @description Array.prototype.forEach - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(obj, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(obj, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-5.js
index de690b5d5..88c9a9aab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-5.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-5.js

- * @description Array.prototype.forEach - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-6.js
index 47a05b1de..3c8f3b746 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-6.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-6.js

- * @description Array.prototype.forEach - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - properties can be added to prototype
+    after current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-7.js
index 8836367ba..a1fb023a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-7.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-7.js

- * @description Array.prototype.forEach - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.forEach(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - properties can be added to prototype
+    after current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.forEach(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-8.js
index 178c1f2ab..ad82364e8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-8.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-8.js

- * @description Array.prototype.forEach - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting own property causes index
+    property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-9.js
index 4e6d3d613..5bd5e2067 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-9.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-b-9.js

- * @description Array.prototype.forEach - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - deleting own property causes index
+    property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-1.js
index 9c06e483d..a3707da25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-1.js

- * @description Array.prototype.forEach - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = { };

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                testResult = (val === kValue);

-            }

-        }

-

-        var obj = { 5: kValue, length: 100 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = { };
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                testResult = (val === kValue);
+            }
+        }
+
+        var obj = { 5: kValue, length: 100 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-10.js
index e7548600f..57c6b5996 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-10.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-10.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 2) {

-                testResult = (val === 12);

-            }

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 2) {
+                testResult = (val === 12);
+            }
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-11.js
index afea5de86..4df544d3a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-11.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-11.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        var proto = { 0: 5 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        var proto = { 0: 5 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-12.js
index efdafa55f..a871ed146 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-12.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-12.js

- * @description  Array.prototype.forEach - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 111);

-            }

-        }

-

-        var arr = [];

-        try {

-            Array.prototype[0] = 10;

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 111;

-                },

-                configurable: true

-            });

-

-            arr.forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 111);
+            }
+        }
+
+        var arr = [];
+        try {
+            Array.prototype[0] = 10;
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 111;
+                },
+                configurable: true
+            });
+
+            arr.forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-13.js
index 46cbb325a..b66773759 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-13.js
@@ -1,49 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-13.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (val === 12);

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 6;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (val === 12);
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 6;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-14.js
index 773c09a7d..2ed8f42c8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-14.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-14.js

- * @description  Array.prototype.forEach - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        var arr = [];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 5;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            arr.forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        var arr = [];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 5;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            arr.forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-15.js
index 0d27c3403..269092a10 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-15.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-15.js

- * @description Array.prototype.forEach - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (val === 11);

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 20;

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (val === 11);
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 20;
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-16.js
index 5be24a005..736a416f5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-16.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-16.js

- * @description Array.prototype.forEach - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            [, , , ].forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            [, , , ].forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-17.js
index 875a75e77..c5634862f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-17.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-17.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-18.js
index 6e1cdb5ee..62d052379 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-18.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-18.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-19.js
index d4ce754c0..9620b3fc1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-19.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-19.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Object.defineProperty(Object.prototype, "1", {

-                get: function () {

-                    return 10;

-                },

-                configurable: true

-            });

-

-            Array.prototype.forEach.call(obj, callbackfn);

-

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Object.defineProperty(Object.prototype, "1", {
+                get: function () {
+                    return 10;
+                },
+                configurable: true
+            });
+
+            Array.prototype.forEach.call(obj, callbackfn);
+
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-2.js
index 40e028c55..2e609638f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-2.js

- * @description Array.prototype.forEach - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        [11].forEach(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        [11].forEach(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-20.js
index cc11fbf94..123fd9dc4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-20.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-20.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 100;

-                },

-                configurable: true

-            });

-

-            arr.forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 100;
+                },
+                configurable: true
+            });
+
+            arr.forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-21.js
index 43add6a0f..92deb403a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-21.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-21.js

- * @description Array.prototype.forEach - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-22.js
index 646b9b455..383c03e86 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-22.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-22.js

- * @description Array.prototype.forEach - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (typeof val === "undefined");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            [, 1].forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (typeof val === "undefined");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            [, 1].forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-23.js
index 6e2fbbdc9..cf0c7ded1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-23.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-23.js

- * @description Array.prototype.forEach - This object is an global object which contains index property

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 11;

-            fnGlobalObject().length = 1;

-

-            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);

-

-            return testResult;

-        } finally {

-            delete fnGlobalObject()[0];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - This object is an global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 11;
+            fnGlobalObject().length = 1;
+
+            Array.prototype.forEach.call(fnGlobalObject(), callbackfn);
+
+            return testResult;
+        } finally {
+            delete fnGlobalObject()[0];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-25.js
index f95c5e9bd..a2630fdb4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-25.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-25.js

- * @description Array.prototype.forEach - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.forEach.call(arguments, callbackfn);

-        };

-

-        func(11);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.forEach.call(arguments, callbackfn);
+        };
+
+        func(11);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-26.js
index 879b7d481..9e47df567 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-26.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-26.js

- * @description Array.prototype.forEach - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (called !== 1 && !testResult) {

-                return;

-            }

-            if (idx === 0) {

-                testResult = (val === 11);

-            } else if (idx === 1) {

-                testResult = (val === 9);

-            } else {

-                testResult = false;

-            }

-        }

-

-        var func = function (a, b) {

-            Array.prototype.forEach.call(arguments, callbackfn);

-        };

-

-        func(11, 9);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    equals number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (called !== 1 && !testResult) {
+                return;
+            }
+            if (idx === 0) {
+                testResult = (val === 11);
+            } else if (idx === 1) {
+                testResult = (val === 9);
+            } else {
+                testResult = false;
+            }
+        }
+
+        var func = function (a, b) {
+            Array.prototype.forEach.call(arguments, callbackfn);
+        };
+
+        func(11, 9);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-27.js
index 64bec297a..906112ad3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-27.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-27.js

- * @description Array.prototype.forEach - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (called !== 1 && !testResult) {

-                return;

-            }

-            if (idx === 0) {

-                testResult = (val === 11);

-            } else if (idx === 1) {

-                testResult = (val === 12);

-            } else if (idx === 2) {

-                testResult = (val === 9);

-            } else {

-                testResult = false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.forEach.call(arguments, callbackfn);

-        };

-

-        func(11, 12, 9);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (called !== 1 && !testResult) {
+                return;
+            }
+            if (idx === 0) {
+                testResult = (val === 11);
+            } else if (idx === 1) {
+                testResult = (val === 12);
+            } else if (idx === 2) {
+                testResult = (val === 9);
+            } else {
+                testResult = false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.forEach.call(arguments, callbackfn);
+        };
+
+        func(11, 12, 9);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-28.js
index e1626e74f..5eeae4be2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-28.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-28.js

- * @description Array.prototype.forEach - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (val === 9);

-            }

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 13;

-                }

-            },

-            configurable: true

-        });

-

-        arr.forEach(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (val === 9);
+            }
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 13;
+                }
+            },
+            configurable: true
+        });
+
+        arr.forEach(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-29.js
index a3e241f0e..805c76b10 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-29.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-29.js

- * @description Array.prototype.forEach - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var obj = { length: 2 };

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (val === 9);

-            }

-        }

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 13;

-                }

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element changed by getter on previous
+    iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var obj = { length: 2 };
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (val === 9);
+            }
+        }
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 13;
+                }
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-3.js
index 74d590199..0a6a6700b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-3.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-3.js

- * @description Array.prototype.forEach - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                testResult = (val === kValue);

-            }

-        }

-

-        var proto = { 5: 100 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[5] = kValue;

-        child.length = 10;

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                testResult = (val === kValue);
+            }
+        }
+
+        var proto = { 5: 100 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[5] = kValue;
+        child.length = 10;
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-30.js
index 65a0fa917..d5b99a591 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-30.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-30.js

- * @description Array.prototype.forEach - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-        }

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                accessed = true;

-                return 100;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.forEach.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - unnhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+        }
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                accessed = true;
+                return 100;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.forEach.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-31.js
index e041ff16f..3656709d5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-31.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-31.js

- * @description Array.prototype.forEach - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-        }

-

-        var arr = [];

-        arr[5] = 10;

-        arr[10] = 100;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                accessed = true;

-                return 100;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.forEach(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - unnhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+        }
+
+        var arr = [];
+        arr[5] = 10;
+        arr[10] = 100;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                accessed = true;
+                return 100;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.forEach(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-4.js
index 4f8f016f9..922afb196 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-4.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-4.js

- * @description Array.prototype.forEach - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 12);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 11;

-

-            [12].forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 12);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 11;
+
+            [12].forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-5.js
index 4f5962e3e..e8f411e15 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-5.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-5.js

- * @description Array.prototype.forEach - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: 11,

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: 11,
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-6.js
index e0a2300c3..3551ba87e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-6.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-6.js

- * @description Array.prototype.forEach - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 9;

-                },

-                configurable: true

-            });

-

-            [11].forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 9;
+                },
+                configurable: true
+            });
+
+            [11].forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-7.js
index 3397b227a..d428b8f31 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-7.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-7.js

- * @description Array.prototype.forEach - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = 'abc';

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                testResult = (val === kValue);

-            }

-        }

-

-        var proto = { 5: kValue };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Array.prototype.forEach.call(child, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 'abc';
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                testResult = (val === kValue);
+            }
+        }
+
+        var proto = { 5: kValue };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Array.prototype.forEach.call(child, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-8.js
index 1b1d09052..de6517745 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-8.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-8.js

- * @description Array.prototype.forEach - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                testResult = (val === 13);

-            }

-        }

-

-        try {

-            Array.prototype[1] = 13;

-

-            [, , , ].forEach(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is inherited
+    data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                testResult = (val === 13);
+            }
+        }
+
+        try {
+            Array.prototype[1] = 13;
+
+            [, , , ].forEach(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-9.js
index f2869ff6d..81bec442c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-9.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-i-9.js

- * @description Array.prototype.forEach - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                testResult = (val === 11);

-            }

-        }

-

-        var obj = { 10: 10, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        Array.prototype.forEach.call(obj, callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                testResult = (val === 11);
+            }
+        }
+
+        var obj = { 10: 10, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        Array.prototype.forEach.call(obj, callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-1.js
index 370b848b0..ed461ae2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-1.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-1.js

- * @description Array.prototype.forEach - callbackfn called with correct parameters

- */

-

-

-function testcase() { 

- 

-  var bPar = true;

-  var bCalled = false;

-  function callbackfn(val, idx, obj)

-  {

-    bCalled = true;

-    if(obj[idx] !== val)

-      bPar = false;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  arr[999999] = -6.6;

-  arr.forEach(callbackfn);

-  if(bCalled === true && bPar === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - callbackfn called with correct parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bPar = true;
+  var bCalled = false;
+  function callbackfn(val, idx, obj)
+  {
+    bCalled = true;
+    if(obj[idx] !== val)
+      bPar = false;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  arr[999999] = -6.6;
+  arr.forEach(callbackfn);
+  if(bCalled === true && bPar === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-10.js
index 21613ef03..1cd6b6a75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-10.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-10.js

- * @description Array.prototype.forEach - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val) {

-            result = (val > 10);

-        }

-

-        [11].forEach(callbackfn); 

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn is called with 1 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val) {
+            result = (val > 10);
+        }
+
+        [11].forEach(callbackfn); 
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-11.js
index b16202909..b175409ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-11.js

- * @description Array.prototype.forEach - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx) {

-            result = (val > 10 && arguments[2][idx] === val);

-        }

-

-        [11].forEach(callbackfn); 

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn is called with 2 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx) {
+            result = (val > 10 && arguments[2][idx] === val);
+        }
+
+        [11].forEach(callbackfn); 
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-12.js
index bf20a006b..93316c067 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-12.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-12.js

- * @description Array.prototype.forEach - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (val > 10 && obj[idx] === val);

-        }

-

-        [11].forEach(callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn is called with 3 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (val > 10 && obj[idx] === val);
+        }
+
+        [11].forEach(callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-13.js
index 8d0ae4195..7cd9e8294 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-13.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-13.js

- * @description Array.prototype.forEach - callbackfn that uses arguments

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn() {

-            result = (arguments[2][arguments[1]] === arguments[0]);

-        }

-

-        [11].forEach(callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - callbackfn that uses arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn() {
+            result = (arguments[2][arguments[1]] === arguments[0]);
+        }
+
+        [11].forEach(callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-16.js
index d89d5a5a2..42ef99b9a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-16.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-16.js

- * @description Array.prototype.forEach - 'this' of 'callbackfn' is a Boolean object when T is not an object (T is a boolean)

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (this.valueOf() !== false);

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn, false);

-        return !result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'this' of 'callbackfn' is a Boolean
+    object when T is not an object (T is a boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (this.valueOf() !== false);
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn, false);
+        return !result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-17.js
index 35218a9fb..44574c03c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-17.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-17.js

- * @description Array.prototype.forEach - 'this' of 'callbackfn' is a Number object when T is not an object (T is a number)

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, o) {

-            result = (5 === this.valueOf());

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn, 5);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'this' of 'callbackfn' is a Number
+    object when T is not an object (T is a number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, o) {
+            result = (5 === this.valueOf());
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn, 5);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-18.js
index dc48561c7..f0374fd76 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-18.js

- * @description Array.prototype.forEach - 'this' of 'callbackfn' is an String object when T is not an object (T is a string)

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = ('hello' === this.valueOf());

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn, "hello");

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - 'this' of 'callbackfn' is an String
+    object when T is not an object (T is a string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = ('hello' === this.valueOf());
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn, "hello");
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-19.js
index 59a658afe..fcac08620 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-19.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-19.js

- * @description Array.prototype.forEach - non-indexed properties are not called

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var result = true;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            if (val === 8) {

-                result = false;

-            }

-        }

-

-        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - non-indexed properties are not called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var result = true;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            if (val === 8) {
+                result = false;
+            }
+        }
+
+        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-2.js
index 301ad0d00..fbff98eca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-2.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-2.js

- * @description Array.prototype.forEach - callbackfn takes 3 arguments

- */

-

-

-function testcase() { 

- 

-  var parCnt = 3;

-  var bCalled = false

-  function callbackfn(val, idx, obj)

-  { 

-    bCalled = true;

-    if(arguments.length !== 3)

-      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters

-  }

-

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  arr.forEach(callbackfn);

-  if(bCalled === true && parCnt === 3)

-    return true;

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - callbackfn takes 3 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var parCnt = 3;
+  var bCalled = false
+  function callbackfn(val, idx, obj)
+  { 
+    bCalled = true;
+    if(arguments.length !== 3)
+      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters
+  }
+
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  arr.forEach(callbackfn);
+  if(bCalled === true && parCnt === 3)
+    return true;
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-20.js
index 176866e5a..81014ae81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-20.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-20.js

- * @description Array.prototype.forEach - callbackfn called with correct parameters (thisArg is correct)

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(val, idx, obj) {

-            result = (10 === this.threshold);

-        }

-

-        var thisArg = { threshold: 10 };

-

-        var obj = { 0: 11, length: 1 };

-

-        Array.prototype.forEach.call(obj, callbackfn, thisArg);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn called with correct
+    parameters (thisArg is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(val, idx, obj) {
+            result = (10 === this.threshold);
+        }
+
+        var thisArg = { threshold: 10 };
+
+        var obj = { 0: 11, length: 1 };
+
+        Array.prototype.forEach.call(obj, callbackfn, thisArg);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-21.js
index aa5432b35..c11ad0ed1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-21.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-21.js

- * @description Array.prototype.forEach - callbackfn called with correct parameters (kValue is correct)

- */

-

-

-function testcase() {

-

-        var resultOne = false;

-        var resultTwo = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                resultOne = (val === 11);

-            }

-

-            if (idx === 1) {

-                resultTwo = (val === 12);

-            }

-

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return resultOne && resultTwo;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn called with correct
+    parameters (kValue is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var resultOne = false;
+        var resultTwo = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                resultOne = (val === 11);
+            }
+
+            if (idx === 1) {
+                resultTwo = (val === 12);
+            }
+
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return resultOne && resultTwo;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-22.js
index fa09807fd..ed1fb7f30 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-22.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-22.js

- * @description Array.prototype.forEach - callbackfn called with correct parameters (the index k is correct)

- */

-

-

-function testcase() {

-

-        var resultOne = false;

-        var resultTwo = false;

-

-        function callbackfn(val, idx, obj) {

-            if (val === 11) {

-                resultOne = (idx === 0);

-            }

-

-            if (val === 12) {

-                resultTwo = (idx === 1);

-            }

-

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return resultOne && resultTwo;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn called with correct
+    parameters (the index k is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var resultOne = false;
+        var resultTwo = false;
+
+        function callbackfn(val, idx, obj) {
+            if (val === 11) {
+                resultOne = (idx === 0);
+            }
+
+            if (val === 12) {
+                resultTwo = (idx === 1);
+            }
+
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return resultOne && resultTwo;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-23.js
index d4efb25f3..dbfe55f17 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-23.js

- * @description Array.prototype.forEach - callbackfn called with correct parameters (this object O is correct)

- */

-

-

-function testcase() {

-

-        var result = false;

-        var obj = { 0: 11, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            result = (obj === o);

-        }

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn called with correct
+    parameters (this object O is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var obj = { 0: 11, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            result = (obj === o);
+        }
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-4.js
index 2937acc1a..c1f876102 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-4.js

- * @description Array.prototype.forEach - k values are passed in ascending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = 0;

-        var called = 0;

-        var result = true;

-        function callbackfn(val, idx, o) {

-            called++;

-            if (lastIdx !== idx) {

-                result = false;

-            } else {

-                lastIdx++;

-            }

-        }

-

-        arr.forEach(callbackfn);

-        return result && arr.length === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - k values are passed in ascending numeric
+    order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = 0;
+        var called = 0;
+        var result = true;
+        function callbackfn(val, idx, o) {
+            called++;
+            if (lastIdx !== idx) {
+                result = false;
+            } else {
+                lastIdx++;
+            }
+        }
+
+        arr.forEach(callbackfn);
+        return result && arr.length === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-5.js
index 005df5350..6c2b0569c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-5.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-5.js

- * @description Array.prototype.forEach - k values are accessed during each iteration and not prior to starting the loop on an Array

- */

-

-

-function testcase() {

-

-        var result = true;

-        var kIndex = [];

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {

-                    result = false;

-                }

-                kIndex[idx] = 1;

-            } else {

-                result = false;

-            }

-        }

-

-        [11, 12, 13, 14].forEach(callbackfn, undefined);

-

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - k values are accessed during each
+    iteration and not prior to starting the loop on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+        var kIndex = [];
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {
+                    result = false;
+                }
+                kIndex[idx] = 1;
+            } else {
+                result = false;
+            }
+        }
+
+        [11, 12, 13, 14].forEach(callbackfn, undefined);
+
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-6.js
index aaa79032f..9afc50ff6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-6.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-6.js

- * @description Array.prototype.forEach - arguments to callbackfn are self consistent

- */

-

-

-function testcase() {

-

-        var result = false;

-        var obj = { 0: 11, length: 1 };

-        var thisArg = {};

-

-        function callbackfn() {

-            result = (this === thisArg &&

-                arguments[0] === 11 &&

-                arguments[1] === 0 &&

-                arguments[2] === obj);

-        }

-

-        Array.prototype.forEach.call(obj, callbackfn, thisArg);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - arguments to callbackfn are self
+    consistent
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var obj = { 0: 11, length: 1 };
+        var thisArg = {};
+
+        function callbackfn() {
+            result = (this === thisArg &&
+                arguments[0] === 11 &&
+                arguments[1] === 0 &&
+                arguments[2] === obj);
+        }
+
+        Array.prototype.forEach.call(obj, callbackfn, thisArg);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-7.js
index e916f666c..0fbbbfc5f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-7.js

- * @description Array.prototype.forEach - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 0) {

-                accessed = true;

-            }

-            if (idx === 0) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.forEach.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof Error && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - unhandled exceptions happened in
+    callbackfn terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 0) {
+                accessed = true;
+            }
+            if (idx === 0) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.forEach.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof Error && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-8.js
index 34bc9ea23..b52c3df40 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-8.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-8.js

- * @description Array.prototype.forEach - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var result = false;

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            if (idx === 0) {

-                obj[idx + 1] = 8;

-            }

-            

-            if (idx === 1) {

-                result = (val === 8);

-            }

-        }

-

-        Array.prototype.forEach.call(obj, callbackfn);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - element changed by callbackfn on
+    previous iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            if (idx === 0) {
+                obj[idx + 1] = 8;
+            }
+            
+            if (idx === 1) {
+                result = (val === 8);
+            }
+        }
+
+        Array.prototype.forEach.call(obj, callbackfn);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-9.js
index 29913da33..4d6dc1b1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-9.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-7-c-ii-9.js

- * @description Array.prototype.forEach - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-        function callbackfn() {

-            called++;

-        }

-

-        [11, 12].forEach(callbackfn);

-        return 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - callbackfn is called with 0 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        function callbackfn() {
+            called++;
+        }
+
+        [11, 12].forEach(callbackfn);
+        return 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-1.js
index 53a6663f1..f5b8d0124 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-1.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = [].forEach(cb);

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = [].forEach(cb);
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-10.js
index be63e955c..b7ba34057 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-10.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-10.js

- * @description Array.prototype.forEach - subclassed array when length is reduced

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 1;

-  

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach - subclassed array when length is reduced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 1;
+  
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-11.js
index 5e43d48cd..b47f1dff5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-11.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-11.js

- * @description Array.prototype.forEach doesn't mutate the array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return true;

-  }

-  var arr = [1,2,3,4,5];

-  arr.forEach(callbackfn);

-  if(arr[0] === 1 &&

-     arr[1] === 2 &&

-     arr[2] === 3 &&

-     arr[3] === 4 &&

-     arr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't mutate the array on which it is
+    called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return true;
+  }
+  var arr = [1,2,3,4,5];
+  arr.forEach(callbackfn);
+  if(arr[0] === 1 &&
+     arr[1] === 2 &&
+     arr[2] === 3 &&
+     arr[3] === 4 &&
+     arr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-12.js
index bb8620a3e..7c0e15b36 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-12.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-12.js

- * @description Array.prototype.forEach doesn't visit expandos

- */

-

-

-function testcase() {

-

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-  }

-  var arr = [1,2,3,4,5];

-  arr["i"] = 10;

-  arr[true] = 11;

-

-  arr.forEach(callbackfn);

-  if(callCnt == 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.forEach doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+  }
+  var arr = [1,2,3,4,5];
+  arr["i"] = 10;
+  arr[true] = 11;
+
+  arr.forEach(callbackfn);
+  if(callCnt == 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-13.js
index 649e2acac..4a0508241 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-13.js

- * @description Array.prototype.forEach - undefined will be returned when 'len' is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-        }

-

-        var result = [].forEach(callbackfn);

-        return typeof result === "undefined" && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach - undefined will be returned when 'len' is
+    0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+        }
+
+        var result = [].forEach(callbackfn);
+        return typeof result === "undefined" && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-2.js
index c0c9e2375..61c5708b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-2.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-3.js
index 7858b392e..b04d3378f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-3.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-3.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-4.js
index 6b7fcf2dc..599e74647 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-4.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-5.js
index 09d29fe89..a9cda884a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-5.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-6.js
index 2177459b9..99039c2f3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-6.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-6.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-7.js
index 3259b15ab..70c543b8d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-7.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-7.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden with obj w/o valueOf
+    (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-8.js
index fe25b5c16..9df017f77 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-8.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-8.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden with []

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden with []
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-9.js
index 5b6cffec5..0b85e5fbe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-9.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.18/15.4.4.18-8-9.js

- * @description Array.prototype.forEach doesn't call callbackfn if 'length' is 0 (subclassed Array, length overridden with [0]

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [0];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  var callCnt = 0;

-  function cb(){callCnt++}

-  var i = f.forEach(cb);  

-  if (callCnt === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.forEach doesn't call callbackfn if 'length' is 0
+    (subclassed Array, length overridden with [0]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [0];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  var callCnt = 0;
+  function cb(){callCnt++}
+  var i = f.forEach(cb);  
+  if (callCnt === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A1.js
index f7c6db33a..452ce26fb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A1.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * array.forEach can be frozen while in progress
- *
- * @path ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A1.js
- * @description Freezes array.forEach during a forEach to see if it works
- */
+/*---
+info: array.forEach can be frozen while in progress
+description: Freezes array.forEach during a forEach to see if it works
+---*/
 
 ['z'].forEach(function(){ Object.freeze(Array.prototype.forEach); });
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A2.js
index bc45d19ab..f1a436003 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A2.js
@@ -1,15 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * array.forEach can be frozen while in progress
- *
- * @path ch15/15.4/15.4.4/15.4.4.18/S15.4.4.18_A2.js
- * @description Freezes array.forEach during a forEach to see if it works
- */
+/*---
+info: array.forEach can be frozen while in progress
+description: Freezes array.forEach during a forEach to see if it works
+---*/
 
 function foo() {
   ['z'].forEach(function(){ Object.freeze(Array.prototype.forEach); });
 }
 foo();
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-1.js
index 5086ee9e7..6a0dcbf5a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-1.js

- * @description Array.prototype.map must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.map;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.map;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-2.js
index 1a8db8871..3882ac0ea 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-0-2.js

- * @description Array.prototype.map.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.map.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.map.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-1.js
index 8d5e99473..6b293b52c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-1.js

- * @description Array.prototype.map - applied to undefined

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.map.call(undefined); // TypeError is thrown if value is undefined

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.map.call(undefined); // TypeError is thrown if value is undefined
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-10.js
index a94fdb553..cacab7397 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-10.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-10.js

- * @description Array.prototype.map - applied to the Math object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object Math]' === Object.prototype.toString.call(obj));

-        }

-       

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            var testResult = Array.prototype.map.call(Math, callbackfn);

-            return testResult[0] === true;

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object Math]' === Object.prototype.toString.call(obj));
+        }
+       
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            var testResult = Array.prototype.map.call(Math, callbackfn);
+            return testResult[0] === true;
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-11.js
index 0d8c50c8c..4fc5b9081 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-11.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-11.js

- * @description Array.prototype.map - applied to Date object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Date;

-        }

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Date;
+        }
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-12.js
index 3f100dcfe..476506ce7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-12.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-12.js

- * @description Array.prototype.map - applied to RegExp object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof RegExp;

-        }

-

-        var obj = new RegExp();

-        obj.length = 1;

-        obj[0] = 1;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof RegExp;
+        }
+
+        var obj = new RegExp();
+        obj.length = 1;
+        obj[0] = 1;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-13.js
index 33b5dfb0b..05dcc3124 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-13.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-13.js

- * @description Array.prototype.map - applied to the JSON object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object JSON]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            var testResult = Array.prototype.map.call(JSON, callbackfn);

-            return testResult[0] === true;

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object JSON]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            var testResult = Array.prototype.map.call(JSON, callbackfn);
+            return testResult[0] === true;
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-14.js
index f195f0300..52b9336d9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-14.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-14.js

- * @description Array.prototype.map - applied to Error object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Error;

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Error;
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-15.js
index b15213fb4..422ead071 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-15.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-15.js

- * @description Array.prototype.map - applied to the Arguments object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return ('[object Arguments]' === Object.prototype.toString.call(obj));

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return ('[object Arguments]' === Object.prototype.toString.call(obj));
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-2.js
index dd4555294..b9231183e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-2.js

- * @description Array.prototype.map - applied to null

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.map.call(null); // TypeError is thrown if value is null

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.map.call(null); // TypeError is thrown if value is null
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-3.js
index 0a9e6aee3..c4647262e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-3.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-3.js

- * @description Array.prototype.map - applied to boolean primitive

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = true;

-            Boolean.prototype.length = 1;

-

-            var testResult = Array.prototype.map.call(false, callbackfn);

-            return testResult[0] === true;

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = true;
+            Boolean.prototype.length = 1;
+
+            var testResult = Array.prototype.map.call(false, callbackfn);
+            return testResult[0] === true;
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-4.js
index 880a1b3f1..d65a48ef3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-4.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-4.js

- * @description Array.prototype.map - applied to Boolean object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-5.js
index 32d4fc48b..b677d53d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-5.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-5.js

- * @description Array.prototype.map - applied to number primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-

-            var testResult = Array.prototype.map.call(2.5, callbackfn);

-            return testResult[0] === true;

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+
+            var testResult = Array.prototype.map.call(2.5, callbackfn);
+            return testResult[0] === true;
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-6.js
index 727d6ac53..cabf25fb4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-6.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-6.js

- * @description Array.prototype.map - applied to Number object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-7.js
index cb7a6289a..01f117b96 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-7.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-7.js

- * @description Array.prototype.map - applied to string primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var testResult = Array.prototype.map.call("abc", callbackfn);

-

-        return testResult[0] === true && testResult[1] === true && testResult[2] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var testResult = Array.prototype.map.call("abc", callbackfn);
+
+        return testResult[0] === true && testResult[1] === true && testResult[2] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-8.js
index d9582dac8..7ae711c07 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-8.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-8.js

- * @description Array.prototype.map - applied to String object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var obj = new String("abc");

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true && testResult[2] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var obj = new String("abc");
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true && testResult[2] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-9.js
index 382eeb910..1e95836ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-9.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-1-9.js

- * @description Array.prototype.map - applied to Function object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Function;

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Function;
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-1.js
index db8ffe25f..c6536cc3a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-1.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-1.js

- * @description Array.prototype.map - applied to Array-like object when 'length' is an own data property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object when 'length'
+    is an own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-10.js
index 22db2211c..27a3370dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-10.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-10.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-11.js
index df8573a35..55c5ea6f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-11.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-11.js

- * @description Array.prototype.map - applied to Array-like object when 'length' is an own accessor property without a get function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return 0 === testResult.length;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object when 'length'
+    is an own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return 0 === testResult.length;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-12.js
index 56c357069..b828f8242 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-12.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-12.js

- * @description Array.prototype.map - applied to the Array-like object when 'length' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 12, 1: 11 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            var testResult = Array.prototype.map.call(obj, callbackfn);

-            return testResult.length === 0;

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to the Array-like object when
+    'length' is own accessor property without a get function that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 12, 1: 11 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            var testResult = Array.prototype.map.call(obj, callbackfn);
+            return testResult.length === 0;
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-13.js
index d9389bf6b..9be97c170 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-13.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-13.js

- * @description Array.prototype.map - applied to the Array-like object when 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return 0 === testResult.length;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to the Array-like object when
+    'length' is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return 0 === testResult.length;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-14.js
index 76bf3e253..9e4555249 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-14.js

- * @description Array.prototype.map - applied to the Array-like object that 'length' property doesn't exist

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return 0 === testResult.length;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to the Array-like object that
+    'length' property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return 0 === testResult.length;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-15.js
index c4a3c39c7..c8ad17fa0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-15.js
@@ -1,32 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-15.js

- * @description Array.prototype.map - when 'length' is property of the global object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            var testResult = Array.prototype.map.call(fnGlobalObject(), callbackfn);

-            return testResult.length === 2;

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - when 'length' is property of the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            var testResult = Array.prototype.map.call(fnGlobalObject(), callbackfn);
+            return testResult.length === 2;
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-17.js
index f9fe52b75..821bc792c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-17.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-17.js

- * @description Array.prototype.map - applied to Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.map.call(arguments, callbackfn);

-        };

-

-        var testResult = func(12, 11);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.map.call(arguments, callbackfn);
+        };
+
+        var testResult = func(12, 11);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-18.js
index d9aa220b2..f04a93879 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-18.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-18.js

- * @description Array.prototype.map - applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return parseInt(val, 10) > 1;

-        }

-

-        var str = new String("432");

-        try {

-            String.prototype[3] = "1";

-            var testResult = Array.prototype.map.call(str, callbackfn);

-

-            return 3 === testResult.length;

-        } finally {

-            delete String.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return parseInt(val, 10) > 1;
+        }
+
+        var str = new String("432");
+        try {
+            String.prototype[3] = "1";
+            var testResult = Array.prototype.map.call(str, callbackfn);
+
+            return 3 === testResult.length;
+        } finally {
+            delete String.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-19.js
index 91a99f37a..1388552f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-19.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-19.js

- * @description Array.prototype.map - applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        var testResult = Array.prototype.map.call(fun, callbackfn);

-

-        return 2 === testResult.length;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Function object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        var testResult = Array.prototype.map.call(fun, callbackfn);
+
+        return 2 === testResult.length;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-2.js
index d0098f814..f96d15c63 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-2.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-2.js

- * @description Array.prototype.map - when 'length' is own data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var testResult = [12, 11].map(callbackfn);

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - when 'length' is own data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var testResult = [12, 11].map(callbackfn);
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-3.js
index 77a92c38d..2264fa229 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-3.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-3.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    own data property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-4.js
index 869d93f20..ac81d0bb8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-4.js

- * @description Array.prototype.map - when 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-        var arrProtoLen;

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            var testResult = [12, 11].map(callbackfn);

-            return testResult.length === 2;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - when 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+        var arrProtoLen;
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            var testResult = [12, 11].map(callbackfn);
+            return testResult.length === 2;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-5.js
index a5663a4b4..435f30fd1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-5.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-5.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    own data property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-6.js
index 0178c7520..5f59242fe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-6.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-6.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-7.js
index 49376c058..354f1cee6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-7.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-8.js
index 1186f45ec..58227fa94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-8.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-8.js

- * @description Array.prototype.map - applied to Array-like object, 'length' is an own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object, 'length' is an
+    own accessor property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-9.js
index 9f5fc1562..4966f6d7d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-9.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-2-9.js

- * @description Array.prototype.map - applied to Array-like object when 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - applied to Array-like object when 'length'
+    is an own accessor property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-1.js
index 0d33e8567..c84d7303b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-1.js

- * @description Array.prototype.map - value of 'length' is undefined

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { length: undefined };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { length: undefined };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-10.js
index 3ab521826..3a156c5a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-10.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-10.js

- * @description Array.prototype.map - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is a number (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-11.js
index 6a43b1a4b..0e70a0e1f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-11.js

- * @description Array.prototype.map - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "2" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is a string containing a positive
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "2" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-12.js
index bc8a8bd60..d4fbe2d2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-12.js

- * @description Array.prototype.map - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "-4294967294" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is a string containing a negative
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "-4294967294" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-13.js
index 6d6dd4516..f91a0587d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-13.js

- * @description Array.prototype.map - value of 'length' is string that is able to convert to number primitive (value is a decimal number)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "2.5" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is string that is able to
+    convert to number primitive (value is a decimal number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "2.5" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-14.js
index 12ab69187..20cf1dc03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-14.js

- * @description Array.prototype.map - 'length' is a string containing Infinity

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 9, length: "Infinity" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - 'length' is a string containing Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 9, length: "Infinity" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-15.js
index 53ed04cbc..abd918ed6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-15.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-15.js

- * @description Array.prototype.map - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "2E0" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "2E0" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-16.js
index c02d8a271..e9f34c3a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-16.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-16.js

- * @description Array.prototype.map - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "0x0002" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - 'length' is a string containing a hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "0x0002" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-17.js
index b594f2c03..fe7cc8840 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-17.js

- * @description Array.prototype.map - when 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 11, 1: 9, 2: 12, length: "0002.00" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - when 'length' is a string containing a
+    number with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 11, 1: 9, 2: 12, length: "0002.00" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-18.js
index 19878a1e3..3378ab5c1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-18.js

- * @description Array.prototype.map - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { length: "asdf!_" };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { length: "asdf!_" };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-19.js
index 7804d0442..0fabe04fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-19.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-19.js

- * @description Array.prototype.map - value of 'length' is an Object which has an own toString method

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is an Object which has an
+    own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-2.js
index 940421288..2cbee5c81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-2.js

- * @description Array.prototype.map on an Array-like object if 'length' is 1 (length overridden to true(type conversion))

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: true };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map on an Array-like object if 'length' is 1
+    (length overridden to true(type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: true };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-20.js
index 62fa55bcc..dba2f5a4d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-20.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-20.js

- * @description Array.prototype.map - value of 'length' is an Object which has an own valueOf method

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is an Object which has an
+    own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-21.js
index 9af6c7cd8..7cb010a24 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-21.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-21.js

- * @description Array.prototype.map - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var firstStepOccured = false;

-        var secondStepOccured = false;

-        var obj = {

-            0: 11,

-            1: 9,

-

-            length: {

-                valueOf: function () {

-                    firstStepOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    secondStepOccured = true;

-                    return '2';

-                }

-            }

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2 && firstStepOccured && secondStepOccured;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var firstStepOccured = false;
+        var secondStepOccured = false;
+        var obj = {
+            0: 11,
+            1: 9,
+
+            length: {
+                valueOf: function () {
+                    firstStepOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    secondStepOccured = true;
+                    return '2';
+                }
+            }
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2 && firstStepOccured && secondStepOccured;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-22.js
index a42427771..2961e9a55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-22.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-22.js

- * @description Array.prototype.map throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {

-            1: 11,

-            2: 12,

-

-            length: {

-                valueOf: function () {

-                    return {};

-                },

-                toString: function () {

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.map.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map throws TypeError exception when 'length' is an
+    object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {
+            1: 11,
+            2: 12,
+
+            length: {
+                valueOf: function () {
+                    return {};
+                },
+                toString: function () {
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.map.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-23.js
index d0a6529cd..c7bb0a34e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-23.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-23.js

- * @description Array.prototype.map uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: child

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map uses inherited valueOf method when 'length' is
+    an object with an own toString and inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: child
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-24.js
index e74dfc417..2e3c2de93 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-24.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-24.js

- * @description Array.prototype.map - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 2.685

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is a positive non-integer,
+    ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 2.685
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-25.js
index fb8650562..43ebce9ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-25.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-25.js

- * @description Array.prototype.map - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: -4294967294.5

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is a negative non-integer,
+    ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: -4294967294.5
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-28.js
index 6ec1c9b0c..68cfdd255 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-28.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-28.js

- * @description Array.prototype.map - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is boundary value (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-29.js
index 17cc5ec77..29002a55b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-29.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-29.js

- * @description Array.prototype.map - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-        return newArr.length === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is boundary value (2^32 +
+    1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+        return newArr.length === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-3.js
index 21eaf9a20..07d5b2fb6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-3.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-3.js

- * @description Array.prototype.map - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: 0 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is a number (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: 0 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-4.js
index ddcaa5e8a..bac58223a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-4.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-4.js

- * @description Array.prototype.map - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: +0 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is a number (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: +0 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-5.js
index df448ed92..b8fe99288 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-5.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-5.js

- * @description Array.prototype.map - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 11, length: -0 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - value of 'length' is a number (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 11, length: -0 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-6.js
index 350f8271a..faa65bf39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-6.js

- * @description Array.prototype.map - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 10, 1: 12, 2: 9, length: 2 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is a string containing a positive
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 10, 1: 12, 2: 9, length: 2 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-7.js
index 2088b90cc..542837098 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-7.js

- * @description Array.prototype.map - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 10, 1: 12, 2: 9, length: -4294967294 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'length' is a string containing a negative
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 10, 1: 12, 2: 9, length: -4294967294 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-8.js
index 7c6fc4cfa..a932fa894 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-8.js

- * @description Array.prototype.map - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-9.js
index 7b3257ed0..e283d35d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-3-9.js

- * @description Array.prototype.map - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 10;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 10;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-1.js
index 148503eb6..a0ae16261 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-1.js

- * @description Array.prototype.map throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-10.js
index 9fb309af3..3b431abdb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-10.js

- * @description Array.prototype.map - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - the exception is not thrown if exception was
+    thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-11.js
index 539ca88f6..553e49adb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-11.js

- * @description Array.prototype.map - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - the exception is not thrown if exception was
+    thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-12.js
index 91b6d20f0..158377b4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-12.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-12.js

- * @description Array.prototype.map - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var testResult = [11, 9].map(callbackfn);

-        return testResult.length === 2 && testResult[0] === true && testResult[1] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var testResult = [11, 9].map(callbackfn);
+        return testResult.length === 2 && testResult[0] === true && testResult[1] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-15.js
index 55d5d62d6..08c5588ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-15.js

- * @description Array.prototype.map - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj);

-            return false;

-        } catch (e) {

-            return e instanceof TypeError && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - calling with no callbackfn is the same as
+    passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj);
+            return false;
+        } catch (e) {
+            return e instanceof TypeError && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-2.js
index bfddbb4ce..9f0321828 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-2.js

- * @description Array.prototype.map throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-3.js
index 05dfe0f0e..0bff093b9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-3.js

- * @description Array.prototype.map throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-4.js
index 342756203..559fdfe83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-4.js

- * @description Array.prototype.map throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-5.js
index aca5ee86d..5070b5757 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-5.js

- * @description Array.prototype.map throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-6.js
index a5867eb1f..f10caf6ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-6.js

- * @description Array.prototype.map throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-7.js
index ce7b92ead..25b04ffac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-7.js

- * @description Array.prototype.map throws TypeError if callbackfn is Object without Call internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.map(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map throws TypeError if callbackfn is Object
+    without Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.map(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-8.js
index e0d48d431..e6f2a14cc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-8.js

- * @description Array.prototype.map - Side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - Side effects produced by step 2 are visible
+    when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-9.js
index 4045a508e..2acf07177 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-4-9.js

- * @description Array.prototype.map - Side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - Side effects produced by step 3 are visible
+    when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1-s.js
index ff305673e..c090e1f1d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1-s.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1-s.js

- * @description Array.prototype.map - thisArg not passed to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() {

-  var innerThisCorrect = false;

-  

-  function callbackfn(val, idx, obj) {

-    "use strict";

-    innerThisCorrect = this===undefined;

-    return true;

-  }

-

-  [1].map(callbackfn);

-  return innerThisCorrect;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg not passed to strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var innerThisCorrect = false;
+  
+  function callbackfn(val, idx, obj) {
+    "use strict";
+    innerThisCorrect = this===undefined;
+    return true;
+  }
+
+  [1].map(callbackfn);
+  return innerThisCorrect;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1.js
index fa027e13b..1cbe2fae9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-1.js

- * @description Array.prototype.map - thisArg not passed

- */

-

-

-function testcase() {

-  try {

-    fnGlobalObject()._15_4_4_19_5_1 = true;

-    var _15_4_4_19_5_1 = false;

-  

-    function callbackfn(val, idx, obj) {

-      return this._15_4_4_19_5_1;

-    }

-    var srcArr = [1];

-    var resArr = srcArr.map(callbackfn);

-    if( resArr[0] === true)

-      return true;    

-	

-	return false;

-  }

-  finally {

-	delete fnGlobalObject()._15_4_4_19_5_1;

-  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg not passed
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  try {
+    fnGlobalObject()._15_4_4_19_5_1 = true;
+    var _15_4_4_19_5_1 = false;
+  
+    function callbackfn(val, idx, obj) {
+      return this._15_4_4_19_5_1;
+    }
+    var srcArr = [1];
+    var resArr = srcArr.map(callbackfn);
+    if( resArr[0] === true)
+      return true;    
+	
+	return false;
+  }
+  finally {
+	delete fnGlobalObject()._15_4_4_19_5_1;
+  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-10.js
index bb8fe0e19..7a8f96f9b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-10.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-10.js

- * @description Array.prototype.map - Array object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objArray = new Array(2);

-

-        function callbackfn(val, idx, obj) {

-            return this === objArray;

-        }

-

-        var testResult = [11].map(callbackfn, objArray);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Array object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objArray = new Array(2);
+
+        function callbackfn(val, idx, obj) {
+            return this === objArray;
+        }
+
+        var testResult = [11].map(callbackfn, objArray);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-11.js
index fd09a32f5..b1511578b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-11.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-11.js

- * @description Array.prototype.map - String object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objString = new String();

-

-        function callbackfn(val, idx, obj) {

-            return this === objString;

-        }

-

-        var testResult = [11].map(callbackfn, objString);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - String object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objString = new String();
+
+        function callbackfn(val, idx, obj) {
+            return this === objString;
+        }
+
+        var testResult = [11].map(callbackfn, objString);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-12.js
index e2ec294c3..ac321d430 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-12.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-12.js

- * @description Array.prototype.map - Boolean object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objBoolean = new Boolean();

-

-        function callbackfn(val, idx, obj) {

-            return this === objBoolean;

-        }

-

-        var testResult = [11].map(callbackfn, objBoolean);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Boolean object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objBoolean = new Boolean();
+
+        function callbackfn(val, idx, obj) {
+            return this === objBoolean;
+        }
+
+        var testResult = [11].map(callbackfn, objBoolean);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-13.js
index 586165aef..9bb11a7da 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-13.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-13.js

- * @description Array.prototype.map - Number object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objNumber = new Number();

-

-        function callbackfn(val, idx, obj) {

-            return this === objNumber;

-        }

-

-        var testResult = [11].map(callbackfn, objNumber);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Number object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objNumber = new Number();
+
+        function callbackfn(val, idx, obj) {
+            return this === objNumber;
+        }
+
+        var testResult = [11].map(callbackfn, objNumber);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-14.js
index a266476f4..842e1a414 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-14.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-14.js

- * @description Array.prototype.map - the Math object can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === Math;

-        }

-

-        var testResult = [11].map(callbackfn, Math);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - the Math object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === Math;
+        }
+
+        var testResult = [11].map(callbackfn, Math);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-15.js
index 408af6ef1..aac4eaea1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-15.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-15.js

- * @description Array.prototype.map - Date object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objDate = new Date();

-

-        function callbackfn(val, idx, obj) {

-            return this === objDate;

-        }

-

-        var testResult = [11].map(callbackfn, objDate);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Date object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objDate = new Date();
+
+        function callbackfn(val, idx, obj) {
+            return this === objDate;
+        }
+
+        var testResult = [11].map(callbackfn, objDate);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-16.js
index e71489d42..48d1eab99 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-16.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-16.js

- * @description Array.prototype.map - RegExp object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objRegExp = new RegExp();

-

-        function callbackfn(val, idx, obj) {

-            return this === objRegExp;

-        }

-

-        var testResult = [11].map(callbackfn, objRegExp);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - RegExp object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objRegExp = new RegExp();
+
+        function callbackfn(val, idx, obj) {
+            return this === objRegExp;
+        }
+
+        var testResult = [11].map(callbackfn, objRegExp);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-17.js
index 12658c653..ba6826fbb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-17.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-17.js

- * @description Array.prototype.map - the JSON object can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === JSON;

-        }

-

-        var testResult = [11].map(callbackfn, JSON);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - the JSON object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === JSON;
+        }
+
+        var testResult = [11].map(callbackfn, JSON);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-18.js
index b00f3a28f..0867efc2d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-18.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-18.js

- * @description Array.prototype.map - Error object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objError = new RangeError();

-

-        function callbackfn(val, idx, obj) {

-            return this === objError;

-        }

-

-        var testResult = [11].map(callbackfn, objError);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Error object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objError = new RangeError();
+
+        function callbackfn(val, idx, obj) {
+            return this === objError;
+        }
+
+        var testResult = [11].map(callbackfn, objError);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-19.js
index f7def993e..9d81dbe41 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-19.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-19.js

- * @description Array.prototype.map - the Arguments object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var arg;

-

-        function callbackfn(val, idx, obj) {

-            return this === arg;

-        }

-

-        arg = (function () {

-            return arguments;

-        }(1, 2, 3));

-

-        var testResult = [11].map(callbackfn, arg);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - the Arguments object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+
+        function callbackfn(val, idx, obj) {
+            return this === arg;
+        }
+
+        arg = (function () {
+            return arguments;
+        }(1, 2, 3));
+
+        var testResult = [11].map(callbackfn, arg);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-2.js
index b590aa06c..2a5aa6e18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-2.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-2.js

- * @description Array.prototype.map - thisArg is Object

- */

-

-

-function testcase() {

-  var res = false;

-  var o = new Object();

-  o.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var srcArr = [1];

-  var resArr = srcArr.map(callbackfn,o);

-  if( resArr[0] === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg is Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var o = new Object();
+  o.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var srcArr = [1];
+  var resArr = srcArr.map(callbackfn,o);
+  if( resArr[0] === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-21.js
index c8b41eb1b..c798b3f34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-21.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-21.js

- * @description Array.prototype.map - the global object can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === fnGlobalObject();

-        }

-

-        var testResult = [11].map(callbackfn, fnGlobalObject());

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - the global object can be used as thisArg
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === fnGlobalObject();
+        }
+
+        var testResult = [11].map(callbackfn, fnGlobalObject());
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-22.js
index e24a201f0..91fb83cb7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-22.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-22.js

- * @description Array.prototype.map - boolean primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === false;

-        }

-

-        var testResult = [11].map(callbackfn, false);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - boolean primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === false;
+        }
+
+        var testResult = [11].map(callbackfn, false);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-23.js
index f476eafb6..48cf9d2ad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-23.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-23.js

- * @description Array.prototype.map - number primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === 101;

-        }

-

-        var testResult = [11].map(callbackfn, 101);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - number primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === 101;
+        }
+
+        var testResult = [11].map(callbackfn, 101);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-24.js
index 72a81d7c6..42909dbd8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-24.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-24.js

- * @description Array.prototype.map - string primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === "abc";

-        }

-

-        var testResult = [11].map(callbackfn, "abc");

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - string primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === "abc";
+        }
+
+        var testResult = [11].map(callbackfn, "abc");
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-3.js
index c5f26c12c..3f444ba16 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-3.js

- * @description Array.prototype.map - thisArg is Array

- */

-

-

-function testcase() {

-  var res = false;

-  var a = new Array();

-  a.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var srcArr = [1];

-  var resArr = srcArr.map(callbackfn,a);

-  if( resArr[0] === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg is Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var a = new Array();
+  a.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var srcArr = [1];
+  var resArr = srcArr.map(callbackfn,a);
+  if( resArr[0] === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-4.js
index 00e25c49d..67cf268e0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-4.js

- * @description Array.prototype.map - thisArg is object from object template(prototype)

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-  

-  function foo(){}

-  foo.prototype.res = true;

-  var f = new foo();

-  

-  var srcArr = [1];

-  var resArr = srcArr.map(callbackfn,f);

-  if( resArr[0] === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - thisArg is object from object
+    template(prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+  
+  function foo(){}
+  foo.prototype.res = true;
+  var f = new foo();
+  
+  var srcArr = [1];
+  var resArr = srcArr.map(callbackfn,f);
+  if( resArr[0] === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-5.js
index 30c93439e..42941f232 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-5.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-5.js

- * @description Array.prototype.map - thisArg is object from object template

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  var f = new foo();

-  f.res = true;

-  

-  var srcArr = [1];

-  var resArr = srcArr.map(callbackfn,f);

-  if( resArr[0] === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg is object from object template
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  var f = new foo();
+  f.res = true;
+  
+  var srcArr = [1];
+  var resArr = srcArr.map(callbackfn,f);
+  if( resArr[0] === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-6.js
index 51cd1d79c..eae47c804 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-6.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-6.js

- * @description Array.prototype.map - thisArg is function

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  foo.res = true;

-  

-  var srcArr = [1];

-  var resArr = srcArr.map(callbackfn,foo);

-  if( resArr[0] === true)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - thisArg is function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  foo.res = true;
+  
+  var srcArr = [1];
+  var resArr = srcArr.map(callbackfn,foo);
+  if( resArr[0] === true)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-7.js
index d50832125..c6186c145 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-7.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-7.js

- * @description Array.prototype.map - built-in functions can be used as thisArg

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this === eval;

-        }

-

-        var testResult = [11].map(callbackfn, eval);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - built-in functions can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this === eval;
+        }
+
+        var testResult = [11].map(callbackfn, eval);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-9.js
index 8977a5579..bb60a638c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-9.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-5-9.js

- * @description Array.prototype.map - Function object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var objFunction = function () { };

-

-        function callbackfn(val, idx, obj) {

-            return this === objFunction;

-        }

-

-        var testResult = [11].map(callbackfn, objFunction);

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - Function object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objFunction = function () { };
+
+        function callbackfn(val, idx, obj) {
+            return this === objFunction;
+        }
+
+        var testResult = [11].map(callbackfn, objFunction);
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-1.js
index 58cc2d0b0..8c13a5ab3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-1.js

- * @description Array.prototype.map - Array.isArray returns true when input argument is the ourput array

- */

-

-

-function testcase() {

-

-        var newArr = [11].map(function () { });

-

-        return Array.isArray(newArr);

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - Array.isArray returns true when input
+    argument is the ourput array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newArr = [11].map(function () { });
+
+        return Array.isArray(newArr);
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-2.js
index f8a125381..ba44da4c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-2.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-6-2.js

- * @description Array.prototype.map - the returned array is instanceof Array

- */

-

-

-function testcase() {

-

-        var newArr = [11].map(function () { });

-

-        return newArr instanceof Array;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - the returned array is instanceof Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newArr = [11].map(function () { });
+
+        return newArr instanceof Array;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-1.js
index e400b1265..014daab25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-1.js

- * @description Array.prototype.map doesn't consider new elements added to array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    srcArr[2] = 3;

-    srcArr[5] = 6;

-    return 1;

-  }

-

-  var srcArr = [1,2,,4,5];

-  var resArr = srcArr.map(callbackfn);

-  if(resArr.length === 5)

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map doesn't consider new elements added to array
+    after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    srcArr[2] = 3;
+    srcArr[5] = 6;
+    return 1;
+  }
+
+  var srcArr = [1,2,,4,5];
+  var resArr = srcArr.map(callbackfn);
+  if(resArr.length === 5)
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-2.js
index 988fa0ae6..59c999e11 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-2.js

- * @description Array.prototype.map considers new value of elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {    

-    srcArr[4] = -1;

-    if(val > 0)

-      return 1;

-    else

-      return 0;

-  }

-

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.map(callbackfn);

-  if(resArr.length === 5 && resArr[4] === 0)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map considers new value of elements in array after
+    it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {    
+    srcArr[4] = -1;
+    if(val > 0)
+      return 1;
+    else
+      return 0;
+  }
+
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.map(callbackfn);
+  if(resArr.length === 5 && resArr[4] === 0)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-3.js
index a355f41a3..63debe851 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-3.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-3.js

- * @description Array.prototype.map doesn't visit deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete srcArr[4];

-    if(val > 0)

-      return 1;

-    else

-      return 0;

-

-  }

-

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.map(callbackfn);

-  if(resArr.length === 5 && resArr[4] === undefined)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map doesn't visit deleted elements in array after
+    the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete srcArr[4];
+    if(val > 0)
+      return 1;
+    else
+      return 0;
+
+  }
+
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.map(callbackfn);
+  if(resArr.length === 5 && resArr[4] === undefined)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-4.js
index 6cfd6f215..f7e154006 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-4.js

- * @description Array.prototype.map doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    srcArr.length = 2;

-    callCnt++;

-    return 1;

-  }

-

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.map(callbackfn);

-  if(resArr.length === 5  && callCnt === 2 && resArr[2] === undefined)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    srcArr.length = 2;
+    callCnt++;
+    return 1;
+  }
+
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.map(callbackfn);
+  if(resArr.length === 5  && callCnt === 2 && resArr[2] === undefined)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-5.js
index 4711eeb11..60e6d5ef9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-5.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-5.js

- * @description Array.prototype.map doesn't consider newly added elements in sparse array

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    srcArr[1000] = 3;

-    callCnt++;

-    return val;

-  }

-

-  var srcArr = new Array(10);

-  srcArr[1] = 1;

-  srcArr[2] = 2;

-  var resArr = srcArr.map(callbackfn);

-  if( resArr.length === 10 && callCnt === 2)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map doesn't consider newly added elements in
+    sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    srcArr[1000] = 3;
+    callCnt++;
+    return val;
+  }
+
+  var srcArr = new Array(10);
+  srcArr[1] = 1;
+  srcArr[2] = 2;
+  var resArr = srcArr.map(callbackfn);
+  if( resArr.length === 10 && callCnt === 2)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-6.js
index 54f41e899..5ba4dc5bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-6.js

- * @description Array.prototype.map visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete srcArr[4];

-    if(val > 0)

-      return 1;

-    else

-      return 0;

-

-  }

-

-  Array.prototype[4] = 5;

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.map(callbackfn);

-  delete Array.prototype[4];

-  if(resArr.length === 5 && resArr[4] === 1)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map visits deleted element in array after the call
+    when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete srcArr[4];
+    if(val > 0)
+      return 1;
+    else
+      return 0;
+
+  }
+
+  Array.prototype[4] = 5;
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.map(callbackfn);
+  delete Array.prototype[4];
+  if(resArr.length === 5 && resArr[4] === 1)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-7.js
index e0edd25ca..03d0fbe1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-7.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-7.js

- * @description Array.prototype.map successful to delete the object in callbackfn

- */

-

-

-function testcase() {

-        var obj = {};

-        obj.srcArr = [1, 2, 3, 4, 5];

-

-        function callbackfn(val, idx, obj) {

-            delete obj.srcArr;

-            if (val > 0)

-                return 1;

-            else

-                return 0;

-        }

-

-        var resArr = obj.srcArr.map(callbackfn);

-        return resArr.toString() === "1,1,1,1,1" && !obj.hasOwnProperty("arr");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map successful to delete the object in callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {};
+        obj.srcArr = [1, 2, 3, 4, 5];
+
+        function callbackfn(val, idx, obj) {
+            delete obj.srcArr;
+            if (val > 0)
+                return 1;
+            else
+                return 0;
+        }
+
+        var resArr = obj.srcArr.map(callbackfn);
+        return resArr.toString() === "1,1,1,1,1" && !obj.hasOwnProperty("arr");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-8.js
index f31c5e23b..daeda023d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-8.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-8.js

- * @description Array.prototype.map - no observable effects occur if length is 0 on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 0 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - no observable effects occur if length is 0
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 0 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-9.js
index 76d39b411..7bad55985 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-9.js

- * @description Array.prototype.map - modifications to length don't change number of iterations on an Array

- */

-

-

-function testcase() {

-        var called = 0;

-        function callbackfn(val, idx, obj) {

-            called += 1;

-            return val > 10;

-        }

-

-        var arr = [9, , 12];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 8;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-

-        return testResult.length === 3 && called === 2 && typeof testResult[2] === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - modifications to length don't change number
+    of iterations on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        function callbackfn(val, idx, obj) {
+            called += 1;
+            return val > 10;
+        }
+
+        var arr = [9, , 12];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 8;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+
+        return testResult.length === 3 && called === 2 && typeof testResult[2] === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-1.js
index be5986522..4dd593cb0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-1.js

- * @description Array.prototype.map - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return 1;

-  }

-

-  var srcArr = new Array(10);

-  srcArr[1] = undefined; //explicitly assigning a value

-  var resArr = srcArr.map(callbackfn);

-  if( resArr.length === 10 && callCnt === 1)

-      return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn not called for indexes never been
+    assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return 1;
+  }
+
+  var srcArr = new Array(10);
+  srcArr[1] = undefined; //explicitly assigning a value
+  var resArr = srcArr.map(callbackfn);
+  if( resArr.length === 10 && callCnt === 1)
+      return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-10.js
index 729b4cb76..c2565ca0b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-10.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-10.js

- * @description Array.prototype.map - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return idx === 1 && typeof val === "undefined";

-        }

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            var testResult = Array.prototype.map.call(obj, callbackfn);

-            return testResult.length === 20 && typeof testResult[1] === "undefined";

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return idx === 1 && typeof val === "undefined";
+        }
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            var testResult = Array.prototype.map.call(obj, callbackfn);
+            return testResult.length === 20 && typeof testResult[1] === "undefined";
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-11.js
index 0f8e4ecfc..7415de060 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-11.js

- * @description Array.prototype.map - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return idx === 1 && typeof val === "undefined";

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            var testResult = arr.map(callbackfn);

-            return testResult.length === 3 && typeof testResult[1] === "undefined";

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return idx === 1 && typeof val === "undefined";
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            var testResult = arr.map(callbackfn);
+            return testResult.length === 3 && typeof testResult[1] === "undefined";
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-12.js
index be4b5fdb6..916772507 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-12.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-12.js

- * @description Array.prototype.map - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 3) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var obj = { 0: 0, 1: 1, 2: 2, length: 10 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 3;

-            var testResult = Array.prototype.map.call(obj, callbackfn);

-            return testResult[1] === false; 

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 3) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var obj = { 0: 0, 1: 1, 2: 2, length: 10 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 3;
+            var testResult = Array.prototype.map.call(obj, callbackfn);
+            return testResult[1] === false; 
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-13.js
index 19564a33e..647a4d53d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-13.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-13.js

- * @description Array.prototype.map - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 3) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 3;

-            var testResult = arr.map(callbackfn);

-            return testResult[1] === false;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 3) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 3;
+            var testResult = arr.map(callbackfn);
+            return testResult[1] === false;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-14.js
index ae6b51385..c66004fc0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-14.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-14.js

- * @description Array.prototype.map - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 3 && typeof val === "undefined";

-        }

-

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-        return typeof testResult[3] === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 3 && typeof val === "undefined";
+        }
+
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+        return typeof testResult[3] === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-15.js
index b1efefacb..f6cd6953e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-15.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-15.js

- * @description Array.prototype.map - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var testResult = arr.map(callbackfn);

-            return testResult.length === 3 && testResult[2] === false;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - decreasing length of array with prototype
+    property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var testResult = arr.map(callbackfn);
+            return testResult.length === 3 && testResult[2] === false;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-16.js
index 340679e96..cefeceb33 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-16.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-16.js

- * @description Array.prototype.map - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-        return testResult.length === 3 && testResult[2] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - decreasing length of array does not delete
+    non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+        return testResult.length === 3 && testResult[2] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-2.js
index 1f9eb92b7..031d67e0b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-2.js
@@ -1,34 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-2.js

- * @description Array.prototype.map - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2 && val === "length") {

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult[2] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - added properties in step 2 are visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2 && val === "length") {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult[2] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-3.js
index 542c8b53e..ea5bf9ce6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-3.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-3.js

- * @description Array.prototype.map - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 2) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var obj = { 2: 6.99, 8: 19 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[2];

-                return 10;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return typeof testResult[2] === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - deleted properties in step 2 are visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 2) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var obj = { 2: 6.99, 8: 19 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[2];
+                return 10;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return typeof testResult[2] === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-4.js
index fbd3f3a2a..6ceef9d3e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-4.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-4.js

- * @description Array.prototype.map - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(obj, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult[0] === true && testResult[1] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(obj, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult[0] === true && testResult[1] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-5.js
index 288e30201..d6ffe2b80 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-5.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-5.js

- * @description Array.prototype.map - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-        return testResult[0] === true && testResult[1] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+        return testResult[0] === true && testResult[1] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-6.js
index 0d4b09edc..bca7520b9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-6.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-6.js

- * @description Array.prototype.map - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            var testResult = Array.prototype.map.call(obj, callbackfn);

-            return testResult[0] === true && testResult[1] === false;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - properties can be added to prototype after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            var testResult = Array.prototype.map.call(obj, callbackfn);
+            return testResult[0] === true && testResult[1] === false;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-7.js
index 3261923d1..9e886b8cb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-7.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-7.js

- * @description Array.prototype.map - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [0, , 2];

-

-        try {

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    Object.defineProperty(Array.prototype, "1", {

-                        get: function () {

-                            return 6.99;

-                        },

-                        configurable: true

-                    });

-                    return 0;

-                },

-                configurable: true

-            });

-

-            var testResult = arr.map(callbackfn);

-            return testResult[0] === true && testResult[1] === false;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - properties can be added to prototype after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [0, , 2];
+
+        try {
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    Object.defineProperty(Array.prototype, "1", {
+                        get: function () {
+                            return 6.99;
+                        },
+                        configurable: true
+                    });
+                    return 0;
+                },
+                configurable: true
+            });
+
+            var testResult = arr.map(callbackfn);
+            return testResult[0] === true && testResult[1] === false;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-8.js
index 342bc67db..73699e042 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-8.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-8.js

- * @description Array.prototype.map - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult[0] === true && typeof testResult[1] === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting own property causes index property
+    not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult[0] === true && typeof testResult[1] === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-9.js
index d227af7f9..880fa2e38 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-9.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-b-9.js

- * @description Array.prototype.map - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-        return testResult[0] === true && typeof testResult[1] === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - deleting own property causes index property
+    not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+        return testResult[0] === true && typeof testResult[1] === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-1.js
index 98bfa49bf..84aa04742 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-1.js

- * @description Array.prototype.map - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = {};

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var obj = { 5: kValue, length: 100 };

-

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr[5] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var obj = { 5: kValue, length: 100 };
+
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr[5] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-10.js
index 40c52743b..2f3e85027 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-10.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-10.js

- * @description Array.prototype.map - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-11.js
index 405fd550e..124ac9d7d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-11.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-11.js

- * @description Array.prototype.map - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { 0: 5, length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { 0: 5, length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-12.js
index eefb1f985..c7f3f3432 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-12.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-12.js

- * @description Array.prototype.map - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        try {

-            Array.prototype[0] = 11;

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return kValue;

-                },

-                configurable: true

-            });

-

-            var testResult = arr.map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        try {
+            Array.prototype[0] = 11;
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return kValue;
+                },
+                configurable: true
+            });
+
+            var testResult = arr.map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-13.js
index 0ad61ef0d..0ff24f8ba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-13.js
@@ -1,48 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-13.js

- * @description Array.prototype.map - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { length: 2 };

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { length: 2 };
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-14.js
index 5afe034ff..dc3d473b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-14.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-14.js

- * @description Array.prototype.map - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return kValue;

-                },

-                configurable: true

-            });

-

-            var testResult = arr.map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return kValue;
+                },
+                configurable: true
+            });
+
+            var testResult = arr.map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-15.js
index 8caa229ba..b184a9028 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-15.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-15.js

- * @description Array.prototype.map - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { length: 2 };

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { length: 2 };
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-16.js
index ece87a078..cf8d04736 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-16.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-16.js

- * @description Array.prototype.map - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return kValue;

-                },

-                configurable: true

-            });

-

-            var testResult = [, ].map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return kValue;
+                },
+                configurable: true
+            });
+
+            var testResult = [, ].map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-17.js
index 307ae70c4..9b0e0ec67 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-17.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-17.js

- * @description Array.prototype.map - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-18.js
index 2e3cab974..55711e093 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-18.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-18.js

- * @description Array.prototype.map - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-

-        return testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+
+        return testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-19.js
index 2c82e3086..ccb373cc6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-19.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-19.js

- * @description Array.prototype.map - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var arr = [];

-

-        try {

-            Object.defineProperty(arr, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 100;

-                },

-                configurable: true

-            });

-

-            var testResult = arr.map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var arr = [];
+
+        try {
+            Object.defineProperty(arr, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 100;
+                },
+                configurable: true
+            });
+
+            var testResult = arr.map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-2.js
index 35fc8b31d..6cdee80ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-2.js

- * @description Array.prototype.map - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = {};

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var arr = [kValue];

-

-        var newArr = arr.map(callbackfn);

-

-        return newArr[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var arr = [kValue];
+
+        var newArr = arr.map(callbackfn);
+
+        return newArr[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-20.js
index 3efa5bb8b..0b59a1ad4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-20.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-20.js

- * @description Array.prototype.map - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var proto = {};

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-

-        Object.defineProperty(child, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 100;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var proto = {};
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+
+        Object.defineProperty(child, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 100;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-21.js
index 30b967488..234855949 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-21.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-21.js

- * @description Array.prototype.map - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        var proto = { length: 2 };

-        Object.defineProperty(proto, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        var proto = { length: 2 };
+        Object.defineProperty(proto, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-22.js
index 03f98b42b..a630d288a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-22.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-22.js

- * @description Array.prototype.map - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return typeof val === "undefined";

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            var testResult = [,].map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return typeof val === "undefined";
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            var testResult = [,].map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-23.js
index 8281b371e..27acab70f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-23.js
@@ -1,36 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-23.js

- * @description Array.prototype.map - This object is the global object which contains index property

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = kValue;

-            fnGlobalObject().length = 2;

-

-            var testResult = Array.prototype.map.call(fnGlobalObject(), callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete fnGlobalObject()[0];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - This object is the global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = kValue;
+            fnGlobalObject().length = 2;
+
+            var testResult = Array.prototype.map.call(fnGlobalObject(), callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete fnGlobalObject()[0];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-25.js
index 0fbb3c334..34fa630d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-25.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-25.js

- * @description Array.prototype.map - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.map.call(arguments, callbackfn);

-        };

-

-        var testResult = func(9);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.map.call(arguments, callbackfn);
+        };
+
+        var testResult = func(9);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-26.js
index 7e3fc7e37..b8100b16f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-26.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-26.js

- * @description Array.prototype.map - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 9;

-            } else if (idx === 1) {

-                return val === 11;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.map.call(arguments, callbackfn);

-        };

-

-        var testResult = func(9, 11);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 9;
+            } else if (idx === 1) {
+                return val === 11;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.map.call(arguments, callbackfn);
+        };
+
+        var testResult = func(9, 11);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-27.js
index 4ef582ef1..a3a0de5fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-27.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-27.js

- * @description Array.prototype.map - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 9;

-            } else if (idx === 1) {

-                return val === 11;

-            } else if (idx === 2) {

-                return val === 12;

-            } else {

-                return false;

-            }

-

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.map.call(arguments, callbackfn);

-        };

-

-        var testResult = func(9, 11, 12);

-

-        return testResult[0] === true && testResult[1] === true && testResult[2] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 9;
+            } else if (idx === 1) {
+                return val === 11;
+            } else if (idx === 2) {
+                return val === 12;
+            } else {
+                return false;
+            }
+
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.map.call(arguments, callbackfn);
+        };
+
+        var testResult = func(9, 11, 12);
+
+        return testResult[0] === true && testResult[1] === true && testResult[2] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-28.js
index d67e0a3f0..a0460b377 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-28.js
@@ -1,50 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-28.js

- * @description Array.prototype.map - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            } else if (idx === 1) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 11;

-                }

-            },

-            configurable: true

-        });

-

-        var testResult = arr.map(callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            } else if (idx === 1) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 11;
+                }
+            },
+            configurable: true
+        });
+
+        var testResult = arr.map(callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-29.js
index ee077355c..00ae71c91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-29.js
@@ -1,50 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-29.js

- * @description Array.prototype.map - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var obj = { length: 2 };

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            } else if (idx === 1) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 11;

-                }

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element changed by getter on previous
+    iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var obj = { length: 2 };
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            } else if (idx === 1) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 11;
+                }
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-3.js
index c1cab57fd..ec47bb2db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-3.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-3.js

- * @description Array.prototype.map - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { 5: 12, length: 10 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[5] = kValue;

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[5] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    that overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { 5: 12, length: 10 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[5] = kValue;
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[5] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-30.js
index b8e280792..872b3f22b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-30.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-30.js

- * @description Array.prototype.map - unhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-        }

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                accessed = true;

-                return 100;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.map.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - unhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+        }
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                accessed = true;
+                return 100;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.map.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-31.js
index 81068dfdf..da8baf0b3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-31.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-31.js

- * @description Array.prototype.map - unhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-        }

-

-        var arr = [];

-        arr[5] = 10;

-        arr[10] = 100;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                accessed = true;

-                return 100;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.map(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - unhandled exceptions happened in getter
+    terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+        }
+
+        var arr = [];
+        arr[5] = 10;
+        arr[10] = 100;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                accessed = true;
+                return 100;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.map(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-4.js
index 7994d2bb8..f83953e96 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-4.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-4.js

- * @description Array.prototype.map - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Array.prototype[0] = 11;

-

-            var testResult = [kValue].map(callbackfn);

-

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Array.prototype[0] = 11;
+
+            var testResult = [kValue].map(callbackfn);
+
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-5.js
index 13bb10f7b..137e9dc65 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-5.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-5.js

- * @description Array.prototype.map - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "5", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-        Object.defineProperty(child, "5", {

-            value: kValue,

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(child, callbackfn);

-

-        return testResult[5] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    that overrides an inherited accessor property on an Array-like
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "5", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+        Object.defineProperty(child, "5", {
+            value: kValue,
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(child, callbackfn);
+
+        return testResult[5] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-6.js
index 78f4afd3c..615ddfa1f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-6.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-6.js

- * @description Array.prototype.map - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 9;

-                },

-                configurable: true

-            });

-

-            var testResult = [kValue].map(callbackfn);

-            return testResult[0] === true;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own data property
+    that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 9;
+                },
+                configurable: true
+            });
+
+            var testResult = [kValue].map(callbackfn);
+            return testResult[0] === true;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-7.js
index 4f00964a7..520e91b3b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-7.js

- * @description Array.prototype.map - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 5) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var proto = { 5: kValue, length: 10 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        var newArr = Array.prototype.map.call(child, callbackfn);

-

-        return newArr[5] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 5) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var proto = { 5: kValue, length: 10 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        var newArr = Array.prototype.map.call(child, callbackfn);
+
+        return newArr[5] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-8.js
index 2b6b46668..114a4e72e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-8.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-8.js

- * @description Array.prototype.map - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === 13;

-            }

-            return false;

-        }

-

-        try {

-            Array.prototype[1] = 13;

-

-            var newArr = [, , , ].map(callbackfn);

-

-            return newArr[1] === true;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === 13;
+            }
+            return false;
+        }
+
+        try {
+            Array.prototype[1] = 13;
+
+            var newArr = [, , , ].map(callbackfn);
+
+            return newArr[1] === true;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-9.js
index 796e6e541..736e11596 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-9.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-i-9.js

- * @description Array.prototype.map - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = "abc";

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === kValue;

-            }

-            return false;

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return kValue;

-            },

-            configurable: true

-        });

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = "abc";
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === kValue;
+            }
+            return false;
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return kValue;
+            },
+            configurable: true
+        });
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-1.js
index ed414f850..966511f3c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-1.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-1.js

- * @description Array.prototype.map - callbackfn called with correct parameters

- */

-

-

-function testcase() { 

- 

-  var bPar = true;

-  var bCalled = false;

-  function callbackfn(val, idx, obj)

-  {

-    bCalled = true;

-    if(obj[idx] !== val)

-      bPar = false;

-  }

-

-  var srcArr = [0,1,true,null,new Object(),"five"];

-  srcArr[999999] = -6.6;

-  resArr = srcArr.map(callbackfn);

-  

-  if(bCalled === true && bPar === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn called with correct parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bPar = true;
+  var bCalled = false;
+  function callbackfn(val, idx, obj)
+  {
+    bCalled = true;
+    if(obj[idx] !== val)
+      bPar = false;
+  }
+
+  var srcArr = [0,1,true,null,new Object(),"five"];
+  srcArr[999999] = -6.6;
+  resArr = srcArr.map(callbackfn);
+  
+  if(bCalled === true && bPar === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-10.js
index bfaddec68..7f0a154bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-10.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-10.js

- * @description Array.prototype.map - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val) {

-            return val > 10;

-        }

-

-        var testResult = [11].map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn is called with 1 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val) {
+            return val > 10;
+        }
+
+        var testResult = [11].map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-11.js
index a39bcc3b8..8d6e1d612 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-11.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-11.js

- * @description Array.prototype.map - callbackfn is called with 2 formal parameters

- */

-

-

-function testcase() {

-        function callbackfn(val, idx) {

-            return (val > 10 && arguments[2][idx] === val);

-        }

-

-        var testResult = [11].map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn is called with 2 formal parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx) {
+            return (val > 10 && arguments[2][idx] === val);
+        }
+
+        var testResult = [11].map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-12.js
index c5ea2da22..1412f2cb2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-12.js

- * @description Array.prototype.map - callbackfn is called with 3 formal parameters

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return (val > 10 && obj[idx] === val);

-        }

-

-        var testResult = [11].map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn is called with 3 formal parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return (val > 10 && obj[idx] === val);
+        }
+
+        var testResult = [11].map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-13.js
index b66463f99..ae614ed83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-13.js

- * @description Array.prototype.map - callbackfn that uses arguments object to get parameter value

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return arguments[2][arguments[1]] === arguments[0];

-        }

-

-        var testResult = [11].map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn that uses arguments object to get
+    parameter value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return arguments[2][arguments[1]] === arguments[0];
+        }
+
+        var testResult = [11].map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-16.js
index 6c315797d..6684948fb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-16.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-16.js

- * @description Array.prototype.map - 'this' object when T is not an object (T is a boolean primitive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === false;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn, false);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'this' object when T is not an object (T is
+    a boolean primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === false;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn, false);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-17.js
index bbb97698f..ecdf28f42 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-17.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-17.js

- * @description Array.prototype.map - 'this' object when T is not an object (T is a number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === 5;

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn, 5);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'this' object when T is not an object (T is
+    a number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === 5;
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn, 5);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-18.js
index 045b9bb98..e75a09eab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-18.js

- * @description Array.prototype.map - 'this' object when T is not an object (T is a string primitive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === "hello!";

-        }

-

-        var obj = { 0: 11, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn, "hello!");

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - 'this' object when T is not an object (T is
+    a string primitive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === "hello!";
+        }
+
+        var obj = { 0: 11, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn, "hello!");
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-19.js
index fed11c63f..4f4234432 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-19.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-19.js

- * @description Array.prototype.map - non-indexed properties are not called.

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var result = false;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (val === 11) {

-                result = true;

-            }

-            return true;

-        }

-

-        var obj = { 0: 9, non_index_property: 11, length: 20 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return !result && testResult[0] === true && called === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - non-indexed properties are not called.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var result = false;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (val === 11) {
+                result = true;
+            }
+            return true;
+        }
+
+        var obj = { 0: 9, non_index_property: 11, length: 20 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return !result && testResult[0] === true && called === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-2.js
index c9dabd69d..f8444d029 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-2.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-2.js

- * @description Array.prototype.map - callbackfn takes 3 arguments

- */

-

-

-function testcase() { 

- 

-  var parCnt = 3;

-  var bCalled = false

-  function callbackfn(val, idx, obj)

-  { 

-    bCalled = true;

-    if(arguments.length !== 3)

-      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters

-  }

-

-  var srcArr = [0,1,2,3,4,5,6,7,8,9];

-  var resArr = srcArr.map(callbackfn);

-  if(bCalled === true && parCnt === 3)

-    return true;

-

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn takes 3 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var parCnt = 3;
+  var bCalled = false
+  function callbackfn(val, idx, obj)
+  { 
+    bCalled = true;
+    if(arguments.length !== 3)
+      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters
+  }
+
+  var srcArr = [0,1,2,3,4,5,6,7,8,9];
+  var resArr = srcArr.map(callbackfn);
+  if(bCalled === true && parCnt === 3)
+    return true;
+
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-20.js
index b1688283d..b1dbfaef1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-20.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-20.js

- * @description Array.prototype.map - callbackfn called with correct parameters (thisArg is correct)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.threshold === 10;

-        }

-

-        var thisArg = { threshold: 10 };

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn, thisArg);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn called with correct parameters
+    (thisArg is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.threshold === 10;
+        }
+
+        var thisArg = { threshold: 10 };
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn, thisArg);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-21.js
index 93a6fbe20..dd09278c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-21.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-21.js

- * @description Array.prototype.map - callbackfn called with correct parameters (kValue is correct)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            }

-

-            if (idx === 1) {

-                return val === 12;

-            }

-

-            return false;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn called with correct parameters
+    (kValue is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            }
+
+            if (idx === 1) {
+                return val === 12;
+            }
+
+            return false;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-22.js
index 1505e5f08..a827cc53b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-22.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-22.js

- * @description Array.prototype.map - callbackfn called with correct parameters (the index k is correct)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (val === 11) {

-                return idx === 0;

-            }

-

-            if (val === 12) {

-                return idx === 1;

-            }

-

-            return false;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true && testResult[1] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn called with correct parameters
+    (the index k is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (val === 11) {
+                return idx === 0;
+            }
+
+            if (val === 12) {
+                return idx === 1;
+            }
+
+            return false;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true && testResult[1] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-23.js
index ab87c8715..0de7f9e64 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-23.js

- * @description Array.prototype.map - callbackfn called with correct parameters (this object O is correct)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            return obj === o;

-        }

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - callbackfn called with correct parameters
+    (this object O is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            return obj === o;
+        }
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-4.js
index 5e512111a..1032ef7d6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-4.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-4.js

- * @description Array.prototype.map - k values are passed in acending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = 0;

-        var called = 0;

-        var result = true;

-        function callbackfn(val, idx, o) {

-            called++;

-            if (lastIdx !== idx) {

-                result = false;

-            } else {

-                lastIdx++;

-            }

-        }

-

-        arr.map(callbackfn);

-        return result && arr.length === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - k values are passed in acending numeric order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = 0;
+        var called = 0;
+        var result = true;
+        function callbackfn(val, idx, o) {
+            called++;
+            if (lastIdx !== idx) {
+                result = false;
+            } else {
+                lastIdx++;
+            }
+        }
+
+        arr.map(callbackfn);
+        return result && arr.length === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-5.js
index c37394d4e..13acf9006 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-5.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-5.js

- * @description Array.prototype.map - k values are accessed during each iteration and not prior to starting the loop.

- */

-

-

-function testcase() {

-

-        var kIndex = [];

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {

-                    return true;

-                }

-                kIndex[idx] = 1;

-                return false;

-            } else {

-                return true;

-            }

-        }

-

-        var testResult = [11, 12, 13, 14].map(callbackfn);

-

-        return testResult.length === 4 && testResult[0] === false &&

-            testResult[1] === false && testResult[2] === false &&

-            testResult[3] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - k values are accessed during each iteration
+    and not prior to starting the loop.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kIndex = [];
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {
+                    return true;
+                }
+                kIndex[idx] = 1;
+                return false;
+            } else {
+                return true;
+            }
+        }
+
+        var testResult = [11, 12, 13, 14].map(callbackfn);
+
+        return testResult.length === 4 && testResult[0] === false &&
+            testResult[1] === false && testResult[2] === false &&
+            testResult[3] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-6.js
index e3378b640..60fc22c43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-6.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-6.js

- * @description Array.prototype.map - arguments to callbackfn are self consistent.

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, length: 1 };

-        var thisArg = {};

-

-        function callbackfn() {

-            return this === thisArg &&

-                arguments[0] === 11 &&

-                arguments[1] === 0 &&

-                arguments[2] === obj;

-        }

-

-        var testResult = Array.prototype.map.call(obj, callbackfn, thisArg);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - arguments to callbackfn are self consistent.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, length: 1 };
+        var thisArg = {};
+
+        function callbackfn() {
+            return this === thisArg &&
+                arguments[0] === 11 &&
+                arguments[1] === 0 &&
+                arguments[2] === obj;
+        }
+
+        var testResult = Array.prototype.map.call(obj, callbackfn, thisArg);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-7.js
index a0bffca6b..ff8c60922 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-7.js

- * @description Array.prototype.map - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            if (idx > 0) {

-                accessed = true;

-            }

-            if (idx === 0) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.map.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return ex instanceof Error && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - unhandled exceptions happened in callbackfn
+    terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            if (idx > 0) {
+                accessed = true;
+            }
+            if (idx === 0) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.map.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return ex instanceof Error && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-8.js
index ab4c90fc6..d7a6b851e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-8.js

- * @description Array.prototype.map - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var obj = { 0: 9, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            if (idx === 0) {

-                obj[idx + 1] = 8;

-            }

-            return val > 10;

-        }

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult[1] === false;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - element changed by callbackfn on previous
+    iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 9, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            if (idx === 0) {
+                obj[idx + 1] = 8;
+            }
+            return val > 10;
+        }
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult[1] === false;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-9.js
index 745ea3f56..ef70b5825 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-9.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-ii-9.js

- * @description Array.prototype.map - callbackfn with 0 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return true;

-        }

-

-        var testResult = [11].map(callbackfn);

-

-        return testResult[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - callbackfn with 0 formal parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return true;
+        }
+
+        var testResult = [11].map(callbackfn);
+
+        return testResult[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-1.js
index 491130bca..bca75fcfd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-1.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-1.js

- * @description Array.prototype.map - getOwnPropertyDescriptor(all true) of returned array element

- */

-

-

-function testcase() {

-  

-  function callbackfn(val, idx, obj){

-	  if(val % 2)

-	    return (2 * val + 1); 

-	  else

-	    return (val / 2);

-  }

-  var srcArr = [0,1,2,3,4];

-  var resArr = srcArr.map(callbackfn);

-  if (resArr.length > 0){

-     var desc = Object.getOwnPropertyDescriptor(resArr, 1) 

-     if(desc.value === 3 &&        //srcArr[1] = 2*1+1 = 3

-       desc.writable === true &&

-       desc.enumerable === true &&

-       desc.configurable === true){

-         return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - getOwnPropertyDescriptor(all true) of
+    returned array element
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  function callbackfn(val, idx, obj){
+	  if(val % 2)
+	    return (2 * val + 1); 
+	  else
+	    return (val / 2);
+  }
+  var srcArr = [0,1,2,3,4];
+  var resArr = srcArr.map(callbackfn);
+  if (resArr.length > 0){
+     var desc = Object.getOwnPropertyDescriptor(resArr, 1) 
+     if(desc.value === 3 &&        //srcArr[1] = 2*1+1 = 3
+       desc.writable === true &&
+       desc.enumerable === true &&
+       desc.configurable === true){
+         return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-2.js
index c9a22395c..01dcb7a26 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-2.js

- * @description Array.prototype.map - value of returned array element equals to 'mappedValue'

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        return newArr[0] === obj[0] && newArr[1] === obj[1];

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of returned array element equals to
+    'mappedValue'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        return newArr[0] === obj[0] && newArr[1] === obj[1];
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-3.js
index 4d7edbc9a..6850fd361 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-3.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-3.js

- * @description Array.prototype.map - value of returned array element can be overwritten

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return 11;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        try {

-            var tempVal = newArr[1];

-            newArr[1] += 1;

-            return newArr[1] !== tempVal;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of returned array element can be
+    overwritten
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return 11;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        try {
+            var tempVal = newArr[1];
+            newArr[1] += 1;
+            return newArr[1] !== tempVal;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-4.js
index dffbb011f..c5d4c8753 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-4.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-4.js

- * @description Array.prototype.map - value of returned array element can be enumerated

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, length: 2 };

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        var prop;

-        var enumerable = false;

-        for (prop in newArr) {

-            if (newArr.hasOwnProperty(prop)) {

-                if (prop === "0") {

-                    enumerable = true;

-                }

-            }

-        }

-

-        return enumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of returned array element can be
+    enumerated
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, length: 2 };
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        var prop;
+        var enumerable = false;
+        for (prop in newArr) {
+            if (newArr.hasOwnProperty(prop)) {
+                if (prop === "0") {
+                    enumerable = true;
+                }
+            }
+        }
+
+        return enumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-5.js
index 254249f0f..987a7406b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-5.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-8-c-iii-5.js

- * @description Array.prototype.map - value of returned array element can be changed or deleted

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.map.call(obj, callbackfn);

-

-        try {

-            var tempVal = newArr[1];

-            delete newArr[1];

-            return tempVal !== undefined && newArr[1] === undefined;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - value of returned array element can be
+    changed or deleted
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.map.call(obj, callbackfn);
+
+        try {
+            var tempVal = newArr[1];
+            delete newArr[1];
+            return tempVal !== undefined && newArr[1] === undefined;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-1.js
index 66ca32101..205ccc630 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-1.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-1.js

- * @description Array.prototype.map doesn't mutate the Array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return true;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr.map(callbackfn);

-  if(srcArr[0] === 1 &&

-     srcArr[1] === 2 &&

-     srcArr[2] === 3 &&

-     srcArr[3] === 4 &&

-     srcArr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map doesn't mutate the Array on which it is called
+    on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return true;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr.map(callbackfn);
+  if(srcArr[0] === 1 &&
+     srcArr[1] === 2 &&
+     srcArr[2] === 3 &&
+     srcArr[3] === 4 &&
+     srcArr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-10.js
index c7c13cb00..b1f4c66e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-10.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var Foo = function () { };

-        Foo.prototype = [1, 2, 3];

-        var obj = new Foo();

-        obj.length = {

-            valueOf: function () {

-                return 0;

-            }

-        };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var Foo = function () { };
+        Foo.prototype = [1, 2, 3];
+        var obj = new Foo();
+        obj.length = {
+            valueOf: function () {
+                return 0;
+            }
+        };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-11.js
index d7ae2792b..eb750fe4b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-11.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-11.js

- * @description Array.prototype.map - returns an empty array if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-        function Foo() { }

-        Foo.prototype = [1, 2, 3];

-

-        var f = new Foo();

-

-        var o = {

-            toString: function () {

-                return '0';

-            }

-        };

-        f.length = o;

-

-        // objects inherit the default valueOf method of the Object object;

-        // that simply returns the itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-

-        function cb() { }

-        var a = Array.prototype.map.call(f, cb);

-

-        if (Array.isArray(a) && a.length === 0) {

-            return true;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - returns an empty array if 'length' is 0
+    (subclassed Array, length overridden with obj w/o valueOf
+    (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function Foo() { }
+        Foo.prototype = [1, 2, 3];
+
+        var f = new Foo();
+
+        var o = {
+            toString: function () {
+                return '0';
+            }
+        };
+        f.length = o;
+
+        // objects inherit the default valueOf method of the Object object;
+        // that simply returns the itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+
+        function cb() { }
+        var a = Array.prototype.map.call(f, cb);
+
+        if (Array.isArray(a) && a.length === 0) {
+            return true;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-12.js
index 3c2c1549e..005988348 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-12.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-12.js

- * @description Array.prototype.map - returns an empty array if 'length' is 0 (subclassed Array, length overridden with [])

- */

-

-

-function testcase() {

-        function Foo() { }

-        Foo.prototype = [1, 2, 3];

-        var f = new Foo();

-

-        f.length = [];

-

-        // objects inherit the default valueOf method of the Object object;

-        // that simply returns the itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-        //

-        // The toString( ) method on Array converts the array elements to strings,

-        // then returns the result of concatenating these strings, with commas in

-        // between. An array with no elements converts to the empty string, which

-        // converts to the number 0. If an array has a single element that is a

-        // number n, the array converts to a string representation of n, which is

-        // then converted back to n itself. If an array contains more than one element,

-        // or if its one element is not a number, the array converts to NaN.

-

-        function cb() { }

-        var a = Array.prototype.map.call(f, cb);

-

-        if (Array.isArray(a) && a.length === 0) {

-            return true;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - returns an empty array if 'length' is 0
+    (subclassed Array, length overridden with [])
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function Foo() { }
+        Foo.prototype = [1, 2, 3];
+        var f = new Foo();
+
+        f.length = [];
+
+        // objects inherit the default valueOf method of the Object object;
+        // that simply returns the itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+        //
+        // The toString( ) method on Array converts the array elements to strings,
+        // then returns the result of concatenating these strings, with commas in
+        // between. An array with no elements converts to the empty string, which
+        // converts to the number 0. If an array has a single element that is a
+        // number n, the array converts to a string representation of n, which is
+        // then converted back to n itself. If an array contains more than one element,
+        // or if its one element is not a number, the array converts to NaN.
+
+        function cb() { }
+        var a = Array.prototype.map.call(f, cb);
+
+        if (Array.isArray(a) && a.length === 0) {
+            return true;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-13.js
index 61295822b..aa760e4f1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-13.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-13.js

- * @description Array.prototype.map - if there are no side effects of the functions, O is unmodified

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val > 2;

-        }

-

-        var arr = [1, 2, 3, 4];

-

-        arr.map(callbackfn);

-

-        return 1 === arr[0] && 2 === arr[1] && 3 === arr[2] && 4 === arr[3] && 4 === called;

-

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - if there are no side effects of the
+    functions, O is unmodified
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val > 2;
+        }
+
+        var arr = [1, 2, 3, 4];
+
+        arr.map(callbackfn);
+
+        return 1 === arr[0] && 2 === arr[1] && 3 === arr[2] && 4 === arr[3] && 4 === called;
+
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-2.js
index dbec9daae..122554182 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-2.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-2.js

- * @description Array.prototype.map returns new Array with same number of elements and values the result of callbackfn

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return val + 10;

-  }

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.map(callbackfn);

-  if(resArr[0] === 11 &&

-     resArr[1] === 12 &&

-     resArr[2] === 13 &&

-     resArr[3] === 14 &&

-     resArr[4] === 15)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map returns new Array with same number of elements
+    and values the result of callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return val + 10;
+  }
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.map(callbackfn);
+  if(resArr[0] === 11 &&
+     resArr[1] === 12 &&
+     resArr[2] === 13 &&
+     resArr[3] === 14 &&
+     resArr[4] === 15)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-3.js
index e187329f7..8a3b274a8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-3.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-3.js

- * @description Array.prototype.map - subclassed array when length is reduced

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 1;

-  

-  function cb(){}

-  var a = f.map(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map - subclassed array when length is reduced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 1;
+  
+  function cb(){}
+  var a = f.map(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-4.js
index 1fbf80b26..201a709ee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-4.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-4.js

- * @description Array.prototype.map doesn't visit expandos

- */

-

-

-function testcase() {

-

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr["i"] = 10;

-  srcArr[true] = 11;

-

-  var resArr = srcArr.map(callbackfn);

-  if(callCnt == 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.map doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr["i"] = 10;
+  srcArr[true] = 11;
+
+  var resArr = srcArr.map(callbackfn);
+  if(callCnt == 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-5.js
index 2d6641aa4..9268e2c49 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-5.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-5.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var obj = { 0: 9, 1: 8, length: 0 };

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-

-        return testResult.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var obj = { 0: 9, 1: 8, length: 0 };
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+
+        return testResult.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-6.js
index 0673b91e6..fbdd987c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-6.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-6.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10;

-        }

-

-        var Foo = function () { };

-        Foo.prototype = [1, 2, 3];

-        var obj = new Foo();

-        obj.length = null;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (subclassed Array, length overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10;
+        }
+
+        var Foo = function () { };
+        Foo.prototype = [1, 2, 3];
+        var obj = new Foo();
+        obj.length = null;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-7.js
index b9c0d86d2..105e68193 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-7.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-7.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var Foo = function () { };

-        Foo.prototype = [1, 2, 3];

-        var obj = new Foo();

-        obj.length = false;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (subclassed Array, length overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var Foo = function () { };
+        Foo.prototype = [1, 2, 3];
+        var obj = new Foo();
+        obj.length = false;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-8.js
index d5e85b719..9d0d85f98 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-8.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-8.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var Foo = function () { };

-        Foo.prototype = [1, 2, 3];

-        var obj = new Foo();

-        obj.length = 0;

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (subclassed Array, length overridden to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var Foo = function () { };
+        Foo.prototype = [1, 2, 3];
+        var obj = new Foo();
+        obj.length = 0;
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-9.js
index 673462058..c851ffd7b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-9.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.19/15.4.4.19-9-9.js

- * @description Array.prototype.map - empty array to be returned if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var Foo = function () { };

-        Foo.prototype = [1, 2, 3];

-        var obj = new Foo();

-        obj.length = '0';

-

-        var testResult = Array.prototype.map.call(obj, callbackfn);

-        return testResult.length === 0;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.map - empty array to be returned if 'length' is 0
+    (subclassed Array, length overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var Foo = function () { };
+        Foo.prototype = [1, 2, 3];
+        var obj = new Foo();
+        obj.length = '0';
+
+        var testResult = Array.prototype.map.call(obj, callbackfn);
+        return testResult.length === 0;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T1.js
index 96e1eeeef..1bca4b1c7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of calling this function is the same as if
- * the built-in join method were invoked for this object with no argument
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T1.js
- * @description If Result(2) is zero, return the empty string
- */
+/*---
+info: >
+    The result of calling this function is the same as if
+    the built-in join method were invoked for this object with no argument
+description: If Result(2) is zero, return the empty string
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -29,5 +28,4 @@ if (x.toString() !== x.join()) {
   if (x.toString() !== "") {
     $ERROR('#2.2: x = []; x[0] = 1; x.length = 0; x.toString() === "". Actual: ' + (x.toString()));
   }  
-}    
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T2.js
index e4cfad770..c011f2ad1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of calling this function is the same as if
- * the built-in join method were invoked for this object with no argument
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T2.js
- * @description The elements of the array are converted to strings, and these strings are
- * then concatenated, separated by occurrences of the separator. If no separator is provided,
- * a single comma is used as the separator
- */
+/*---
+info: >
+    The result of calling this function is the same as if
+    the built-in join method were invoked for this object with no argument
+description: >
+    The elements of the array are converted to strings, and these
+    strings are  then concatenated, separated by occurrences of the
+    separator. If no separator is provided,  a single comma is used as
+    the separator
+---*/
 
 //CHECK#1
 var x = new Array(0,1,2,3);
@@ -53,4 +54,3 @@ if (x.toString() !== x.join()) {
     $ERROR('#4.2: x = []; x[0] = 0; x.toString() === "0". Actual: ' + (x.toString()));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T3.js
index 793b503fc..aeb79e096 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of calling this function is the same as if
- * the built-in join method were invoked for this object with no argument
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T3.js
- * @description Operator use ToString from array arguments
- */
+/*---
+info: >
+    The result of calling this function is the same as if
+    the built-in join method were invoked for this object with no argument
+description: Operator use ToString from array arguments
+---*/
 
 //CHECK#0
 var x = new Array("","","");
@@ -87,5 +86,4 @@ if (x.toString() !== x.join()) {
   if (x.toString() !== "NaN,NaN,NaN") {
     $ERROR('#7.2: var x = new Array(NaN,NaN,NaN); x.toString(NaN,NaN,NaN) === "NaN,NaN,NaN". Actual: ' + (x.toString(NaN,NaN,NaN)));
   }
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T4.js
index a68bee58a..3efbee8e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The result of calling this function is the same as if
- * the built-in join method were invoked for this object with no argument
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A1_T4.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: >
+    The result of calling this function is the same as if
+    the built-in join method were invoked for this object with no argument
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "+"}};
@@ -109,4 +108,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}} var x = new Array(object); x.toString() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A3_T1.js
index 9b3c038c0..44c66bb33 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A3_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: "[[Prototype]] of Array instance is Array.prototype"
+---*/
 
 //CHECK#1
 Array.prototype[1] = 1;
@@ -15,4 +13,3 @@ x.length = 2;
 if (x.toString() !== "0,1") {  
   $ERROR('#1: Array.prototype[1] = 1; x = [0]; x.length = 2; x.toString() === "0,1". Actual: ' + (x.toString()));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.1.js
index 7fba67be4..eff0122dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toString has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of toString has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.toString.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.toString){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.toString) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.2.js
index 5731a02aa..a486109b5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toString has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of toString has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.toString.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.toString.hasOwnProperty('length') !== true) {
 if (Array.prototype.toString.length === undefined) {
   $ERROR('#3: delete Array.prototype.toString.length; Array.prototype.toString.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.3.js
index 185f84881..d5d879aca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toString has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of toString has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.toString.length;
@@ -15,5 +13,3 @@ Array.prototype.toString.length = Infinity;
 if (Array.prototype.toString.length !== x) {
   $ERROR('#1: x = Array.prototype.toString.length; Array.prototype.toString.length = Infinity; Array.prototype.toString.length === x. Actual: ' + (Array.prototype.toString.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.4.js
index 888ef487a..2f89016b5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toString is 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.4.js
- * @description toString.length === 1
- */
+/*---
+info: The length property of toString is 0
+description: toString.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.toString.length !== 0) {
   $ERROR('#1: Array.prototype.toString.length === 0. Actual: ' + (Array.prototype.toString.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.5.js
index a49eae5c5..5248f77ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The toString property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('toString') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "toString") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.6.js
index f24592438..6d43824e7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.6.js
- * @description Checking Array.prototype.toString.prototype
- */
+/*---
+info: The toString property of Array has not prototype property
+description: Checking Array.prototype.toString.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.toString.prototype !== undefined) {
   $ERROR('#1: Array.prototype.toString.prototype === undefined. Actual: ' + (Array.prototype.toString.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.7.js
index fa9d85a8b..e6cad9d72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.2/S15.4.4.2_A4.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The toString property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.toString() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-1.js
index df1216a65..14b546dde 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-1.js

- * @description Array.prototype.filter must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.filter;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.filter;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-2.js
index 6ded42404..7202003b4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-0-2.js

- * @description Array.prototype.filter.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.filter.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.filter.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-1.js
index e14c7f94d..aee27cb1f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-1.js

- * @description Array.prototype.filter applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.filter.call(undefined); // TypeError is thrown if value is undefined

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.filter.call(undefined); // TypeError is thrown if value is undefined
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-10.js
index cd0e7e1c2..ef009ce58 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-10.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-10.js

- * @description Array.prototype.filter applied to the Math object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return '[object Math]' === Object.prototype.toString.call(obj);

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            var newArr = Array.prototype.filter.call(Math, callbackfn);

-            return newArr[0] === 1;

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return '[object Math]' === Object.prototype.toString.call(obj);
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            var newArr = Array.prototype.filter.call(Math, callbackfn);
+            return newArr[0] === 1;
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-11.js
index 58fcce06d..fe1c49763 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-11.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-11.js

- * @description Array.prototype.filter applied to Date object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Date;

-        }

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Date;
+        }
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-12.js
index 157db3dac..da91e3ada 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-12.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-12.js

- * @description Array.prototype.filter applied to RegExp object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof RegExp;

-        }

-

-        var obj = new RegExp();

-        obj.length = 2;

-        obj[1] = true;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr[0] === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof RegExp;
+        }
+
+        var obj = new RegExp();
+        obj.length = 2;
+        obj[1] = true;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr[0] === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-13.js
index b00a43748..058e5a9a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-13.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-13.js

- * @description Array.prototype.filter applied to the JSON object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return '[object JSON]' === Object.prototype.toString.call(JSON);

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            var newArr = Array.prototype.filter.call(JSON, callbackfn);

-            return newArr[0] === 1;

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return '[object JSON]' === Object.prototype.toString.call(JSON);
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            var newArr = Array.prototype.filter.call(JSON, callbackfn);
+            return newArr[0] === 1;
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-14.js
index ce855f37d..8fcdd47ff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-14.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-14.js

- * @description Array.prototype.filter applied to Error object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Error;

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Error;
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-15.js
index 95f853652..b014e5ec5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-15.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-15.js

- * @description Array.prototype.filter applied to the Arguments object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return '[object Arguments]' === Object.prototype.toString.call(obj);

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === "a" && newArr[1] === "b";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return '[object Arguments]' === Object.prototype.toString.call(obj);
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === "a" && newArr[1] === "b";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-2.js
index f2f9646e7..b3f25e6f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-2.js

- * @description Array.prototype.filter applied to null throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.filter.call(null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.filter.call(null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-3.js
index ee7b9157e..a4481101c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-3.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-3.js

- * @description Array.prototype.filter applied to boolean primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = true;

-            Boolean.prototype.length = 1;

-

-            var newArr = Array.prototype.filter.call(false, callbackfn);

-            return newArr[0] === true;

-

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = true;
+            Boolean.prototype.length = 1;
+
+            var newArr = Array.prototype.filter.call(false, callbackfn);
+            return newArr[0] === true;
+
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-4.js
index 1231de578..51be98f92 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-4.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-4.js

- * @description Array.prototype.filter applied to Boolean Object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === 11 && newArr[1] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to Boolean Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === 11 && newArr[1] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-5.js
index 12ca2c088..76135c2d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-5.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-5.js

- * @description Array.prototype.filter applied to number primitive

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-

-            var newArr = Array.prototype.filter.call(2.5, callbackfn);

-            return newArr[0] === 1;

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+
+            var newArr = Array.prototype.filter.call(2.5, callbackfn);
+            return newArr[0] === 1;
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-6.js
index 8904040dd..1f58c5577 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-6.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-6.js

- * @description Array.prototype.filter applied to Number object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr[0] === 11 && newArr[1] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr[0] === 11 && newArr[1] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-7.js
index bfcba1764..cdd74b04f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-7.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-7.js

- * @description Array.prototype.filter applied to string primitive

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var newArr = Array.prototype.filter.call("abc", callbackfn);

-

-        return newArr[0] === "a";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var newArr = Array.prototype.filter.call("abc", callbackfn);
+
+        return newArr[0] === "a";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-8.js
index ee9b550d6..658a92981 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-8.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-8.js

- * @description Array.prototype.filter applied to String object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var obj = new String("abc");

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === "a";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var obj = new String("abc");
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === "a";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-9.js
index ee9ef957f..25177e862 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-9.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-1-9.js

- * @description Array.prototype.filter applied to Function object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj instanceof Function;

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === 11 && newArr[1] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj instanceof Function;
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === 11 && newArr[1] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-1.js
index 04b67cc34..782221171 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-1.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-1.js

- * @description Array.prototype.filter doesn't mutate the Array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    return true;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr.filter(callbackfn);

-  if(srcArr[0] === 1 &&

-     srcArr[1] === 2 &&

-     srcArr[2] === 3 &&

-     srcArr[3] === 4 &&

-     srcArr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter doesn't mutate the Array on which it is
+    called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    return true;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr.filter(callbackfn);
+  if(srcArr[0] === 1 &&
+     srcArr[1] === 2 &&
+     srcArr[2] === 3 &&
+     srcArr[3] === 4 &&
+     srcArr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-2.js
index efbd3cf3f..0fdfe22a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-2.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-2.js

- * @description Array.prototype.filter returns new Array with length equal to number of true returned by callbackfn

- */

-

-

-function testcase() {

-

-  function callbackfn(val, idx, obj)

-  {

-    if(val % 2)

-      return true;

-    else

-      return false;

-  }

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.filter(callbackfn);

-  if(resArr.length === 3 &&

-     resArr[0] === 1 &&

-     resArr[1] === 3 &&

-     resArr[2] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns new Array with length equal to
+    number of true returned by callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(val, idx, obj)
+  {
+    if(val % 2)
+      return true;
+    else
+      return false;
+  }
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.filter(callbackfn);
+  if(resArr.length === 3 &&
+     resArr[0] === 1 &&
+     resArr[1] === 3 &&
+     resArr[2] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-3.js
index 411e55cd2..260579696 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-3.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-3.js

- * @description Array.prototype.filter - subclassed array when length is reduced

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 1;

-  

-  function cb(){return true;}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - subclassed array when length is reduced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 1;
+  
+  function cb(){return true;}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-4.js
index fcaf25d7f..b07507087 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-4.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-10-4.js

- * @description Array.prototype.filter doesn't visit expandos

- */

-

-

-function testcase() {

-

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr["i"] = 10;

-  srcArr[true] = 11;

-

-  var resArr = srcArr.filter(callbackfn);

-  if(callCnt == 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr["i"] = 10;
+  srcArr[true] = 11;
+
+  var resArr = srcArr.filter(callbackfn);
+  if(callCnt == 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-1.js
index 19661c4a0..d115cc621 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-1.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is own data property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-10.js
index e82a59bf5..a26bd4061 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-10.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-10.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-11.js
index cfcc67614..612ef3d99 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-11.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-11.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-12.js
index e70c6efea..5686bf020 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-12.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-12.js

- * @description Array.prototype.filter - 'length' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 12, 1: 11 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            var newArr = Array.prototype.filter.call(obj, callbackfn);

-            return newArr.length === 0 && !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is own accessor property without
+    a get function that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 12, 1: 11 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            var newArr = Array.prototype.filter.call(obj, callbackfn);
+            return newArr.length === 0 && !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-13.js
index 030f0b05c..104da7d25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-13.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-13.js

- * @description Array.prototype.filter applied to the Array-like object that 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to the Array-like object that
+    'length' is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-14.js
index 4beb887fb..f992fa562 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-14.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-14.js

- * @description Array.prototype.filter applied to the Array-like object that 'length property doesn't exist

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to the Array-like object that
+    'length property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-15.js
index 4c283d310..2e4de0278 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-15.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-15.js

- * @description Array.prototype.filter - 'length' is property of the global object

- */

-

-

-function testcase() {

-       

-        function callbackfn(val, idx, obj) {

-            return  obj.length === 2;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);

-            return newArr.length === 2;

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+       
+        function callbackfn(val, idx, obj) {
+            return  obj.length === 2;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);
+            return newArr.length === 2;
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-17.js
index 7eb84334a..dfdbea5aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-17.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-17.js

- * @description Array.prototype.filter applied to the Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var func = function (a, b) {

-            var newArr = Array.prototype.filter.call(arguments, callbackfn);

-            return newArr.length === 2;

-        };

-

-        return func(12, 11);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to the Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var func = function (a, b) {
+            var newArr = Array.prototype.filter.call(arguments, callbackfn);
+            return newArr.length === 2;
+        };
+
+        return func(12, 11);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-18.js
index 3ae375579..d4418dd8b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-18.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-18.js

- * @description Array.prototype.filter applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 3;

-        }

-

-        var str = new String("012");

-

-        var newArr = Array.prototype.filter.call(str, callbackfn);

-        return newArr.length === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 3;
+        }
+
+        var str = new String("012");
+
+        var newArr = Array.prototype.filter.call(str, callbackfn);
+        return newArr.length === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-19.js
index 985494ba0..082af4630 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-19.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-19.js

- * @description Array.prototype.filter applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        var newArr = Array.prototype.filter.call(fun, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Function object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        var newArr = Array.prototype.filter.call(fun, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-2.js
index b8168332f..09cf57422 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-2.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-2.js

- * @description Array.prototype.filter - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var newArr = [12, 11].filter(callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var newArr = [12, 11].filter(callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-3.js
index d6d538c0c..a252fe0dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-3.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-3.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is an own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    an own data property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-4.js
index 9b245fb71..69c6f3813 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-4.js

- * @description Array.prototype.filter - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var arrProtoLen;

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-            var newArr = [12, 11].filter(callbackfn);

-            return newArr.length === 2;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arrProtoLen;
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+            var newArr = [12, 11].filter(callbackfn);
+            return newArr.length === 2;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-5.js
index 502f4004d..6171ce772 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-5.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-5.js

- * @description Array.prototype.filter to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter to Array-like object, 'length' is an own
+    data property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-6.js
index 556d4eadb..03379a585 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-6.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-6.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-7.js
index 0f1d1decc..bf7d47cce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-7.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    an own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-8.js
index 6ccfee9bd..96fa34156 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-8.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-8.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    own accessor property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-9.js
index da9a06660..e2affc1e8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-9.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-2-9.js

- * @description Array.prototype.filter applied to Array-like object, 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return obj.length === 2;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-        return newArr.length === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied to Array-like object, 'length' is
+    an own accessor property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return obj.length === 2;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+        return newArr.length === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-1.js
index 98af5183a..3ccb6b063 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-1.js

- * @description Array.prototype.filter - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 0, 1: 1, length: undefined };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 0, 1: 1, length: undefined };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-10.js
index a512cfebd..bb2528963 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-10.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-10.js

- * @description Array.prototype.filter - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-11.js
index a20bc6ec8..99c04b73d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-11.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-11.js

- * @description Array.prototype.filter - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing a
+    positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-12.js
index 001eddca5..750d50100 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-12.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-12.js

- * @description Array.prototype.filter - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "-4294967294" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing a
+    negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "-4294967294" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-13.js
index 081a34ace..8d72bc68d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-13.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-13.js

- * @description Array.prototype.filter - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2.5" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing a decimal
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2.5" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-14.js
index 9c366d125..480708c64 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-14.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-14.js

- * @description Array.prototype.filter - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed1 = false;

-        var accessed2 = false;

-        var accessed3 = false;

-

-        function callbackfn1(val, idx, obj) {

-            accessed1 = true;

-            return true;

-        }

-

-        function callbackfn2(val, idx, obj) {

-            accessed2 = true;

-            return true;

-        }

-

-        function callbackfn3(val, idx, obj) {

-            accessed3 = true;

-            return true;

-        }

-

-        var obj1 = { 0: 9, length: "Infinity" };

-        var obj2 = { 0: 9, length: "-Infinity" };

-        var obj3 = { 0: 9, length: "+Infinity" };

-

-        var newArr1 = Array.prototype.filter.call(obj1, callbackfn1);

-        var newArr2 = Array.prototype.filter.call(obj2, callbackfn2);

-        var newArr3 = Array.prototype.filter.call(obj3, callbackfn3);

-

-        return !accessed1 && newArr1.length === 0 &&

-            !accessed2 && newArr2.length === 0 && 

-            !accessed3 && newArr3.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing
+    +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed1 = false;
+        var accessed2 = false;
+        var accessed3 = false;
+
+        function callbackfn1(val, idx, obj) {
+            accessed1 = true;
+            return true;
+        }
+
+        function callbackfn2(val, idx, obj) {
+            accessed2 = true;
+            return true;
+        }
+
+        function callbackfn3(val, idx, obj) {
+            accessed3 = true;
+            return true;
+        }
+
+        var obj1 = { 0: 9, length: "Infinity" };
+        var obj2 = { 0: 9, length: "-Infinity" };
+        var obj3 = { 0: 9, length: "+Infinity" };
+
+        var newArr1 = Array.prototype.filter.call(obj1, callbackfn1);
+        var newArr2 = Array.prototype.filter.call(obj2, callbackfn2);
+        var newArr3 = Array.prototype.filter.call(obj3, callbackfn3);
+
+        return !accessed1 && newArr1.length === 0 &&
+            !accessed2 && newArr2.length === 0 && 
+            !accessed3 && newArr3.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-15.js
index 3bb70bf7a..6f5b95bf3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-15.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-15.js

- * @description Array.prototype.filter - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2E0" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2E0" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-16.js
index 4614e4e28..1cfa3de72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-16.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-16.js

- * @description Array.prototype.filter - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0x0002" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing a hex
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0x0002" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-17.js
index 77aa5f139..f42ac3c55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-17.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-17.js

- * @description Array.prototype.filter - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0002.00" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0002.00" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-18.js
index a51bf0070..1a1ff3ecb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-18.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-18.js

- * @description Array.prototype.filter - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 9, length: "asdf!_" };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return !accessed && newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 9, length: "asdf!_" };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return !accessed && newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-19.js
index c800684f1..a9ac98f68 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-19.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-19.js

- * @description Array.prototype.filter - value of 'length' is an Object which has an own toString method.

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is an Object which has
+    an own toString method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-2.js
index 547a5dfd7..4a4624203 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-2.js

- * @description Array.prototype.filter applied on an Array-like object if 'length' is 1 (length overridden to true(type conversion))

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 9, length: true };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter applied on an Array-like object if 'length'
+    is 1 (length overridden to true(type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 9, length: true };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-20.js
index 2f57d4ec0..84ac90b78 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-20.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-20.js

- * @description Array.prototype.filter - value of 'length' is an Object which has an own valueOf method.

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is an Object which has
+    an own valueOf method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-21.js
index 9ccf1b566..30ffd4d3f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-21.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-21.js

- * @description Array.prototype.filter - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var firstStepOccured = false;

-        var secondStepOccured = false;

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    firstStepOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    secondStepOccured = true;

-                    return '2';

-                }

-            }

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11 && firstStepOccured && secondStepOccured;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var firstStepOccured = false;
+        var secondStepOccured = false;
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    firstStepOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    secondStepOccured = true;
+                    return '2';
+                }
+            }
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11 && firstStepOccured && secondStepOccured;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-22.js
index 46456d64d..82d0219f2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-22.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-22.js

- * @description Array.prototype.filter throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var firstStepOccured = false;

-        var secondStepOccured = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 12,

-

-            length: {

-                valueOf: function () {

-                    firstStepOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    secondStepOccured = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.filter.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && !accessed && firstStepOccured && secondStepOccured;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter throws TypeError exception when 'length' is
+    an object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var firstStepOccured = false;
+        var secondStepOccured = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 12,
+
+            length: {
+                valueOf: function () {
+                    firstStepOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    secondStepOccured = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.filter.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && !accessed && firstStepOccured && secondStepOccured;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-23.js
index 10f91bfb9..796f2e0fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-23.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-23.js

- * @description Array.prototype.filter uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: child

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter uses inherited valueOf method when 'length'
+    is an object with an own toString and inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: child
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-24.js
index a36919bc2..9ef0d86a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-24.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-24.js

- * @description Array.prototype.filter - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: 2.685

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: 2.685
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-25.js
index c22a2e306..c5008fe82 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-25.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-25.js

- * @description Array.prototype.filter - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: -4294967294.5

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: -4294967294.5
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-28.js
index 80ec2fc14..a0fb83952 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-28.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-28.js

- * @description Array.prototype.filter - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return !accessed && newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - value of 'length' is boundary value (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return !accessed && newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-29.js
index be0ebf1a9..bfca15263 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-29.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-29.js

- * @description Array.prototype.filter - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is boundary value (2^32
+    + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-3.js
index c7fe70417..1a02703bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-3.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-3.js

- * @description Array.prototype.filter - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 11, length: 0 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - value of 'length' is a number (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 11, length: 0 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-4.js
index 8c23975a1..b60ff4900 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-4.js

- * @description Array.prototype.filter - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 11, length: +0 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 11, length: +0 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-5.js
index 6a6ad1335..35c78a2eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-5.js

- * @description Array.prototype.filter - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 11, length: -0 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 11, length: -0 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-6.js
index cb2fa9e08..835353b9a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-6.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-6.js

- * @description Array.prototype.filter - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: 2 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: 2 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-7.js
index 59e1cf19b..bc98b776a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-7.js

- * @description Array.prototype.filter - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 1: 11, 2: 9, length: -4294967294 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 1: 11, 2: 9, length: -4294967294 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-8.js
index dd0e1706f..e9a03cb34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-8.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-8.js

- * @description Array.prototype.filter - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-9.js
index 343c6eb9f..29fe65de3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-9.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-3-9.js

- * @description Array.prototype.filter - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-1.js
index 434f4849b..cc01b28f5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-1.js

- * @description Array.prototype.filter throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-10.js
index 435bbbe67..d08830b1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-10.js

- * @description Array.prototype.filter - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-11.js
index 62fdbdafd..a8ab83875 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-11.js

- * @description Array.prototype.filter - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-12.js
index c81a2f28c..84698f3a5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-12.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-12.js

- * @description Array.prototype.filter - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 1) {

-                return val === 9;

-            }

-            return false;

-        }

-

-        var newArr = [11, 9].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 1) {
+                return val === 9;
+            }
+            return false;
+        }
+
+        var newArr = [11, 9].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-15.js
index 3c9fbb82d..dddeb6169 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-15.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-15.js

- * @description Array.prototype.filter - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - calling with no callbackfn is the same as
+    passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-2.js
index 14f5c2645..31cc74e56 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-2.js

- * @description Array.prototype.filter throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-3.js
index 38963334b..6a4adf76b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-3.js

- * @description Array.prototype.filter throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-4.js
index 01794a530..9d563d51c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-4.js

- * @description Array.prototype.filter throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-5.js
index 3f8a51201..ab0194799 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-5.js

- * @description Array.prototype.filter throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-6.js
index fd83a8237..624de0772 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-6.js

- * @description Array.prototype.filter throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-7.js
index 3b881d868..08f8b05eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-7.js

- * @description Array.prototype.filter throws TypeError if callbackfn is Object without [[Call]] internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.filter(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter throws TypeError if callbackfn is Object
+    without [[Call]] internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.filter(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-8.js
index 9c0da9ad9..df9259ece 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-8.js

- * @description Array.prototype.filter - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-9.js
index 686a4c595..b4a31147f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-4-9.js

- * @description Array.prototype.filter - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1-s.js
index cff026b7c..9e0e628d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1-s.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1-s.js

- * @description Array.prototype.filter - thisArg not passed to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() {

-  var innerThisCorrect = false;

-  

-  function callbackfn(val, idx, obj) {

-    "use strict";

-    innerThisCorrect = this===undefined;

-    return true;

-  }

-

-  [1].filter(callbackfn);

-  return innerThisCorrect;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg not passed to strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var innerThisCorrect = false;
+  
+  function callbackfn(val, idx, obj) {
+    "use strict";
+    innerThisCorrect = this===undefined;
+    return true;
+  }
+
+  [1].filter(callbackfn);
+  return innerThisCorrect;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1.js
index 0d39bfd6e..3d6e9fb66 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-1.js

- * @description Array.prototype.filter - thisArg is passed

- */

-

-

-function testcase() {

-        this._15_4_4_20_5_1 = false;

-        var _15_4_4_20_5_1 = true;

-

-        function callbackfn(val, idx, obj) {

-            return this._15_4_4_20_5_1;

-        }

-        var srcArr = [1];

-        var resArr = srcArr.filter(callbackfn);

-        return resArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg is passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        this._15_4_4_20_5_1 = false;
+        var _15_4_4_20_5_1 = true;
+
+        function callbackfn(val, idx, obj) {
+            return this._15_4_4_20_5_1;
+        }
+        var srcArr = [1];
+        var resArr = srcArr.filter(callbackfn);
+        return resArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-10.js
index 88666e9ab..d14fc5d55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-10.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-10.js

- * @description Array.prototype.filter - Array Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objArray = new Array(10);

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objArray;

-        }

-

-

-        var newArr = [11].filter(callbackfn, objArray);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Array Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objArray = new Array(10);
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objArray;
+        }
+
+
+        var newArr = [11].filter(callbackfn, objArray);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-11.js
index cd233d0b0..e33996833 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-11.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-11.js

- * @description Array.prototype.filter - String Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objString = new String();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objString;

-        }

-

-        var newArr = [11].filter(callbackfn, objString);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - String Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objString = new String();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objString;
+        }
+
+        var newArr = [11].filter(callbackfn, objString);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-12.js
index 068c4248c..b461873dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-12.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-12.js

- * @description Array.prototype.filter - Boolean Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objBoolean = new Boolean();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objBoolean;

-        }

-

-        var newArr = [11].filter(callbackfn, objBoolean);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Boolean Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objBoolean = new Boolean();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objBoolean;
+        }
+
+        var newArr = [11].filter(callbackfn, objBoolean);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-13.js
index 103bb21fc..e097c50f2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-13.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-13.js

- * @description Array.prototype.filter - Number Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objNumber = new Number();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objNumber;

-        }

-

-        var newArr = [11].filter(callbackfn, objNumber);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Number Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objNumber = new Number();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objNumber;
+        }
+
+        var newArr = [11].filter(callbackfn, objNumber);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-14.js
index 396c63d9c..fbe9faeca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-14.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-14.js

- * @description Array.prototype.filter - the Math object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === Math;

-        }

-

-        var newArr = [11].filter(callbackfn, Math);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - the Math object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === Math;
+        }
+
+        var newArr = [11].filter(callbackfn, Math);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-15.js
index 92ba2038f..fc8fdf5a8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-15.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-15.js

- * @description Array.prototype.filter - Date Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var objDate = new Date();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objDate;

-        }

-

-        var newArr = [11].filter(callbackfn, objDate);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Date Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var objDate = new Date();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objDate;
+        }
+
+        var newArr = [11].filter(callbackfn, objDate);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-16.js
index 529070b4e..41e0eee8a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-16.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-16.js

- * @description Array.prototype.filter - RegExp Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var objRegExp = new RegExp();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objRegExp;

-        }

-

-        var newArr = [11].filter(callbackfn, objRegExp);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - RegExp Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var objRegExp = new RegExp();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objRegExp;
+        }
+
+        var newArr = [11].filter(callbackfn, objRegExp);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-17.js
index ab56608aa..503e133d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-17.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-17.js

- * @description Array.prototype.filter - the JSON object can be used as thisArg

- */

-

-

-function testcase() {

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === JSON;

-        }

-

-        var newArr = [11].filter(callbackfn, JSON);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - the JSON object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === JSON;
+        }
+
+        var newArr = [11].filter(callbackfn, JSON);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-18.js
index 699a11a84..e31eeca89 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-18.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-18.js

- * @description Array.prototype.filter - Error Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objError = new RangeError();

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objError;

-        }

-

-        var newArr = [11].filter(callbackfn, objError);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Error Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objError = new RangeError();
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objError;
+        }
+
+        var newArr = [11].filter(callbackfn, objError);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-19.js
index 7fbbcd6db..c6febfb1e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-19.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-19.js

- * @description Array.prototype.filter - the Arguments object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arg;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === arg;

-        }

-

-        (function fun() {

-            arg = arguments;

-        }(1, 2, 3));

-

-        var newArr = [11].filter(callbackfn, arg);

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - the Arguments object can be used as
+    thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arg;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === arg;
+        }
+
+        (function fun() {
+            arg = arguments;
+        }(1, 2, 3));
+
+        var newArr = [11].filter(callbackfn, arg);
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-2.js
index 51f8f6d83..a830376fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-2.js

- * @description Array.prototype.filter - thisArg is Object

- */

-

-

-function testcase() {

-  var res = false;

-  var o = new Object();

-  o.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var srcArr = [1];

-  var resArr = srcArr.filter(callbackfn,o);

-  if( resArr.length === 1)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg is Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var o = new Object();
+  o.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var srcArr = [1];
+  var resArr = srcArr.filter(callbackfn,o);
+  if( resArr.length === 1)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-21.js
index e4f2763de..bc5872101 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-21.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-21.js

- * @description Array.prototype.filter - the global object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === fnGlobalObject();

-        }

-

-        var newArr = [11].filter(callbackfn, fnGlobalObject());

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - the global object can be used as thisArg
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === fnGlobalObject();
+        }
+
+        var newArr = [11].filter(callbackfn, fnGlobalObject());
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-22.js
index 08804d5a5..277de410d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-22.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-22.js

- * @description Array.prototype.filter - boolean primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === false;

-        }

-

-        var newArr = [11].filter(callbackfn, false);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - boolean primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === false;
+        }
+
+        var newArr = [11].filter(callbackfn, false);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-23.js
index aa9167d18..301483582 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-23.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-23.js

- * @description Array.prototype.filter - number primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === 101;

-        }

-

-        var newArr = [11].filter(callbackfn, 101);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - number primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === 101;
+        }
+
+        var newArr = [11].filter(callbackfn, 101);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-24.js
index fd046462c..bbf5933a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-24.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-24.js

- * @description Array.prototype.filter - string primitive can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this.valueOf() === "abc";

-        }

-

-        var newArr = [11].filter(callbackfn, "abc");

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - string primitive can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this.valueOf() === "abc";
+        }
+
+        var newArr = [11].filter(callbackfn, "abc");
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-27.js
index 2cd66d7d9..a66daf450 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-27.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-27.js

- * @description Array.prototype.filter - Array.isArray(arg) returns true when arg is the returned array

- */

-

-

-function testcase() {

-

-        var newArr = [11].filter(function () { });

-

-        return Array.isArray(newArr);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - Array.isArray(arg) returns true when arg
+    is the returned array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newArr = [11].filter(function () { });
+
+        return Array.isArray(newArr);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-28.js
index 64cf6a350..9d0956a1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-28.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-28.js

- * @description Array.prototype.filter - the returned array is instanceof Array

- */

-

-

-function testcase() {

-

-        var newArr = [11].filter(function () { });

-

-        return newArr instanceof Array;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - the returned array is instanceof Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newArr = [11].filter(function () { });
+
+        return newArr instanceof Array;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-29.js
index b9af88961..ba3314b8e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-29.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-29.js

- * @description Array.prototype.filter - returns an array whose length is 0

- */

-

-

-function testcase() {

-

-        var newArr = [11].filter(function () { });

-

-        return newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - returns an array whose length is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var newArr = [11].filter(function () { });
+
+        return newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-3.js
index 0bd6806da..3b0ee8661 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-3.js

- * @description Array.prototype.filter - thisArg is Array

- */

-

-

-function testcase() {

-  var res = false;

-  var a = new Array();

-  a.res = true;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  var srcArr = [1];

-  var resArr = srcArr.filter(callbackfn,a);

-  if( resArr.length === 1)

-    return true;

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg is Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  var a = new Array();
+  a.res = true;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  var srcArr = [1];
+  var resArr = srcArr.filter(callbackfn,a);
+  if( resArr.length === 1)
+    return true;
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-30.js
index e1596a799..7742c3b25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-30.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-30.js

- * @description Array.prototype.filter - thisArg not passed

- */

-

-

-function testcase() {

-        function innerObj() {

-            this._15_4_4_20_5_30 = true;

-            var _15_4_4_20_5_30 = false;

-            

-            function callbackfn(val, idx, obj) {

-                return this._15_4_4_20_5_30;

-            }

-            var srcArr = [1];

-            var resArr = srcArr.filter(callbackfn);

-            this.retVal = resArr.length === 0;

-        }

-        return new innerObj().retVal;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg not passed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function innerObj() {
+            this._15_4_4_20_5_30 = true;
+            var _15_4_4_20_5_30 = false;
+            
+            function callbackfn(val, idx, obj) {
+                return this._15_4_4_20_5_30;
+            }
+            var srcArr = [1];
+            var resArr = srcArr.filter(callbackfn);
+            this.retVal = resArr.length === 0;
+        }
+        return new innerObj().retVal;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-4.js
index dfc8583e3..56b28df91 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-4.js

- * @description Array.prototype.filter - thisArg is object from object template(prototype)

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-  

-  function foo(){}

-  foo.prototype.res = true;

-  var f = new foo();

-

-  var srcArr = [1];

-  var resArr = srcArr.filter(callbackfn,f);

-  if( resArr.length === 1)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - thisArg is object from object
+    template(prototype)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+  
+  function foo(){}
+  foo.prototype.res = true;
+  var f = new foo();
+
+  var srcArr = [1];
+  var resArr = srcArr.filter(callbackfn,f);
+  if( resArr.length === 1)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-5.js
index c86dc5194..23605afcb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-5.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-5.js

- * @description Array.prototype.filter - thisArg is object from object template

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  var f = new foo();

-  f.res = true;

-  

-  var srcArr = [1];

-  var resArr = srcArr.filter(callbackfn,f);

-  if( resArr.length === 1)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg is object from object template
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  var f = new foo();
+  f.res = true;
+  
+  var srcArr = [1];
+  var resArr = srcArr.filter(callbackfn,f);
+  if( resArr.length === 1)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-6.js
index aa9f9b6ff..cfde52f99 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-6.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-6.js

- * @description Array.prototype.filter - thisArg is function

- */

-

-

-function testcase() {

-  var res = false;

-  function callbackfn(val, idx, obj)

-  {

-    return this.res;

-  }

-

-  function foo(){}

-  foo.res = true;

-  

-  var srcArr = [1];

-  var resArr = srcArr.filter(callbackfn,foo);

-  if( resArr.length === 1)

-    return true;    

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - thisArg is function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var res = false;
+  function callbackfn(val, idx, obj)
+  {
+    return this.res;
+  }
+
+  function foo(){}
+  foo.res = true;
+  
+  var srcArr = [1];
+  var resArr = srcArr.filter(callbackfn,foo);
+  if( resArr.length === 1)
+    return true;    
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-7.js
index 430bb4238..a4c8a1470 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-7.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-7.js

- * @description Array.prototype.filter - built-in functions can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === eval;

-        }

-

-        var newArr = [11].filter(callbackfn, eval);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - built-in functions can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === eval;
+        }
+
+        var newArr = [11].filter(callbackfn, eval);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-9.js
index dd4e33147..affc77049 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-9.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-5-9.js

- * @description Array.prototype.filter - Function Object can be used as thisArg

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objFunction = function () { };

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return this === objFunction;

-        }

-

-        var newArr = [11].filter(callbackfn, objFunction);

-

-        return newArr[0] === 11 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - Function Object can be used as thisArg
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objFunction = function () { };
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return this === objFunction;
+        }
+
+        var newArr = [11].filter(callbackfn, objFunction);
+
+        return newArr[0] === 11 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-1.js
index fab568d2c..2b437dd70 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-1.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-1.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (empty array)

- */

-

-

-function testcase() {

-  function cb(){}

-  var a = [].filter(cb);

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  var a = [].filter(cb);
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-2.js
index 1f65e43c9..414016d4a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-2.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-3.js
index de83325a3..77d4050b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-3.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-4.js
index 9d65eb3af..c26ee2cfd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-4.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-5.js
index 8ead2217f..c603be128 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-5.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-5.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-6.js
index da854c1d3..a6cf00b5d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-6.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-6.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-7.js
index 43652d6e5..464928b9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-7.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-7.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden with obj w/o valueOf
+    (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-8.js
index 2efeab87b..07275eb49 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-8.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-6-8.js

- * @description Array.prototype.filter returns an empty array if 'length' is 0 (subclassed Array, length overridden with []

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  var a = f.filter(cb);

-  

-  if (Array.isArray(a) &&

-      a.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter returns an empty array if 'length' is 0
+    (subclassed Array, length overridden with []
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  var a = f.filter(cb);
+  
+  if (Array.isArray(a) &&
+      a.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-1.js
index 69b7498bf..2ab4f2d54 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-1.js

- * @description Array.prototype.filter doesn't consider new elements added to array after it is called

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            srcArr[2] = 3;

-            srcArr[5] = 6;

-            return true;

-        }

-

-        var srcArr = [1, 2, , 4, 5];

-        var resArr = srcArr.filter(callbackfn);

-        return resArr.length === 5;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter doesn't consider new elements added to
+    array after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            srcArr[2] = 3;
+            srcArr[5] = 6;
+            return true;
+        }
+
+        var srcArr = [1, 2, , 4, 5];
+        var resArr = srcArr.filter(callbackfn);
+        return resArr.length === 5;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-2.js
index b6b5fc3e8..002eb054d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-2.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-2.js

- * @description Array.prototype.filter considers new value of elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {    

-    srcArr[2] = -1;

-    srcArr[4] = -1;

-    if(val > 0)

-      return true;

-    else

-      return false;

-  }

-

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.filter(callbackfn);

-  if(resArr.length === 3 && resArr[0] === 1 && resArr[2] === 4)

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter considers new value of elements in array
+    after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {    
+    srcArr[2] = -1;
+    srcArr[4] = -1;
+    if(val > 0)
+      return true;
+    else
+      return false;
+  }
+
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.filter(callbackfn);
+  if(resArr.length === 3 && resArr[0] === 1 && resArr[2] === 4)
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-3.js
index f59db35c7..98ac4605e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-3.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-3.js

- * @description Array.prototype.filter doesn't visit deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete srcArr[2];

-    delete srcArr[4];

-    if(val > 0)

-      return true;

-    else

-      return false;

-   }

-

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.filter(callbackfn);

-  if(resArr.length === 3 && resArr[0] === 1 && resArr[2] === 4 )    // two elements deleted

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter doesn't visit deleted elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete srcArr[2];
+    delete srcArr[4];
+    if(val > 0)
+      return true;
+    else
+      return false;
+   }
+
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.filter(callbackfn);
+  if(resArr.length === 3 && resArr[0] === 1 && resArr[2] === 4 )    // two elements deleted
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-4.js
index 7391b6ac9..adc0dbf3c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-4.js

- * @description Array.prototype.filter doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    srcArr.length = 2;

-    return true;

-  }

-

-  var srcArr = [1,2,3,4,6];

-  var resArr = srcArr.filter(callbackfn);

-  if(resArr.length === 2 )

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    srcArr.length = 2;
+    return true;
+  }
+
+  var srcArr = [1,2,3,4,6];
+  var resArr = srcArr.filter(callbackfn);
+  if(resArr.length === 2 )
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-5.js
index 3750be13e..be22b1567 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-5.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-5.js

- * @description Array.prototype.filter doesn't consider newly added elements in sparse array

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    srcArr[1000] = 3;

-    return true;

-  }

-

-  var srcArr = new Array(10);

-  srcArr[1] = 1;

-  srcArr[2] = 2;

-  var resArr = srcArr.filter(callbackfn);

-  if( resArr.length === 2)    

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter doesn't consider newly added elements in
+    sparse array
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    srcArr[1000] = 3;
+    return true;
+  }
+
+  var srcArr = new Array(10);
+  srcArr[1] = 1;
+  srcArr[2] = 2;
+  var resArr = srcArr.filter(callbackfn);
+  if( resArr.length === 2)    
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-6.js
index 268b946a3..5cdabcd34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-6.js

- * @description Array.prototype.filter visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(val, idx, obj)

-  {

-    delete srcArr[2];

-    delete srcArr[4];

-    if(val > 0)

-      return true;

-    else

-      return false;

-   }

-

-  Array.prototype[4] = 5;

-  var srcArr = [1,2,3,4,5];

-  var resArr = srcArr.filter(callbackfn);

-  delete Array.prototype[4];

-  if(resArr.length === 4 && resArr[0] === 1 && resArr[3] == 5)    // only one element deleted

-      return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter visits deleted element in array after the
+    call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(val, idx, obj)
+  {
+    delete srcArr[2];
+    delete srcArr[4];
+    if(val > 0)
+      return true;
+    else
+      return false;
+   }
+
+  Array.prototype[4] = 5;
+  var srcArr = [1,2,3,4,5];
+  var resArr = srcArr.filter(callbackfn);
+  delete Array.prototype[4];
+  if(resArr.length === 4 && resArr[0] === 1 && resArr[3] == 5)    // only one element deleted
+      return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-7.js
index 940a89505..802fc917a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-7.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-7.js

- * @description Array.prototype.filter stops calling callbackfn once the array is deleted during the call

- */

-

-

-function testcase() {

-        var o = new Object();

-        o.srcArr = [1, 2, 3, 4, 5];

-

-        function callbackfn(val, idx, obj) {

-            delete o.srcArr;

-            if (val > 0)

-                return true;

-            else

-                return false;

-        }

-

-        var resArr = o.srcArr.filter(callbackfn);

-        return resArr.length === 5 && typeof o.srcArr === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter stops calling callbackfn once the array is
+    deleted during the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var o = new Object();
+        o.srcArr = [1, 2, 3, 4, 5];
+
+        function callbackfn(val, idx, obj) {
+            delete o.srcArr;
+            if (val > 0)
+                return true;
+            else
+                return false;
+        }
+
+        var resArr = o.srcArr.filter(callbackfn);
+        return resArr.length === 5 && typeof o.srcArr === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-8.js
index cfec8a475..5b2fd1e4d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-8.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-8.js

- * @description Array.prototype.filter - no observable effects occur if len is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 0 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return accessed === false && obj.length === 0 && newArr.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - no observable effects occur if len is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 0 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return accessed === false && obj.length === 0 && newArr.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-9.js
index 34bb276a4..4531fc28f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-9.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-9.js

- * @description Array.prototype.filter - modifications to length don't change number of iterations

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return true;

-        }

-

-        var obj = { 1: 12, 2: 9, length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                obj.length = 3;

-                return 11;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 2 && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - modifications to length don't change
+    number of iterations
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return true;
+        }
+
+        var obj = { 1: 12, 2: 9, length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                obj.length = 3;
+                return 11;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 2 && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-1.js
index eeef37773..475efec5f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-1.js

- * @description Array.prototype.filter - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(val, idx, obj)

-  {

-    callCnt++;

-    return false;

-  }

-

-  var srcArr = new Array(10);

-  srcArr[1] = undefined; //explicitly assigning a value

-  var resArr = srcArr.filter(callbackfn);

-  if( resArr.length === 0 && callCnt === 1)

-      return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn not called for indexes never
+    been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(val, idx, obj)
+  {
+    callCnt++;
+    return false;
+  }
+
+  var srcArr = new Array(10);
+  srcArr[1] = undefined; //explicitly assigning a value
+  var resArr = srcArr.filter(callbackfn);
+  if( resArr.length === 0 && callCnt === 1)
+      return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-10.js
index d84c01439..7be8704c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-10.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-10.js

- * @description Array.prototype.filter - deleting property of prototype causes prototype index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete Object.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-            return newArr.length === 2 && newArr[1] !== 1;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting property of prototype causes
+    prototype index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete Object.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+            return newArr.length === 2 && newArr[1] !== 1;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-11.js
index 39a19babc..6852d5b98 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-11.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-11.js

- * @description Array.prototype.filter - deleting property of prototype causes prototype index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            var newArr = arr.filter(callbackfn);

-            return newArr.length === 2 && newArr[1] !== 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting property of prototype causes
+    prototype index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            var newArr = arr.filter(callbackfn);
+            return newArr.length === 2 && newArr[1] !== 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-12.js
index a3f6eb33d..c899a3511 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-12.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-12.js

- * @description Array.prototype.filter - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var obj = { 0: 0, 1: 111, 2: 2, length: 10 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-            return newArr.length === 3 && newArr[1] === 1;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var obj = { 0: 0, 1: 111, 2: 2, length: 10 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+            return newArr.length === 3 && newArr[1] === 1;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-13.js
index e6d30405b..6b82dc098 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-13.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-13.js

- * @description Array.prototype.filter - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val < 3 ? true : false;

-        }

-        var arr = [0, 111, 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 3 && newArr[1] === 1;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val < 3 ? true : false;
+        }
+        var arr = [0, 111, 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 3 && newArr[1] === 1;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-14.js
index ac233d798..e7a6d2f0f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-14.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-14.js

- * @description Array.prototype.filter - decreasing length of array causes index property not to be visited

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var arr = [0, 1, 2, "last"];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 3;

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newArr = arr.filter(callbackfn);

-

-

-        return newArr.length === 3 && newArr[2] === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - decreasing length of array causes index
+    property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var arr = [0, 1, 2, "last"];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 3;
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newArr = arr.filter(callbackfn);
+
+
+        return newArr.length === 3 && newArr[2] === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-15.js
index f510e0307..6ed40a454 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-15.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-15.js

- * @description Array.prototype.filter - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var arr = [0, 1, 2];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 3 && newArr[2] === "prototype";

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - decreasing length of array with prototype
+    property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var arr = [0, 1, 2];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 3 && newArr[2] === "prototype";
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-16.js
index af6c29be3..f8f75bdb1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-16.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-16.js

- * @description Array.prototype.filter - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var arr = [0, 1, 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 3 && newArr[2] === "unconfigurable";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var arr = [0, 1, 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 3 && newArr[2] === "unconfigurable";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-2.js
index b56144313..5a96c4cbb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-2.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-2.js

- * @description Array.prototype.filter - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "length";

-                return 3;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === "length";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - added properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "length";
+                return 3;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === "length";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-3.js
index 483568517..63eaf11a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-3.js

- * @description Array.prototype.filter - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var obj = { 2: 6.99, 8: 19 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[2];

-                return 10;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] !== 6.99;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var obj = { 2: 6.99, 8: 19 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[2];
+                return 10;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] !== 6.99;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-4.js
index 9e60ba7f8..ccb38cb18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-4.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-4.js

- * @description Array.prototype.filter - properties added into own object after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(obj, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 2 && newArr[1] === 6.99;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - properties added into own object after
+    current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(obj, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 2 && newArr[1] === 6.99;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-5.js
index 7b5f4073a..ceba1745c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-5.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-5.js

- * @description Array.prototype.filter - properties added into own object after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 3 && newArr[1] === 6.99;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - properties added into own object after
+    current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 3 && newArr[1] === 6.99;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-6.js
index c39fd82ea..27135035a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-6.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-6.js

- * @description Array.prototype.filter - properties can be added to prototype after current position are visited on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var obj = { length: 2 };

-

-        try {

-            Object.defineProperty(obj, "0", {

-                get: function () {

-                    Object.defineProperty(Object.prototype, "1", {

-                        get: function () {

-                            return 6.99;

-                        },

-                        configurable: true

-                    });

-                    return 0;

-                },

-                configurable: true

-            });

-

-            var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-            return newArr.length === 2 && Array[1] === 6.99;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - properties can be added to prototype
+    after current position are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var obj = { length: 2 };
+
+        try {
+            Object.defineProperty(obj, "0", {
+                get: function () {
+                    Object.defineProperty(Object.prototype, "1", {
+                        get: function () {
+                            return 6.99;
+                        },
+                        configurable: true
+                    });
+                    return 0;
+                },
+                configurable: true
+            });
+
+            var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+            return newArr.length === 2 && Array[1] === 6.99;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-7.js
index 72c0eb82b..0eb855dc5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-7.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-7.js

- * @description Array.prototype.filter - properties can be added to prototype after current position are visited on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var arr = [0, , 2];

-

-        try {

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    Object.defineProperty(Array.prototype, "1", {

-                        get: function () {

-                            return 6.99;

-                        },

-                        configurable: true

-                    });

-                    return 0;

-                },

-                configurable: true

-            });

-

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 3 && newArr[1] === 6.99;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - properties can be added to prototype
+    after current position are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var arr = [0, , 2];
+
+        try {
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    Object.defineProperty(Array.prototype, "1", {
+                        get: function () {
+                            return 6.99;
+                        },
+                        configurable: true
+                    });
+                    return 0;
+                },
+                configurable: true
+            });
+
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 3 && newArr[1] === 6.99;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-8.js
index 2678ea067..61d269a2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-8.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-8.js

- * @description Array.prototype.filter - deleting own property causes index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-        var accessed = false;

-        var obj = { length: 2 };

-

-        function callbackfn(val, idx, o) {

-            accessed = true;

-            return true;

-        }

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting own property causes index
+    property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var accessed = false;
+        var obj = { length: 2 };
+
+        function callbackfn(val, idx, o) {
+            accessed = true;
+            return true;
+        }
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-9.js
index 5071b8de6..f31ff566e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-9.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-b-9.js

- * @description Array.prototype.filter - deleting own property causes index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-        var arr = [1, 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - deleting own property causes index
+    property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+        var arr = [1, 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-1.js
index 8b7f210d4..c1e2eb7ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-1.js

- * @description Array.prototype.filter - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = {};

-        function callbackfn(val, idx, obj) {

-            return (idx === 5) && (val === kValue);

-        }

-

-        var obj = { 5: kValue, length: 100 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === kValue;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = {};
+        function callbackfn(val, idx, obj) {
+            return (idx === 5) && (val === kValue);
+        }
+
+        var obj = { 5: kValue, length: 100 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === kValue;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-10.js
index ebcf49e5f..81b0a3e24 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-10.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 2 && val === 12;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 2 && val === 12;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-11.js
index 492545e30..c90e0262a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-11.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-11.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 0 && val === 11;

-        }

-

-        var proto = { 0: 5, 1: 6 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 0 && val === 11;
+        }
+
+        var proto = { 0: 5, 1: 6 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-12.js
index 8bba89634..6ab855205 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-12.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-12.js

- * @description  Array.prototype.filter - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val === 111 && idx === 0;

-        }

-

-        var arr = [];

-        try {

-            Array.prototype[0] = 10;

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 111;

-                },

-                configurable: true

-            });

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 111;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val === 111 && idx === 0;
+        }
+
+        var arr = [];
+        try {
+            Array.prototype[0] = 10;
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 111;
+                },
+                configurable: true
+            });
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 111;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-13.js
index 5523e3898..f20b01a37 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-13.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-13.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return idx === 1 && val === 12;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 6;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return 12;

-            },

-            configurable: true

-        });

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return idx === 1 && val === 12;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 6;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return 12;
+            },
+            configurable: true
+        });
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-14.js
index 04644b770..cd77c2677 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-14.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-14.js

- * @description  Array.prototype.filter - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 0 && val === 11;

-        }

-

-        var arr = [];

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 5;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 0 && val === 11;
+        }
+
+        var arr = [];
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 5;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-15.js
index 48a65e072..6c3e5e1b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-15.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-15.js

- * @description Array.prototype.filter - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val === 11 && idx === 1;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 20;

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val === 11 && idx === 1;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 20;
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-16.js
index 418090083..93d84ad6f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-16.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-16.js

- * @description Array.prototype.filter - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 0 && val === 11;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-            var newArr = [, , , ].filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 0 && val === 11;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+            var newArr = [, , , ].filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-17.js
index 4b465c1d6..dc2b587f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-17.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-17.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return undefined === val && idx === 1;

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === undefined;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return undefined === val && idx === 1;
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === undefined;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-18.js
index ebcd74226..13a0f20a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-18.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-18.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return undefined === val && idx === 0;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === undefined;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return undefined === val && idx === 0;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === undefined;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-19.js
index 4f3e65879..eef3c331e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-19.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-19.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return undefined === val && idx === 1;

-        }

-

-        var obj = { length: 2 };

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-        try {

-            Object.prototype[1] = 10;

-            var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-            return newArr.length === 1 && newArr[0] === undefined;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return undefined === val && idx === 1;
+        }
+
+        var obj = { length: 2 };
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+        try {
+            Object.prototype[1] = 10;
+            var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+            return newArr.length === 1 && newArr[0] === undefined;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-2.js
index 58e9960a9..733039d7e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-2.js

- * @description Array.prototype.filter - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            }

-        }

-

-        var newArr = [11].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            }
+        }
+
+        var newArr = [11].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-20.js
index cf831394b..51ef28128 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-20.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-20.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return undefined === val && idx === 0;

-        }

-

-        var arr = [];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[0] = 100;

-            var newArr = arr.filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === undefined;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return undefined === val && idx === 0;
+        }
+
+        var arr = [];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[0] = 100;
+            var newArr = arr.filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === undefined;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-21.js
index aa6908629..b07a3f2e0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-21.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-21.js

- * @description Array.prototype.filter - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val === undefined && idx === 1;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === undefined;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val === undefined && idx === 1;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === undefined;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-22.js
index bcbb1e242..5a9dd7043 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-22.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-22.js

- * @description Array.prototype.filter - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return undefined === val && idx === 0;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-            var newArr = [, ].filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === undefined;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return undefined === val && idx === 0;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+            var newArr = [, ].filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === undefined;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-23.js
index b702c481a..b4c93c447 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-23.js
@@ -1,29 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-23.js

- * @description Array.prototype.filter - This object is the global object which contains index property

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 0 && val === 11;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 11;

-            fnGlobalObject().length = 1;

-            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);

-            return newArr.length === 1 && newArr[0] === 11;

-        } finally {

-            delete fnGlobalObject()[0];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - This object is the global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 0 && val === 11;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 11;
+            fnGlobalObject().length = 1;
+            var newArr = Array.prototype.filter.call(fnGlobalObject(), callbackfn);
+            return newArr.length === 1 && newArr[0] === 11;
+        } finally {
+            delete fnGlobalObject()[0];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-25.js
index f49124ed6..7cc2b8be1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-25.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-25.js

- * @description Array.prototype.filter - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val === 11 && idx === 0;

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.filter.call(arguments, callbackfn);

-        };

-

-        var newArr = func(11);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val === 11 && idx === 0;
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.filter.call(arguments, callbackfn);
+        };
+
+        var newArr = func(11);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-26.js
index 656cc0f67..a164bae39 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-26.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-26.js

- * @description Array.prototype.filter - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            } else if (idx === 1) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.filter.call(arguments, callbackfn);

-        };

-        var newArr = func(11, 9);

-

-        return newArr.length === 2 && newArr[0] === 11 &&

-            newArr[1] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            } else if (idx === 1) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.filter.call(arguments, callbackfn);
+        };
+        var newArr = func(11, 9);
+
+        return newArr.length === 2 && newArr[0] === 11 &&
+            newArr[1] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-27.js
index 7527894b9..be029d51c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-27.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-27.js

- * @description Array.prototype.filter - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            } else if (idx === 1) {

-                return val === 12;

-            } else if (idx === 2) {

-                return val === 9;

-            } else {

-                return false;

-            }

-        }

-

-        var func = function (a, b) {

-            return Array.prototype.filter.call(arguments, callbackfn);

-        };

-        var newArr = func(11, 12, 9);

-

-        return newArr.length === 3 && newArr[0] === 11 &&

-            newArr[1] === 12 && newArr[2] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            } else if (idx === 1) {
+                return val === 12;
+            } else if (idx === 2) {
+                return val === 9;
+            } else {
+                return false;
+            }
+        }
+
+        var func = function (a, b) {
+            return Array.prototype.filter.call(arguments, callbackfn);
+        };
+        var newArr = func(11, 12, 9);
+
+        return newArr.length === 3 && newArr[0] === 11 &&
+            newArr[1] === 12 && newArr[2] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-28.js
index b8386acb4..ce46e6942 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-28.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-28.js

- * @description Array.prototype.filter - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var preIterVisible = false;

-        var arr = [];

-

-        function callbackfn(val, idx, obj) {

-            return idx === 1 && val === 9;

-        }

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 11;

-                }

-            },

-            configurable: true

-        });

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var preIterVisible = false;
+        var arr = [];
+
+        function callbackfn(val, idx, obj) {
+            return idx === 1 && val === 9;
+        }
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 11;
+                }
+            },
+            configurable: true
+        });
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-29.js
index 9059990a8..fea95828e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-29.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-29.js

- * @description Array.prototype.filter - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-        function callbackfn(val, idx, obj) {

-            return val === 9 && idx === 1;

-        }

-

-        var preIterVisible = false;

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 9;

-                } else {

-                    return 13;

-                }

-            },

-            configurable: true

-        });

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 9;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element changed by getter on previous
+    iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(val, idx, obj) {
+            return val === 9 && idx === 1;
+        }
+
+        var preIterVisible = false;
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 9;
+                } else {
+                    return 13;
+                }
+            },
+            configurable: true
+        });
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 9;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-3.js
index d363c6930..f74153893 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-3.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-3.js

- * @description Array.prototype.filter - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return (idx === 5) && (val === "abc");

-        }

-

-        var proto = { 0: 11, 5: 100 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[5] = "abc";

-        child.length = 10;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === "abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return (idx === 5) && (val === "abc");
+        }
+
+        var proto = { 0: 11, 5: 100 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[5] = "abc";
+        child.length = 10;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === "abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-30.js
index 4a71236d5..6407e19c8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-30.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-30.js

- * @description Array.prototype.filter - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.filter.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - unnhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var obj = { 0: 11, 5: 10, 10: 8, length: 20 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.filter.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-31.js
index 157f035f7..c30a80339 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-31.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-31.js

- * @description Array.prototype.filter - unnhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(val, idx, obj) {

-            if (idx > 1) {

-                accessed = true;

-            }

-            return true;

-        }

-

-        var arr = [];

-        arr[5] = 10;

-        arr[10] = 100;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.filter(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - unnhandled exceptions happened in getter
+    terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(val, idx, obj) {
+            if (idx > 1) {
+                accessed = true;
+            }
+            return true;
+        }
+
+        var arr = [];
+        arr[5] = 10;
+        arr[10] = 100;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.filter(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-4.js
index d6afea001..8e0104916 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-4.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-4.js

- * @description Array.prototype.filter - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return (idx === 0) && (val === 12);

-        }

-

-        try {

-            Array.prototype[0] = 11;

-            var newArr = [12].filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 12;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return (idx === 0) && (val === 12);
+        }
+
+        try {
+            Array.prototype[0] = 11;
+            var newArr = [12].filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 12;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-5.js
index 4226b2c70..e9ead5350 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-5.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-5.js

- * @description Array.prototype.filter - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return idx === 0 && val === 11;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 5;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: 11,

-            configurable: true

-        });

-        child[1] = 12;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return idx === 0 && val === 11;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 5;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: 11,
+            configurable: true
+        });
+        child[1] = 12;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-6.js
index 72ebc10f8..efedfc1cd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-6.js

- * @description Array.prototype.filter - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val === 11;

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 9;

-                },

-                configurable: true

-            });

-            var newArr = [11].filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 11;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val === 11;
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 9;
+                },
+                configurable: true
+            });
+            var newArr = [11].filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 11;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-7.js
index 0bca7870c..0d9305b4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-7.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-7.js

- * @description Array.prototype.filter - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var kValue = 'abc';

-

-        function callbackfn(val, idx, obj) {

-            return (idx === 5) && (val === kValue);

-        }

-

-        var proto = { 5: kValue };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 10;

-

-        var newArr = Array.prototype.filter.call(child, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === kValue;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kValue = 'abc';
+
+        function callbackfn(val, idx, obj) {
+            return (idx === 5) && (val === kValue);
+        }
+
+        var proto = { 5: kValue };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 10;
+
+        var newArr = Array.prototype.filter.call(child, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === kValue;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-8.js
index ec075a3ee..054e2aa20 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-8.js

- * @description Array.prototype.filter - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return (idx === 1) && (val === 13);

-        }

-

-        try {

-            Array.prototype[1] = 13;

-            var newArr = [, , , ].filter(callbackfn);

-

-            return newArr.length === 1 && newArr[0] === 13;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return (idx === 1) && (val === 13);
+        }
+
+        try {
+            Array.prototype[1] = 13;
+            var newArr = [, , , ].filter(callbackfn);
+
+            return newArr.length === 1 && newArr[0] === 13;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-9.js
index 50d83fb60..8304127c4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-9.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-i-9.js

- * @description Array.prototype.filter - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return (idx === 0) && (val === 11);

-        }

-

-        var obj = { 10: 10, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return (idx === 0) && (val === 11);
+        }
+
+        var obj = { 10: 10, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-1.js
index 48d596041..b922f3f86 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-1.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-1.js

- * @description Array.prototype.filter - callbackfn called with correct parameters

- */

-

-

-function testcase() { 

- 

-  var bPar = true;

-  var bCalled = false;

-  function callbackfn(val, idx, obj)

-  {

-    bCalled = true;

-    if(obj[idx] !== val)

-      bPar = false;

-  }

-

-  var srcArr = [0,1,true,null,new Object(),"five"];

-  srcArr[999999] = -6.6;

-  var resArr = srcArr.filter(callbackfn);

-  

-  if(bCalled === true && bPar === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - callbackfn called with correct parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bPar = true;
+  var bCalled = false;
+  function callbackfn(val, idx, obj)
+  {
+    bCalled = true;
+    if(obj[idx] !== val)
+      bPar = false;
+  }
+
+  var srcArr = [0,1,true,null,new Object(),"five"];
+  srcArr[999999] = -6.6;
+  var resArr = srcArr.filter(callbackfn);
+  
+  if(bCalled === true && bPar === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-10.js
index 6107644fc..8924e4da4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-10.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-10.js

- * @description Array.prototype.filter - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val) {

-            return val > 10;

-        }

-        var newArr = [12].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn is called with 1 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val) {
+            return val > 10;
+        }
+        var newArr = [12].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-11.js
index cad0f9883..5cf1c2b5e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-11.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-11.js

- * @description Array.prototype.filter - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx) {

-            return val > 10 && arguments[2][idx] === val;

-        }

-        var newArr = [11].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn is called with 2 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx) {
+            return val > 10 && arguments[2][idx] === val;
+        }
+        var newArr = [11].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-12.js
index 6f2ff59a7..09817bcca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-12.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-12.js

- * @description Array.prototype.filter - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return val > 10 && obj[idx] === val;

-        }

-        var newArr = [11].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn is called with 3 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return val > 10 && obj[idx] === val;
+        }
+        var newArr = [11].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-13.js
index 3061b78c4..d12e6a818 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-13.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-13.js

- * @description Array.prototype.filter - callbackfn that uses arguments object to get parameter value

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return arguments[2][arguments[1]] === arguments[0];

-        }

-        var newArr = [11].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn that uses arguments object to
+    get parameter value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return arguments[2][arguments[1]] === arguments[0];
+        }
+        var newArr = [11].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-16.js
index 327c76b14..568956673 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-16.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-16.js

- * @description Array.prototype.filter - 'this' of 'callbackfn' is a Boolean object when T is not an object (T is a boolean)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return this.valueOf() === false;

-        }

-

-        var obj = { 0: 11, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn, false);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'this' of 'callbackfn' is a Boolean
+    object when T is not an object (T is a boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return this.valueOf() === false;
+        }
+
+        var obj = { 0: 11, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn, false);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-17.js
index 19b9daa34..99e878b94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-17.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-17.js

- * @description Array.prototype.filter -'this' of 'callbackfn' is a Number object when T is not an object (T is a number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, o) {

-            return 5 === this.valueOf();

-        }

-

-        var obj = { 0: 11, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn, 5);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter -'this' of 'callbackfn' is a Number object
+    when T is not an object (T is a number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, o) {
+            return 5 === this.valueOf();
+        }
+
+        var obj = { 0: 11, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn, 5);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-18.js
index fda004d5c..f9c877544 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-18.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-18.js

- * @description Array.prototype.filter - 'this' of 'callbackfn' is an String object when T is not an object (T is a string)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return 'hello' === this.valueOf();

-        }

-

-        var obj = { 0: 11, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn, "hello");

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - 'this' of 'callbackfn' is an String
+    object when T is not an object (T is a string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return 'hello' === this.valueOf();
+        }
+
+        var obj = { 0: 11, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn, "hello");
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-19.js
index a019570e3..a0c0f2237 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-19.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-19.js

- * @description Array.prototype.filter - non-indexed properties are not called

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return val === 8;

-        }

-

-        var obj = { 0: 11, non_index_property: 8, 2: 5, length: 20 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - non-indexed properties are not called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return val === 8;
+        }
+
+        var obj = { 0: 11, non_index_property: 8, 2: 5, length: 20 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-2.js
index bd1eb409f..62d50dd57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-2.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-2.js

- * @description Array.prototype.filter - callbackfn takes 3 arguments

- */

-

-

-function testcase() { 

- 

-  var parCnt = 3;

-  var bCalled = false

-  function callbackfn(val, idx, obj)

-  { 

-    bCalled = true;

-    if(arguments.length !== 3)

-      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters

-  }

-

-  var srcArr = [0,1,2,3,4,5,6,7,8,9];

-  var resArr = srcArr.filter(callbackfn);

-  if(bCalled === true && parCnt === 3)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - callbackfn takes 3 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var parCnt = 3;
+  var bCalled = false
+  function callbackfn(val, idx, obj)
+  { 
+    bCalled = true;
+    if(arguments.length !== 3)
+      parCnt = arguments.length;   //verify if callbackfn was called with 3 parameters
+  }
+
+  var srcArr = [0,1,2,3,4,5,6,7,8,9];
+  var resArr = srcArr.filter(callbackfn);
+  if(bCalled === true && parCnt === 3)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-20.js
index be1376e45..c2c68bc84 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-20.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-20.js

- * @description Array.prototype.filter - callbackfn called with correct parameters (thisArg is correct)

- */

-

-

-function testcase() {

-

-        var thisArg = { threshold: 10 };

-

-        function callbackfn(val, idx, obj) {

-            return this === thisArg;

-        }

-

-        var obj = { 0: 11, length: 1 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn, thisArg);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn called with correct parameters
+    (thisArg is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var thisArg = { threshold: 10 };
+
+        function callbackfn(val, idx, obj) {
+            return this === thisArg;
+        }
+
+        var obj = { 0: 11, length: 1 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn, thisArg);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-21.js
index d52e2ef0e..58e1e3ee2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-21.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-21.js

- * @description Array.prototype.filter - callbackfn called with correct parameters (kValue is correct)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (idx === 0) {

-                return val === 11;

-            }

-

-            if (idx === 1) {

-                return val === 12;

-            }

-

-            return false;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 2 && newArr[0] === 11 && newArr[1] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn called with correct parameters
+    (kValue is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (idx === 0) {
+                return val === 11;
+            }
+
+            if (idx === 1) {
+                return val === 12;
+            }
+
+            return false;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 2 && newArr[0] === 11 && newArr[1] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-22.js
index bf7a1f972..c3e055016 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-22.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-22.js

- * @description Array.prototype.filter - callbackfn called with correct parameters (the index k is correct)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            if (val === 11) {

-                return idx === 0;

-            }

-

-            if (val === 12) {

-                return idx === 1;

-            }

-

-            return false;

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 2 && newArr[0] === 11 && newArr[1] === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn called with correct parameters
+    (the index k is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            if (val === 11) {
+                return idx === 0;
+            }
+
+            if (val === 12) {
+                return idx === 1;
+            }
+
+            return false;
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 2 && newArr[0] === 11 && newArr[1] === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-23.js
index 5f670b467..509076d7e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-23.js

- * @description Array.prototype.filter - callbackfn called with correct parameters (this object O is correct)

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            return obj === o;

-        }

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn called with correct parameters
+    (this object O is correct)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            return obj === o;
+        }
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-4.js
index 4d94c159a..2c1cc781a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-4.js

- * @description Array.prototype.filter - k values are passed in ascending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = 0;

-        var called = 0;

-        function callbackfn(val, idx, o) {

-            called++;

-            if (lastIdx !== idx) {

-                return false;

-            } else {

-                lastIdx++;

-                return true;

-            }

-        }

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - k values are passed in ascending numeric
+    order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = 0;
+        var called = 0;
+        function callbackfn(val, idx, o) {
+            called++;
+            if (lastIdx !== idx) {
+                return false;
+            } else {
+                lastIdx++;
+                return true;
+            }
+        }
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-5.js
index 1027c6405..774e5018f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-5.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-5.js

- * @description Array.prototype.filter - k values are accessed during each iteration and not prior to starting the loop on an Array

- */

-

-

-function testcase() {

-

-        var kIndex = [];

-        var called = 0;

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            called++;

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            if (kIndex[idx] === undefined) {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && kIndex[idx - 1] === undefined) {

-                    return true;

-                }

-                kIndex[idx] = 1;

-                return false;

-            } else {

-                return true;

-            }

-        }

-        var newArr = [11, 12, 13, 14].filter(callbackfn, undefined);

-

-        return newArr.length === 0 && called === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - k values are accessed during each
+    iteration and not prior to starting the loop on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var kIndex = [];
+        var called = 0;
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            called++;
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            if (kIndex[idx] === undefined) {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && kIndex[idx - 1] === undefined) {
+                    return true;
+                }
+                kIndex[idx] = 1;
+                return false;
+            } else {
+                return true;
+            }
+        }
+        var newArr = [11, 12, 13, 14].filter(callbackfn, undefined);
+
+        return newArr.length === 0 && called === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-6.js
index 7e8e21017..ac79eecdf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-6.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-6.js

- * @description Array.prototype.filter - arguments to callbackfn are self consistent

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, length: 1 };

-        var thisArg = {};

-

-        function callbackfn() {

-            return this === thisArg &&

-                arguments[0] === 11 &&

-                arguments[1] === 0 &&

-                arguments[2] === obj;

-        }

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn, thisArg);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - arguments to callbackfn are self
+    consistent
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, length: 1 };
+        var thisArg = {};
+
+        function callbackfn() {
+            return this === thisArg &&
+                arguments[0] === 11 &&
+                arguments[1] === 0 &&
+                arguments[2] === obj;
+        }
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn, thisArg);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-7.js
index 1b4fa8423..e79c28167 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-7.js

- * @description Array.prototype.filter - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (called === 1) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-            return true;

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.filter.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return 1 === called && ex instanceof Error;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - unhandled exceptions happened in
+    callbackfn terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (called === 1) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+            return true;
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.filter.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return 1 === called && ex instanceof Error;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-8.js
index 4c25ec1ee..662e00e74 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-8.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-8.js

- * @description Array.prototype.filter - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        function callbackfn(val, idx, o) {

-            if (idx === 0) {

-                obj[idx + 1] = 8;

-            }

-            return val > 10;

-        }

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - element changed by callbackfn on previous
+    iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        function callbackfn(val, idx, o) {
+            if (idx === 0) {
+                obj[idx + 1] = 8;
+            }
+            return val > 10;
+        }
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-9.js
index 34030ff0d..941f1194e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-9.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-ii-9.js

- * @description Array.prototype.filter - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return true;

-        }

-        var newArr = [11].filter(callbackfn);

-

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - callbackfn is called with 0 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return true;
+        }
+        var newArr = [11].filter(callbackfn);
+
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-1.js
index 2eed950e9..dc8b0fc03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-1.js

- * @description Array.prototype.filter - value of returned array element equals to 'kValue'

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        return newArr[0] === obj[0] && newArr[1] === obj[1];

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of returned array element equals to
+    'kValue'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        return newArr[0] === obj[0] && newArr[1] === obj[1];
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-2.js
index 9e89079fb..877b289d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-2.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-2.js

- * @description Array.prototype.filter - value of returned array element can be overwritten

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        try {

-            var tempVal = newArr[1];

-            newArr[1] += 1;

-            return newArr[1] !== tempVal;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of returned array element can be
+    overwritten
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        try {
+            var tempVal = newArr[1];
+            newArr[1] += 1;
+            return newArr[1] !== tempVal;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-3.js
index 1ad2c00bf..49d703d9e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-3.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-3.js

- * @description Array.prototype.filter - value of returned array element can be enumerated

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        var prop;

-        var enumerable = false;

-        for (prop in newArr) {

-            if (newArr.hasOwnProperty(prop)) {

-                if (prop === "0") {

-                    enumerable = true;

-                }

-            }

-        }

-

-        return enumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of returned array element can be
+    enumerated
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        var prop;
+        var enumerable = false;
+        for (prop in newArr) {
+            if (newArr.hasOwnProperty(prop)) {
+                if (prop === "0") {
+                    enumerable = true;
+                }
+            }
+        }
+
+        return enumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-4.js
index b63a39c44..96fcd046e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-4.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-4.js

- * @description Array.prototype.filter - value of returned array element can be changed or deleted

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-

-        try {

-            var tempVal = newArr[1];

-            delete newArr[1];

-            return tempVal !== undefined && newArr[1] === undefined;

-        } catch (ex) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - value of returned array element can be
+    changed or deleted
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+
+        try {
+            var tempVal = newArr[1];
+            delete newArr[1];
+            return tempVal !== undefined && newArr[1] === undefined;
+        } catch (ex) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-5.js
index 5db52838f..f67596d98 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-5.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-5.js

- * @description Array.prototype.filter - values of 'to' are passed in acending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4];

-        var lastToIdx = 0;

-        var called = 0;

-        function callbackfn(val, idx, obj) {

-            called++;

-            if (lastToIdx !== idx) {

-                return false;

-            } else {

-                lastToIdx++;

-                return true;

-            }

-        }

-        var newArr = arr.filter(callbackfn);

-

-        return newArr.length === 5 && called === 5;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - values of 'to' are passed in acending
+    numeric order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4];
+        var lastToIdx = 0;
+        var called = 0;
+        function callbackfn(val, idx, obj) {
+            called++;
+            if (lastToIdx !== idx) {
+                return false;
+            } else {
+                lastToIdx++;
+                return true;
+            }
+        }
+        var newArr = arr.filter(callbackfn);
+
+        return newArr.length === 5 && called === 5;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-6.js
index 32b781a64..822cf0dd4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-6.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1-6.js

- * @description Array.prototype.filter - values of 'to' are accessed during each iteration when 'selected' is converted to true and not prior to starting the loop

- */

-

-

-function testcase() {

-

-        var toIndex = [];

-        var called = 0;

-

-        //By below way, we could verify that 'to' would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(val, idx, obj) {

-            called++;

-            //Each position should be visited one time, which means 'to' is accessed one time during iterations.

-            if (toIndex[idx] === undefined) {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && toIndex[idx - 1] === undefined) {

-                    return false;

-                }

-                toIndex[idx] = 1;

-                return true;

-            } else {

-                return false;

-            }

-        }

-        var newArr = [11, 12, 13, 14].filter(callbackfn, undefined);

-

-        return newArr.length === 4 && called === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - values of 'to' are accessed during each
+    iteration when 'selected' is converted to true and not prior to
+    starting the loop
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toIndex = [];
+        var called = 0;
+
+        //By below way, we could verify that 'to' would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(val, idx, obj) {
+            called++;
+            //Each position should be visited one time, which means 'to' is accessed one time during iterations.
+            if (toIndex[idx] === undefined) {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && toIndex[idx - 1] === undefined) {
+                    return false;
+                }
+                toIndex[idx] = 1;
+                return true;
+            } else {
+                return false;
+            }
+        }
+        var newArr = [11, 12, 13, 14].filter(callbackfn, undefined);
+
+        return newArr.length === 4 && called === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1.js
index 7c48aca13..d1ba7339b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-1.js

- * @description Array.prototype.filter - getOwnPropertyDescriptor(all true) of returned array element

- */

-

-

-function testcase() {

-  

-  function callbackfn(val, idx, obj){

-    if(val % 2)

-      return true; 

-    else

-      return false;

-  }

-  var srcArr = [0,1,2,3,4];

-  var resArr = srcArr.filter(callbackfn);

-  if (resArr.length > 0){

-     var desc = Object.getOwnPropertyDescriptor(resArr, 1) 

-     if(desc.value === 3 &&        //srcArr[1] = true

-       desc.writable === true &&

-       desc.enumerable === true &&

-       desc.configurable === true){

-         return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - getOwnPropertyDescriptor(all true) of
+    returned array element
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+  function callbackfn(val, idx, obj){
+    if(val % 2)
+      return true; 
+    else
+      return false;
+  }
+  var srcArr = [0,1,2,3,4];
+  var resArr = srcArr.filter(callbackfn);
+  if (resArr.length > 0){
+     var desc = Object.getOwnPropertyDescriptor(resArr, 1) 
+     if(desc.value === 3 &&        //srcArr[1] = true
+       desc.writable === true &&
+       desc.enumerable === true &&
+       desc.configurable === true){
+         return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-10.js
index 9cf805a87..464f99d47 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-10.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-10.js

- * @description Array.prototype.filter return value of callbackfn is a number (value is negative number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return -5;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a number
+    (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return -5;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-11.js
index 3680e0a0b..fe762d0e7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-11.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-11.js

- * @description Array.prototype.filter return value of callbackfn is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return Infinity;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a number
+    (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return Infinity;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-12.js
index 9d757dd37..216631f1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-12.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-12.js

- * @description Array.prototype.filter return value of callbackfn is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return -Infinity;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a number
+    (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return -Infinity;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-13.js
index 31454c215..0fd5df218 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-13.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-13.js

- * @description Array.prototype.filter return value of callbackfn is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return NaN;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a number
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return NaN;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-14.js
index e43b91d12..b1403c13a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-14.js

- * @description Array.prototype.filter return value of callbackfn is an empty string

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return "";

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is an empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return "";
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-15.js
index e65a5b263..3c7971029 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-15.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-15.js

- * @description Array.prototype.filter return value of callbackfn is a non-empty string

- */

-

-

-function testcase() {

-    

-        function callbackfn(val, idx, obj) {

-            return "non-empty string";

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a non-empty
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        function callbackfn(val, idx, obj) {
+            return "non-empty string";
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-16.js
index 3cf354559..5de4998c3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-16.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-16.js

- * @description Array.prototype.filter return value of callbackfn is a Function object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return function () { };

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a Function
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return function () { };
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-17.js
index 3043d48e4..680e4bea9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-17.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-17.js

- * @description Array.prototype.filter return value of callbackfn is an Array object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Array(10);

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is an Array
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Array(10);
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-18.js
index 021275593..8f96f71b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-18.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-18.js

- * @description Array.prototype.filter return value of callbackfn is a String object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new String();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a String
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new String();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-19.js
index 6db0b0e3d..072e70047 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-19.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-19.js

- * @description Array.prototype.filter return value of callbackfn is a Boolean object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Boolean();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter return value of callbackfn is a Boolean
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Boolean();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-2.js
index 5a2602afc..c111ab6c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-2.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-2.js

- * @description Array.prototype.filter - return value of callbackfn is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, o) {

-            accessed = true;

-            return undefined;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return  newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - return value of callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, o) {
+            accessed = true;
+            return undefined;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return  newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-20.js
index 94c866489..b6f984124 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-20.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-20.js

- * @description Array.prototype.filter - return value of callbackfn is a Number object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Number();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a Number
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Number();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-21.js
index 3fdf2663e..8dd158544 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-21.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-21.js

- * @description Array.prototype.filter - return value of callbackfn is the Math object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return Math;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is the Math
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return Math;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-22.js
index 237bfdae6..bbf839781 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-22.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-22.js

- * @description Array.prototype.filter - return value of callbackfn is a Date object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Date();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a Date
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Date();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-23.js
index 22e527896..29e5e8b9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-23.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-23.js

- * @description Array.prototype.filter - return value of callbackfn is a RegExp object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new RegExp();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a RegExp
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new RegExp();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-24.js
index 24f2b160f..9cd0abca9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-24.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-24.js

- * @description Array.prototype.filter - return value of callbackfn is the JSON object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return JSON;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is the JSON
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return JSON;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-25.js
index 5ba073f4a..482f972bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-25.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-25.js

- * @description Array.prototype.filter - return value of callbackfn is an Error object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new EvalError();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is an Error
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new EvalError();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-26.js
index 32437ac18..7d108631d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-26.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-26.js

- * @description Array.prototype.filter - return value of callbackfn is the Arguments object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return arguments;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is the
+    Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return arguments;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-28.js
index 2d4d295a1..9a24bbc25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-28.js
@@ -1,21 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-28.js

- * @description Array.prototype.filter - return value of callbackfn is the global object

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return fnGlobalObject();

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return fnGlobalObject();
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-29.js
index c3dbbfd98..742c688b0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-29.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-29.js

- * @description Array.prototype.filter - false prevents element added to output Array

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(val, idx, obj) {

-            called++;

-            return val > 10;

-        }

-

-        var obj = { 0: 11, 1: 8, length: 20 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 1 && newArr[0] !== 8 && called === 2;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - false prevents element added to output
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(val, idx, obj) {
+            called++;
+            return val > 10;
+        }
+
+        var obj = { 0: 11, 1: 8, length: 20 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 1 && newArr[0] !== 8 && called === 2;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-3.js
index b4a887f47..8225abfd5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-3.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-3.js

- * @description Array.prototype.filter - return value of callbackfn is null

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return null;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.filter - return value of callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return null;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-30.js
index c1e2c4dd6..71fe038bd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-30.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-30.js

- * @description Array.prototype.filter - return value (new Boolean(false)) of callbackfn is treated as true value

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return new Boolean(false);

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value (new Boolean(false)) of
+    callbackfn is treated as true value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return new Boolean(false);
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-4.js
index 881e96424..524df498b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-4.js

- * @description Array.prototype.filter - return value of callbackfn is a boolean (value is false)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return false;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a boolean
+    (value is false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return false;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-5.js
index 819e1290f..09def66a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-5.js

- * @description Array.prototype.filter - return value of callbackfn is a boolean (value is true)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return true;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        var newArr = Array.prototype.filter.call(obj, callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a boolean
+    (value is true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return true;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        var newArr = Array.prototype.filter.call(obj, callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-6.js
index 65c3bd29b..b11737745 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-6.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-6.js

- * @description Array.prototype.filter - return value of callbackfn is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return 0;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a number
+    (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return 0;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-7.js
index 35c88de29..f793ddcfe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-7.js

- * @description Array.prototype.filter - return value of callbackfn is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return +0;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a number
+    (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return +0;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-8.js
index 36e615b0a..8a5aa2bac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-8.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-8.js

- * @description Array.prototype.filter - return value of callbackfn is a nunmber (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(val, idx, obj) {

-            accessed = true;

-            return -0;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 0 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a nunmber
+    (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(val, idx, obj) {
+            accessed = true;
+            return -0;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 0 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-9.js
index 42ce920fc..4a7321bbe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-9.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.20/15.4.4.20-9-c-iii-9.js

- * @description Array.prototype.filter - return value of callbackfn is a number (value is positive number)

- */

-

-

-function testcase() {

-

-        function callbackfn(val, idx, obj) {

-            return 5;

-        }

-

-        var newArr = [11].filter(callbackfn);

-        return newArr.length === 1 && newArr[0] === 11;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.filter - return value of callbackfn is a number
+    (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(val, idx, obj) {
+            return 5;
+        }
+
+        var newArr = [11].filter(callbackfn);
+        return newArr.length === 1 && newArr[0] === 11;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-1.js
index 4752c229b..1d204448b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-1.js

- * @description Array.prototype.reduce must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.reduce;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.reduce;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-2.js
index 963a11350..ace8ab4de 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-0-2.js

- * @description Array.prototype.reduce.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.reduce.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.reduce.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-1.js
index d16a54e6b..a9def8e7a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-1.js

- * @description Array.prototype.reduce applied to undefined

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.reduce.call(undefined); 

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.reduce.call(undefined); 
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-10.js
index 17105cfc3..722892cbc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-10.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-10.js

- * @description Array.prototype.reduce applied to the Math object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return ('[object Math]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            return Array.prototype.reduce.call(Math, callbackfn, 1);

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return ('[object Math]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            return Array.prototype.reduce.call(Math, callbackfn, 1);
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-11.js
index 6923a1cad..c31db4022 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-11.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-11.js

- * @description Array.prototype.reduce applied to Date object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Date;

-        }

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Date;
+        }
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-12.js
index e5c7d6e4f..937040ff7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-12.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-12.js

- * @description Array.prototype.reduce applied to RegExp object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof RegExp;

-        }

-

-        var obj = new RegExp();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof RegExp;
+        }
+
+        var obj = new RegExp();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-13.js
index a18b849d0..de915c10b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-13.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-13.js

- * @description Array.prototype.reduce applied to the JSON object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return ('[object JSON]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            return Array.prototype.reduce.call(JSON, callbackfn, 1);

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return ('[object JSON]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            return Array.prototype.reduce.call(JSON, callbackfn, 1);
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-14.js
index 9b7829261..4bbed2579 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-14.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-14.js

- * @description Array.prototype.reduce applied to Error object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Error;

-        }

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Error;
+        }
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-15.js
index ab9438215..139fa3911 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-15.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-15.js

- * @description Array.prototype.reduce applied to the Arguments object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return ('[object Arguments]' === Object.prototype.toString.call(obj));

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return ('[object Arguments]' === Object.prototype.toString.call(obj));
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-2.js
index 6b2598d70..88ae5615b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-2.js

- * @description Array.prototype.reduce applied to null

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.reduce.call(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.reduce.call(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-3.js
index 93ac91aa1..58f4cd0d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-3.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-3.js

- * @description Array.prototype.reduce applied to boolean primitive

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return  obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = true;

-            Boolean.prototype.length = 1;

-

-            return Array.prototype.reduce.call(false, callbackfn, 1);

-

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return  obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = true;
+            Boolean.prototype.length = 1;
+
+            return Array.prototype.reduce.call(false, callbackfn, 1);
+
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-4.js
index 274450faf..401b584bd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-4.js

- * @description Array.prototype.reduce applied to Boolean object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Boolean;

-        }

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Boolean;
+        }
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-5.js
index 7963db108..2303801dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-5.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-5.js

- * @description Array.prototype.reduce applied to number primitive

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-

-            return Array.prototype.reduce.call(2.5, callbackfn, 1);

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+
+            return Array.prototype.reduce.call(2.5, callbackfn, 1);
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-6.js
index ddfd67807..8b2c021ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-6.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-6.js

- * @description Array.prototype.reduce applied to Number object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Number;

-        }

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Number;
+        }
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-7.js
index 4447edbe3..69f4895bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-7.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-7.js

- * @description Array.prototype.reduce applied to string primitive

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof String;

-        }

-

-        return Array.prototype.reduce.call("abc", callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof String;
+        }
+
+        return Array.prototype.reduce.call("abc", callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-8.js
index 7ca7872e8..efd435171 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-8.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-8.js

- * @description Array.prototype.reduce applied to String object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof String;

-        }

-

-        var obj = new String("abc");

-

-        return  Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof String;
+        }
+
+        var obj = new String("abc");
+
+        return  Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-9.js
index dff16be5a..331b16fa6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-9.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-1-9.js

- * @description Array.prototype.reduce applied to Function object

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return obj instanceof Function;

-        }

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return obj instanceof Function;
+        }
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-1.js
index 1454d62fd..6ae30fad8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-1.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-1.js

- * @description Array.prototype.reduce doesn't mutate the Array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return 1;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr.reduce(callbackfn);

-  if(srcArr[0] === 1 &&

-     srcArr[1] === 2 &&

-     srcArr[2] === 3 &&

-     srcArr[3] === 4 &&

-     srcArr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce doesn't mutate the Array on which it is
+    called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return 1;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr.reduce(callbackfn);
+  if(srcArr[0] === 1 &&
+     srcArr[1] === 2 &&
+     srcArr[2] === 3 &&
+     srcArr[3] === 4 &&
+     srcArr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-2.js
index f1f784512..f5d607f40 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-2.js

- * @description Array.prototype.reduce reduces the array in ascending order of indices

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return prevVal + curVal;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  if(srcArr.reduce(callbackfn) === '12345')

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce reduces the array in ascending order of
+    indices
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return prevVal + curVal;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  if(srcArr.reduce(callbackfn) === '12345')
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-3.js
index fc44c8a88..1c24bfccf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-3.js

- * @description Array.prototype.reduce - subclassed array of length 1

- */

-

-

-function testcase() {

-  foo.prototype = [1];

-  function foo() {}

-  var f = new foo();

-  

-  function cb(){}

-  if(f.reduce(cb) === 1)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - subclassed array of length 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = [1];
+  function foo() {}
+  var f = new foo();
+  
+  function cb(){}
+  if(f.reduce(cb) === 1)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-4.js
index 957b7a60a..1d76abfd5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-4.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-4.js

- * @description Array.prototype.reduce - subclassed array with length more than 1

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3, 4);

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduce(cb) === 10)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - subclassed array with length more than 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3, 4);
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduce(cb) === 10)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-5.js
index 42271ef9e..6660a3b19 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-5.js

- * @description Array.prototype.reduce reduces the array in ascending order of indices(initialvalue present)

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return prevVal + curVal;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  if(srcArr.reduce(callbackfn,'0') === '012345')

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce reduces the array in ascending order of
+    indices(initialvalue present)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return prevVal + curVal;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  if(srcArr.reduce(callbackfn,'0') === '012345')
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-6.js
index 719a06609..e17284515 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-6.js

- * @description Array.prototype.reduce - subclassed array when initialvalue provided

- */

-

-

-function testcase() {

-  foo.prototype = [1,2,3,4];

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduce(cb,-1) === 9)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - subclassed array when initialvalue
+    provided
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = [1,2,3,4];
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduce(cb,-1) === 9)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-7.js
index ae6ffd2eb..f3b935a97 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-7.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-7.js

- * @description Array.prototype.reduce - subclassed array with length 1 and initialvalue provided

- */

-

-

-function testcase() {

-  foo.prototype = [1];

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduce(cb,-1) === 0)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - subclassed array with length 1 and
+    initialvalue provided
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = [1];
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduce(cb,-1) === 0)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-8.js
index edc04facf..f85e98ee1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-8.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-10-8.js

- * @description Array.prototype.reduce doesn't visit expandos

- */

-

-

-function testcase() {

-

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    callCnt++;

-    return curVal;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  srcArr["i"] = 10;

-  srcArr[true] = 11;

-  srcArr.reduce(callbackfn);

-

-  if(callCnt == 4)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    callCnt++;
+    return curVal;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  srcArr["i"] = 10;
+  srcArr[true] = 11;
+  srcArr.reduce(callbackfn);
+
+  if(callCnt == 4)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-1.js
index 6f41dda6b..6061bd587 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-1.js

- * @description Array.prototype.reduce - 'length' is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is own data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-10.js
index d9d958416..bba5cfc29 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-10.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-10.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-11.js
index 9d91bf2e8..0193701d6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-11.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-11.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-12.js
index e513d33ff..57acb274d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-12.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-12.js

- * @description Array.prototype.reduce - 'length' is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 12, 1: 11 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is own accessor property without
+    a get function that overrides an inherited accessor property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 12, 1: 11 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-13.js
index f36617fcd..fc539b87b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-13.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-13.js

- * @description Array.prototype.reduce applied to Array-like object that 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object that 'length'
+    is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-14.js
index cdec1882f..35e91fdb2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-14.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-14.js

- * @description Array.prototype.reduce applied to the Array-like object that 'length' property doesn't exist

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to the Array-like object that
+    'length' property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-15.js
index ee69a7e2a..3a7f14b7e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-15.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-15.js

- * @description Array.prototype.reduce - 'length' is property of the global object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            return Array.prototype.reduce.call(fnGlobalObject(), callbackfn, 1) === true;

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - 'length' is property of the global object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            return Array.prototype.reduce.call(fnGlobalObject(), callbackfn, 1) === true;
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-17.js
index ecbb39faa..ecf274872 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-17.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-17.js

- * @description Array.prototype.reduce applied to the Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var func = function (a, b) {

-            arguments[2] = 9;

-            return Array.prototype.reduce.call(arguments, callbackfn, 1);

-        };

-

-        return func(12, 11) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to the Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var func = function (a, b) {
+            arguments[2] = 9;
+            return Array.prototype.reduce.call(arguments, callbackfn, 1);
+        };
+
+        return func(12, 11) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-18.js
index fa6c849cc..55622457c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-18.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-18.js

- * @description Array.prototype.reduce applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 3);

-        }

-

-        var str = new String("012");

-

-        return Array.prototype.reduce.call(str, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to String object, which implements
+    its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 3);
+        }
+
+        var str = new String("012");
+
+        return Array.prototype.reduce.call(str, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-19.js
index 2c6a930eb..ab54d57c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-19.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-19.js

- * @description Array.prototype.reduce applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        return Array.prototype.reduce.call(fun, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Function object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        return Array.prototype.reduce.call(fun, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-2.js
index e93fdf37f..a6499eec4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-2.js

- * @description Array.prototype.reduce - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        return [12, 11].reduce(callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - 'length' is own data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        return [12, 11].reduce(callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-3.js
index 164ca827b..6a351abed 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-3.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-3.js

- * @description Array.prototype.reduce - 'length' is an own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is an own data property that
+    overrides an inherited data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-4.js
index 514785827..a96b21839 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-4.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-4.js

- * @description Array.prototype.reduce - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        var storeProtoLength;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        try {

-            storeProtoLength = Array.prototype.length;

-            Array.prototype.length = 0;

-

-            return [12, 11].reduce(callbackfn, 1) === true;

-        } finally {

-            Array.prototype.length = storeProtoLength;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var storeProtoLength;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        try {
+            storeProtoLength = Array.prototype.length;
+            Array.prototype.length = 0;
+
+            return [12, 11].reduce(callbackfn, 1) === true;
+        } finally {
+            Array.prototype.length = storeProtoLength;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-5.js
index 798a4c119..9b5d6d71a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-5.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-5.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an own data property that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-6.js
index 10069f82e..67213f1ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-6.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-6.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = { length: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = { length: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-7.js
index 956cc954b..37fc53283 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-7.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-7.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-8.js
index 226bd641c..4df6eddd5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-8.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-8.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an own accessor property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-9.js
index d35bca35d..65921b20f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-9.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-2-9.js

- * @description Array.prototype.reduce applied to Array-like object, 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (obj.length === 2);

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduce.call(child, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce applied to Array-like object, 'length' is
+    an own accessor property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (obj.length === 2);
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduce.call(child, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-1.js
index 1bb20958c..0aed35d78 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-1.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-1.js

- * @description Array.prototype.reduce - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 0, 1: 1, length: undefined };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 0, 1: 1, length: undefined };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-10.js
index 122722cec..7e2a52c2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-10.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-10.js

- * @description Array.prototype.reduce - value of 'length' is number primitive (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is number primitive
+    (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-11.js
index 89297cf3c..6267017f0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-11.js

- * @description Array.prototype.reduce - 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing a
+    positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-12.js
index 2a0b3e217..c85599d81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-12.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-12.js

- * @description Array.prototype.reduce - 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "-4294967294" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing a
+    negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "-4294967294" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-13.js
index 0a1741cfd..dd03b2e18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-13.js

- * @description Array.prototype.reduce - 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2.5" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing a decimal
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2.5" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-14.js
index 01f086dfb..19d063eba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-14.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-14.js

- * @description Array.prototype.reduce - 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed1 = false;

-        var accessed2 = false;

-        var accessed3 = false;

-

-        function callbackfn1(prevVal, curVal, idx, obj) {

-            accessed1 = true;

-            return 2;

-        }

-

-        function callbackfn2(prevVal, curVal, idx, obj) {

-            accessed2 = true;

-            return 2;

-        }

-

-        function callbackfn3(prevVal, curVal, idx, obj) {

-            accessed3 = true;

-            return 2;

-        }

-

-        var obj1 = { 0: 9, length: "Infinity" };

-        var obj2 = { 0: 9, length: "-Infinity" };

-        var obj3 = { 0: 9, length: "+Infinity" };

-

-        return Array.prototype.reduce.call(obj1, callbackfn1, 1) === 1 &&

-            Array.prototype.reduce.call(obj2, callbackfn2, 1) === 1 &&

-            Array.prototype.reduce.call(obj3, callbackfn3, 1) === 1 &&

-            !accessed1 && !accessed2 && !accessed3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing
+    +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed1 = false;
+        var accessed2 = false;
+        var accessed3 = false;
+
+        function callbackfn1(prevVal, curVal, idx, obj) {
+            accessed1 = true;
+            return 2;
+        }
+
+        function callbackfn2(prevVal, curVal, idx, obj) {
+            accessed2 = true;
+            return 2;
+        }
+
+        function callbackfn3(prevVal, curVal, idx, obj) {
+            accessed3 = true;
+            return 2;
+        }
+
+        var obj1 = { 0: 9, length: "Infinity" };
+        var obj2 = { 0: 9, length: "-Infinity" };
+        var obj3 = { 0: 9, length: "+Infinity" };
+
+        return Array.prototype.reduce.call(obj1, callbackfn1, 1) === 1 &&
+            Array.prototype.reduce.call(obj2, callbackfn2, 1) === 1 &&
+            Array.prototype.reduce.call(obj3, callbackfn3, 1) === 1 &&
+            !accessed1 && !accessed2 && !accessed3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-15.js
index b2086ee21..9726c1f1c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-15.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-15.js

- * @description Array.prototype.reduce - 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "2E0" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing an
+    exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "2E0" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-16.js
index 187d7b635..63d459bd9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-16.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-16.js

- * @description Array.prototype.reduce - 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0x0002" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing a hex
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0x0002" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-17.js
index b2cd47586..bc9f5e776 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-17.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-17.js

- * @description Array.prototype.reduce - 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: "0002.00" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is a string containing a number
+    with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: "0002.00" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-18.js
index 11d782740..cbc3154f3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-18.js

- * @description Array.prototype.reduce - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 9, length: "asdf!_" };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a string that can't
+    convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 9, length: "asdf!_" };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-19.js
index f086ec0e6..65f014e4d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-19.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-19.js

- * @description Array.prototype.reduce - value of 'length' is an Object which has an own toString method

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                toString: function () {

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is an Object which has
+    an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                toString: function () {
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-2.js
index 85b69685c..f904781e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-2.js

- * @description Array.prototype.reduce - value of 'length' is a boolean (value is true)

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 0);

-        }

-

-        var obj = { 0: 11, 1: 9, length: true };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a boolean (value is
+    true)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 0);
+        }
+
+        var obj = { 0: 11, 1: 9, length: true };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-20.js
index 362d133f9..837e7e60d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-20.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-20.js

- * @description Array.prototype.reduce - value of 'length' is an object which has an own valueOf method

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    return 2;

-                }

-            }

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is an object which has
+    an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    return 2;
+                }
+            }
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-21.js
index 0f1fde7b7..ece437f36 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-21.js
@@ -1,38 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-21.js

- * @description Array.prototype.reduce - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var valueOfOccured = false;

-        var toStringOccured = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    valueOfOccured = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringOccured = true;

-                    return '2';

-                }

-            }

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true && valueOfOccured && toStringOccured;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'length' is an object that has an own
+    valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var valueOfOccured = false;
+        var toStringOccured = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    valueOfOccured = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringOccured = true;
+                    return '2';
+                }
+            }
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true && valueOfOccured && toStringOccured;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-22.js
index 8794e981a..75ed4dcf2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-22.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-22.js

- * @description Array.prototype.reduce throws TypeError exception - 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return true;

-        }

-

-        var obj = {

-            1: 11,

-            2: 12,

-

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn, 1);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && !accessed && toStringAccessed && valueOfAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError exception - 'length' is an
+    object with toString and valueOf methods that don�t return
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return true;
+        }
+
+        var obj = {
+            1: 11,
+            2: 12,
+
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn, 1);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && !accessed && toStringAccessed && valueOfAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-23.js
index 9e3e05d67..d9266beb2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-23.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-23.js

- * @description Array.prototype.reduce uses inherited valueOf method - 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: child

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce uses inherited valueOf method - 'length' is
+    an object with an own toString and inherited valueOf methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: child
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-24.js
index 4756c93ba..ef83e297f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-24.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-24.js

- * @description Array.prototype.reduce - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: 2.685

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: 2.685
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-25.js
index 2a7cb1264..21795ecbd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-25.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-25.js

- * @description Array.prototype.reduce - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = {

-            1: 11,

-            2: 9,

-            length: -4294967294.5

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = {
+            1: 11,
+            2: 9,
+            length: -4294967294.5
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-28.js
index 97082927f..80919e07f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-28.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-28.js

- * @description Array.prototype.reduce - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - value of 'length' is boundary value (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-29.js
index 774d29ae1..d69f6ba4d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-29.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-29.js

- * @description Array.prototype.reduce - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 0);

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is boundary value (2^32
+    + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 0);
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-3.js
index 785ad88c4..b15ddfa67 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-3.js
@@ -1,25 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-3.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 1, 1: 1, length: 0 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - value of 'length' is a number (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 1, 1: 1, length: 0 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-4.js
index 6a58f9455..bb115800a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-4.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 11, length: +0 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 11, length: +0 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-5.js
index 8bacc6257..160a70eb0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-5.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 11, length: -0 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 11, length: -0 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-6.js
index 921c787b0..7eecca6d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-6.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-6.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: 2 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: 2 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-7.js
index ac61e1b6d..969451f19 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-7.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal === 11 && idx === 1);

-        }

-

-        var obj = { 1: 11, 2: 9, length: -4294967294 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal === 11 && idx === 1);
+        }
+
+        var obj = { 1: 11, 2: 9, length: -4294967294 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-8.js
index ea8dab5c2..d986ae3e3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-8.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-8.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return 2;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return 2;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-9.js
index 09419edff..690c9fbb1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-9.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-3-9.js

- * @description Array.prototype.reduce - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'length' is a number (value is
+    -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-1.js
index 203c5f4fb..51c9d1971 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-1.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce throws TypeError if callbackfn is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-10.js
index e87a5d221..b938c690b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-10.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-11.js
index 7f7bb626c..45d0eb93c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-11.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-12.js
index cca11c199..db4c7270c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-12.js

- * @description Array.prototype.reduce - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return curVal > 10;

-        }

-

-        return [11, 9].reduce(callbackfn, 1) === false && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return curVal > 10;
+        }
+
+        return [11, 9].reduce(callbackfn, 1) === false && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-15.js
index fd2b44373..ec83c5767 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-15.js

- * @description Array.prototype.reduce - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - calling with no callbackfn is the same as
+    passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-2.js
index d804f29b7..bfec9cda5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-2.js

- * @description Array.prototype.reduce throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-3.js
index 8e41ec67b..1e8f21738 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-3.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-4.js
index 4bdd99973..ffc6775a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-4.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-4.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce throws TypeError if callbackfn is boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-5.js
index 89232db4f..9e8b3ff77 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-5.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce throws TypeError if callbackfn is number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-6.js
index 6f7a5fbb0..ef63f528d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-6.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-6.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce throws TypeError if callbackfn is string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-7.js
index 4925be776..90d5dfd34 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-7.js

- * @description Array.prototype.reduce throws TypeError if callbackfn is Object without [[Call]] internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if callbackfn is Object
+    without [[Call]] internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-8.js
index a42eac725..7ee42eec7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-8.js

- * @description Array.prototype.reduce - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-9.js
index c7dc059f0..87a948e43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-4-9.js

- * @description Array.prototype.reduce - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-1.js
index cbc6d9894..b595bfffb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-1.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (empty array), no initVal

- */

-

-

-function testcase() {

-  function cb(){}

-  

-  try {

-    [].reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0 (empty
+    array), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  
+  try {
+    [].reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-10.js
index 710006b98..8cf55651e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-10.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-10.js

- * @description Array.prototype.reduce - if exception occurs, it occurs after any side-effects that might be produced by step 2

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal > 10);

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - if exception occurs, it occurs after any
+    side-effects that might be produced by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal > 10);
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-11.js
index fbbd84d65..8c18cc0eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-11.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-11.js

- * @description Array.prototype.reduce - if the exception occurs, it occurs after any side-effects that might be produced by step 3

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal > 10);

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "0";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - if the exception occurs, it occurs after
+    any side-effects that might be produced by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal > 10);
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "0";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-12.js
index 7aafcd35d..ada735548 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-12.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-12.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal > 10);

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal > 10);
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-13.js
index fd2c46224..a8e9fc9c9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-13.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-13.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return (curVal > 10);

-        }

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return (curVal > 10);
+        }
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-2.js
index ac8b265f6..0f10bc3e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-2.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-2.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden to null (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to null (type conversion)),
+    no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-3.js
index e5f25b103..8e21fd3b6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-3.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-3.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden to false (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to false (type conversion)),
+    no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-4.js
index f0fe536c7..96e33e4e9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-4.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-4.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to 0 (type conversion)), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-5.js
index 8cdf1ddd4..21fd116ab 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-5.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-5.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to '0' (type conversion)), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-6.js
index dc9de2289..a490bac28 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-6.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-6.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden with obj with valueOf), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-7.js
index c127bc38c..de40b9021 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-7.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-7.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with obj w/o valueOf
+    (toString)), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-8.js
index 9f8f57683..f0544092c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-8.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-8.js

- * @description Array.prototype.reduce throws TypeError if 'length' is 0 (subclassed Array, length overridden with []), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    f.reduce(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with []), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    f.reduce(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-9.js
index b6cbece42..6e08ad029 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-9.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-5-9.js

- * @description Array.prototype.reduce - 'initialValue' is returned if 'len' is 0 and 'initialValue' is present

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        return [].reduce(callbackfn, 3) === 3 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'initialValue' is returned if 'len' is 0
+    and 'initialValue' is present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        return [].reduce(callbackfn, 3) === 3 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-1.js
index 20b713137..f5fe154a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-1.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (empty array)

- */

-

-

-function testcase() {

-  function cb(){}

-  

-  try {

-    if([].reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  
+  try {
+    if([].reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-10.js
index 5b26688ab..8d3a2b0b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-10.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-10.js

- * @description Array.prototype.reduce - 'initialValue' is present

- */

-

-

-function testcase() {

-

-        var str = "initialValue is present";

-        return str === [].reduce(function () { }, str);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - 'initialValue' is present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = "initialValue is present";
+        return str === [].reduce(function () { }, str);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-11.js
index 9546e7e26..d61060309 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-11.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-11.js

- * @description Array.prototype.reduce - 'initialValue' is not present

- */

-

-

-function testcase() {

-

-        var str = "initialValue is not present";

-        return str === [str].reduce(function () { });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - 'initialValue' is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = "initialValue is not present";
+        return str === [str].reduce(function () { });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-2.js
index a60a31b3e..7d1de234b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-2.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-2.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden to
+    null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-3.js
index 1e053ffdd..aed3286cf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-3.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-3.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden to
+    false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-4.js
index 7faee731e..f87ee8ebd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-4.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-4.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden to 0
+    (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-5.js
index 38b8244d2..6eb485c31 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-5.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-5.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden to
+    '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-6.js
index 752a82e11..5c9ef6023 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-6.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-6.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden with
+    obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-7.js
index 1c04ec216..cfb99d59e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-7.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-7.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden with
+    obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-8.js
index 04af24be1..5394f0ca2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-8.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-8.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with [])

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden with
+    [])
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-9.js
index 6b28dc31e..de83c54d9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-9.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-7-9.js

- * @description Array.prototype.reduce returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with [0])

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [0];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    if(f.reduce(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialValue if 'length' is 0 and
+    initialValue is present (subclassed Array, length overridden with
+    [0])
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [0];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    if(f.reduce(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-1.js
index 877c62291..df0c645a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-1.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-1.js

- * @description Array.prototype.reduce - no observable effects occur if 'len' is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var obj = { length: 0 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                accessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - no observable effects occur if 'len' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var obj = { length: 0 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                accessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-2.js
index 3c04d5281..eb862a1c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-2.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-2.js

- * @description Array.prototype.reduce - modifications to length don't change number of iterations in step 9

- */

-

-

-function testcase() {

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            return idx;

-        }

-

-        var obj = { 3: 12, 4: 9, length: 4 };

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                obj.length = 10;

-                return 11;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.reduce.call(obj, callbackfn) === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - modifications to length don't change
+    number of iterations in step 9
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            return idx;
+        }
+
+        var obj = { 3: 12, 4: 9, length: 4 };
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                obj.length = 10;
+                return 11;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.reduce.call(obj, callbackfn) === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-3.js
index 95671a585..52dfc0199 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-3.js
@@ -1,47 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-3.js

- * @description Array.prototype.reduce - loop is broken once 'kPresent' is true

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var testResult = false;

-        var firstCalled = 0;

-        var secondCalled = 0;

-

-        function callbackfn(prevVal, val, idx, obj) {

-            if (called === 0) {

-                testResult = (idx === 1);

-            }

-            called++;

-        }

-

-        var arr = [, , ];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                firstCalled++;

-                return 11;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                secondCalled++;

-                return 9;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult && firstCalled === 1 && secondCalled === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - loop is broken once 'kPresent' is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var testResult = false;
+        var firstCalled = 0;
+        var secondCalled = 0;
+
+        function callbackfn(prevVal, val, idx, obj) {
+            if (called === 0) {
+                testResult = (idx === 1);
+            }
+            called++;
+        }
+
+        var arr = [, , ];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                firstCalled++;
+                return 11;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                secondCalled++;
+                return 9;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult && firstCalled === 1 && secondCalled === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-1.js
index a5890cbbf..a00959661 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-1.js

- * @description Array.prototype.reduce - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var obj = { };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[1] = "accumulator";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.reduce.call(obj, function () { }) === "accumulator";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - added properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[1] = "accumulator";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.reduce.call(obj, function () { }) === "accumulator";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-2.js
index a65b9b40c..d6e0edf03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-ii-2.js

- * @description Array.prototype.reduce - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var obj = { 1: "accumulator", 2: "another" };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[1];

-                return 3;

-            },

-            configurable: true

-        });

-

-        return "accumulator" !== Array.prototype.reduce.call(obj, function () { });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 1: "accumulator", 2: "another" };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[1];
+                return 3;
+            },
+            configurable: true
+        });
+
+        return "accumulator" !== Array.prototype.reduce.call(obj, function () { });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-1.js
index 9ec1ff66f..de9377f73 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-1.js

- * @description Array.prototype.reduce - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-10.js
index 416ece163..659a43891 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-10.js

- * @description Array.prototype.reduce - when element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var arr = [, 1, 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - when element to be retrieved is own
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var arr = [, 1, 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-11.js
index 5df02d1d6..ecc7bf552 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-11.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-11.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return "9";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return "9";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-12.js
index 641dfbfba..b96b47228 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-12.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-12.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            var arr = [, 1, 2];

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return "9";

-                },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            var arr = [, 1, 2];
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return "9";
+                },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-13.js
index 882081871..f467d2154 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-13.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-13.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        var proto = { 1: 1, 2: 2};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "0", {

-            get: function () {

-                return "9";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        var proto = { 1: 1, 2: 2};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "0", {
+            get: function () {
+                return "9";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-14.js
index 146ea6d15..f83a166da 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-14.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-14.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 0;

-                },

-                configurable: true

-            });

-

-            var arr = [, 1, 2];

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    return "9";

-                },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 0;
+                },
+                configurable: true
+            });
+
+            var arr = [, 1, 2];
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    return "9";
+                },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-15.js
index 50e203ee7..5c2f25cf0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-15.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var proto = { 1: 1, 2: 2 };

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var proto = { 1: 1, 2: 2 };
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-16.js
index 0364f42f8..1b1bc1d47 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-16.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-16.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return 0;

-                },

-                configurable: true

-            });

-

-            var arr = [, 1, 2];

-

-            arr.reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return 0;
+                },
+                configurable: true
+            });
+
+            var arr = [, 1, 2];
+
+            arr.reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-17.js
index f8e267513..b3d3496dd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-17.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-17.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        var obj = { 1: 1, 2: 2, length: 3 };

-

-        Object.defineProperty(obj, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        var obj = { 1: 1, 2: 2, length: 3 };
+
+        Object.defineProperty(obj, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-18.js
index 1dea9e3e5..19310b604 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-18.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-18.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        var arr = [, 1, 2];

-

-        Object.defineProperty(arr, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        var arr = [, 1, 2];
+
+        Object.defineProperty(arr, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-19.js
index e14193e0b..5551b68b8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-19.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-19.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        try {

-            Object.prototype[0] = 0;

-

-            var obj = { 1: 1, 2: 2, length: 3 };

-

-            Object.defineProperty(obj, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            Array.prototype.reduce.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        try {
+            Object.prototype[0] = 0;
+
+            var obj = { 1: 1, 2: 2, length: 3 };
+
+            Object.defineProperty(obj, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            Array.prototype.reduce.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-2.js
index 6156849bc..357af359f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-2.js

- * @description Array.prototype.reduce - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var arr = [0, 1, 2];

-        arr.reduce(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var arr = [0, 1, 2];
+        arr.reduce(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-20.js
index fd0de8ec2..655e07b0c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-20.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-20.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            var arr = [, 1, 2];

-            Object.defineProperty(arr, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            var arr = [, 1, 2];
+            Object.defineProperty(arr, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-21.js
index 7f2b49976..fa0542d1e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-21.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-21.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        var proto = { 1: 1, 2: 2 };

-

-        Object.defineProperty(proto, "0", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        var proto = { 1: 1, 2: 2 };
+
+        Object.defineProperty(proto, "0", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-22.js
index 1806ba920..d1a88db12 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-22.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-22.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-    

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === undefined);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                set: function () { },

-                configurable: true

-            });

-

-            var arr = [, 1, 2];

-

-            arr.reduce(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[0];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === undefined);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                set: function () { },
+                configurable: true
+            });
+
+            var arr = [, 1, 2];
+
+            arr.reduce(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[0];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-23.js
index 514b123a1..ad469cfcb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-23.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-23.js

- * @description Array.prototype.reduce - This object is the global object which contains index property

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 0;

-            fnGlobalObject()[1] = 1;

-            fnGlobalObject()[2] = 2;

-            fnGlobalObject().length = 3;

-

-            Array.prototype.reduce.call(fnGlobalObject(), callbackfn);

-            return testResult;

-

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 0;
+            fnGlobalObject()[1] = 1;
+            fnGlobalObject()[2] = 2;
+            fnGlobalObject().length = 3;
+
+            Array.prototype.reduce.call(fnGlobalObject(), callbackfn);
+            return testResult;
+
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-25.js
index d9377dfdf..fad0bbb7f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-25.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-25.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduce.call(arguments, callbackfn);

-        };

-

-        func(0, 1);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduce.call(arguments, callbackfn);
+        };
+
+        func(0, 1);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-26.js
index 64b7a17fd..9a32c1948 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-26.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-26.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (prevVal === 1);

-            }

-        }

-

-        var func = function (a, b, c) {

-            delete arguments[0];

-            Array.prototype.reduce.call(arguments, callbackfn);

-        };

-

-        func(0, 1, 2);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (prevVal === 1);
+            }
+        }
+
+        var func = function (a, b, c) {
+            delete arguments[0];
+            Array.prototype.reduce.call(arguments, callbackfn);
+        };
+
+        func(0, 1, 2);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-27.js
index 66b52595d..c88d8a7da 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-27.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-27.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 3) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var func = function (a, b, c) {

-            delete arguments[0];

-            delete arguments[1];

-            Array.prototype.reduce.call(arguments, callbackfn);

-        };

-

-        func(0, 1, 2, 3);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 3) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var func = function (a, b, c) {
+            delete arguments[0];
+            delete arguments[1];
+            Array.prototype.reduce.call(arguments, callbackfn);
+        };
+
+        func(0, 1, 2, 3);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-28.js
index 10fce9edd..7747624d4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-28.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-28.js

- * @description Array.prototype.reduce - applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "0");

-            }

-        }

-

-        var str = new String("012");

-        Array.prototype.reduce.call(str, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - applied to String object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "0");
+            }
+        }
+
+        var str = new String("012");
+        Array.prototype.reduce.call(str, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-29.js
index cdf16a58c..c1d42c145 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-29.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-29.js

- * @description Array.prototype.reduce - applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var obj = function (a, b, c) {

-            return a + b + c;

-        };

-        obj[0] = 0;

-        obj[1] = 1;

-        obj[2] = 2;

-        obj[3] = 3;

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - applied to Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var obj = function (a, b, c) {
+            return a + b + c;
+        };
+        obj[0] = 0;
+        obj[1] = 1;
+        obj[2] = 2;
+        obj[3] = 3;
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-3.js
index 6db69ae35..fca74b1e9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-3.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-3.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = "9";

-        child[1] = "1";

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = "9";
+        child[1] = "1";
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-30.js
index f956ed449..d5d8ef302 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-30.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-30.js

- * @description Array.prototype.reduce - element changed by getter on current iterations is observed in subsequent iterations on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [, , 2];

-        var preIterVisible = false;

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return 100;

-                }

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element changed by getter on current
+    iterations is observed in subsequent iterations on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [, , 2];
+        var preIterVisible = false;
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return 100;
+                }
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-31.js
index 320be619a..838d55ff5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-31.js
@@ -1,47 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-31.js

- * @description Array.prototype.reduce - element changed by getter on current iterations is observed in subsequent iterations on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { length: 2 };

-        var preIterVisible = false;

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return 100;

-                }

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element changed by getter on current
+    iterations is observed in subsequent iterations on an Array-like
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { length: 2 };
+        var preIterVisible = false;
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return 100;
+                }
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-32.js
index 9e434570c..7d97ac477 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-32.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-32.js

- * @description Array.prototype.reduce - exception in getter terminates iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx >= 1) {

-                accessed = true;

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var obj = { 2: 2, 1: 1, length: 3 };

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed && !testResult;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - exception in getter terminates iteration
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx >= 1) {
+                accessed = true;
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var obj = { 2: 2, 1: 1, length: 3 };
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed && !testResult;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-33.js
index aa942b2df..a8782d094 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-33.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-33.js

- * @description Array.prototype.reduce - exception in getter terminates iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx >= 1) {

-                accessed = true;

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var arr = [, 1, 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduce(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed && !testResult;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - exception in getter terminates iteration
+    on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx >= 1) {
+                accessed = true;
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var arr = [, 1, 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduce(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed && !testResult;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-4.js
index 3a948612a..11fb50e4b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-4.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        try {

-            Array.prototype[0] = "9";

-            [0, 1, 2].reduce(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        try {
+            Array.prototype[0] = "9";
+            [0, 1, 2].reduce(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-5.js
index 9b718ecd0..35d61f4d9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-5.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-5.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "9");

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: "9",

-            configurable: true

-        });

-        child[1] = "1";

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "9");
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: "9",
+            configurable: true
+        });
+        child[1] = "1";
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-6.js
index 0c9792fa8..149aa49e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-6.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-6.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                get: function () {

-                    return "5";

-                },

-                configurable: true

-            });

-

-            [0, 1, 2].reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                get: function () {
+                    return "5";
+                },
+                configurable: true
+            });
+
+            [0, 1, 2].reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-7.js
index 25d3cbabf..06a91b1bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-7.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-7.js

- * @description Array.prototype.reduce - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-8.js
index 3744c3ee1..2567c5ef4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-8.js

- * @description Array.prototype.reduce - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            Array.prototype[1] = 1;

-            Array.prototype[2] = 2;

-            [, , ,].reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            Array.prototype[1] = 1;
+            Array.prototype[2] = 2;
+            [, , ,].reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-9.js
index d6965b3de..1f8dda1ff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-9.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-b-iii-1-9.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 0);

-            }

-        }

-

-        var obj = { 1: 1, 2: 2, length: 3 };

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 0);
+            }
+        }
+
+        var obj = { 1: 1, 2: 2, length: 3 };
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-1.js
index 16fb81fd8..8d11cf811 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-1.js

- * @description Array.prototype.reduce throws TypeError when Array is empty and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-  try {

-    arr.reduce(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError when Array is empty and
+    initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+  try {
+    arr.reduce(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-2.js
index eceae5f01..b0f4b7436 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-2.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-2.js

- * @description Array.prototype.reduce throws TypeError when elements assigned values are deleted by reducing array length and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-  arr[9] = 1;

-  arr.length = 5;

-  try {

-    arr.reduce(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError when elements assigned
+    values are deleted by reducing array length and initialValue is
+    not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+  arr[9] = 1;
+  arr.length = 5;
+  try {
+    arr.reduce(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-3.js
index a730386d2..c3fc371e3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-3.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-3.js

- * @description Array.prototype.reduce throws TypeError when elements assigned values are deleted and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = [1,2,3,4,5];

-  delete arr[0];

-  delete arr[1];

-  delete arr[2];

-  delete arr[3];

-  delete arr[4];

-  try {

-    arr.reduce(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce throws TypeError when elements assigned
+    values are deleted and initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = [1,2,3,4,5];
+  delete arr[0];
+  delete arr[1];
+  delete arr[2];
+  delete arr[3];
+  delete arr[4];
+  try {
+    arr.reduce(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-4.js
index d98d867be..5615143ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-4.js

- * @description Array.prototype.reduce doesn't throw error when array has no own properties but prototype contains a single property

- */

-

-

-function testcase() {

-

-        var arr = [, , , ];

-

-        try {

-            Array.prototype[1] = "prototype";

-            arr.reduce(function () { });

-            return true;

-        } catch (ex) {

-            return false;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce doesn't throw error when array has no own
+    properties but prototype contains a single property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [, , , ];
+
+        try {
+            Array.prototype[1] = "prototype";
+            arr.reduce(function () { });
+            return true;
+        } catch (ex) {
+            return false;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-5.js
index e3076ccd0..4ac9e5043 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-5.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-5.js

- * @description Array.prototype.reduce - if exception occurs, it occurs after any side-effects that might be produced by step 2

- */

-

-

-function testcase() {

-

-        var obj = { };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - if exception occurs, it occurs after any
+    side-effects that might be produced by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-6.js
index ff3767b3d..3d692c8ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-6.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-6.js

- * @description Array.prototype.reduce - if exception occurs, it occurs after any side-effects that might be produced by step 3

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - if exception occurs, it occurs after any
+    side-effects that might be produced by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-7.js
index 466698eca..23841da29 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-7.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-7.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-8.js
index 7e89c2883..d5c506079 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-8-c-8.js

- * @description Array.prototype.reduce - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the exception is not thrown if exception
+    was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-1.js
index 41c4b8c3f..57e5c5cb0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-1.js

- * @description Array.prototype.reduce doesn't consider new elements added to array after it is called

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            arr[5] = 6;

-            arr[2] = 3;

-            return prevVal + curVal;

-        }

-

-        var arr = [1, 2, , 4, '5'];

-        return arr.reduce(callbackfn) === "105";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce doesn't consider new elements added to
+    array after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            arr[5] = 6;
+            arr[2] = 3;
+            return prevVal + curVal;
+        }
+
+        var arr = [1, 2, , 4, '5'];
+        return arr.reduce(callbackfn) === "105";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-10.js
index ecad8565d..1b85bfca5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-10.js

- * @description Array.prototype.reduce called with an initial value doesn't consider new elements added to array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj) {

-    arr[5] = 6;

-    arr[2] = 3;   

-    return prevVal + curVal;

-  }

-

-  var arr = [1,2,,4,'5'];

-  return arr.reduce(callbackfn, "") === "12345";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce called with an initial value doesn't
+    consider new elements added to array after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj) {
+    arr[5] = 6;
+    arr[2] = 3;   
+    return prevVal + curVal;
+  }
+
+  var arr = [1,2,,4,'5'];
+  return arr.reduce(callbackfn, "") === "12345";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-2.js
index 4050e57e1..45e13feba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-2.js

- * @description Array.prototype.reduce considers new value of elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    arr[3] = -2;

-    arr[4] = -1;

-    return prevVal + curVal;

-  }

-

-  var arr = [1,2,3,4,5];

-  if(arr.reduce(callbackfn) === 3)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce considers new value of elements in array
+    after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    arr[3] = -2;
+    arr[4] = -1;
+    return prevVal + curVal;
+  }
+
+  var arr = [1,2,3,4,5];
+  if(arr.reduce(callbackfn) === 3)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-3.js
index 4994dd29e..a8b175535 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-3.js

- * @description Array.prototype.reduce doesn't visit deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)  

-  {

-    delete arr[3];

-    delete arr[4];

-    return prevVal + curVal;    

-  }

-

-  var arr = ['1',2,3,4,5];

-  if(arr.reduce(callbackfn) === "123"  )    // two elements deleted

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce doesn't visit deleted elements in array
+    after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)  
+  {
+    delete arr[3];
+    delete arr[4];
+    return prevVal + curVal;    
+  }
+
+  var arr = ['1',2,3,4,5];
+  if(arr.reduce(callbackfn) === "123"  )    // two elements deleted
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-4.js
index 8a7724edd..75b28e738 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-4.js

- * @description Array.prototype.reduce doesn't visit deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    arr.length = 2;

-    return prevVal + curVal;

-  }

-

-  var arr = [1,2,3,4,5];

-  if(arr.reduce(callbackfn) === 3 )

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce doesn't visit deleted elements when
+    Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    arr.length = 2;
+    return prevVal + curVal;
+  }
+
+  var arr = [1,2,3,4,5];
+  if(arr.reduce(callbackfn) === 3 )
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-5.js
index 2c65d1513..6a9b10ca4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-5.js

- * @description Array.prototype.reduce - callbackfn not called for array with one element

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    callCnt++;

-    return 2;

-  }

-

-  var arr = [1];

-  if(arr.reduce(callbackfn) === 1 && callCnt === 0 )

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn not called for array with one
+    element
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    callCnt++;
+    return 2;
+  }
+
+  var arr = [1];
+  if(arr.reduce(callbackfn) === 1 && callCnt === 0 )
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-6.js
index 344e704a6..46b53834c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-6.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-6.js

- * @description Array.prototype.reduce visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)  

-  {

-    delete arr[3];

-    delete arr[4];

-    return prevVal + curVal;    

-  }

-

-  Array.prototype[4] = 5;

-  var arr = ['1',2,3,4,5];

-  var res = arr.reduce(callbackfn);

-  delete Array.prototype[4];

-

-  if(res === "1235"  )    //one element acually deleted

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce visits deleted element in array after the
+    call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)  
+  {
+    delete arr[3];
+    delete arr[4];
+    return prevVal + curVal;    
+  }
+
+  Array.prototype[4] = 5;
+  var arr = ['1',2,3,4,5];
+  var res = arr.reduce(callbackfn);
+  delete Array.prototype[4];
+
+  if(res === "1235"  )    //one element acually deleted
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-7.js
index 95b163da8..fe5c2dfc9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-7.js

- * @description Array.prototype.reduce stops calling callbackfn once the array is deleted during the call

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            delete o.arr;

-            return prevVal + curVal;

-        }

-

-        var o = new Object();

-        o.arr = ['1', 2, 3, 4, 5];

-        return o.arr.reduce(callbackfn) === "12345" && !o.hasOwnProperty("arr");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce stops calling callbackfn once the array is
+    deleted during the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            delete o.arr;
+            return prevVal + curVal;
+        }
+
+        var o = new Object();
+        o.arr = ['1', 2, 3, 4, 5];
+        return o.arr.reduce(callbackfn) === "12345" && !o.hasOwnProperty("arr");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-8.js
index 932bf009d..2678a6c08 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-8.js
@@ -1,33 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-8.js

- * @description Array.prototype.reduce - no observable effects occur if 'len' is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var callbackAccessed = false;

-        function callbackfn() {

-            callbackAccessed = true;

-        }

-

-        var obj = { length: 0 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                accessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, function () { }, "initialValue");

-        return !accessed && !callbackAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - no observable effects occur if 'len' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var callbackAccessed = false;
+        function callbackfn() {
+            callbackAccessed = true;
+        }
+
+        var obj = { length: 0 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                accessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, function () { }, "initialValue");
+        return !accessed && !callbackAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-9.js
index 7e17803f7..a129d5f5d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-9.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-9.js

- * @description Array.prototype.reduce - modifications to length don't change number of iterations in step 9

- */

-

-

-function testcase() {

-        var called = 0;

-        function callbackfn(accum, val, idx, obj) {

-            called++;

-            return accum + val;

-        }

-

-        var arr = [0, 1, 2, 3];

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 2;

-                return 0;

-            },

-            configurable: true

-        });

-

-        var newAccum = arr.reduce(callbackfn, "initialValue");

-

-        return newAccum === "initialValue01" && called === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - modifications to length don't change
+    number of iterations in step 9
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        function callbackfn(accum, val, idx, obj) {
+            called++;
+            return accum + val;
+        }
+
+        var arr = [0, 1, 2, 3];
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 2;
+                return 0;
+            },
+            configurable: true
+        });
+
+        var newAccum = arr.reduce(callbackfn, "initialValue");
+
+        return newAccum === "initialValue01" && called === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-1.js
index 09cd941c3..868208bc8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-1.js

- * @description Array.prototype.reduce returns initialvalue when Array is empty and initialValue is present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-

-  if(arr.reduce(callbackfn,5) === 5)

-      return true;  

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce returns initialvalue when Array is empty
+    and initialValue is present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+
+  if(arr.reduce(callbackfn,5) === 5)
+      return true;  
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-10.js
index c517da5a1..606a46ad9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-10.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-10.js

- * @description Array.prototype.reduce - deleting property of prototype in step 8 causes deleted index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete Object.prototype[3];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[3] = 1;

-            Array.prototype.reduce.call(obj, callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Object.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting property of prototype in step 8
+    causes deleted index property not to be visited on an Array-like
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete Object.prototype[3];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[3] = 1;
+            Array.prototype.reduce.call(obj, callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Object.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-11.js
index 2affed382..bb46b4e65 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-11.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-11.js

- * @description Array.prototype.reduce - deleting property of prototype in step 8 causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [, , , 3];

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduce(callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting property of prototype in step 8
+    causes deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [, , , 3];
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduce(callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-12.js
index 3c46e35e5..c9c6f831a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-12.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-12.js

- * @description Array.prototype.reduce - deleting own property with prototype property in step 8 causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.reduce.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property with prototype
+    property in step 8 causes prototype index property to be visited
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.reduce.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-13.js
index f407c947c..83019c52c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-13.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-13.js

- * @description Array.prototype.reduce - deleting own property with prototype property in step 8 causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-        var arr = [0, 111];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property with prototype
+    property in step 8 causes prototype index property to be visited
+    on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+        var arr = [0, 111];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-14.js
index 0060cb74e..9ea74d358 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-14.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-14.js

- * @description Array.prototype.reduce - decreasing length of array in step 8 causes deleted index property not to be visited

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 2;

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array in step 8
+    causes deleted index property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 2;
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-15.js
index f7f93d93a..26d4c9c4d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-15.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-15.js

- * @description Array.prototype.reduce - decreasing length of array with prototype property in step 8 causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                testResult = true;

-            }

-        }

-        var arr = [0, 1, 2, 3];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array with prototype
+    property in step 8 causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                testResult = true;
+            }
+        }
+        var arr = [0, 1, 2, 3];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-16.js
index 0a77671ba..5d84c69a2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-16.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-16.js

- * @description Array.prototype.reduce - decreasing length of array in step 8 does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array in step 8 does
+    not delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-17.js
index 487d62430..3ba9a7015 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-17.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-17.js

- * @description Array.prototype.reduce - properties added into own object are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 3 && val === 3) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 5 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                Object.defineProperty(obj, "3", {

-                    get: function () {

-                        return 3;

-                    },

-                    configurable: true

-                });

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added into own object are
+    visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 3 && val === 3) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 5 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                Object.defineProperty(obj, "3", {
+                    get: function () {
+                        return 3;
+                    },
+                    configurable: true
+                });
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-18.js
index 6e1728748..2570275d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-18.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-18.js

- * @description Array.prototype.reduce - properties added into own object are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added into own object are
+    visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-19.js
index ad853f0ec..8d76bf37e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-19.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-19.js

- * @description Array.prototype.reduce - properties added to prototype are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 6 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added to prototype are visited
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 6 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-2.js
index 4349f523c..d9ece1e62 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-2.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-2.js

- * @description Array.prototype.reduce - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 2 && val === "2") {

-                testResult = true;

-            }

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "2";

-                return 3;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - added properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 2 && val === "2") {
+                testResult = true;
+            }
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "2";
+                return 3;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-20.js
index 248414906..bf0c129dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-20.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-20.js

- * @description Array.prototype.reduce - properties can be added to prototype are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduce(callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties can be added to prototype are
+    visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduce(callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-21.js
index c67a8a2c2..2617f24ec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-21.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-21.js

- * @description Array.prototype.reduce - deleting own property causes deleted index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 5: 10, length: 10 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property causes deleted
+    index property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 5: 10, length: 10 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-22.js
index 76e3ecea3..846ded144 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-22.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-22.js

- * @description Array.prototype.reduce - deleting own property causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [1, 2, 4];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, "initialValue");

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property causes deleted
+    index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [1, 2, 4];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, "initialValue");
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-23.js
index e38cb2728..bd52b1eac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-23.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-23.js

- * @description Array.prototype.reduce - deleting property of prototype causes deleted index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete Object.prototype[3];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[3] = 1;

-            Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-            return testResult && accessed;

-        } finally {

-            delete Object.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting property of prototype causes
+    deleted index property not to be visited on an Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete Object.prototype[3];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[3] = 1;
+            Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+            return testResult && accessed;
+        } finally {
+            delete Object.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-24.js
index f87581420..c2d878c57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-24.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-24.js

- * @description Array.prototype.reduce - deleting property of prototype causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, , , 3];

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduce(callbackfn, "initialValue");

-            return testResult && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting property of prototype causes
+    deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, , , 3];
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduce(callbackfn, "initialValue");
+            return testResult && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-25.js
index 5d7dcf853..d849c8015 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-25.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-25.js

- * @description Array.prototype.reduce - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-26.js
index a0a3bbe79..28c7b3dc4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-26.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-26.js

- * @description Array.prototype.reduce - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-        var arr = [0, 111];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduce(callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+        var arr = [0, 111];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduce(callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-27.js
index e3d63daf9..b70d398bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-27.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-27.js

- * @description Array.prototype.reduce - decreasing length of array causes deleted index property not to be visited

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 2;

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, "initialValue");

-

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array causes deleted
+    index property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 2;
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, "initialValue");
+
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-28.js
index e629bdd9e..e597a286a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-28.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-28.js

- * @description Array.prototype.reduce - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 2 && val === "prototype") {

-                testResult = true;

-            }

-        }

-        var arr = [0, 1, 2, 3];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "0", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn, "initialValue");

-

-            return testResult;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array with prototype
+    property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 2 && val === "prototype") {
+                testResult = true;
+            }
+        }
+        var arr = [0, 1, 2, 3];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "0", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn, "initialValue");
+
+            return testResult;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-29.js
index 4d9e6d5b8..241283c19 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-29.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-29.js

- * @description Array.prototype.reduce - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 2 && val === "unconfigurable") {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, "initialValue");

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 2 && val === "unconfigurable") {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, "initialValue");
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-3.js
index 23650e76b..3b8fbb521 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-3.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-3.js

- * @description Array.prototype.reduce - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: "2", 3: 10 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[2];

-                return 5;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, "initialValue");

-

-        return accessed && testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleted properties in step 2 are visible
+    here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: "2", 3: 10 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[2];
+                return 5;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, "initialValue");
+
+        return accessed && testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-4.js
index fbc9313e5..6072afcf3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-4.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-4.js

- * @description Array.prototype.reduce - properties added into own object in step 8 are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 3 && val === 3) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 5 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                Object.defineProperty(obj, "3", {

-                    get: function () {

-                        return 3;

-                    },

-                    configurable: true

-                });

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added into own object in step
+    8 are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 3 && val === 3) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 5 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                Object.defineProperty(obj, "3", {
+                    get: function () {
+                        return 3;
+                    },
+                    configurable: true
+                });
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-5.js
index 5a62b994c..0a665336f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-5.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-5.js

- * @description Array.prototype.reduce - properties added into own object in step 8 are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 1) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added into own object in step
+    8 are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 1) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-6.js
index 23d239945..cbd2f475d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-6.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-6.js

- * @description Array.prototype.reduce - properties added to prototype in step 8 are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 6 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added to prototype in step 8
+    are visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 6 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-7.js
index 160a1df45..d35642530 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-7.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-7.js

- * @description Array.prototype.reduce - properties added to prototype in step 8 are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(accum, val, idx, obj) {

-            if (idx === 1 && val === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduce(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - properties added to prototype in step 8
+    are visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(accum, val, idx, obj) {
+            if (idx === 1 && val === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduce(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-8.js
index 8dbe1476c..b252ce847 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-8.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-8.js

- * @description Array.prototype.reduce - deleting own property in step 8 causes deleted index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 5: 10, length: 10 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property in step 8 causes
+    deleted index property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 5: 10, length: 10 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-9.js
index 0da6959f6..4b7a73cfd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-b-9.js

- * @description Array.prototype.reduce - deleting own property in step 8 causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(accum, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [1, 2, 4];

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - deleting own property in step 8 causes
+    deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(accum, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [1, 2, 4];
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-1.js
index fa0505cc8..bd6cecd09 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-1.js

- * @description Array.prototype.reduce - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    callCnt++;

-    return curVal;

-  }

-

-  var arr = new Array(10);

-  arr[0] = arr[1] = undefined; //explicitly assigning a value

-  if( arr.reduce(callbackfn) === undefined && callCnt === 1)

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn not called for indexes never
+    been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    callCnt++;
+    return curVal;
+  }
+
+  var arr = new Array(10);
+  arr[0] = arr[1] = undefined; //explicitly assigning a value
+  if( arr.reduce(callbackfn) === undefined && callCnt === 1)
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-1.js
index 0b5eb7ebd..539c6feb6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-1.js

- * @description Array.prototype.reduce - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };

-        Array.prototype.reduce.call(obj, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };
+        Array.prototype.reduce.call(obj, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-10.js
index 0dc430757..c13d1d89e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-10.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-10.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-11.js
index fe889f090..8aee7da81 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-11.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-11.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "11");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return "11";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "11");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return "11";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-12.js
index aabe9c8c5..bba36dc55 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-12.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-12.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "11");

-            }

-        }

-

-        try {

-            Array.prototype[1] = 1;

-            var arr = [0, ,2];

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return "11";

-                },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "11");
+            }
+        }
+
+        try {
+            Array.prototype[1] = 1;
+            var arr = [0, ,2];
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return "11";
+                },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-13.js
index 2dcf3c1ec..2655390a9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-13.js
@@ -1,47 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-13.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "11");

-            }

-        }

-

-        var proto = { 0: 0, 2: 2};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return "11";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "11");
+            }
+        }
+
+        var proto = { 0: 0, 2: 2};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return "11";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-14.js
index e385d6b0a..8a7cfa9ed 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-14.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-14.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "11");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var arr = [0, ,2];

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return "11";

-                },

-                configurable: true

-            });

-            arr.reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "11");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var arr = [0, ,2];
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return "11";
+                },
+                configurable: true
+            });
+            arr.reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-15.js
index c22190f9b..7035cd44f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-15.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-15.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var proto = { 0: 0, 2: 2 };

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var proto = { 0: 0, 2: 2 };
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-16.js
index 493aef570..db12377b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-16.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-16.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var arr = [0, , 2, ];

-

-            arr.reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var arr = [0, , 2, ];
+
+            arr.reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-17.js
index b7915936c..2272344c2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-17.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-17.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-18.js
index a70483e63..30d1632ad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-18.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-18.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, initialValue);

-        return testResult;

-         

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, initialValue);
+        return testResult;
+         
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-19.js
index 951e9e0d1..6d5381dd1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-19.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-19.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 0, 2: 2, length: 3 };

-

-            Object.defineProperty(obj, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            Array.prototype.reduce.call(obj, callbackfn, initialValue);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 0, 2: 2, length: 3 };
+
+            Object.defineProperty(obj, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            Array.prototype.reduce.call(obj, callbackfn, initialValue);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-2.js
index 6b57c3837..4a7ab35f2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-2.js

- * @description Array.prototype.reduce - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [0, 1];

-        arr.reduce(callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [0, 1];
+        arr.reduce(callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-20.js
index 7aacab5eb..4fec0e60d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-20.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-20.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arr = [0, , 2];

-            Object.defineProperty(arr, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            arr.reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property without a get function that overrides an inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arr = [0, , 2];
+            Object.defineProperty(arr, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            arr.reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-21.js
index a84eb0709..0e667c866 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-21.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-21.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        var proto = { 0: 0, 2: 2 };

-

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        var proto = { 0: 0, 2: 2 };
+
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-22.js
index 64748a65b..709f8747e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-22.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-22.js

- * @description Array.prototype.reduce - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === undefined);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            var arr = [0, , 2];

-

-            arr.reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === undefined);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            var arr = [0, , 2];
+
+            arr.reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-23.js
index bc8fec5e8..85cc11688 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-23.js
@@ -1,37 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-23.js

- * @description Array.prototype.reduce - This object is the global object which contains index property

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 0;

-            fnGlobalObject()[1] = 1;

-            fnGlobalObject().length = 2;

-

-            Array.prototype.reduce.call(fnGlobalObject(), callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the global object which
+    contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 0;
+            fnGlobalObject()[1] = 1;
+            fnGlobalObject().length = 2;
+
+            Array.prototype.reduce.call(fnGlobalObject(), callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-25.js
index fd1fa64a2..e58472044 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-25.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-25.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduce.call(arguments, callbackfn, initialValue);

-        };

-

-        func(0, 1);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduce.call(arguments, callbackfn, initialValue);
+        };
+
+        func(0, 1);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-26.js
index d59299e90..51136724e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-26.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-26.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (curVal === 2);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduce.call(arguments, callbackfn, initialValue);

-        };

-

-        func(0, 1, 2);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments equals
+    number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (curVal === 2);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduce.call(arguments, callbackfn, initialValue);
+        };
+
+        func(0, 1, 2);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-27.js
index 56a709e3c..ca3762670 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-27.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-27.js

- * @description Array.prototype.reduce - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 3) {

-                testResult = (curVal === 3);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduce.call(arguments, callbackfn, initialValue);

-        };

-

-        func(0, 1, 2, 3);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - This object is the Arguments object which
+    implements its own property get method (number of arguments is
+    greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 3) {
+                testResult = (curVal === 3);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduce.call(arguments, callbackfn, initialValue);
+        };
+
+        func(0, 1, 2, 3);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-28.js
index 9aa33fd8b..3c99b58d6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-28.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-28.js

- * @description Array.prototype.reduce - applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        var str = new String("012");

-     

-        Array.prototype.reduce.call(str, callbackfn, initialValue);

-        return testResult;

-        

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - applied to String object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        var str = new String("012");
+     
+        Array.prototype.reduce.call(str, callbackfn, initialValue);
+        return testResult;
+        
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-29.js
index 04c54757c..6991be78f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-29.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-29.js

- * @description Array.prototype.reduce - applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = function (a, b, c) {

-            return a + b + c;

-        };

-        obj[0] = 0;

-        obj[1] = 1;

-        obj[2] = 2;

-        obj[3] = 3;

-

-        Array.prototype.reduce.call(obj, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - applied to Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = function (a, b, c) {
+            return a + b + c;
+        };
+        obj[0] = 0;
+        obj[1] = 1;
+        obj[2] = 2;
+        obj[3] = 3;
+
+        Array.prototype.reduce.call(obj, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-3.js
index 9b5be0a29..1a8be33a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-3.js
@@ -1,35 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-3.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "11");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 2 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = "11";

-        child[2] = "22";

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "11");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 2 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = "11";
+        child[2] = "22";
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-30.js
index 14ad56223..90a857d18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-30.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-30.js

- * @description Array.prototype.reduce - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [, , 2];

-        var preIterVisible = false;

-

-        Object.defineProperty(arr, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return 100;

-                }

-            },

-            configurable: true

-        });

-

-        arr.reduce(callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element changed by getter on previous
+    iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [, , 2];
+        var preIterVisible = false;
+
+        Object.defineProperty(arr, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return 100;
+                }
+            },
+            configurable: true
+        });
+
+        arr.reduce(callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-31.js
index b0a3ec660..49a57a3b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-31.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-31.js

- * @description Array.prototype.reduce - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { 2: 2, length: 3 };

-        var preIterVisible = false;

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return "11";

-                }

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, initialValue);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element changed by getter on previous
+    iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { 2: 2, length: 3 };
+        var preIterVisible = false;
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return "11";
+                }
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, initialValue);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-32.js
index 92bd0c55b..4dab9f692 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-32.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-32.js

- * @description Array.prototype.reduce - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx >= 1) {

-                accessed = true;

-                testResult = (curVal >= 1);

-            }

-        }

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn, initialValue);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed && !testResult;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - unnhandled exceptions happened in getter
+    terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx >= 1) {
+                accessed = true;
+                testResult = (curVal >= 1);
+            }
+        }
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn, initialValue);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed && !testResult;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-33.js
index 6d0479b4e..d5161ad61 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-33.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-33.js

- * @description Array.prototype.reduce - unnhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx >= 1) {

-                accessed = true;

-                testResult = (curVal >= 1);

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduce(callbackfn, initialValue);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed && !testResult;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - unnhandled exceptions happened in getter
+    terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx >= 1) {
+                accessed = true;
+                testResult = (curVal >= 1);
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduce(callbackfn, initialValue);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed && !testResult;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-4.js
index 7d5b8e0c2..8597a1015 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-4.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Array.prototype[1] = "3";

-            [0, 1, 2].reduce(callbackfn, initialValue);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Array.prototype[1] = "3";
+            [0, 1, 2].reduce(callbackfn, initialValue);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-5.js
index 4fd59cc26..20622fd0f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-5.js
@@ -1,47 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-5.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                testResult = (curVal === "9");

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 0;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        

-        Object.defineProperty(child, "0", {

-            value: "9",

-            configurable: true

-        });

-

-        child[1] = "1";

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                testResult = (curVal === "9");
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 0;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        
+        Object.defineProperty(child, "0", {
+            value: "9",
+            configurable: true
+        });
+
+        child[1] = "1";
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-6.js
index c115ef744..b46a79b5a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-6.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-6.js

- * @description Array.prototype.reduce - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return "9";

-                },

-                configurable: true

-            });

-            [0, 1, 2].reduce(callbackfn, initialValue);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return "9";
+                },
+                configurable: true
+            });
+            [0, 1, 2].reduce(callbackfn, initialValue);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-7.js
index f98140864..d61ff6547 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-7.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-7.js

- * @description Array.prototype.reduce - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduce.call(child, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduce.call(child, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-8.js
index dc90b79a9..c5aa90a2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-8.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-8.js

- * @description Array.prototype.reduce - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            Array.prototype[1] = 1;

-            Array.prototype[2] = 2;

-            [, , , ].reduce(callbackfn, initialValue);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is inherited data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            Array.prototype[1] = 1;
+            Array.prototype[2] = 2;
+            [, , , ].reduce(callbackfn, initialValue);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-9.js
index a51d66611..3789faf7a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-9.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-i-9.js

- * @description Array.prototype.reduce - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduce.call(obj, callbackfn, initialValue);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element to be retrieved is own accessor
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduce.call(obj, callbackfn, initialValue);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-1.js
index e6c2d29d1..ed10085db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-1.js

- * @description Array.prototype.reduce - callbackfn called with correct parameters (initialvalue not passed)

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    if(idx > 0 && obj[idx] === curVal && obj[idx-1] === prevVal)

-      return curVal;

-    else 

-      return false;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  if( arr.reduce(callbackfn) === "five") 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn called with correct parameters
+    (initialvalue not passed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    if(idx > 0 && obj[idx] === curVal && obj[idx-1] === prevVal)
+      return curVal;
+    else 
+      return false;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  if( arr.reduce(callbackfn) === "five") 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-10.js
index a8258c91e..efbf58a89 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-10.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-10.js

- * @description Array.prototype.reduce - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal) {

-            result = (prevVal === 1);

-        }

-

-        [11].reduce(callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn is called with 1 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal) {
+            result = (prevVal === 1);
+        }
+
+        [11].reduce(callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-11.js
index 8990a0de4..abe059996 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-11.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-11.js

- * @description Array.prototype.reduce - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal, curVal) {

-            result = (curVal > 10 && 1 === prevVal);

-        }

-

-        [11].reduce(callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn is called with 2 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal, curVal) {
+            result = (curVal > 10 && 1 === prevVal);
+        }
+
+        [11].reduce(callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-12.js
index 1f8cef862..df9a41e19 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-12.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-12.js

- * @description Array.prototype.reduce - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal, curVal, idx) {

-            result = (prevVal === 1 && arguments[3][idx] === curVal);

-        }

-

-        [11].reduce(callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn is called with 3 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal, curVal, idx) {
+            result = (prevVal === 1 && arguments[3][idx] === curVal);
+        }
+
+        [11].reduce(callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-13.js
index b46437dd3..5d3f762bc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-13.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-13.js

- * @description Array.prototype.reduce - callbackfn is called with 4 formal parameter

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            result = (prevVal === 1 && obj[idx] === curVal);

-        }

-

-        [11].reduce(callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn is called with 4 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            result = (prevVal === 1 && obj[idx] === curVal);
+        }
+
+        [11].reduce(callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-14.js
index 4bd73720a..f304e21e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-14.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-14.js

- * @description Array.prototype.reduce - callbackfn that uses arguments

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn() {

-            result = (arguments[0] === 1 && arguments[3][arguments[2]] === arguments[1]);

-        }

-

-        [11].reduce(callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - callbackfn that uses arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn() {
+            result = (arguments[0] === 1 && arguments[3][arguments[2]] === arguments[1]);
+        }
+
+        [11].reduce(callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-16.js
index e6ab36d26..bae4ee7d2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-16.js
@@ -1,34 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-16.js

- * @description Array.prototype.reduce - non-indexed properties are not called

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var result1 = true;

-        var result2 = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (curVal === 8) {

-                result1 = false;

-            }

-

-            if (prevVal === 8) {

-                result2 = false;

-            }

-        }

-

-        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };

-

-        Array.prototype.reduce.call(obj, callbackfn, 1);

-        return result1 && result2 && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - non-indexed properties are not called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var result1 = true;
+        var result2 = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (curVal === 8) {
+                result1 = false;
+            }
+
+            if (prevVal === 8) {
+                result2 = false;
+            }
+        }
+
+        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };
+
+        Array.prototype.reduce.call(obj, callbackfn, 1);
+        return result1 && result2 && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-17.js
index 4b0ecb7e2..adfa6c6a3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-17.js

- * @description Array.prototype.reduce - 'accumulator' used for current iteration is the result of previous iteration on an Array

- */

-

-

-function testcase() {

-

-        var result = true;

-        var accessed = false;

-        var preIteration = 1;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (preIteration !== prevVal) {

-                result = false;

-            }

-            preIteration = curVal;

-            return curVal;

-        }

-

-        [11, 12, 13].reduce(callbackfn, 1);

-        return result && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - 'accumulator' used for current iteration
+    is the result of previous iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+        var accessed = false;
+        var preIteration = 1;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (preIteration !== prevVal) {
+                result = false;
+            }
+            preIteration = curVal;
+            return curVal;
+        }
+
+        [11, 12, 13].reduce(callbackfn, 1);
+        return result && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-18.js
index e7515a77c..5705cbb72 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-18.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-18.js

- * @description Array.prototype.reduce - value of 'accumulator' used for first iteration is the value of 'initialValue' when it is present on an Array-like object

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                result = (arguments[0] === 1);

-            }

-        }

-

-        var obj = { 0: 11, 1: 9, length: 2 };

-

-        Array.prototype.reduce.call(obj, callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'accumulator' used for first
+    iteration is the value of 'initialValue' when it is present on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                result = (arguments[0] === 1);
+            }
+        }
+
+        var obj = { 0: 11, 1: 9, length: 2 };
+
+        Array.prototype.reduce.call(obj, callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-19.js
index 3c4839829..a82a22610 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-19.js
@@ -1,26 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-19.js

- * @description Array.prototype.reduce - value of 'accumulator' used for first iteration is the value of least index property which is not undefined when 'initialValue' is not present on an Array

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var result = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            called++;

-            if (idx === 1) {

-                result = (prevVal === 11) && curVal === 9;

-            }

-        }

-

-        [11, 9].reduce(callbackfn);

-        return result && called === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - value of 'accumulator' used for first
+    iteration is the value of least index property which is not
+    undefined when 'initialValue' is not present on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var result = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            called++;
+            if (idx === 1) {
+                result = (prevVal === 11) && curVal === 9;
+            }
+        }
+
+        [11, 9].reduce(callbackfn);
+        return result && called === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-2.js
index eac3d5109..2cf5cf27c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-2.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-2.js

- * @description Array.prototype.reduce - callbackfn called with correct parameters (initialvalue passed)

- */

-

-

-function testcase() { 

- 

-  var bParCorrect = false;

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    if(idx === 0 && obj[idx] === curVal && prevVal === initialValue)

-      return curVal;

-    else if(idx > 0 && obj[idx] === curVal && obj[idx-1] === prevVal)

-      return curVal;

-    else

-      return false;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  var initialValue = 5.5;

-  if( arr.reduce(callbackfn,initialValue) === "five") 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn called with correct parameters
+    (initialvalue passed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bParCorrect = false;
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    if(idx === 0 && obj[idx] === curVal && prevVal === initialValue)
+      return curVal;
+    else if(idx > 0 && obj[idx] === curVal && obj[idx-1] === prevVal)
+      return curVal;
+    else
+      return false;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  var initialValue = 5.5;
+  if( arr.reduce(callbackfn,initialValue) === "five") 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-20.js
index d7ba7fe62..4d937aaf8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-20.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-20.js

- * @description Array.prototype.reduce - undefined can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return typeof prevVal === "undefined";

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, undefined) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - undefined can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return typeof prevVal === "undefined";
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, undefined) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-21.js
index 7201f71c3..5320658d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-21.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-21.js

- * @description Array.prototype.reduce - null can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === null;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, null) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - null can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === null;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, null) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-22.js
index ccd9acba9..a5ab0a84f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-22.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-22.js

- * @description Array.prototype.reduce - boolean primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === false;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, false) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - boolean primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === false;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, false) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-23.js
index 3ac6f9d30..c4ec040b5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-23.js

- * @description Array.prototype.reduce - number primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === 12;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, 12) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - number primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === 12;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, 12) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-24.js
index 7deb554fe..aa6025e32 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-24.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-24.js

- * @description Array.prototype.reduce - string primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === "hello_";

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, "hello_") === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - string primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === "hello_";
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, "hello_") === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-25.js
index 12507db44..d68ed6d93 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-25.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-25.js

- * @description Array.prototype.reduce - Function object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objFunction = function () { };

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objFunction;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objFunction) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Function object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objFunction = function () { };
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objFunction;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objFunction) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-26.js
index 0f0ffe500..8e212f124 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-26.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-26.js

- * @description Array.prototype.reduce - Array object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objArray = new Array(10);

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objArray;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objArray) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Array object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objArray = new Array(10);
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objArray;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objArray) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-27.js
index daaf15504..68ad1482f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-27.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-27.js

- * @description Array.prototype.reduce - String object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objString = new String();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objString;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objString) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - String object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objString = new String();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objString;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objString) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-28.js
index 2e1c8acb0..a7327758d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-28.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-28.js

- * @description Array.prototype.reduce - Boolean object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objBoolean = new Boolean();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objBoolean;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objBoolean) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Boolean object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objBoolean = new Boolean();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objBoolean;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objBoolean) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-29.js
index 58d739d0c..a04aa56eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-29.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-29.js

- * @description Array.prototype.reduce - Number object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objNumber = new Number();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objNumber;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objNumber) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Number object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objNumber = new Number();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objNumber;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objNumber) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-3.js
index 4af1a3a64..2e7ab7a58 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-3.js

- * @description Array.prototype.reduce - callbackfn takes 4 arguments

- */

-

-

-function testcase() { 

- 

-  var bCalled = false;

-  function callbackfn(prevVal, curVal, idx, obj)

-  { 

-    bCalled = true;

-    if(prevVal === true && arguments.length === 4)   

-      return true;

-    else

-      return false;

-  }

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  if(arr.reduce(callbackfn,true) === true && bCalled === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - callbackfn takes 4 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bCalled = false;
+  function callbackfn(prevVal, curVal, idx, obj)
+  { 
+    bCalled = true;
+    if(prevVal === true && arguments.length === 4)   
+      return true;
+    else
+      return false;
+  }
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  if(arr.reduce(callbackfn,true) === true && bCalled === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-30.js
index 1a264d477..6aa8a37b3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-30.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-30.js

- * @description Array.prototype.reduce - the Math object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === Math;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, Math) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - the Math object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === Math;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, Math) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-31.js
index b174da5c3..0b28bb294 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-31.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-31.js

- * @description Array.prototype.reduce - Date object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objDate = new Date();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objDate;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objDate) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Date object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objDate = new Date();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objDate;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objDate) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-32.js
index 87c79c2a0..75898649e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-32.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-32.js

- * @description Array.prototype.reduce - RegExp object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objRegExp = new RegExp();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objRegExp;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objRegExp) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - RegExp object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objRegExp = new RegExp();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objRegExp;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objRegExp) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-33.js
index 3c3ae87a7..1b798dc95 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-33.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-33.js

- * @description Array.prototype.reduce - the JSON can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === JSON;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, JSON) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - the JSON can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === JSON;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, JSON) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-34.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-34.js
index ff40bd4a7..ff7de5a0a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-34.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-34.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-34.js

- * @description Array.prototype.reduce - Error object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var objError = new RangeError();

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objError;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, objError) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduce - Error object can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var objError = new RangeError();
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objError;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, objError) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-35.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-35.js
index 6e89c68d3..11d36263e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-35.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-35.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-35.js

- * @description Array.prototype.reduce - the Arguments object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arg;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === arg;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        (function fun() {

-            arg = arguments;

-        }(10, 11, 12, 13));

-

-        return Array.prototype.reduce.call(obj, callbackfn, arg) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the Arguments object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arg;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === arg;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        (function fun() {
+            arg = arguments;
+        }(10, 11, 12, 13));
+
+        return Array.prototype.reduce.call(obj, callbackfn, arg) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-37.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-37.js
index 1cfe96ff7..217f6683b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-37.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-37.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-37.js

- * @description Array.prototype.reduce - the global object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === fnGlobalObject();

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduce.call(obj, callbackfn, fnGlobalObject()) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - the global object can be used as
+    accumulator
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === fnGlobalObject();
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduce.call(obj, callbackfn, fnGlobalObject()) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4-s.js
index 692b84955..ce1becf75 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4-s.js

- * @description Array.prototype.reduce - undefined passed as thisValue to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() { 

-  var innerThisCorrect = false;

-  function callbackfn(prevVal, curVal, idx, obj)

-  { 

-     "use strict";

-     innerThisCorrect = this===undefined;

-     return true;

-  }

-  [0].reduce(callbackfn,true);

-  return innerThisCorrect;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - undefined passed as thisValue to strict
+    callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+  var innerThisCorrect = false;
+  function callbackfn(prevVal, curVal, idx, obj)
+  { 
+     "use strict";
+     innerThisCorrect = this===undefined;
+     return true;
+  }
+  [0].reduce(callbackfn,true);
+  return innerThisCorrect;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4.js
index a95871222..4bd6e3d03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-4.js

- * @description Array.prototype.reduce - k values are passed in acending numeric order on an Array

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2];

-        var lastIdx = 0;

-        var result = true;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (lastIdx !== idx) {

-                result = false;

-            } else {

-                lastIdx++;

-            }

-        }

-

-        arr.reduce(callbackfn, 11);

-        return result && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - k values are passed in acending numeric
+    order on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2];
+        var lastIdx = 0;
+        var result = true;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (lastIdx !== idx) {
+                result = false;
+            } else {
+                lastIdx++;
+            }
+        }
+
+        arr.reduce(callbackfn, 11);
+        return result && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-5.js
index 76a337fd9..cee69c0df 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-5.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-5.js

- * @description Array.prototype.reduce - k values are accessed during each iteration and not prior to starting the loop on an Array

- */

-

-

-function testcase() {

-

-        var result = true;

-        var kIndex = [];

-        var called = 0;

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(prevVal, curVal, idx, obj) {

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            called++;

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its previous index should has been visited.

-                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {

-                    result = false;

-                }

-                kIndex[idx] = 1;

-            } else {

-                result = false;

-            }

-        }

-

-        [11, 12, 13, 14].reduce(callbackfn, 1);

-

-        return result && called === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - k values are accessed during each
+    iteration and not prior to starting the loop on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = true;
+        var kIndex = [];
+        var called = 0;
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(prevVal, curVal, idx, obj) {
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            called++;
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its previous index should has been visited.
+                if (idx !== 0 && typeof kIndex[idx - 1] === "undefined") {
+                    result = false;
+                }
+                kIndex[idx] = 1;
+            } else {
+                result = false;
+            }
+        }
+
+        [11, 12, 13, 14].reduce(callbackfn, 1);
+
+        return result && called === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-7.js
index 1658f66fd..e00fa0d79 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-7.js

- * @description Array.prototype.reduce - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 0) {

-                accessed = true;

-            }

-            if (idx === 0) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.reduce.call(obj, callbackfn, 1);

-            return false;

-        } catch (ex) {

-            return (ex instanceof Error) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - unhandled exceptions happened in
+    callbackfn terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 0) {
+                accessed = true;
+            }
+            if (idx === 0) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.reduce.call(obj, callbackfn, 1);
+            return false;
+        } catch (ex) {
+            return (ex instanceof Error) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-8.js
index 61c13270c..ddb001d18 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-8.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-8.js

- * @description Array.prototype.reduce - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var result = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                obj[idx + 1] = 8;

-            }

-            

-            if (idx === 1) {

-                result = (curVal === 8);

-            }

-        }

-

-        var obj = { 0: 11, 1: 12, length: 2 };

-

-        Array.prototype.reduce.call(obj, callbackfn, 1);

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - element changed by callbackfn on previous
+    iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var result = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                obj[idx + 1] = 8;
+            }
+            
+            if (idx === 1) {
+                result = (curVal === 8);
+            }
+        }
+
+        var obj = { 0: 11, 1: 12, length: 2 };
+
+        Array.prototype.reduce.call(obj, callbackfn, 1);
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-9.js
index 20b8aed1c..102a876c4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-9.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.21/15.4.4.21-9-c-ii-9.js

- * @description Array.prototype.reduce - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-        function callbackfn() {

-            called++;

-        }

-

-        [11, 12].reduce(callbackfn, 1);

-        return 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduce - callbackfn is called with 0 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        function callbackfn() {
+            called++;
+        }
+
+        [11, 12].reduce(callbackfn, 1);
+        return 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-1.js
index 5796279d0..dacaeab14 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-1.js

- * @description Array.prototype.reduceRight must exist as a function

- */

-

-

-function testcase() {

-  var f = Array.prototype.reduceRight;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Array.prototype.reduceRight;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-2.js
index 0fc9fb1b8..9ebe75060 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-0-2.js

- * @description Array.prototype.reduceRight.length must be 1

- */

-

-

-function testcase() {

-  if (Array.prototype.reduceRight.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight.length must be 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Array.prototype.reduceRight.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-1.js
index 3d13569fd..86cebb372 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-1.js

- * @description Array.prototype.reduceRight applied to undefined throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.reduceRight.call(undefined); 

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to undefined throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.reduceRight.call(undefined); 
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-10.js
index 4c04ab1b9..76a4e3e1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-10.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-10.js

- * @description Array.prototype.reduceRight applied to the Math object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return '[object Math]' === Object.prototype.toString.call(obj);

-        }

-

-        try {

-            Math.length = 1;

-            Math[0] = 1;

-            return Array.prototype.reduceRight.call(Math, callbackfn, 1) && accessed;

-        } finally {

-            delete Math[0];

-            delete Math.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to the Math object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return '[object Math]' === Object.prototype.toString.call(obj);
+        }
+
+        try {
+            Math.length = 1;
+            Math[0] = 1;
+            return Array.prototype.reduceRight.call(Math, callbackfn, 1) && accessed;
+        } finally {
+            delete Math[0];
+            delete Math.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-11.js
index c9cb0bb76..032d9f654 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-11.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-11.js

- * @description Array.prototype.reduceRight applied to Date object

- */

-

-

-function testcase() {

-

-        var obj = new Date();

-        obj.length = 1;

-        obj[0] = 1;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj instanceof Date;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Date();
+        obj.length = 1;
+        obj[0] = 1;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj instanceof Date;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-12.js
index b22d82384..d0b5ce443 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-12.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-12.js

- * @description Array.prototype.reduceRight applied to RegExp object

- */

-

-

-function testcase() {

-

-        var obj = new RegExp();

-        obj.length = 1;

-        obj[0] = 1;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, o) {

-            accessed = true;

-            return o instanceof RegExp;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to RegExp object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new RegExp();
+        obj.length = 1;
+        obj[0] = 1;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, o) {
+            accessed = true;
+            return o instanceof RegExp;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-13.js
index 399fd832b..2ca8a6ccc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-13.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-13.js

- * @description Array.prototype.reduceRight applied to the JSON object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return ('[object JSON]' === Object.prototype.toString.call(obj));

-        }

-

-        try {

-            JSON.length = 1;

-            JSON[0] = 1;

-            return Array.prototype.reduceRight.call(JSON, callbackfn, 1) && accessed;

-        } finally {

-            delete JSON.length;

-            delete JSON[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to the JSON object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return ('[object JSON]' === Object.prototype.toString.call(obj));
+        }
+
+        try {
+            JSON.length = 1;
+            JSON[0] = 1;
+            return Array.prototype.reduceRight.call(JSON, callbackfn, 1) && accessed;
+        } finally {
+            delete JSON.length;
+            delete JSON[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-14.js
index 1574867c4..455ca5dc3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-14.js
@@ -1,26 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-14.js

- * @description Array.prototype.reduceRight applied to Error object

- */

-

-

-function testcase() {

-

-        var obj = new Error();

-        obj.length = 1;

-        obj[0] = 1;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, o) {

-            accessed = true;

-            return o instanceof Error;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to Error object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Error();
+        obj.length = 1;
+        obj[0] = 1;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, o) {
+            accessed = true;
+            return o instanceof Error;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-15.js
index b4fb8c62e..80aa82f1a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-15.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-15.js

- * @description Array.prototype.reduceRight applied to the Arguments object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return '[object Arguments]' === Object.prototype.toString.call(obj);

-        }

-

-        var obj = (function () {

-            return arguments;

-        }("a", "b"));

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, "a") && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to the Arguments object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return '[object Arguments]' === Object.prototype.toString.call(obj);
+        }
+
+        var obj = (function () {
+            return arguments;
+        }("a", "b"));
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, "a") && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-2.js
index 9e28609f6..1aa16790b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-2.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-2.js

- * @description Array.prototype.reduceRight applied to null throws a TypeError

- */

-

-

-function testcase() {

-        try {

-            Array.prototype.reduceRight.call(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to null throws a TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Array.prototype.reduceRight.call(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-3.js
index b14059e3b..884305e32 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-3.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-3.js

- * @description Array.prototype.reduceRight applied to boolean primitive

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj instanceof Boolean;

-        }

-

-        try {

-            Boolean.prototype[0] = 1;

-            Boolean.prototype.length = 1;

-            return Array.prototype.reduceRight.call(false, callbackfn, 1) && accessed;

-        } finally {

-            delete Boolean.prototype[0];

-            delete Boolean.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to boolean primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj instanceof Boolean;
+        }
+
+        try {
+            Boolean.prototype[0] = 1;
+            Boolean.prototype.length = 1;
+            return Array.prototype.reduceRight.call(false, callbackfn, 1) && accessed;
+        } finally {
+            delete Boolean.prototype[0];
+            delete Boolean.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-4.js
index 555e3f740..92e76b292 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-4.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-4.js

- * @description Array.prototype.reduceRight applied to Boolean object

- */

-

-

-function testcase() {

-

-        var obj = new Boolean(true);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj instanceof Boolean;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to Boolean object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Boolean(true);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj instanceof Boolean;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-5.js
index 3f8c6bf33..f7b0fec9b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-5.js
@@ -1,30 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-5.js

- * @description Array.prototype.reduceRight applied to number primitive

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj instanceof Number;

-        }

-

-        try {

-            Number.prototype[0] = 1;

-            Number.prototype.length = 1;

-            return Array.prototype.reduceRight.call(2.5, callbackfn, 1) && accessed;

-        } finally {

-            delete Number.prototype[0];

-            delete Number.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to number primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj instanceof Number;
+        }
+
+        try {
+            Number.prototype[0] = 1;
+            Number.prototype.length = 1;
+            return Array.prototype.reduceRight.call(2.5, callbackfn, 1) && accessed;
+        } finally {
+            delete Number.prototype[0];
+            delete Number.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-6.js
index db14da31f..7b4164e4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-6.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-6.js

- * @description Array.prototype.reduceRight applied to Number object

- */

-

-

-function testcase() {

-

-        var obj = new Number(-128);

-        obj.length = 2;

-        obj[0] = 11;

-        obj[1] = 12;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, o) {

-            accessed = true;

-            return o instanceof Number;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to Number object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new Number(-128);
+        obj.length = 2;
+        obj[0] = 11;
+        obj[1] = 12;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, o) {
+            accessed = true;
+            return o instanceof Number;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-7.js
index 11b46169c..7cb9c0949 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-7.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-7.js

- * @description Array.prototype.reduceRight applied to string primitive

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj instanceof String;

-        }

-

-        return Array.prototype.reduceRight.call("hello\nworld\\!", callbackfn, "h") && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to string primitive
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj instanceof String;
+        }
+
+        return Array.prototype.reduceRight.call("hello\nworld\\!", callbackfn, "h") && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-8.js
index 4eadbd788..96410f244 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-8.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-8.js

- * @description Array.prototype.reduceRight applied to String object

- */

-

-

-function testcase() {

-

-        var obj = new String("hello\nworld\\!");

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, o) {

-            accessed = true;

-            return o instanceof String;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, "h") && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to String object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = new String("hello\nworld\\!");
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, o) {
+            accessed = true;
+            return o instanceof String;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, "h") && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-9.js
index dfec5980d..d39a53445 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-9.js
@@ -1,28 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-1-9.js

- * @description Array.prototype.reduceRight applied to Function object

- */

-

-

-function testcase() {

-

-        var obj = function (a, b) {

-            return a + b;

-        };

-        obj[0] = 11;

-        obj[1] = 9;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, o) {

-            accessed = true;

-            return o instanceof Function;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight applied to Function object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = function (a, b) {
+            return a + b;
+        };
+        obj[0] = 11;
+        obj[1] = 9;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, o) {
+            accessed = true;
+            return o instanceof Function;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-1.js
index 01fb36a62..939870091 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-1.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-1.js

- * @description Array.prototype.reduceRight doesn't mutate the Array on which it is called on

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return 1;

-  }

-  var srcArr = [1,2,3,4,5];

-  srcArr.reduceRight(callbackfn);

-  if(srcArr[0] === 1 &&

-     srcArr[1] === 2 &&

-     srcArr[2] === 3 &&

-     srcArr[3] === 4 &&

-     srcArr[4] === 5)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight doesn't mutate the Array on which it
+    is called on
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return 1;
+  }
+  var srcArr = [1,2,3,4,5];
+  srcArr.reduceRight(callbackfn);
+  if(srcArr[0] === 1 &&
+     srcArr[1] === 2 &&
+     srcArr[2] === 3 &&
+     srcArr[3] === 4 &&
+     srcArr[4] === 5)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-2.js
index 949469703..b5c5b2799 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-2.js

- * @description Array.prototype.reduceRight reduces array in descending order of indices

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return prevVal + curVal;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  if(srcArr.reduceRight(callbackfn) === '54321')

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight reduces array in descending order of
+    indices
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return prevVal + curVal;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  if(srcArr.reduceRight(callbackfn) === '54321')
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-3.js
index 8194b7684..3d6ff9eaf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-3.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-3.js

- * @description Array.prototype.reduceRight - subclassed array with length 1

- */

-

-

-function testcase() {

-  foo.prototype = [1];

-  function foo() {}

-  var f = new foo();

-  

-  function cb(){}

-  if(f.reduceRight(cb) === 1)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - subclassed array with length 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = [1];
+  function foo() {}
+  var f = new foo();
+  
+  function cb(){}
+  if(f.reduceRight(cb) === 1)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-4.js
index 953ac8be8..e850d493f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-4.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-4.js

- * @description Array.prototype.reduceRight - subclassed array with length more than 1

- */

-

-

-function testcase() {

-  foo.prototype = new Array(0, 1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduceRight(cb) === 6)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - subclassed array with length more
+    than 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(0, 1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduceRight(cb) === 6)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-5.js
index af5b7901c..0bc79e61b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-5.js

- * @description Array.prototype.reduceRight reduces array in descending order of indices(initialvalue present)

- */

-

-

-function testcase() {

-

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    return prevVal + curVal;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  if(srcArr.reduceRight(callbackfn,'6') === '654321')

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight reduces array in descending order of
+    indices(initialvalue present)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    return prevVal + curVal;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  if(srcArr.reduceRight(callbackfn,'6') === '654321')
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-6.js
index 473b78fa9..7c6c3e374 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-6.js

- * @description Array.prototype.reduceRight - subclassed array when initialvalue provided

- */

-

-

-function testcase() {

-  foo.prototype = new Array(0, 1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduceRight(cb,"4") === "43210")

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - subclassed array when initialvalue
+    provided
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(0, 1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduceRight(cb,"4") === "43210")
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-7.js
index 2cb0e2d9f..24b6700aa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-7.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-7.js

- * @description Array.prototype.reduceRight - subclassed array when length to 1 and initialvalue provided

- */

-

-

-function testcase() {

-  foo.prototype = [1];

-  function foo() {}

-  var f = new foo();

-  

-  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}

-  if(f.reduceRight(cb,"4") === "41")

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - subclassed array when length to 1
+    and initialvalue provided
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = [1];
+  function foo() {}
+  var f = new foo();
+  
+  function cb(prevVal, curVal, idx, obj){return prevVal + curVal;}
+  if(f.reduceRight(cb,"4") === "41")
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-8.js
index bc3b418dd..b6d50d59f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-8.js
@@ -1,31 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-10-8.js

- * @description Array.prototype.reduceRight doesn't visit expandos

- */

-

-

-function testcase() {

-

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal,  idx, obj)

-  {

-    callCnt++;

-  }

-  var srcArr = ['1','2','3','4','5'];

-  srcArr["i"] = 10;

-  srcArr[true] = 11;

-

-  srcArr.reduceRight(callbackfn);

-

-  if(callCnt == 4)

-  {

-    return true;

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight doesn't visit expandos
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal,  idx, obj)
+  {
+    callCnt++;
+  }
+  var srcArr = ['1','2','3','4','5'];
+  srcArr["i"] = 10;
+  srcArr[true] = 11;
+
+  srcArr.reduceRight(callbackfn);
+
+  if(callCnt == 4)
+  {
+    return true;
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-1.js
index bf82f81a9..fa250daca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-1.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-1.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own data property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: 2

-        };

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: 2
+        };
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-10.js
index f02f9e54f..bb09aba5a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-10.js
@@ -1,42 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-10.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an inherited accessor property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var Con = function () { };

-

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-

-        return Array.prototype.reduceRight.call(child, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var Con = function () { };
+
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+
+        return Array.prototype.reduceRight.call(child, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-11.js
index ee947d84e..9ea23c85e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-11.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-11.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return typeof obj.length === "undefined";

-        }

-

-        var obj = {

-            0: 11,

-            1: 12

-        };

-        Object.defineProperty(obj, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 111) === 111 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return typeof obj.length === "undefined";
+        }
+
+        var obj = {
+            0: 11,
+            1: 12
+        };
+        Object.defineProperty(obj, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 111) === 111 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-12.js
index 13e1f0628..e40fd37fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-12.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-12.js

- * @description Array.prototype.reduceRight - 'length' is own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return typeof obj.length === "undefined";

-        }

-

-        try {

-            Object.defineProperty(Object.prototype, "length", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var obj = { 0: 12, 1: 13 };

-            Object.defineProperty(obj, "length", {

-                set: function () { },

-                configurable: true

-            });

-

-            return Array.prototype.reduceRight.call(obj, callbackfn, 11) === 11 && !accessed;

-        } finally {

-            delete Object.prototype.length;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'length' is own accessor property
+    without a get function that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return typeof obj.length === "undefined";
+        }
+
+        try {
+            Object.defineProperty(Object.prototype, "length", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var obj = { 0: 12, 1: 13 };
+            Object.defineProperty(obj, "length", {
+                set: function () { },
+                configurable: true
+            });
+
+            return Array.prototype.reduceRight.call(obj, callbackfn, 11) === 11 && !accessed;
+        } finally {
+            delete Object.prototype.length;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-13.js
index ffb214568..fd3524ed7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-13.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-13.js

- * @description Array.prototype.reduceRight applied to the Array-like object that 'length' is inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return curVal > 10;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 11;

-        child[1] = 12;

-

-        return Array.prototype.reduceRight.call(child, callbackfn, 111) === 111 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to the Array-like object that
+    'length' is inherited accessor property without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return curVal > 10;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 11;
+        child[1] = 12;
+
+        return Array.prototype.reduceRight.call(child, callbackfn, 111) === 111 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-14.js
index 5d8555433..7094bd6b9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-14.js

- * @description Array.prototype.reduceRight applied to the Array-like object that 'length' property doesn't exist

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return curVal > 10;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 111) === 111 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to the Array-like object that
+    'length' property doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return curVal > 10;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 111) === 111 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-15.js
index 2075dd293..1d994e269 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-15.js
@@ -1,35 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-15.js

- * @description Array.prototype.reduceRight - 'length' is property of the global object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === fnGlobalObject().length;

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 12;

-            fnGlobalObject()[1] = 11;

-            fnGlobalObject()[2] = 9;

-            fnGlobalObject().length = 2;

-            return Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn, 111) && accessed;

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'length' is property of the global
+    object
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === fnGlobalObject().length;
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 12;
+            fnGlobalObject()[1] = 11;
+            fnGlobalObject()[2] = 9;
+            fnGlobalObject().length = 2;
+            return Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn, 111) && accessed;
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-17.js
index 7e96d260d..0323f43a8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-17.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-17.js

- * @description Array.prototype.reduceRight applied to the Arguments object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var arg;

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var func = function (a, b) {

-            arg = arguments;

-            return Array.prototype.reduceRight.call(arguments, callbackfn, 11);

-        };

-

-        return func(12, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to the Arguments object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arg;
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var func = function (a, b) {
+            arg = arguments;
+            return Array.prototype.reduceRight.call(arguments, callbackfn, 11);
+        };
+
+        return func(12, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-18.js
index 793799a66..c19ec8bf5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-18.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-18.js

- * @description Array.prototype.reduceRight applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var str = new String("432");

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 3;

-        }

-

-        try {

-            String.prototype[3] = "1";

-            return Array.prototype.reduceRight.call(str, callbackfn, 111) && accessed;

-        } finally {

-            delete String.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to String object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var str = new String("432");
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 3;
+        }
+
+        try {
+            String.prototype[3] = "1";
+            return Array.prototype.reduceRight.call(str, callbackfn, 111) && accessed;
+        } finally {
+            delete String.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-19.js
index f46a4b6d7..51e1f6d9e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-19.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-19.js

- * @description Array.prototype.reduceRight applied to Function object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var fun = function (a, b) {

-            return a + b;

-        };

-        fun[0] = 12;

-        fun[1] = 11;

-        fun[2] = 9;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        return Array.prototype.reduceRight.call(fun, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Function object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var fun = function (a, b) {
+            return a + b;
+        };
+        fun[0] = 12;
+        fun[1] = 11;
+        fun[2] = 9;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        return Array.prototype.reduceRight.call(fun, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-2.js
index a2fef0ae8..5563cdd57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-2.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-2.js

- * @description Array.prototype.reduceRight - 'length' is own data property on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        return [12, 11].reduceRight(callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'length' is own data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        return [12, 11].reduceRight(callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-3.js
index 16d3ed7b8..75d500a68 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-3.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-3.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var accessed = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduceRight.call(child, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own data property that overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduceRight.call(child, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-4.js
index c6f2622e3..7ef8620e3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-4.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-4.js

- * @description Array.prototype.reduceRight - 'length' is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arrProtoLen;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        try {

-            arrProtoLen = Array.prototype.length;

-            Array.prototype.length = 0;

-

-            return [12, 11].reduceRight(callbackfn, 11) && accessed;

-        } finally {

-            Array.prototype.length = arrProtoLen;

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'length' is own data property that
+    overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arrProtoLen;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        try {
+            arrProtoLen = Array.prototype.length;
+            Array.prototype.length = 0;
+
+            return [12, 11].reduceRight(callbackfn, 11) && accessed;
+        } finally {
+            Array.prototype.length = arrProtoLen;
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-5.js
index 794f70e25..5ade6e70a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-5.js
@@ -1,43 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-5.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            value: 2,

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduceRight.call(child, callbackfn) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own data property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            value: 2,
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduceRight.call(child, callbackfn) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-6.js
index c00248c63..177cd03fd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-6.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-6.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an inherited data property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var proto = { length: 2 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        function callbackfn1(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        return Array.prototype.reduceRight.call(child, callbackfn1, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var proto = { length: 2 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        function callbackfn1(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        return Array.prototype.reduceRight.call(child, callbackfn1, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-7.js
index 46b12008b..94a489ce7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-7.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own accessor property

- */

-

-

-function testcase() {

-

-        var accessed = true;

-        var obj = {};

-        obj[0] = 12;

-        obj[1] = 11;

-        obj[2] = 9;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = true;
+        var obj = {};
+        obj[0] = 12;
+        obj[1] = 11;
+        obj[2] = 9;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-8.js
index f955ad6d7..fc3783ee1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-8.js
@@ -1,41 +1,44 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-8.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var proto = { length: 3 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduceRight.call(child, callbackfn, 11) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own accessor property that overrides an inherited data
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var proto = { length: 3 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduceRight.call(child, callbackfn, 11) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-9.js
index c5958db58..292bb6563 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-9.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-2-9.js

- * @description Array.prototype.reduceRight applied to Array-like object, 'length' is an own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn1(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return obj.length === 2;

-        }

-

-        var proto = {};

-        Object.defineProperty(proto, "length", {

-            get: function () {

-                return 3;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        Object.defineProperty(child, "length", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-        child[0] = 12;

-        child[1] = 11;

-        child[2] = 9;

-

-        return Array.prototype.reduceRight.call(child, callbackfn1, 111) && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Array-like object, 'length'
+    is an own accessor property that overrides an inherited accessor
+    property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn1(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return obj.length === 2;
+        }
+
+        var proto = {};
+        Object.defineProperty(proto, "length", {
+            get: function () {
+                return 3;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        Object.defineProperty(child, "length", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+        child[0] = 12;
+        child[1] = 11;
+        child[2] = 9;
+
+        return Array.prototype.reduceRight.call(child, callbackfn1, 111) && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-1.js
index 46c8c3276..532839e60 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-1.js

- * @description Array.prototype.reduceRight - value of 'length' is undefined

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: undefined };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - value of 'length' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: undefined };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-10.js
index e0642b318..96a1860d7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-10.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-10.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is NaN)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: NaN };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: NaN };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-11.js
index 0319ef799..f7d5de410 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-11.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-11.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing a positive number

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing a positive number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-12.js
index 411240b4a..016f995a7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-12.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-12.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing a negative number

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 11, 1: 12, 2: 9, length: "-4294967294" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing a negative number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 11, 1: 12, 2: 9, length: "-4294967294" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-13.js
index 5b2f3a1aa..0b982b030 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-13.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-13.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing a decimal number

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2.5" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing a decimal number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2.5" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-14.js
index 1d95beeb3..ef3d3e29f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-14.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-14.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing +/-Infinity

- */

-

-

-function testcase() {

-

-        var accessed1 = false;

-        var accessed2 = false;

-        var accessed3 = false;

-

-        function callbackfn1(prevVal, curVal, idx, obj) {

-            accessed1 = true;

-        }

-

-        function callbackfn2(prevVal, curVal, idx, obj) {

-            accessed2 = true;

-        }

-

-        function callbackfn3(prevVal, curVal, idx, obj) {

-            accessed3 = true;

-        }

-

-        var obj1 = { 0: 9, length: "Infinity" };

-        var obj2 = { 0: 9, length: "-Infinity" };

-        var obj3 = { 0: 9, length: "+Infinity" };

-

-        return Array.prototype.reduceRight.call(obj1, callbackfn1, 1) === 1 &&

-            Array.prototype.reduceRight.call(obj2, callbackfn2, 2) === 2 &&

-            Array.prototype.reduceRight.call(obj3, callbackfn3, 3) === 3 &&

-            !accessed1 && !accessed2 && !accessed3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing +/-Infinity
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed1 = false;
+        var accessed2 = false;
+        var accessed3 = false;
+
+        function callbackfn1(prevVal, curVal, idx, obj) {
+            accessed1 = true;
+        }
+
+        function callbackfn2(prevVal, curVal, idx, obj) {
+            accessed2 = true;
+        }
+
+        function callbackfn3(prevVal, curVal, idx, obj) {
+            accessed3 = true;
+        }
+
+        var obj1 = { 0: 9, length: "Infinity" };
+        var obj2 = { 0: 9, length: "-Infinity" };
+        var obj3 = { 0: 9, length: "+Infinity" };
+
+        return Array.prototype.reduceRight.call(obj1, callbackfn1, 1) === 1 &&
+            Array.prototype.reduceRight.call(obj2, callbackfn2, 2) === 2 &&
+            Array.prototype.reduceRight.call(obj3, callbackfn3, 3) === 3 &&
+            !accessed1 && !accessed2 && !accessed3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-15.js
index ce93034aa..5b7472d29 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-15.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-15.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing an exponential number

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "2E0" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing an exponential number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "2E0" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-16.js
index 5dc1e8bbd..8cc89cd07 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-16.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-16.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing a hex number

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "0x0002" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing a hex number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "0x0002" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-17.js
index 54d7eed7e..f0dedeb62 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-17.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-17.js

- * @description Array.prototype.reduceRight - value of 'length' is a string containing a number with leading zeros

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: "0002.00" };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string
+    containing a number with leading zeros
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: "0002.00" };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-18.js
index ef67c7465..b8222544a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-18.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-18.js

- * @description Array.prototype.reduceRight - value of 'length' is a string that can't convert to a number

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, 1: 8, length: "two" };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 11) === 11 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a string that
+    can't convert to a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, 1: 8, length: "two" };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 11) === 11 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-19.js
index f213210af..4589c9ad9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-19.js
@@ -1,49 +1,51 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-19.js

- * @description Array.prototype.reduceRight - value of 'length' is an object which has an own toString method

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var toStringAccessed = false;

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: {

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        // objects inherit the default valueOf() method from Object

-        // that simply returns itself. Since the default valueOf() method

-        // does not return a primitive value, ES next tries to convert the object

-        // to a number by calling its toString() method and converting the

-        // resulting string to a number.

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2 && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is an object which
+    has an own toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var toStringAccessed = false;
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: {
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        // objects inherit the default valueOf() method from Object
+        // that simply returns itself. Since the default valueOf() method
+        // does not return a primitive value, ES next tries to convert the object
+        // to a number by calling its toString() method and converting the
+        // resulting string to a number.
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2 && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-2.js
index 6eaa57e22..6fbda57e8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-2.js

- * @description Array.prototype.reduceRight applied to an Array-like object, 'length' is 0 (length overridden to false(type conversion))

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: false };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to an Array-like object,
+    'length' is 0 (length overridden to false(type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: false };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-20.js
index 8c024730a..56f20a77f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-20.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-20.js

- * @description Array.prototype.reduceRight - value of 'length' is an Object which has an own valueOf method

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return 2;

-                }

-            }

-        };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2 && valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is an Object which
+    has an own valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return 2;
+                }
+            }
+        };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2 && valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-21.js
index b29fe62b4..b1ce76af7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-21.js
@@ -1,49 +1,52 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-21.js

- * @description Array.prototype.reduceRight - 'length' is an object that has an own valueOf method that returns an object and toString method that returns a string

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return '2';

-                }

-            }

-        };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2 && valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'length' is an object that has an
+    own valueOf method that returns an object and toString method that
+    returns a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return '2';
+                }
+            }
+        };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2 && valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-22.js
index 51351be4e..f62619c9c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-22.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-22.js

- * @description Array.prototype.reduceRight throws TypeError exception when 'length' is an object with toString and valueOf methods that don�t return primitive values

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            0: 11,

-            1: 12,

-

-            length: {

-                valueOf: function () {

-                    valueOfAccessed = true;

-                    return {};

-                },

-                toString: function () {

-                    toStringAccessed = true;

-                    return {};

-                }

-            }

-        };

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn, 1);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError exception when
+    'length' is an object with toString and valueOf methods that don�t
+    return primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            0: 11,
+            1: 12,
+
+            length: {
+                valueOf: function () {
+                    valueOfAccessed = true;
+                    return {};
+                },
+                toString: function () {
+                    toStringAccessed = true;
+                    return {};
+                }
+            }
+        };
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn, 1);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && toStringAccessed && valueOfAccessed && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-23.js
index a9be94a16..fdacbb8bd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-23.js
@@ -1,55 +1,58 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-23.js

- * @description Array.prototype.reduceRight uses inherited valueOf method when 'length' is an object with an own toString and inherited valueOf methods

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        var valueOfAccessed = false;

-        var toStringAccessed = false;

-

-        var proto = {

-            valueOf: function () {

-                valueOfAccessed = true;

-                return 2;

-            }

-        };

-        var Con = function () { };

-        Con.prototype = proto;

-        var child = new Con();

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        child.toString = function () {

-            toStringAccessed = true;

-            return '1';

-        };

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: child

-        };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2 && valueOfAccessed && !toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight uses inherited valueOf method when
+    'length' is an object with an own toString and inherited valueOf
+    methods
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        var valueOfAccessed = false;
+        var toStringAccessed = false;
+
+        var proto = {
+            valueOf: function () {
+                valueOfAccessed = true;
+                return 2;
+            }
+        };
+        var Con = function () { };
+        Con.prototype = proto;
+        var child = new Con();
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        child.toString = function () {
+            toStringAccessed = true;
+            return '1';
+        };
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: child
+        };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2 && valueOfAccessed && !toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-24.js
index 98f547082..144239f7c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-24.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-24.js

- * @description Array.prototype.reduceRight - value of 'length' is a positive non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 0: 12, 1: 11, 2: 9, length: 2.685 };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a positive
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 0: 12, 1: 11, 2: 9, length: 2.685 };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-25.js
index 3970cdda6..35ee32ee6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-25.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-25.js

- * @description Array.prototype.reduceRight - value of 'length' is a negative non-integer, ensure truncation occurs in the proper direction

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = {

-            0: 12,

-            1: 11,

-            2: 9,

-            length: -4294967294.5

-        };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a negative
+    non-integer, ensure truncation occurs in the proper direction
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = {
+            0: 12,
+            1: 11,
+            2: 9,
+            length: -4294967294.5
+        };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-28.js
index 6dbd9127f..aff658540 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-28.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-28.js

- * @description Array.prototype.reduceRight - value of 'length' is boundary value (2^32)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = {

-            0: 12,

-            length: 4294967296

-        };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is boundary value
+    (2^32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = {
+            0: 12,
+            length: 4294967296
+        };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-29.js
index 8f351eb68..f5e234e57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-29.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-29.js

- * @description Array.prototype.reduceRight - value of 'length' is boundary value (2^32 + 1)

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 0) {

-                testResult1 = false;

-            }

-

-            if (idx === 0) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = {

-            0: 11,

-            1: 9,

-            length: 4294967297

-        };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is boundary value
+    (2^32 + 1)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 0) {
+                testResult1 = false;
+            }
+
+            if (idx === 0) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = {
+            0: 11,
+            1: 9,
+            length: 4294967297
+        };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-3.js
index 4ca0d26f7..19f21e224 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-3.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-3.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is 0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: 0 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: 0 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-4.js
index 683794867..b7fd4ce9d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-4.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-4.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is +0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: +0 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: +0 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-5.js
index aed29d3a0..95d8e4eb1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-5.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-5.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is -0)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: -0 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: -0 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-6.js
index ef1f4ddea..8d93b6a76 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-6.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-6.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is positive)

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 1: 11, 2: 9, length: 2 };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is positive)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 1: 11, 2: 9, length: 2 };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-7.js
index 82ee2aad7..ae76446b4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-7.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-7.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is negative)

- */

-

-

-function testcase() {

-

-        var testResult1 = true;

-        var testResult2 = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx > 1) {

-                testResult1 = false;

-            }

-

-            if (idx === 1) {

-                testResult2 = true;

-            }

-            return false;

-        }

-

-        var obj = { 1: 11, 2: 9, length: -4294967294 };

-

-        Array.prototype.reduceRight.call(obj, callbackfn, 1);

-        return testResult1 && testResult2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is negative)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult1 = true;
+        var testResult2 = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx > 1) {
+                testResult1 = false;
+            }
+
+            if (idx === 1) {
+                testResult2 = true;
+            }
+            return false;
+        }
+
+        var obj = { 1: 11, 2: 9, length: -4294967294 };
+
+        Array.prototype.reduceRight.call(obj, callbackfn, 1);
+        return testResult1 && testResult2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-8.js
index 387c9ece7..888172c1f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-8.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-8.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: Infinity };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: Infinity };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-9.js
index 7d4e0e23a..15b6b4d4b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-9.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-3-9.js

- * @description Array.prototype.reduceRight - value of 'length' is a number (value is -Infinity)

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-        }

-

-        var obj = { 0: 9, length: -Infinity };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'length' is a number (value
+    is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+        }
+
+        var obj = { 0: 9, length: -Infinity };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === 1 && !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-1.js
index 409c912ee..b0d3a6577 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-1.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is undefined

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight();    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if callbackfn is
+    undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight();    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-10.js
index 3bcf048b3..bd6d6c1cb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-10.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-10.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-11.js
index cdaf9efb9..736111010 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-11.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-11.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-12.js
index 1b2c744bb..28075300d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-12.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-12.js

- * @description Array.prototype.reduceRight - 'callbackfn' is a function

- */

-

-

-function testcase() {

-

-        var initialValue = 0;

-        function callbackfn(accum, val, idx, obj) {

-            accum += val;

-            return accum;

-        }

-

-        return 20 === [11, 9].reduceRight(callbackfn, initialValue);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - 'callbackfn' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var initialValue = 0;
+        function callbackfn(accum, val, idx, obj) {
+            accum += val;
+            return accum;
+        }
+
+        return 20 === [11, 9].reduceRight(callbackfn, initialValue);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-15.js
index 52b2844f6..1d8618acc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-15.js

- * @description Array.prototype.reduceRight - calling with no callbackfn is the same as passing undefined for callbackfn

- */

-

-

-function testcase() {

-        var obj = { 10: 10 };

-        var lengthAccessed = false;

-        var loopAccessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                lengthAccessed = true;

-                return 20;

-            },

-            configurable: true

-        });

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                loopAccessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, undefined);

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - calling with no callbackfn is the
+    same as passing undefined for callbackfn
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { 10: 10 };
+        var lengthAccessed = false;
+        var loopAccessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                lengthAccessed = true;
+                return 20;
+            },
+            configurable: true
+        });
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                loopAccessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, undefined);
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && lengthAccessed && !loopAccessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-2.js
index b911f2c94..f0924c932 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-2.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-2.js

- * @description Array.prototype.reduceRight throws ReferenceError if callbackfn is unreferenced

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(foo);    

-  }

-  catch(e) {

-    if(e instanceof ReferenceError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws ReferenceError if callbackfn is
+    unreferenced
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(foo);    
+  }
+  catch(e) {
+    if(e instanceof ReferenceError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-3.js
index 4f8a2f834..49f82cb3f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-3.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-3.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is null

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(null);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight throws TypeError if callbackfn is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(null);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-4.js
index 6df3bb6ce..dd4d4efc1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-4.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-4.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is boolean

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(true);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if callbackfn is
+    boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(true);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-5.js
index 6c16990a9..c31926498 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-5.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-5.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is number

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(5);    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if callbackfn is
+    number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(5);    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-6.js
index a80120bb5..b06cf8e5b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-6.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-6.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is string

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight("abc");    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if callbackfn is
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight("abc");    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-7.js
index 6baa0fab9..56d1a88b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-7.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-7.js

- * @description Array.prototype.reduceRight throws TypeError if callbackfn is Object without [[Call]] internal method

- */

-

-

-function testcase() {

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(new Object());    

-  }

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if callbackfn is
+    Object without [[Call]] internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(new Object());    
+  }
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-8.js
index 05e7beef8..35f5ec164 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-8.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-8.js

- * @description Array.prototype.reduceRight - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-9.js
index 445f4c514..4313ca3ff 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-9.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-4-9.js

- * @description Array.prototype.reduceRight - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, null);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, null);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-1.js
index c83cf38c3..33d3e7b1b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-1.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (empty array), no initVal

- */

-

-

-function testcase() {

-  function cb(){}

-  

-  try {

-    [].reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (empty array), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  
+  try {
+    [].reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-10.js
index 78db4456b..6356251a4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-10.js

- * @description Array.prototype.reduceRight - side-effects produced by step 2 when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side-effects produced by step 2 when
+    an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-11.js
index c063bad6e..e064919e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-11.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-11.js

- * @description Array.prototype.reduceRight - side-effects produced by step 3 when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "0";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side-effects produced by step 3 when
+    an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "0";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-12.js
index bd353e8bc..a4f0fff11 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-12.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-12.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-13.js
index 722bc2b6a..a4a8fe847 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-13.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-13.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = { 0: 11, 1: 12 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 0: 11, 1: 12 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-2.js
index bccba97fb..58e67a53e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-2.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-2.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden to null (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to null (type conversion)),
+    no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-3.js
index d8ed96daf..7dd17314e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-3.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-3.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden to false (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to false (type conversion)),
+    no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-4.js
index 3c069572c..9c31bf037 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-4.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-4.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden to 0 (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to 0 (type conversion)), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-5.js
index 0e678206c..f8fb0147d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-5.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-5.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden to '0' (type conversion)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden to '0' (type conversion)), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-6.js
index 56bc398af..6a72c83be 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-6.js
@@ -1,30 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-6.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden with obj with valueOf), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with obj with valueOf), no
+    initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-7.js
index 3bb6b2447..8f8c1ad4c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-7.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-7.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden with obj w/o valueOf (toString)), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with obj w/o valueOf
+    (toString)), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-8.js
index b705b6073..20e8d55f6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-8.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-8.js

- * @description Array.prototype.reduceRight throws TypeError if 'length' is 0 (subclassed Array, length overridden with []), no initVal

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    f.reduceRight(cb);

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError if 'length' is 0
+    (subclassed Array, length overridden with []), no initVal
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    f.reduceRight(cb);
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-9.js
index 6207502d1..0d98ceb74 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-9.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-5-9.js

- * @description Array.prototype.reduceRight - 'initialValue' is returned if 'len' is 0 and 'initialValue' is present

- */

-

-

-function testcase() {

-

-        var initialValue = 10;

-        return initialValue === [].reduceRight(function () { }, initialValue);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'initialValue' is returned if 'len'
+    is 0 and 'initialValue' is present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var initialValue = 10;
+        return initialValue === [].reduceRight(function () { }, initialValue);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-1.js
index 7c222d596..e3b3734ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-1.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (empty array)

- */

-

-

-function testcase() {

-  function cb(){}

-  

-  try {

-    if([].reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (empty array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function cb(){}
+  
+  try {
+    if([].reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-10.js
index 794e03a2d..713688ee3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-10.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-10.js

- * @description Array.prototype.reduceRight - 'initialValue' is present

- */

-

-

-function testcase() {

-

-        var str = "initialValue is present";

-        return str === [].reduceRight(function () { }, str);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - 'initialValue' is present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = "initialValue is present";
+        return str === [].reduceRight(function () { }, str);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-11.js
index f3df3a4ec..0dc9b532d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-11.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-11.js

- * @description Array.prototype.reduceRight - 'initialValue' is not present

- */

-

-

-function testcase() {

-

-        var str = "initialValue is not present";

-        return str === [str].reduceRight(function () { });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - 'initialValue' is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var str = "initialValue is not present";
+        return str === [str].reduceRight(function () { });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-2.js
index 054a6e5f8..e7a3cd707 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-2.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-2.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to null (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = null;

-  

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    to null (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = null;
+  
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-3.js
index 620f445fb..44d09c077 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-3.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-3.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to false (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = false;

-  

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    to false (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = false;
+  
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-4.js
index e2d28acdf..ad17a044c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-4.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-4.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to 0 (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = 0;

-  

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    to 0 (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = 0;
+  
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-5.js
index 363238454..3906aa154 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-5.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-5.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden to '0' (type conversion))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  f.length = '0';

-  

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    to '0' (type conversion))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  f.length = '0';
+  
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-6.js
index 4182e8ba7..161e5535e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-6.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-6.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with obj with valueOf)

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { valueOf: function () { return 0;}};

-  f.length = o;

-  

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    with obj with valueOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { valueOf: function () { return 0;}};
+  f.length = o;
+  
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-7.js
index 697e6e2a7..551fa861c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-7.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-7.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with obj w/o valueOf (toString))

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  var o = { toString: function () { return '0';}};

-  f.length = o;

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    with obj w/o valueOf (toString))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  var o = { toString: function () { return '0';}};
+  f.length = o;
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-8.js
index e0da31787..771fc72ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-8.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-8.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with [])

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    with [])
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-9.js
index 311b7fec4..3bf24732b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-9.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-7-9.js

- * @description Array.prototype.reduceRight returns initialValue if 'length' is 0 and initialValue is present (subclassed Array, length overridden with [0])

- */

-

-

-function testcase() {

-  foo.prototype = new Array(1, 2, 3);

-  function foo() {}

-  var f = new foo();

-  

-  f.length = [0];

-  

-  // objects inherit the default valueOf method of the Object object;

-  // that simply returns the itself. Since the default valueOf() method

-  // does not return a primitive value, ES next tries to convert the object

-  // to a number by calling its toString() method and converting the

-  // resulting string to a number.

-  //

-  // The toString( ) method on Array converts the array elements to strings,

-  // then returns the result of concatenating these strings, with commas in

-  // between. An array with no elements converts to the empty string, which

-  // converts to the number 0. If an array has a single element that is a

-  // number n, the array converts to a string representation of n, which is

-  // then converted back to n itself. If an array contains more than one element,

-  // or if its one element is not a number, the array converts to NaN.

-

-  function cb(){}

-  try {

-    if(f.reduceRight(cb,1) === 1)

-      return true;

-  }

-  catch (e) {  }  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialValue if 'length' is 0
+    and initialValue is present (subclassed Array, length overridden
+    with [0])
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = new Array(1, 2, 3);
+  function foo() {}
+  var f = new foo();
+  
+  f.length = [0];
+  
+  // objects inherit the default valueOf method of the Object object;
+  // that simply returns the itself. Since the default valueOf() method
+  // does not return a primitive value, ES next tries to convert the object
+  // to a number by calling its toString() method and converting the
+  // resulting string to a number.
+  //
+  // The toString( ) method on Array converts the array elements to strings,
+  // then returns the result of concatenating these strings, with commas in
+  // between. An array with no elements converts to the empty string, which
+  // converts to the number 0. If an array has a single element that is a
+  // number n, the array converts to a string representation of n, which is
+  // then converted back to n itself. If an array contains more than one element,
+  // or if its one element is not a number, the array converts to NaN.
+
+  function cb(){}
+  try {
+    if(f.reduceRight(cb,1) === 1)
+      return true;
+  }
+  catch (e) {  }  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-1.js
index b8276e345..ca3be064b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-1.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-1.js

- * @description Array.prototype.reduceRight - no observable effects occur if 'len' is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        var obj = { length: 0 };

-

-        Object.defineProperty(obj, "0", {

-            get: function () {

-                accessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - no observable effects occur if 'len'
+    is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        var obj = { length: 0 };
+
+        Object.defineProperty(obj, "0", {
+            get: function () {
+                accessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-2.js
index b5f350168..c446d0b93 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-2.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-2.js

- * @description Array.prototype.reduceRight - modifications to length don't change number of iterations in step 9

- */

-

-

-function testcase() {

-        var called = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            called++;

-            return prevVal + curVal;

-        }

-

-        var arr = [0, 1, 2, 3];

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                arr.length = 2;

-                return 10;

-            },

-            configurable: true

-        });

-

-        var preVal = arr.reduceRight(callbackfn);

-

-        return preVal === 11 && called === 2;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - modifications to length don't change
+    number of iterations in step 9
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            called++;
+            return prevVal + curVal;
+        }
+
+        var arr = [0, 1, 2, 3];
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                arr.length = 2;
+                return 10;
+            },
+            configurable: true
+        });
+
+        var preVal = arr.reduceRight(callbackfn);
+
+        return preVal === 11 && called === 2;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-3.js
index be8f95077..5b4321e57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-3.js
@@ -1,48 +1,50 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-3.js

- * @description Array.prototype.reduceRight -  while loop is breaken once 'kPresent' is true

- */

-

-

-function testcase() {

-

-        var called = 0;

-        var testResult = false;

-        var firstCalled = 0;

-        var secondCalled = 0;

-

-        function callbackfn(prevVal, val, idx, obj) {

-            if (called === 0) {

-                testResult = (idx === 1);

-            }

-            called++;

-        }

-

-        var arr = [, , , ];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                firstCalled++;

-                return 9;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                secondCalled++;

-                return 11;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-

-        return testResult && firstCalled === 1 && secondCalled === 1;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight -  while loop is breaken once
+    'kPresent' is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+        var testResult = false;
+        var firstCalled = 0;
+        var secondCalled = 0;
+
+        function callbackfn(prevVal, val, idx, obj) {
+            if (called === 0) {
+                testResult = (idx === 1);
+            }
+            called++;
+        }
+
+        var arr = [, , , ];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                firstCalled++;
+                return 9;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                secondCalled++;
+                return 11;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+
+        return testResult && firstCalled === 1 && secondCalled === 1;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-1.js
index c688a1549..c0790f007 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-1.js
@@ -1,28 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-1.js

- * @description Array.prototype.reduceRight - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        function callbackfn(prevVal, curVal, idx, obj) { }

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "accumulator";

-                return 3;

-            },

-            configurable: true

-        });

-

-        return Array.prototype.reduceRight.call(obj, callbackfn) === "accumulator";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - added properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        function callbackfn(prevVal, curVal, idx, obj) { }
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "accumulator";
+                return 3;
+            },
+            configurable: true
+        });
+
+        return Array.prototype.reduceRight.call(obj, callbackfn) === "accumulator";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-2.js
index 1d62a1491..830b63947 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-ii-2.js

- * @description Array.prototype.reduceRight - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var obj = { 2: "accumulator", 3: "another" };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[2];

-                return 5;

-            },

-            configurable: true

-        });

-

-        return "accumulator" !== Array.prototype.reduceRight.call(obj, function () { });

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleted properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { 2: "accumulator", 3: "another" };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[2];
+                return 5;
+            },
+            configurable: true
+        });
+
+        return "accumulator" !== Array.prototype.reduceRight.call(obj, function () { });
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-1.js
index 9f091642e..e6d46c05c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-1.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                testResult = (prevVal === 1);

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, length: 2 };

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                testResult = (prevVal === 1);
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, length: 2 };
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-10.js
index 69dce91a3..5e73d2956 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-10.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-10.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (curVal === 2);

-            }

-        }

-

-        var arr = [0, 1, , 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (curVal === 2);
+            }
+        }
+
+        var arr = [0, 1, , 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-11.js
index 296d86b57..0eaa47b95 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-11.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-11.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "2", {

-            get: function () {

-                return "20";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "2", {
+            get: function () {
+                return "20";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-12.js
index e57aa01cb..b5896e057 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-12.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-12.js

- * @description  Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        try {

-            Array.prototype[2] = 2;

-            var arr = [0, 1];

-

-            Object.defineProperty(arr, "2", {

-                get: function () {

-                    return "20";

-                },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        try {
+            Array.prototype[2] = 2;
+            var arr = [0, 1];
+
+            Object.defineProperty(arr, "2", {
+                get: function () {
+                    return "20";
+                },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-13.js
index 467e4824f..0510575b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-13.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-13.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1 };

-

-        Object.defineProperty(proto, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "2", {

-            get: function () {

-                return "20";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1 };
+
+        Object.defineProperty(proto, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "2", {
+            get: function () {
+                return "20";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-14.js
index 2905e74f3..dd6a91cfb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-14.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-14.js

- * @description  Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var arr = [0, 1, , ];

-

-            Object.defineProperty(arr, "2", {

-                get: function () {

-                    return "20";

-                },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var arr = [0, 1, , ];
+
+            Object.defineProperty(arr, "2", {
+                get: function () {
+                    return "20";
+                },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-15.js
index 4bceb899e..bb5b98d1f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-15.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var proto = { 0: 0, 1: 1 };

-

-        Object.defineProperty(proto, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var proto = { 0: 0, 1: 1 };
+
+        Object.defineProperty(proto, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-16.js
index c549ec9fe..48d83d7e4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-16.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-16.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return 2;

-                },

-                configurable: true

-            });

-

-            var arr = [0, 1, , ];

-

-            arr.reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return 2;
+                },
+                configurable: true
+            });
+
+            var arr = [0, 1, , ];
+
+            arr.reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-17.js
index cbe5e91c5..c54af5b7e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-17.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-17.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, length: 3 };

-

-        Object.defineProperty(obj, "2", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, length: 3 };
+
+        Object.defineProperty(obj, "2", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-18.js
index d93f63e02..59a2595bb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-18.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-18.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        var arr = [0, 1];

-

-        Object.defineProperty(arr, "2", {

-            set: function () { },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        var arr = [0, 1];
+
+        Object.defineProperty(arr, "2", {
+            set: function () { },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-19.js
index 08508f88a..ff7f50b51 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-19.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-19.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        try {

-            Object.prototype[2] = 2;

-

-            var obj = { 0: 0, 1: 1, length: 3 };

-            Object.defineProperty(obj, "2", {

-                set: function () { },

-                configurable: true

-            });

-

-            Array.prototype.reduceRight.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[2];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        try {
+            Object.prototype[2] = 2;
+
+            var obj = { 0: 0, 1: 1, length: 3 };
+            Object.defineProperty(obj, "2", {
+                set: function () { },
+                configurable: true
+            });
+
+            Array.prototype.reduceRight.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[2];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-2.js
index 364ec69a6..080c6cfa6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-2.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var arr = [0, 1, 2];

-

-        arr.reduceRight(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var arr = [0, 1, 2];
+
+        arr.reduceRight(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-20.js
index 1b5eaf3ea..281440641 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-20.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-20.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        try {

-            Array.prototype[2] = 2;

-            var arr = [0, 1];

-            Object.defineProperty(arr, "2", {

-                set: function () { },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        try {
+            Array.prototype[2] = 2;
+            var arr = [0, 1];
+            Object.defineProperty(arr, "2", {
+                set: function () { },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-21.js
index 7599574d4..3c65afaf5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-21.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-21.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1 };

-

-        Object.defineProperty(proto, "2", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1 };
+
+        Object.defineProperty(proto, "2", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-22.js
index 6df64d3c0..cc69ddd22 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-22.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-22.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof prevVal === "undefined");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                set: function () { },

-                configurable: true

-            });

-

-            var arr = [0, 1, , ];

-

-            arr.reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof prevVal === "undefined");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                set: function () { },
+                configurable: true
+            });
+
+            var arr = [0, 1, , ];
+
+            arr.reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-23.js
index 0a2b0f0b8..135277bd5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-23.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-23.js

- * @description Array.prototype.reduceRight - This object is the global object which contains index property

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 0;

-            fnGlobalObject()[1] = 1;

-            fnGlobalObject()[2] = 2;

-            fnGlobalObject().length = 3;

-

-            Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn);

-            return testResult;

-

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the global object
+    which contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 0;
+            fnGlobalObject()[1] = 1;
+            fnGlobalObject()[2] = 2;
+            fnGlobalObject().length = 3;
+
+            Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn);
+            return testResult;
+
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-25.js
index 48ce5f7e4..988f9b152 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-25.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-25.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                testResult = (prevVal === 1);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn);

-        };

-

-        func(0, 1);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                testResult = (prevVal === 1);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn);
+        };
+
+        func(0, 1);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-26.js
index 7e1d2fc4a..e6abe07b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-26.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-26.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn);

-        };

-

-        func(0, 1, 2);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    equals number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn);
+        };
+
+        func(0, 1, 2);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-27.js
index ff4a84088..fe9209256 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-27.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-27.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (prevVal === 3);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn);

-        };

-

-        func(0, 1, 2, 3);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (prevVal === 3);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn);
+        };
+
+        func(0, 1, 2, 3);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-28.js
index a62248b01..478ceddd6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-28.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-28.js

- * @description Array.prototype.reduceRight applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "2");

-            }

-        }

-

-        var str = new String("012");

-

-        Array.prototype.reduceRight.call(str, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to String object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "2");
+            }
+        }
+
+        var str = new String("012");
+
+        Array.prototype.reduceRight.call(str, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-29.js
index 129a46c91..e021c3216 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-29.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-29.js

- * @description Array.prototype.reduceRight applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var obj = function (a, b, c) {

-            return a + b + c;

-        };

-

-        obj[0] = 0;

-        obj[1] = 1;

-        obj[2] = 2;

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var obj = function (a, b, c) {
+            return a + b + c;
+        };
+
+        obj[0] = 0;
+        obj[1] = 1;
+        obj[2] = 2;
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-3.js
index 1723e640e..5dcda666c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-3.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-3.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 2 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = "10";

-        child[2] = "20";

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 2 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = "10";
+        child[2] = "20";
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-30.js
index 7cd992f91..de886e305 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-30.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-30.js

- * @description Array.prototype.reduceRight - element changed by getter on current iteration is observed in subsequent iterations on an Array

- */

-

-

-function testcase() {

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1 && prevVal === 2);

-            }

-        }

-

-        var arr = [0];

-        var preIterVisible = false;

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return "20";

-                }

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                preIterVisible = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element changed by getter on current
+    iteration is observed in subsequent iterations on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1 && prevVal === 2);
+            }
+        }
+
+        var arr = [0];
+        var preIterVisible = false;
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return "20";
+                }
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                preIterVisible = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-31.js
index f33947869..2cbced976 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-31.js
@@ -1,45 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-31.js

- * @description Array.prototype.reduceRight - element changed by getter on current iteration is observed subsequetly on an Array-like object

- */

-

-

-function testcase() {

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2 && curVal === 1);

-            }

-        }

-

-        var obj = { 0: 0, length: 3 };

-        var preIterVisible = false;

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return "20";

-                }

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                preIterVisible = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element changed by getter on current
+    iteration is observed subsequetly on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2 && curVal === 1);
+            }
+        }
+
+        var obj = { 0: 0, length: 3 };
+        var preIterVisible = false;
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return "20";
+                }
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                preIterVisible = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-32.js
index 5313fa04a..1f7b5e5d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-32.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-32.js

- * @description Array.prototype.reduceRight - Exception in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx <= 1) {

-                accessed = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, length: 3 };

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Exception in getter terminate
+    iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx <= 1) {
+                accessed = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, length: 3 };
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-33.js
index 8ca3350ad..04d55e182 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-33.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-33.js

- * @description Array.prototype.reduceRight - Exception in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx <= 1) {

-                accessed = true;

-            }

-        }

-

-        var arr = [0, 1];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduceRight(callbackfn);

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Exception in getter terminate
+    iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx <= 1) {
+                accessed = true;
+            }
+        }
+
+        var arr = [0, 1];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduceRight(callbackfn);
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-4.js
index 768008388..66ee8d492 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-4.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        try {

-            Array.prototype[2] = "11";

-            [0, 1, 2].reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        try {
+            Array.prototype[2] = "11";
+            [0, 1, 2].reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-5.js
index b3e6a1e5f..e71ace66b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-5.js
@@ -1,45 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-5.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === "20");

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "2", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-        child[0] = "0";

-        child[1] = "1";

-        Object.defineProperty(proto, "2", {

-            value: "20",

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === "20");
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "2", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+        child[0] = "0";
+        child[1] = "1";
+        Object.defineProperty(proto, "2", {
+            value: "20",
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-6.js
index 9817a0dc4..878830d53 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-6.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-6.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "2";

-                },

-                configurable: true

-            });

-            [0, 1, 2].reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[2];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "2";
+                },
+                configurable: true
+            });
+            [0, 1, 2].reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[2];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-7.js
index 6d3829f01..910b2cc99 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-7.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-7.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-

-        Array.prototype.reduceRight.call(child, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2, length: 3 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+
+        Array.prototype.reduceRight.call(child, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-8.js
index 60afbbb5e..5a41889a4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-8.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            Array.prototype[1] = 1;

-            Array.prototype[2] = 2;

-            [, , ,].reduceRight(callbackfn);

-            return testResult;

-

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            Array.prototype[1] = 1;
+            Array.prototype[2] = 2;
+            [, , ,].reduceRight(callbackfn);
+            return testResult;
+
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-9.js
index 266a41b0c..206ae8c2f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-b-iii-1-9.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 2);

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, length: 3 };

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                return 2;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 2);
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, length: 3 };
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                return 2;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-1.js
index 487249257..a0c001fe1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-1.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-1.js

- * @description Array.prototype.reduceRight throws TypeError when Array is empty and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-  try {

-    arr.reduceRight(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError when Array is empty
+    and initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+  try {
+    arr.reduceRight(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-2.js
index 88ff3a234..799d58939 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-2.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-2.js

- * @description Array.prototype.reduceRight throws TypeError when elements assigned values are deleted by reducign array length and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-  arr[9] = 1;

-  arr.length = 5;

-  try {

-    arr.reduceRight(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError when elements
+    assigned values are deleted by reducign array length and
+    initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+  arr[9] = 1;
+  arr.length = 5;
+  try {
+    arr.reduceRight(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-3.js
index af2b44d7d..2c74b47fd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-3.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-3.js

- * @description Array.prototype.reduceRight throws TypeError when elements assigned values are deleted and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = [1,2,3,4,5];

-  delete arr[0];

-  delete arr[1];

-  delete arr[2];

-  delete arr[3];

-  delete arr[4];

-  try {

-    arr.reduceRight(callbackfn);

-  } 

-  catch(e) {

-    if(e instanceof TypeError)

-      return true;  

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight throws TypeError when elements
+    assigned values are deleted and initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = [1,2,3,4,5];
+  delete arr[0];
+  delete arr[1];
+  delete arr[2];
+  delete arr[3];
+  delete arr[4];
+  try {
+    arr.reduceRight(callbackfn);
+  } 
+  catch(e) {
+    if(e instanceof TypeError)
+      return true;  
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-4.js
index 8b6e2173b..44519d2da 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-4.js

- * @description Array.prototype.reduceRight doesn't throw error when array has no own properties but prototype contains a single property

- */

-

-

-function testcase() {

-

-        var arr = [, , , ];

-

-        try {

-            Array.prototype[1] = "prototype";

-            arr.reduceRight(function () { });

-            return true;

-        } catch (ex) {

-            return false;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight doesn't throw error when array has no
+    own properties but prototype contains a single property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [, , , ];
+
+        try {
+            Array.prototype[1] = "prototype";
+            arr.reduceRight(function () { });
+            return true;
+        } catch (ex) {
+            return false;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-5.js
index 72e3b2ae0..12922d18b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-5.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-5.js

- * @description Array.prototype.reduceRight - side effects produced by step 2 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = { };

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                accessed = true;

-                return 2;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side effects produced by step 2 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = { };
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                accessed = true;
+                return 2;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-6.js
index 7be447abf..b980ce6f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-6.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-6.js

- * @description Array.prototype.reduceRight - side effects produced by step 3 are visible when an exception occurs

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        var accessed = false;

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        accessed = true;

-                        return "2";

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError) && accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - side effects produced by step 3 are
+    visible when an exception occurs
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        var accessed = false;
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        accessed = true;
+                        return "2";
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError) && accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-7.js
index 16900c0b3..291f30d27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-7.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-7.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 2

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                throw new SyntaxError();

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                throw new SyntaxError();
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-8.js
index 1e5c81167..ec51a7bbd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-8-c-8.js

- * @description Array.prototype.reduceRight - the exception is not thrown if exception was thrown by step 3

- */

-

-

-function testcase() {

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                return {

-                    toString: function () {

-                        throw new SyntaxError();

-                    }

-                };

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, function () { });

-            return false;

-        } catch (ex) {

-            return !(ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the exception is not thrown if
+    exception was thrown by step 3
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                return {
+                    toString: function () {
+                        throw new SyntaxError();
+                    }
+                };
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, function () { });
+            return false;
+        } catch (ex) {
+            return !(ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-1.js
index 91730cae5..4897c4621 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-1.js
@@ -1,22 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-1.js

- * @description Array.prototype.reduceRight doesn't consider new elements which index is larger than array original length added to array after it is called, consider new elements which index is smaller than array length

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            arr[5] = 6;

-            arr[2] = 3;

-            return prevVal + curVal;

-        }

-

-        var arr = ['1', 2, , 4, '5'];

-        return arr.reduceRight(callbackfn) === "54321";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight doesn't consider new elements which
+    index is larger than array original length added to array after it
+    is called, consider new elements which index is smaller than array
+    length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            arr[5] = 6;
+            arr[2] = 3;
+            return prevVal + curVal;
+        }
+
+        var arr = ['1', 2, , 4, '5'];
+        return arr.reduceRight(callbackfn) === "54321";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-2.js
index d85e721e4..e21db33b7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-2.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-2.js

- * @description Array.prototype.reduceRight considers new value of elements in array after it is called

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    arr[3] = -2;

-    arr[0] = -1;

-    return prevVal + curVal;

-  }

-

-  var arr = [1,2,3,4,5];

-  if(arr.reduceRight(callbackfn) === 13)

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight considers new value of elements in
+    array after it is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    arr[3] = -2;
+    arr[0] = -1;
+    return prevVal + curVal;
+  }
+
+  var arr = [1,2,3,4,5];
+  if(arr.reduceRight(callbackfn) === 13)
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-3.js
index 6a07dc585..0a2425f03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-3.js

- * @description Array.prototype.reduceRight doesn't consider unvisited deleted elements in array after the call

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)  

-  {

-    delete arr[1];

-    delete arr[4];

-    return prevVal + curVal;    

-  }

-

-  var arr = ['1',2,3,4,5];

-  if(arr.reduceRight(callbackfn) === "121" )    // two elements deleted

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight doesn't consider unvisited deleted
+    elements in array after the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)  
+  {
+    delete arr[1];
+    delete arr[4];
+    return prevVal + curVal;    
+  }
+
+  var arr = ['1',2,3,4,5];
+  if(arr.reduceRight(callbackfn) === "121" )    // two elements deleted
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-4.js
index bbf7080ed..7eea640dc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-4.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-4.js

- * @description Array.prototype.reduceRight doesn't consider unvisited deleted elements when Array.length is decreased

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    arr.length = 2;

-    return prevVal + curVal;

-  }

-

-  var arr = [1,2,3,4,5];

-  if(arr.reduceRight(callbackfn) === 12 )

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight doesn't consider unvisited deleted
+    elements when Array.length is decreased
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    arr.length = 2;
+    return prevVal + curVal;
+  }
+
+  var arr = [1,2,3,4,5];
+  if(arr.reduceRight(callbackfn) === 12 )
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-5.js
index 733d80b59..7346c1616 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-5.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-5.js

- * @description Array.prototype.reduceRight - callbackfn not called for array with one element

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    callCnt++;

-    return 2;

-  }

-

-  var arr = [1];

-  if(arr.reduceRight(callbackfn) === 1 && callCnt === 0 )

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn not called for array with
+    one element
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    callCnt++;
+    return 2;
+  }
+
+  var arr = [1];
+  if(arr.reduceRight(callbackfn) === 1 && callCnt === 0 )
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-6.js
index 15ced19ef..fd0d4e35f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-6.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-6.js

- * @description Array.prototype.reduceRight visits deleted element in array after the call when same index is also present in prototype

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)  

-  {

-    delete arr[1];

-    delete arr[2];

-    return prevVal + curVal;    

-  }

-  Array.prototype[2] = 6;

-  var arr = ['1',2,3,4,5];

-  var res = arr.reduceRight(callbackfn);

-  delete Array.prototype[2];

-

-  if(res === "151" )    //one element deleted

-    return true;  

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight visits deleted element in array after
+    the call when same index is also present in prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)  
+  {
+    delete arr[1];
+    delete arr[2];
+    return prevVal + curVal;    
+  }
+  Array.prototype[2] = 6;
+  var arr = ['1',2,3,4,5];
+  var res = arr.reduceRight(callbackfn);
+  delete Array.prototype[2];
+
+  if(res === "151" )    //one element deleted
+    return true;  
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-7.js
index 7115beca4..64f46cb60 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-7.js

- * @description Array.prototype.reduceRight not affect call when the array is deleted during the call

- */

-

-

-function testcase() {

-        function callbackfn(prevVal, curVal, idx, obj) {

-            delete o.arr;

-            return prevVal + curVal;

-        }

-

-        var o = new Object();

-        o.arr = ['1', 2, 3, 4, 5];

-        return o.arr.reduceRight(callbackfn) === "141" && !o.hasOwnProperty("arr");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight not affect call when the array is
+    deleted during the call
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function callbackfn(prevVal, curVal, idx, obj) {
+            delete o.arr;
+            return prevVal + curVal;
+        }
+
+        var o = new Object();
+        o.arr = ['1', 2, 3, 4, 5];
+        return o.arr.reduceRight(callbackfn) === "141" && !o.hasOwnProperty("arr");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-8.js
index adf2d7ee3..d3746d332 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-8.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-8.js

- * @description Array.prototype.reduceRight - no observable effects occur if 'len' is 0

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn() {

-            accessed = true;

-        }

-

-        var obj = { length: 0 };

-

-        Object.defineProperty(obj, "5", {

-            get: function () {

-                accessed = true;

-                return 10;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, function () { }, "initialValue");

-        return !accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - no observable effects occur if 'len'
+    is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn() {
+            accessed = true;
+        }
+
+        var obj = { length: 0 };
+
+        Object.defineProperty(obj, "5", {
+            get: function () {
+                accessed = true;
+                return 10;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, function () { }, "initialValue");
+        return !accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-9.js
index f661c629f..fbed767db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-9.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-9.js

- * @description Array.prototype.reduceRight - modifications to length will change number of iterations

- */

-

-

-function testcase() {

-        var called = 0;

-        function callbackfn(preVal, val, idx, obj) {

-            called++;

-        }

-

-        var arr = [0, 1, 2, 3];

-        Object.defineProperty(arr, "4", {

-            get: function () {

-                arr.length = 2;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-

-        return called === 3;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - modifications to length will change
+    number of iterations
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var called = 0;
+        function callbackfn(preVal, val, idx, obj) {
+            called++;
+        }
+
+        var arr = [0, 1, 2, 3];
+        Object.defineProperty(arr, "4", {
+            get: function () {
+                arr.length = 2;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+
+        return called === 3;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-1.js
index e2d928db0..d1830a6e5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-1.js

- * @description Array.prototype.reduceRight returns initialvalue when Array is empty and initialValue is not present

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-  }

-

-  var arr = new Array(10);

-  

-  if(arr.reduceRight(callbackfn,5) === 5)

-    return true;  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight returns initialvalue when Array is
+    empty and initialValue is not present
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+  }
+
+  var arr = new Array(10);
+  
+  if(arr.reduceRight(callbackfn,5) === 5)
+    return true;  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-10.js
index 1d6005c61..130c6e3a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-10.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-10.js

- * @description Array.prototype.reduceRight - deleting property of prototype in step 8 causes deleted index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(preVal, val, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "5", {

-            get: function () {

-                delete Object.prototype[3];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[3] = 1;

-            Array.prototype.reduceRight.call(obj, callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Object.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting property of prototype in
+    step 8 causes deleted index property not to be visited on an
+    Array-like Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(preVal, val, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "5", {
+            get: function () {
+                delete Object.prototype[3];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[3] = 1;
+            Array.prototype.reduceRight.call(obj, callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Object.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-11.js
index ed5c4b32a..9de88c549 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-11.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-11.js

- * @description Array.prototype.reduceRight - deleting property of prototype in step 8 causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, , , ];

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduceRight(callbackfn);

-            return testResult && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting property of prototype in
+    step 8 causes deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, , , ];
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduceRight(callbackfn);
+            return testResult && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-12.js
index ef7371db6..2d97e642f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-12.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-12.js

- * @description Array.prototype.reduceRight - deleting own property with prototype property in step 8 causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 111, length: 10 };

-

-        Object.defineProperty(obj, "4", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.reduceRight.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property with prototype
+    property in step 8 causes prototype index property to be visited
+    on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 111, length: 10 };
+
+        Object.defineProperty(obj, "4", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.reduceRight.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-13.js
index 98b592345..5ab0bf436 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-13.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-13.js

- * @description Array.prototype.reduceRight - deleting own property with prototype property in step 8 causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-        var arr = [0, 111];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduceRight(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property with prototype
+    property in step 8 causes prototype index property to be visited
+    on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+        var arr = [0, 111];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduceRight(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-14.js
index 729158add..064fb17ac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-14.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-14.js

- * @description Array.prototype.reduceRight - decreasing length of array in step 8 causes deleted index property not to be visited

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                arr.length = 2;

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array in step 8
+    causes deleted index property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                arr.length = 2;
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-15.js
index c6ff3dc47..b1d1a9c4b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-15.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-15.js

- * @description Array.prototype.reduceRight - decreasing length of array with prototype property in step 8 causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2 && curVal === "prototype") {

-                testResult = true;

-            }

-        }

-        var arr = [0, 1, 2, 3];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "3", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn);

-

-            return testResult;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array with
+    prototype property in step 8 causes prototype index property to be
+    visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2 && curVal === "prototype") {
+                testResult = true;
+            }
+        }
+        var arr = [0, 1, 2, 3];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "3", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn);
+
+            return testResult;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-16.js
index 256884a7f..7238182d3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-16.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-16.js

- * @description Array.prototype.reduceRight - decreasing length of array in step 8 does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2 && curVal === "unconfigurable") {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array in step 8
+    does not delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2 && curVal === "unconfigurable") {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-17.js
index 0dee9d966..37c317aac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-17.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-17.js

- * @description Array.prototype.reduceRight - properties added into own object are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0 && curVal === 0) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                Object.defineProperty(obj, "0", {

-                    get: function () {

-                        return 0;

-                    },

-                    configurable: true

-                });

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added into own object are
+    visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0 && curVal === 0) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                Object.defineProperty(obj, "0", {
+                    get: function () {
+                        return 0;
+                    },
+                    configurable: true
+                });
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-18.js
index 702a8590a..423e32494 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-18.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-18.js

- * @description Array.prototype.reduceRight - properties added into own object are visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added into own object are
+    visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-19.js
index 4ce0b025b..561ba7c9e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-19.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-19.js

- * @description Array.prototype.reduceRight - properties added to prototype are visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 6 };

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added to prototype are
+    visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 6 };
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-2.js
index 556d8d640..6d5298ed0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-2.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-2.js

- * @description Array.prototype.reduceRight - added properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2 && curVal === "2") {

-                testResult = true;

-            }

-        }

-

-        var obj = {};

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                obj[2] = "2";

-                return 3;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - added properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2 && curVal === "2") {
+                testResult = true;
+            }
+        }
+
+        var obj = {};
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                obj[2] = "2";
+                return 3;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-20.js
index 21b490e47..0d2a6f05c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-20.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-20.js

- * @description Array.prototype.reduceRight - properties added to prototype can be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added to prototype can be
+    visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-21.js
index e0ea32986..32ac164af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-21.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-21.js

- * @description Array.prototype.reduceRight - deleting own property causes deleted index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 0: 10, length: 10 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "5", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property causes deleted
+    index property not to be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 0: 10, length: 10 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "5", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-22.js
index 13ebf8fc5..55ce03b8b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-22.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-22.js

- * @description Array.prototype.reduceRight - deleting own property causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [1, 2, 4];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property causes deleted
+    index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [1, 2, 4];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-23.js
index aadccc3ad..7130756ed 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-23.js
@@ -1,42 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-23.js

- * @description Array.prototype.reduceRight - deleting property of prototype causes deleted index property not to be visited on an Array-like Object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 3) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: 2, length: 20 };

-

-        Object.defineProperty(obj, "5", {

-            get: function () {

-                delete Object.prototype[3];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[3] = 1;

-            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-            return testResult && accessed;

-        } finally {

-            delete Object.prototype[3];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting property of prototype
+    causes deleted index property not to be visited on an Array-like
+    Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 3) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: 2, length: 20 };
+
+        Object.defineProperty(obj, "5", {
+            get: function () {
+                delete Object.prototype[3];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[3] = 1;
+            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+            return testResult && accessed;
+        } finally {
+            delete Object.prototype[3];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-24.js
index d1237462e..3f459e637 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-24.js
@@ -1,41 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-24.js

- * @description Array.prototype.reduceRight - deleting property of prototype causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, , , ];

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                delete Array.prototype[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult && accessed;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting property of prototype
+    causes deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, , , ];
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                delete Array.prototype[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult && accessed;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-25.js
index 957a7f3b1..f11a044ae 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-25.js
@@ -1,40 +1,43 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-25.js

- * @description Array.prototype.reduceRight - deleting own property with prototype property causes prototype index property to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };

-

-        Object.defineProperty(obj, "4", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Object.prototype[1] = 1;

-            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property with prototype
+    property causes prototype index property to be visited on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 0, 1: 111, 4: 10, length: 10 };
+
+        Object.defineProperty(obj, "4", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Object.prototype[1] = 1;
+            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-26.js
index 3e834301b..525a7a014 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-26.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-26.js

- * @description Array.prototype.reduceRight - deleting own property with prototype property causes prototype index property to be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-        var arr = [0, 111];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype[1] = 1;

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property with prototype
+    property causes prototype index property to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+        var arr = [0, 111];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype[1] = 1;
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-27.js
index bc65007e4..ff88d0629 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-27.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-27.js

- * @description Array.prototype.reduceRight - decreasing length of array causes deleted index property not to be visited

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                arr.length = 2;

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array causes
+    deleted index property not to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                arr.length = 2;
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-28.js
index f4a598f36..d8d9cbc37 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-28.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-28.js

- * @description Array.prototype.reduceRight - decreasing length of array with prototype property causes prototype index property to be visited

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2 && curVal === "prototype") {

-                testResult = true;

-            }

-        }

-        var arr = [0, 1, 2, 3];

-

-        try {

-            Object.defineProperty(Array.prototype, "2", {

-                get: function () {

-                    return "prototype";

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(arr, "3", {

-                get: function () {

-                    arr.length = 2;

-                    return 1;

-                },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn, "initialValue");

-

-            return testResult;

-        } finally {

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array with
+    prototype property causes prototype index property to be visited
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2 && curVal === "prototype") {
+                testResult = true;
+            }
+        }
+        var arr = [0, 1, 2, 3];
+
+        try {
+            Object.defineProperty(Array.prototype, "2", {
+                get: function () {
+                    return "prototype";
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(arr, "3", {
+                get: function () {
+                    arr.length = 2;
+                    return 1;
+                },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn, "initialValue");
+
+            return testResult;
+        } finally {
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-29.js
index 2866d075b..78c7aeac2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-29.js
@@ -1,43 +1,45 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-29.js

- * @description Array.prototype.reduceRight - decreasing length of array does not delete non-configurable properties

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2 && curVal === "unconfigurable") {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, 1, 2, 3];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                return "unconfigurable";

-            },

-            configurable: false

-        });

-

-        Object.defineProperty(arr, "3", {

-            get: function () {

-                arr.length = 2;

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - decreasing length of array does not
+    delete non-configurable properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2 && curVal === "unconfigurable") {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, 1, 2, 3];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                return "unconfigurable";
+            },
+            configurable: false
+        });
+
+        Object.defineProperty(arr, "3", {
+            get: function () {
+                arr.length = 2;
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-3.js
index 43e54d5ef..3f6f11a4e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-3.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-3.js

- * @description Array.prototype.reduceRight - deleted properties in step 2 are visible here

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 2) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 2: "2", 3: 10 };

-

-        Object.defineProperty(obj, "length", {

-            get: function () {

-                delete obj[2];

-                return 5;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-

-        return accessed && testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleted properties in step 2 are
+    visible here
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 2) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 2: "2", 3: 10 };
+
+        Object.defineProperty(obj, "length", {
+            get: function () {
+                delete obj[2];
+                return 5;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+
+        return accessed && testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-4.js
index a01922b22..b2e0a6834 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-4.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-4.js

- * @description Array.prototype.reduceRight - properties added into own object in step 8 can be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            if (idx === 0 && curVal === 0) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 2 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                Object.defineProperty(obj, "0", {

-                    get: function () {

-                        return 0;

-                    },

-                    configurable: true

-                });

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added into own object in
+    step 8 can be visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            if (idx === 0 && curVal === 0) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 2 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                Object.defineProperty(obj, "0", {
+                    get: function () {
+                        return 0;
+                    },
+                    configurable: true
+                });
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-5.js
index 4d1556f4c..1f51d521e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-5.js
@@ -1,40 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-5.js

- * @description Array.prototype.reduceRight - properties added into own object in step 8 can be visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 1) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(arr, "1", {

-                    get: function () {

-                        return 1;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added into own object in
+    step 8 can be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 1) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(arr, "1", {
+                    get: function () {
+                        return 1;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-6.js
index 587acd4e8..02891357c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-6.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-6.js

- * @description Array.prototype.reduceRight - properties added to prototype in step 8 visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var obj = { length: 6 };

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                Object.defineProperty(Object.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn);

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added to prototype in
+    step 8 visited on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var obj = { length: 6 };
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                Object.defineProperty(Object.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn);
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-7.js
index ec2fc0c3c..775af0ebd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-7.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-7.js

- * @description Array.prototype.reduceRight - properties added to prototype in step 8 visited on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            if (idx === 1 && curVal === 6.99) {

-                testResult = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                Object.defineProperty(Array.prototype, "1", {

-                    get: function () {

-                        return 6.99;

-                    },

-                    configurable: true

-                });

-                return 0;

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduceRight(callbackfn);

-            return testResult;

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - properties added to prototype in
+    step 8 visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            if (idx === 1 && curVal === 6.99) {
+                testResult = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                Object.defineProperty(Array.prototype, "1", {
+                    get: function () {
+                        return 6.99;
+                    },
+                    configurable: true
+                });
+                return 0;
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduceRight(callbackfn);
+            return testResult;
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-8.js
index d080f6386..40e564cf2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-8.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-8.js

- * @description Array.prototype.reduceRight - deleting own property in step 8 causes deleted index property not to be visited on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(preVal, val, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var obj = { 0: 10, length: 10 };

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 6.99;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "5", {

-            get: function () {

-                delete obj[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property in step 8
+    causes deleted index property not to be visited on an Array-like
+    object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(preVal, val, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var obj = { 0: 10, length: 10 };
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 6.99;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "5", {
+            get: function () {
+                delete obj[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-9.js
index 3b5262d0d..c27ee7076 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-9.js
@@ -1,44 +1,46 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-b-9.js

- * @description Array.prototype.reduceRight - deleting own property in step 8 causes deleted index property not to be visited on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var testResult = true;

-

-        function callbackfn(preVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                testResult = false;

-            }

-        }

-

-        var arr = [0];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return "6.99";

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                delete arr[1];

-                return 0;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn);

-        return testResult && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - deleting own property in step 8
+    causes deleted index property not to be visited on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var testResult = true;
+
+        function callbackfn(preVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                testResult = false;
+            }
+        }
+
+        var arr = [0];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return "6.99";
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                delete arr[1];
+                return 0;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn);
+        return testResult && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-1.js
index e9605005b..22b4b3ed8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-1.js

- * @description Array.prototype.reduceRight - callbackfn not called for indexes never been assigned values

- */

-

-

-function testcase() { 

- 

-  var callCnt = 0;

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    callCnt++;

-    return curVal;

-  }

-

-  var arr = new Array(10);

-  arr[0] = arr[1] = undefined; //explicitly assigning a value

-  if( arr.reduceRight(callbackfn) === undefined && callCnt === 1)

-    return true;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn not called for indexes
+    never been assigned values
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var callCnt = 0;
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    callCnt++;
+    return curVal;
+  }
+
+  var arr = new Array(10);
+  arr[0] = arr[1] = undefined; //explicitly assigning a value
+  if( arr.reduceRight(callbackfn) === undefined && callCnt === 1)
+    return true;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-1.js
index 9f7d759f7..e6c6c51b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-1.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                testResult = (curVal === 0);

-            }

-        }

-

-        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                testResult = (curVal === 0);
+            }
+        }
+
+        var obj = { 0: 0, 1: 1, 2: 2, length: 2 };
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-10.js
index c38db49a8..01094e245 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-10.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property on an Array

- */

-

-

-function testcase() {

-    

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-11.js
index 23faac6e7..b5379b7b3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-11.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-11.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        var proto = { 0: 0, 1: 11, 2: 2 };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return "1";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        var proto = { 0: 0, 1: 11, 2: 2 };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return "1";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-12.js
index d90ff9b89..354f8ac8c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-12.js
@@ -1,39 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-12.js

- * @description  Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-        

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        try {

-            Array.prototype[1] = 11;

-            var arr = [0, ,2];

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return "1";

-                },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited data property on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        try {
+            Array.prototype[1] = 11;
+            var arr = [0, ,2];
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return "1";
+                },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-13.js
index 23e696b2c..dad90438a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-13.js
@@ -1,46 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-13.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-        

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        var proto = { 0: 0, 2: 2};

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 11;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Object.defineProperty(child, "1", {

-            get: function () {

-                return "1";

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        var proto = { 0: 0, 2: 2};
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 11;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Object.defineProperty(child, "1", {
+            get: function () {
+                return "1";
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-14.js
index af7095e0d..3e704d4cc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-14.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-14.js

- * @description  Array.prototype.reduceRight - element to be retrieved is own accessor property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 11;

-                },

-                configurable: true

-            });

-

-            var arr = [0, ,2];

-

-            Object.defineProperty(arr, "1", {

-                get: function () {

-                    return "1";

-                },

-                configurable: true

-            });

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property that overrides an inherited accessor property on
+    an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 11;
+                },
+                configurable: true
+            });
+
+            var arr = [0, ,2];
+
+            Object.defineProperty(arr, "1", {
+                get: function () {
+                    return "1";
+                },
+                configurable: true
+            });
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-15.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-15.js
index b87645abd..b2f1fbfed 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-15.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-15.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-15.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var proto = { 0: 0, 2: 2 };

-

-        Object.defineProperty(proto, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var proto = { 0: 0, 2: 2 };
+
+        Object.defineProperty(proto, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-16.js
index ec6fa02a8..b4daf5b93 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-16.js
@@ -1,38 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-16.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return 1;

-                },

-                configurable: true

-            });

-

-            var arr = [0, , 2];

-

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return 1;
+                },
+                configurable: true
+            });
+
+            var arr = [0, , 2];
+
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-17.js
index 9c6d616d3..bd34c6641 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-17.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-17.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-

-        Object.defineProperty(obj, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+
+        Object.defineProperty(obj, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-18.js
index c4d92754f..dc9369521 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-18.js
@@ -1,32 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-18.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult;

-         

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult;
+         
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-19.js
index 28b625dcb..0f5a93614 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-19.js
@@ -1,37 +1,40 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-19.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        try {

-            Object.prototype[1] = 1;

-

-            var obj = { 0: 0, 2: 2, length: 3 };

-            Object.defineProperty(obj, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-            return testResult;

-        } finally {

-            delete Object.prototype[1];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        try {
+            Object.prototype[1] = 1;
+
+            var obj = { 0: 0, 2: 2, length: 3 };
+            Object.defineProperty(obj, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+            return testResult;
+        } finally {
+            delete Object.prototype[1];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-2.js
index aac59de14..03b22b03d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-2.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [0, 1, 2];

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [0, 1, 2];
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-20.js
index 5e5ba85f8..a2d94f6b3 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-20.js
@@ -1,36 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-20.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property without a get function that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        try {

-            Array.prototype[1] = 1;

-            var arr = [0, ,2];

-            Object.defineProperty(arr, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property without a get function that overrides an
+    inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        try {
+            Array.prototype[1] = 1;
+            var arr = [0, ,2];
+            Object.defineProperty(arr, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-21.js
index d889aabda..f1928a679 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-21.js
@@ -1,39 +1,41 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-21.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property without a get function on an Array-like object

- */

-

-

-function testcase() {

-    

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        var proto = { 0: 0, 2: 2 };

-

-        Object.defineProperty(proto, "1", {

-            set: function () { },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property without a get function on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        var proto = { 0: 0, 2: 2 };
+
+        Object.defineProperty(proto, "1", {
+            set: function () { },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-22.js
index 92042cb65..64dbcbbc4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-22.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-22.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited accessor property without a get function on an Array

- */

-

-

-function testcase() {

-    

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (typeof curVal === "undefined");

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                set: function () { },

-                configurable: true

-            });

-

-            var arr = [0, , 2];

-

-            arr.reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    accessor property without a get function on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (typeof curVal === "undefined");
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                set: function () { },
+                configurable: true
+            });
+
+            var arr = [0, , 2];
+
+            arr.reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-23.js
index 6d267608c..18d6c86eb 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-23.js
@@ -1,38 +1,42 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-23.js

- * @description Array.prototype.reduceRight - This object is an global object which contains index property

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            var oldLen = fnGlobalObject().length;

-            fnGlobalObject()[0] = 0;

-            fnGlobalObject()[1] = 1;

-            fnGlobalObject()[2] = 2;

-            fnGlobalObject().length = 3;

-

-            Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete fnGlobalObject()[0];

-            delete fnGlobalObject()[1];

-            delete fnGlobalObject()[2];

-            fnGlobalObject().length = oldLen;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is an global object
+    which contains index property
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            var oldLen = fnGlobalObject().length;
+            fnGlobalObject()[0] = 0;
+            fnGlobalObject()[1] = 1;
+            fnGlobalObject()[2] = 2;
+            fnGlobalObject().length = 3;
+
+            Array.prototype.reduceRight.call(fnGlobalObject(), callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete fnGlobalObject()[0];
+            delete fnGlobalObject()[1];
+            delete fnGlobalObject()[2];
+            fnGlobalObject().length = oldLen;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-25.js
index 97a8e54b4..b9f150ee8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-25.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-25.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments is less than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");

-        };

-

-        func(0, 1);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is less than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");
+        };
+
+        func(0, 1);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-26.js
index fad7e2f36..9bb4eaded 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-26.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-26.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments equals number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (curVal === 2);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");

-        };

-

-        func(0, 1, 2);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    equals number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (curVal === 2);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");
+        };
+
+        func(0, 1, 2);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-27.js
index a7a51e52d..be8cf9293 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-27.js
@@ -1,28 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-27.js

- * @description Array.prototype.reduceRight - This object is the Arguments object which implements its own property get method (number of arguments is greater than number of parameters)

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 3) {

-                testResult = (curVal === 3);

-            }

-        }

-

-        var func = function (a, b, c) {

-            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");

-        };

-

-        func(0, 1, 2, 3);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - This object is the Arguments object
+    which implements its own property get method (number of arguments
+    is greater than number of parameters)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 3) {
+                testResult = (curVal === 3);
+            }
+        }
+
+        var func = function (a, b, c) {
+            Array.prototype.reduceRight.call(arguments, callbackfn, "initialValue");
+        };
+
+        func(0, 1, 2, 3);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-28.js
index 37788d32e..713b73a43 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-28.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-28.js

- * @description Array.prototype.reduceRight applied to String object, which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        var str = new String("012");

-        Array.prototype.reduceRight.call(str, callbackfn, "initialValue");

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to String object, which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        var str = new String("012");
+        Array.prototype.reduceRight.call(str, callbackfn, "initialValue");
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-29.js
index c9fea29d9..7390d9ebe 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-29.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-29.js

- * @description Array.prototype.reduceRight applied to Function object which implements its own property get method

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var initialValue = 0;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = function (a, b, c) {

-            return a + b + c;

-        };

-        obj[0] = 0;

-        obj[1] = 1;

-        obj[2] = 2;

-        obj[3] = 3;

-

-        Array.prototype.reduceRight.call(obj, callbackfn, initialValue);

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight applied to Function object which
+    implements its own property get method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var initialValue = 0;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = function (a, b, c) {
+            return a + b + c;
+        };
+        obj[0] = 0;
+        obj[1] = 1;
+        obj[2] = 2;
+        obj[3] = 3;
+
+        Array.prototype.reduceRight.call(obj, callbackfn, initialValue);
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-3.js
index 924a7e6e4..4f9715622 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-3.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-3.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === "1");

-            }

-        }

-

-        var proto = { 0: 10, 1: 11, 2: 12, length: 2 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child[1] = "1";

-        child[2] = "2";

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited data property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === "1");
+            }
+        }
+
+        var proto = { 0: 10, 1: 11, 2: 12, length: 2 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child[1] = "1";
+        child[2] = "2";
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-30.js
index 06e454b17..60239232b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-30.js
@@ -1,46 +1,48 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-30.js

- * @description Array.prototype.reduceRight - element changed by getter on previous iterations is observed on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var arr = [, ,];

-        var preIterVisible = false;

-

-        Object.defineProperty(arr, "2", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return "11";

-                }

-            },

-            configurable: true

-        });

-

-        arr.reduceRight(callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element changed by getter on
+    previous iterations is observed on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var arr = [, ,];
+        var preIterVisible = false;
+
+        Object.defineProperty(arr, "2", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return "11";
+                }
+            },
+            configurable: true
+        });
+
+        arr.reduceRight(callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-31.js
index 0d558e0e4..d59afc704 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-31.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-31.js

- * @description Array.prototype.reduceRight - element changed by getter on previous iterations is observed on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { length: 3 };

-        var preIterVisible = false;

-

-        Object.defineProperty(obj, "2", {

-            get: function () {

-                preIterVisible = true;

-                return 0;

-            },

-            configurable: true

-        });

-

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                if (preIterVisible) {

-                    return 1;

-                } else {

-                    return "11";

-                }

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element changed by getter on
+    previous iterations is observed on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { length: 3 };
+        var preIterVisible = false;
+
+        Object.defineProperty(obj, "2", {
+            get: function () {
+                preIterVisible = true;
+                return 0;
+            },
+            configurable: true
+        });
+
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                if (preIterVisible) {
+                    return 1;
+                } else {
+                    return "11";
+                }
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-32.js
index 2f1423ad5..6fd72875b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-32.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-32.js

- * @description Array.prototype.reduceRight - unnhandled exceptions happened in getter terminate iteration on an Array-like object

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx <= 1) {

-                accessed = true;

-            }

-        }

-

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-            return false;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - unnhandled exceptions happened in
+    getter terminate iteration on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx <= 1) {
+                accessed = true;
+            }
+        }
+
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+            return false;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-33.js
index a1e6a7988..0c3304797 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-33.js
@@ -1,37 +1,39 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-33.js

- * @description Array.prototype.reduceRight - unnhandled exceptions happened in getter terminate iteration on an Array

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx <= 1) {

-                accessed = true;

-            }

-        }

-

-        var arr = [0, , 2];

-

-        Object.defineProperty(arr, "1", {

-            get: function () {

-                throw new RangeError("unhandle exception happened in getter");

-            },

-            configurable: true

-        });

-

-        try {

-            arr.reduceRight(callbackfn, "initialValue");

-            return true;

-        } catch (ex) {

-            return (ex instanceof RangeError) && !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - unnhandled exceptions happened in
+    getter terminate iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx <= 1) {
+                accessed = true;
+            }
+        }
+
+        var arr = [0, , 2];
+
+        Object.defineProperty(arr, "1", {
+            get: function () {
+                throw new RangeError("unhandle exception happened in getter");
+            },
+            configurable: true
+        });
+
+        try {
+            arr.reduceRight(callbackfn, "initialValue");
+            return true;
+        } catch (ex) {
+            return (ex instanceof RangeError) && !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-4.js
index 7621f8a37..b7d63899f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-4.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Array.prototype[1] = "11";

-            [0, 1, 2].reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Array.prototype[1] = "11";
+            [0, 1, 2].reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-5.js
index e336657d5..0ab856ad9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-5.js
@@ -1,44 +1,47 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-5.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 0) {

-                testResult = (curVal === "0");

-            }

-        }

-

-        var proto = {};

-

-        Object.defineProperty(proto, "0", {

-            get: function () {

-                return 10;

-            },

-            configurable: true

-        });

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 2;

-        Object.defineProperty(child, "0", {

-            value: "0",

-            configurable: true

-        });

-        child[1] = "1";

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited accessor property on an
+    Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 0) {
+                testResult = (curVal === "0");
+            }
+        }
+
+        var proto = {};
+
+        Object.defineProperty(proto, "0", {
+            get: function () {
+                return 10;
+            },
+            configurable: true
+        });
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 2;
+        Object.defineProperty(child, "0", {
+            value: "0",
+            configurable: true
+        });
+        child[1] = "1";
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-6.js
index 0e1fff8e4..c8fcf9f87 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-6.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-6.js

- * @description Array.prototype.reduceRight - element to be retrieved is own data property that overrides an inherited accessor property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Object.defineProperty(Array.prototype, "1", {

-                get: function () {

-                    return "11";

-                },

-                configurable: true

-            });

-            [0, 1, 2].reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[1];

-        }

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own data
+    property that overrides an inherited accessor property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Object.defineProperty(Array.prototype, "1", {
+                get: function () {
+                    return "11";
+                },
+                configurable: true
+            });
+            [0, 1, 2].reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[1];
+        }
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-7.js
index 0fe74c677..fedcea975 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-7.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-7.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited data property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var proto = { 0: 0, 1: 1, 2: 2 };

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.length = 3;

-

-        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    data property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var proto = { 0: 0, 1: 1, 2: 2 };
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.length = 3;
+
+        Array.prototype.reduceRight.call(child, callbackfn, "initialValue");
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-8.js
index f289ed0f5..f52e8237a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-8.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-8.js

- * @description Array.prototype.reduceRight - element to be retrieved is inherited data property on an Array

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        try {

-            Array.prototype[0] = 0;

-            Array.prototype[1] = 1;

-            Array.prototype[2] = 2;

-            [, , , ].reduceRight(callbackfn, "initialValue");

-            return testResult;

-

-        } finally {

-            delete Array.prototype[0];

-            delete Array.prototype[1];

-            delete Array.prototype[2];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is inherited
+    data property on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        try {
+            Array.prototype[0] = 0;
+            Array.prototype[1] = 1;
+            Array.prototype[2] = 2;
+            [, , , ].reduceRight(callbackfn, "initialValue");
+            return testResult;
+
+        } finally {
+            delete Array.prototype[0];
+            delete Array.prototype[1];
+            delete Array.prototype[2];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-9.js
index db7670447..bd9dbbcd8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-9.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-i-9.js

- * @description Array.prototype.reduceRight - element to be retrieved is own accessor property on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (curVal === 1);

-            }

-        }

-

-        var obj = { 0: 0, 2: 2, length: 3 };

-        Object.defineProperty(obj, "1", {

-            get: function () {

-                return 1;

-            },

-            configurable: true

-        });

-

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return testResult;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element to be retrieved is own
+    accessor property on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (curVal === 1);
+            }
+        }
+
+        var obj = { 0: 0, 2: 2, length: 3 };
+        Object.defineProperty(obj, "1", {
+            get: function () {
+                return 1;
+            },
+            configurable: true
+        });
+
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return testResult;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-1.js
index fe345d052..e8ddaa4a4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-1.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-1.js

- * @description Array.prototype.reduceRight - callbackfn called with correct parameters (initialvalue not passed)

- */

-

-

-function testcase() { 

- 

-  function callbackfn(prevVal, curVal, idx, obj)

-  {

-    if(idx+1 < obj.length && obj[idx] === curVal && obj[idx+1] === prevVal)

-      return curVal;

-    else 

-      return false;

-  }

-

-  var arr = [0,1,true,null,new Object(),"five"];

-  if( arr.reduceRight(callbackfn) === 0) 

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn called with correct
+    parameters (initialvalue not passed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  function callbackfn(prevVal, curVal, idx, obj)
+  {
+    if(idx+1 < obj.length && obj[idx] === curVal && obj[idx+1] === prevVal)
+      return curVal;
+    else 
+      return false;
+  }
+
+  var arr = [0,1,true,null,new Object(),"five"];
+  if( arr.reduceRight(callbackfn) === 0) 
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-10.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-10.js
index 5414316d6..cd807ad2e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-10.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-10.js

- * @description Array.prototype.reduceRight - callbackfn is called with 1 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn(prevVal) {

-            called++;

-            return prevVal;

-        }

-

-        return [11, 12].reduceRight(callbackfn, 100) === 100 && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn is called with 1 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn(prevVal) {
+            called++;
+            return prevVal;
+        }
+
+        return [11, 12].reduceRight(callbackfn, 100) === 100 && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-11.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-11.js
index ff012c0fb..45c18594a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-11.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-11.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-11.js

- * @description Array.prototype.reduceRight - callbackfn is called with 2 formal parameter

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal) {

-            if (prevVal === 100) {

-                testResult = true;

-            }

-            return curVal > 10;

-        }

-

-        return [11].reduceRight(callbackfn, 100) === true && testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn is called with 2 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal) {
+            if (prevVal === 100) {
+                testResult = true;
+            }
+            return curVal > 10;
+        }
+
+        return [11].reduceRight(callbackfn, 100) === true && testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-12.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-12.js
index ca5c48839..c34d5a716 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-12.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-12.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-12.js

- * @description Array.prototype.reduceRight - callbackfn is called with 3 formal parameter

- */

-

-

-function testcase() {

-

-        var testResult = false;

-        var arr = [11, 12, 13];

-        var initVal = 6.99;

-

-        function callbackfn(prevVal, curVal, idx) {

-            if (idx === 2) {

-                testResult = (prevVal === initVal);

-            }

-            return curVal > 10 && arguments[3][idx] === curVal;

-        }

-

-        return arr.reduceRight(callbackfn, initVal) === true && testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn is called with 3 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+        var arr = [11, 12, 13];
+        var initVal = 6.99;
+
+        function callbackfn(prevVal, curVal, idx) {
+            if (idx === 2) {
+                testResult = (prevVal === initVal);
+            }
+            return curVal > 10 && arguments[3][idx] === curVal;
+        }
+
+        return arr.reduceRight(callbackfn, initVal) === true && testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-13.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-13.js
index 6529c4e1b..a05f561d1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-13.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-13.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-13.js

- * @description Array.prototype.reduceRight - callbackfn is called with 4 formal parameter

- */

-

-

-function testcase() {

-

-        var arr = [11, 12, 13];

-        var initVal = 6.99;

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 2) {

-                testResult = (prevVal === initVal);

-            }

-            return curVal > 10 && obj[idx] === curVal;

-        }

-

-        return arr.reduceRight(callbackfn, initVal) === true && testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn is called with 4 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [11, 12, 13];
+        var initVal = 6.99;
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 2) {
+                testResult = (prevVal === initVal);
+            }
+            return curVal > 10 && obj[idx] === curVal;
+        }
+
+        return arr.reduceRight(callbackfn, initVal) === true && testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-14.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-14.js
index cba99c8df..7ddd3751c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-14.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-14.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-14.js

- * @description Array.prototype.reduceRight - callbackfn uses arguments

- */

-

-

-function testcase() {

-

-        function callbackfn() {

-            return arguments[0] === 100 && arguments[3][arguments[2]] === arguments[1];

-        }

-

-        return [11].reduceRight(callbackfn, 100) === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - callbackfn uses arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function callbackfn() {
+            return arguments[0] === 100 && arguments[3][arguments[2]] === arguments[1];
+        }
+
+        return [11].reduceRight(callbackfn, 100) === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-16.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-16.js
index 1cf556943..37fb8adcf 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-16.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-16.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-16.js

- * @description Array.prototype.reduceRight - non-indexed properties are not called on an Array-like object

- */

-

-

-function testcase() {

-

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (prevVal === 8 || curVal === 8) {

-                testResult = true;

-            }

-        }

-

-        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };

-        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");

-        return !testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - non-indexed properties are not
+    called on an Array-like object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (prevVal === 8 || curVal === 8) {
+                testResult = true;
+            }
+        }
+
+        var obj = { 0: 11, 10: 12, non_index_property: 8, length: 20 };
+        Array.prototype.reduceRight.call(obj, callbackfn, "initialValue");
+        return !testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-17.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-17.js
index fe3709fc8..64250a66f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-17.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-17.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-17.js

- * @description Array.prototype.reduceRight - 'accumulator' used for current iteration is the result of previous iteration on an Array

- */

-

-

-function testcase() {

-

-        var arr = [11, 12, 13];

-        var testResult = true;

-        var initVal = 6.99;

-        var preResult = initVal;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (prevVal !== preResult) {

-                testResult = false;

-            }

-            preResult = curVal;

-            return curVal;

-        }

-

-        arr.reduceRight(callbackfn, initVal);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'accumulator' used for current
+    iteration is the result of previous iteration on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [11, 12, 13];
+        var testResult = true;
+        var initVal = 6.99;
+        var preResult = initVal;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (prevVal !== preResult) {
+                testResult = false;
+            }
+            preResult = curVal;
+            return curVal;
+        }
+
+        arr.reduceRight(callbackfn, initVal);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-18.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-18.js
index 5acf1a37d..57d2ce986 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-18.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-18.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-18.js

- * @description Array.prototype.reduceRight - 'accumulator' used for first iteration is the value of 'initialValue' when it is present on an Array

- */

-

-

-function testcase() {

-

-        var arr = [11, 12];

-        var testResult = false;

-        var initVal = 6.99;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === initVal);

-            }

-            return curVal;

-        }

-

-        arr.reduceRight(callbackfn, initVal);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - 'accumulator' used for first
+    iteration is the value of 'initialValue' when it is present on an
+    Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [11, 12];
+        var testResult = false;
+        var initVal = 6.99;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === initVal);
+            }
+            return curVal;
+        }
+
+        arr.reduceRight(callbackfn, initVal);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-19.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-19.js
index 1746fa2f3..7fef529a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-19.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-19.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-19.js

- * @description Array.prototype.reduceRight - value of 'accumulator' used for first iteration is the value of max index property which is not undefined when 'initialValue' is not present on an Array

- */

-

-

-function testcase() {

-

-        var arr = [11, 12, 13];

-        var testResult = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === 1) {

-                testResult = (prevVal === 13);

-            }

-            return curVal;

-        }

-        arr.reduceRight(callbackfn);

-

-        return testResult;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - value of 'accumulator' used for
+    first iteration is the value of max index property which is not
+    undefined when 'initialValue' is not present on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [11, 12, 13];
+        var testResult = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === 1) {
+                testResult = (prevVal === 13);
+            }
+            return curVal;
+        }
+        arr.reduceRight(callbackfn);
+
+        return testResult;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-2.js
index a2eb37659..b3f880786 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-2.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-2.js

- * @description Array.prototype.reduceRight - callbackfn called with correct parameters (initialvalue passed)

- */

-

-

-function testcase() {

-        var bParCorrect = false;

-        var arr = [0, 1, true, null, new Object(), "five"];

-        var initialValue = 5.5;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx === obj.length - 1 && obj[idx] === curVal && prevVal === initialValue)

-                return curVal;

-            else if (idx + 1 < obj.length && obj[idx] === curVal && obj[idx + 1] === prevVal)

-                return curVal;

-            else

-                return false;

-        }

-        return arr.reduceRight(callbackfn, initialValue) === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn called with correct
+    parameters (initialvalue passed)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var bParCorrect = false;
+        var arr = [0, 1, true, null, new Object(), "five"];
+        var initialValue = 5.5;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx === obj.length - 1 && obj[idx] === curVal && prevVal === initialValue)
+                return curVal;
+            else if (idx + 1 < obj.length && obj[idx] === curVal && obj[idx + 1] === prevVal)
+                return curVal;
+            else
+                return false;
+        }
+        return arr.reduceRight(callbackfn, initialValue) === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-20.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-20.js
index b50af0424..21e9fb638 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-20.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-20.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-20.js

- * @description Array.prototype.reduceRight - undefined can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return typeof prevVal === "undefined";

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, undefined) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - undefined can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return typeof prevVal === "undefined";
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, undefined) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-21.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-21.js
index 82c95dc33..3df03d3ad 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-21.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-21.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-21.js

- * @description Array.prototype.reduceRight - null can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === null;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, null) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - null can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === null;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, null) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-22.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-22.js
index a89d892e5..168f2e009 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-22.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-22.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-22.js

- * @description Array.prototype.reduceRight - boolean primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === false;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, false) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - boolean primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === false;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, false) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-23.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-23.js
index 2779e1470..5ab9bca32 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-23.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-23.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-23.js

- * @description Array.prototype.reduceRight - number primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === 12;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 12) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - number primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === 12;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 12) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-24.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-24.js
index e1ec10615..506ef4075 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-24.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-24.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-24.js

- * @description Array.prototype.reduceRight - string primitive can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === "hello_";

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, "hello_") === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - string primitive can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === "hello_";
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, "hello_") === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-25.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-25.js
index d83d4d6ae..72d14c97c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-25.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-25.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-25.js

- * @description Array.prototype.reduceRight - Function Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objFunction = function () { };

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objFunction;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objFunction) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Function Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objFunction = function () { };
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objFunction;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objFunction) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-26.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-26.js
index 8ff9b5b0b..268076002 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-26.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-26.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-26.js

- * @description Array.prototype.reduceRight - Array Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objArray = [];

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objArray;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objArray) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Array Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objArray = [];
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objArray;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objArray) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-27.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-27.js
index 132749347..fe3abe41a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-27.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-27.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-27.js

- * @description Array.prototype.reduceRight - String Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objString = new String();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objString;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objString) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - String Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objString = new String();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objString;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objString) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-28.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-28.js
index e74b6383a..b36378992 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-28.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-28.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-28.js

- * @description Array.prototype.reduceRight - Boolean Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objBoolean = new Boolean();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objBoolean;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objBoolean) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Boolean Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objBoolean = new Boolean();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objBoolean;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objBoolean) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-29.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-29.js
index 0d411299c..2c407dc82 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-29.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-29.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-29.js

- * @description Array.prototype.reduceRight - Number Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objNumber = new Number();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objNumber;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objNumber) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Number Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objNumber = new Number();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objNumber;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objNumber) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-3.js
index c9ef375d7..2b9c0c8b6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-3.js
@@ -1,27 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-3.js

- * @description Array.prototype.reduceRight - callbackfn takes 4 arguments

- */

-

-

-function testcase() { 

- 

-  var bCalled = false;

-  function callbackfn(prevVal, curVal, idx, obj)

-  { 

-    bCalled = true;

-    if(prevVal === true && arguments.length === 4)   

-      return true;

-    else

-      return false;

-  }

-  var arr = [0,1,2,3,4,5,6,7,8,9];

-  if(arr.reduceRight(callbackfn,true) === true && bCalled === true)

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - callbackfn takes 4 arguments
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+ 
+  var bCalled = false;
+  function callbackfn(prevVal, curVal, idx, obj)
+  { 
+    bCalled = true;
+    if(prevVal === true && arguments.length === 4)   
+      return true;
+    else
+      return false;
+  }
+  var arr = [0,1,2,3,4,5,6,7,8,9];
+  if(arr.reduceRight(callbackfn,true) === true && bCalled === true)
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-30.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-30.js
index dd579c6b8..cef981a06 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-30.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-30.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-30.js

- * @description Array.prototype.reduceRight - the Math Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === Math;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, Math) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the Math Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === Math;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, Math) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-31.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-31.js
index 54a3ec51a..af07e44bd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-31.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-31.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-31.js

- * @description Array.prototype.reduceRight - Date Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objDate = new Date();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objDate;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objDate) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Date Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objDate = new Date();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objDate;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objDate) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-32.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-32.js
index efd8016ac..9425b4b27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-32.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-32.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-32.js

- * @description Array.prototype.reduceRight - RegExp Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objRegExp = new RegExp();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objRegExp;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objRegExp) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - RegExp Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objRegExp = new RegExp();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objRegExp;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objRegExp) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-33.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-33.js
index c7b706732..b60e61d2c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-33.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-33.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-33.js

- * @description Array.prototype.reduceRight - the JSON can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === JSON;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, JSON) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array.prototype.reduceRight - the JSON can be used as accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === JSON;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, JSON) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-34.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-34.js
index 426106ff1..7918bdfd8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-34.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-34.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-34.js

- * @description Array.prototype.reduceRight - Error Object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var objError = new RangeError();

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === objError;

-        }

-

-        var obj = { 0: 11, length: 1 };

-        

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, objError) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - Error Object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var objError = new RangeError();
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === objError;
+        }
+
+        var obj = { 0: 11, length: 1 };
+        
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, objError) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-35.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-35.js
index 479de4a15..baa9c3a25 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-35.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-35.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-35.js

- * @description Array.prototype.reduceRight - the Arguments object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var arg;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === arg;

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        (function fun() {

-            arg = arguments;

-        }(10, 11, 12, 13));

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, arg) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the Arguments object can be used as
+    accumulator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var arg;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === arg;
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        (function fun() {
+            arg = arguments;
+        }(10, 11, 12, 13));
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, arg) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-37.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-37.js
index ccdf48c96..e2270d03c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-37.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-37.js
@@ -1,24 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-37.js

- * @description Array.prototype.reduceRight - the global object can be used as accumulator

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            return prevVal === fnGlobalObject();

-        }

-

-        var obj = { 0: 11, length: 1 };

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, fnGlobalObject()) === true && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - the global object can be used as
+    accumulator
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            return prevVal === fnGlobalObject();
+        }
+
+        var obj = { 0: 11, length: 1 };
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, fnGlobalObject()) === true && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4-s.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4-s.js
index 85b067a32..945424c57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4-s.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4-s.js

- * @description Array.prototype.reduceRight - undefined passed as thisValue to strict callbackfn

- * @onlyStrict

- */

-

-

-function testcase() { 

-  var innerThisCorrect = false;

-  function callbackfn(prevVal, curVal, idx, obj)

-  { 

-     "use strict";

-     innerThisCorrect = this===undefined;

-     return true;

-  }

-  [0].reduceRight(callbackfn,true);

-  return innerThisCorrect;    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - undefined passed as thisValue to
+    strict callbackfn
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() { 
+  var innerThisCorrect = false;
+  function callbackfn(prevVal, curVal, idx, obj)
+  { 
+     "use strict";
+     innerThisCorrect = this===undefined;
+     return true;
+  }
+  [0].reduceRight(callbackfn,true);
+  return innerThisCorrect;    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4.js
index 3d8ab24a3..a08582783 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4.js
@@ -1,30 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-4.js

- * @description Array.prototype.reduceRight - k values are passed in acending numeric order

- */

-

-

-function testcase() {

-

-        var arr = [0, 1, 2, 3, 4, 5];

-        var lastIdx = arr.length - 1;

-        var accessed = false;

-        var result = true;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (lastIdx !== idx) {

-                result = false;

-            } else {

-                lastIdx--;

-            }

-        }

-        arr.reduceRight(callbackfn, 1);

-        return result && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - k values are passed in acending
+    numeric order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var arr = [0, 1, 2, 3, 4, 5];
+        var lastIdx = arr.length - 1;
+        var accessed = false;
+        var result = true;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (lastIdx !== idx) {
+                result = false;
+            } else {
+                lastIdx--;
+            }
+        }
+        arr.reduceRight(callbackfn, 1);
+        return result && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-5.js
index 013672cc3..78c0b6e7a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-5.js
@@ -1,36 +1,38 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-5.js

- * @description Array.prototype.reduceRight - k values are accessed during each iteration and not prior to starting the loop on an Array

- */

-

-

-function testcase() {

-        var arr = [11, 12, 13, 14];

-        var kIndex = [];

-        var result = true;

-        var called = 0;

-

-        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.

-        function callbackfn(preVal, curVal, idx, o) {

-            //Each position should be visited one time, which means k is accessed one time during iterations.

-            called++;

-            if (typeof kIndex[idx] === "undefined") {

-                //when current position is visited, its next index should has been visited.

-                if (idx !== arr.length - 1 && typeof kIndex[idx + 1] === "undefined") {

-                    result = false;

-                }

-                kIndex[idx] = 1;

-            } else {

-                result = false;

-            }

-        }

-

-        arr.reduceRight(callbackfn, 1);

-        return result && called === 4;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - k values are accessed during each
+    iteration and not prior to starting the loop on an Array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var arr = [11, 12, 13, 14];
+        var kIndex = [];
+        var result = true;
+        var called = 0;
+
+        //By below way, we could verify that k would be setted as 0, 1, ..., length - 1 in order, and each value will be setted one time.
+        function callbackfn(preVal, curVal, idx, o) {
+            //Each position should be visited one time, which means k is accessed one time during iterations.
+            called++;
+            if (typeof kIndex[idx] === "undefined") {
+                //when current position is visited, its next index should has been visited.
+                if (idx !== arr.length - 1 && typeof kIndex[idx + 1] === "undefined") {
+                    result = false;
+                }
+                kIndex[idx] = 1;
+            } else {
+                result = false;
+            }
+        }
+
+        arr.reduceRight(callbackfn, 1);
+        return result && called === 4;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-7.js
index b38af7d9d..9be98964c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-7.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-7.js

- * @description Array.prototype.reduceRight - unhandled exceptions happened in callbackfn terminate iteration

- */

-

-

-function testcase() {

-

-        var accessed = false;

-

-        function callbackfn(prevVal, curVal, idx, obj) {

-            if (idx < 10) {

-                accessed = true;

-            }

-            if (idx === 10) {

-                throw new Error("Exception occurred in callbackfn");

-            }

-        }

-

-        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };

-

-        try {

-            Array.prototype.reduceRight.call(obj, callbackfn, 1);

-            return false;

-        } catch (ex) {

-            return !accessed;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - unhandled exceptions happened in
+    callbackfn terminate iteration
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+
+        function callbackfn(prevVal, curVal, idx, obj) {
+            if (idx < 10) {
+                accessed = true;
+            }
+            if (idx === 10) {
+                throw new Error("Exception occurred in callbackfn");
+            }
+        }
+
+        var obj = { 0: 11, 4: 10, 10: 8, length: 20 };
+
+        try {
+            Array.prototype.reduceRight.call(obj, callbackfn, 1);
+            return false;
+        } catch (ex) {
+            return !accessed;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-8.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-8.js
index 2e6b0c1f7..ee5615279 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-8.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-8.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-8.js

- * @description Array.prototype.reduceRight - element changed by callbackfn on previous iterations is observed

- */

-

-

-function testcase() {

-

-        var accessed = false;

-        var obj = { 0: 11, 1: 12, length: 2 };

-        function callbackfn(prevVal, curVal, idx, obj) {

-            accessed = true;

-            if (idx === 1) {

-                obj[idx - 1] = 8;

-            }

-            return curVal > 10;

-        }

-

-        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === false && accessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - element changed by callbackfn on
+    previous iterations is observed
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var accessed = false;
+        var obj = { 0: 11, 1: 12, length: 2 };
+        function callbackfn(prevVal, curVal, idx, obj) {
+            accessed = true;
+            if (idx === 1) {
+                obj[idx - 1] = 8;
+            }
+            return curVal > 10;
+        }
+
+        return Array.prototype.reduceRight.call(obj, callbackfn, 1) === false && accessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-9.js b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-9.js
index bac8e4e6c..eec75795d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-9.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.22/15.4.4.22-9-c-ii-9.js

- * @description Array.prototype.reduceRight - callbackfn is called with 0 formal parameter

- */

-

-

-function testcase() {

-

-        var called = 0;

-

-        function callbackfn() {

-            called++;

-            return true;

-        }

-

-        return [11, 12].reduceRight(callbackfn, 11) === true && 2 === called;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.reduceRight - callbackfn is called with 0 formal
+    parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var called = 0;
+
+        function callbackfn() {
+            called++;
+            return true;
+        }
+
+        return [11, 12].reduceRight(callbackfn, 11) === true && 2 === called;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A1_T1.js
index 5b3383478..821e9f5f8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A1_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The elements of the array are converted to strings using their
- * toLocaleString methods, and these strings are then concatenated, separated
- * by occurrences of a separator string that has been derived in an
- * implementation-defined locale-specific way
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A1_T1.js
- * @description it is the function that should be invoked
- */
+/*---
+info: >
+    The elements of the array are converted to strings using their
+    toLocaleString methods, and these strings are then concatenated, separated
+    by occurrences of a separator string that has been derived in an
+    implementation-defined locale-specific way
+description: it is the function that should be invoked
+---*/
 
 var n = 0;
 var obj = {toLocaleString: function() {n++}};
@@ -19,5 +18,4 @@ arr.toLocaleString();
 //CHECK#1
 if (n !== 3) {
   $ERROR('#1: var n = 0; var obj = {toLocaleString: function() {n++}}; var arr = [undefined, obj, null, obj, obj]; arr.toLocaleString(); n === 3. Actual: ' + (n));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A3_T1.js
index d0e88177a..93d009444 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A3_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: "[[Prototype]] of Array instance is Array.prototype"
+---*/
 
 //CHECK#1
 var n = 0;
@@ -18,4 +16,3 @@ x.toLocaleString();
 if (n !== 2) {  
   $ERROR('#1: var n = 0; var obj = {toLocaleString: function() {n++}}; Array.prototype[1] = obj; x = [obj]; x.length = 2; x.toLocaleString(); n === 2. Actual: ' + (n));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.1.js
index c14d7c5c4..1b78d14e1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toLocaleString has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of toLocaleString has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.toLocaleString.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.toLocaleString){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.toLocaleString) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.2.js
index 138fa94df..c00f73172 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toLocaleString has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of toLocaleString has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.toLocaleString.hasOwnProperty('length') !== true) {
@@ -24,6 +23,3 @@ if (Array.prototype.toLocaleString.hasOwnProperty('length') !== true) {
 if (Array.prototype.toLocaleString.length === undefined) {
   $ERROR('#3: delete Array.prototype.toLocaleString.length; Array.prototype.toLocaleString.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.3.js
index f3f058468..c90ece4b5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toLocaleString has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of toLocaleString has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.toLocaleString.length;
@@ -15,5 +13,3 @@ Array.prototype.toLocaleString.length = Infinity;
 if (Array.prototype.toLocaleString.length !== x) {
   $ERROR('#1: x = Array.prototype.toLocaleString.length; Array.prototype.toLocaleString.length = Infinity; Array.prototype.toLocaleString.length === x. Actual: ' + (Array.prototype.toLocaleString.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.4.js
index ca21a5c59..026426e8f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of toLocaleString is 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.4.js
- * @description toLocaleString.length === 1
- */
+/*---
+info: The length property of toLocaleString is 0
+description: toLocaleString.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.toLocaleString.length !== 0) {
   $ERROR('#1: Array.prototype.toLocaleString.length === 0. Actual: ' + (Array.prototype.toLocaleString.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.5.js
index d4873dcb6..dab1b3d5b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toLocaleString property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The toLocaleString property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('toLocaleString') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "toLocaleString") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.6.js
index 5d6783051..44123f71b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toLocaleString property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.6.js
- * @description Checking Array.prototype.toLocaleString.prototype
- */
+/*---
+info: The toLocaleString property of Array has not prototype property
+description: Checking Array.prototype.toLocaleString.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.toLocaleString.prototype !== undefined) {
   $ERROR('#1: Array.prototype.toLocaleString.prototype === undefined. Actual: ' + (Array.prototype.toLocaleString.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.7.js
index 52a8f32ca..0d6cdc5ca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toLocaleString property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.3/S15.4.4.3_A4.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The toLocaleString property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.toLocaleString() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-b-iii-3-b-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-b-iii-3-b-1.js
index 88be1b8c2..c9b323dcc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-b-iii-3-b-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-b-iii-3-b-1.js
@@ -1,47 +1,49 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-b-iii-3-b-1.js

- * @description Array.prototype.concat will concat an Array when index property (read-only) exists in Array.prototype (Step 5.b.iii.3.b)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-

-            var oldArr = [101];

-

-            var newArr = Array.prototype.concat.call(oldArr);

-

-            var verifyValue = false;

-            verifyValue = newArr[0] === 101;

-

-            var verifyEnumerable = false;

-            for (var p in newArr) {

-                if (p === "0" && newArr.hasOwnProperty("0")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyWritable = false;

-            newArr[0] = 12;

-            verifyWritable = newArr[0] === 12;

-

-            var verifyConfigurable = false;

-            delete newArr[0];

-            verifyConfigurable = newArr.hasOwnProperty("0");

-

-            return verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.concat will concat an Array when index property
+    (read-only) exists in Array.prototype (Step 5.b.iii.3.b)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+
+            var oldArr = [101];
+
+            var newArr = Array.prototype.concat.call(oldArr);
+
+            var verifyValue = false;
+            verifyValue = newArr[0] === 101;
+
+            var verifyEnumerable = false;
+            for (var p in newArr) {
+                if (p === "0" && newArr.hasOwnProperty("0")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyWritable = false;
+            newArr[0] = 12;
+            verifyWritable = newArr[0] === 12;
+
+            var verifyConfigurable = false;
+            delete newArr[0];
+            verifyConfigurable = newArr.hasOwnProperty("0");
+
+            return verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-c-i-1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-c-i-1.js
index 67bac366c..96f7abc3b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-c-i-1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-c-i-1.js
@@ -1,51 +1,53 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.4/15.4.4.4/15.4.4.4-5-c-i-1.js

- * @description Array.prototype.concat will concat an Array when index property (read-only) exists in Array.prototype (Step 5.c.i)

- */

-

-

-function testcase() {

-        try {

-            Object.defineProperty(Array.prototype, "0", {

-                value: 100,

-                writable: false,

-                configurable: true

-            });

-

-            var newArr = Array.prototype.concat.call(101);

-

-            var hasProperty = newArr.hasOwnProperty("0");

-

-	    var instanceOfVerify = typeof newArr[0]==="object";

-            

-            var verifyValue = false;

-            verifyValue = newArr[0] == 101;

-

-            var verifyEnumerable = false;

-            for (var p in newArr) {

-                if (p === "0" && newArr.hasOwnProperty("0")) {

-                    verifyEnumerable = true;

-                }

-            }

-

-            var verifyWritable = false;

-            newArr[0] = 12;

-            verifyWritable = newArr[0] === 12;

-

-            var verifyConfigurable = false;

-            delete newArr[0];

-            verifyConfigurable = newArr.hasOwnProperty("0");

-

-            return hasProperty && instanceOfVerify && verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;

-	

-

-        } finally {

-            delete Array.prototype[0];

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Array.prototype.concat will concat an Array when index property
+    (read-only) exists in Array.prototype (Step 5.c.i)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Object.defineProperty(Array.prototype, "0", {
+                value: 100,
+                writable: false,
+                configurable: true
+            });
+
+            var newArr = Array.prototype.concat.call(101);
+
+            var hasProperty = newArr.hasOwnProperty("0");
+
+	    var instanceOfVerify = typeof newArr[0]==="object";
+            
+            var verifyValue = false;
+            verifyValue = newArr[0] == 101;
+
+            var verifyEnumerable = false;
+            for (var p in newArr) {
+                if (p === "0" && newArr.hasOwnProperty("0")) {
+                    verifyEnumerable = true;
+                }
+            }
+
+            var verifyWritable = false;
+            newArr[0] = 12;
+            verifyWritable = newArr[0] === 12;
+
+            var verifyConfigurable = false;
+            delete newArr[0];
+            verifyConfigurable = newArr.hasOwnProperty("0");
+
+            return hasProperty && instanceOfVerify && verifyValue && !verifyConfigurable && verifyEnumerable && verifyWritable;
+	
+
+        } finally {
+            delete Array.prototype[0];
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T1.js
index f5eb4eeab..49b910a92 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the concat method is called with zero or more arguments item1, item2,
- * etc., it returns an array containing the array elements of the object followed by
- * the array elements of each argument in order
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T1.js
- * @description Checking this algorithm, items are Array object
- */
+/*---
+info: >
+    When the concat method is called with zero or more arguments item1, item2,
+    etc., it returns an array containing the array elements of the object followed by
+    the array elements of each argument in order
+description: Checking this algorithm, items are Array object
+---*/
 
 var x = new Array();
 var y = new Array(0,1);
@@ -49,5 +48,4 @@ if (arr[4] !== 4) {
 //CHECK#6
 if (arr.length !== 5) {
   $ERROR('#6: var x = new Array(); var y = new Array(0,1); var z = new Array(2,3,4); var arr = x.concat(y,z); arr.length === 5. Actual: ' + (arr.length));
-}                
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T2.js
index 35c104f7d..9812130ef 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the concat method is called with zero or more arguments item1, item2,
- * etc., it returns an array containing the array elements of the object followed by
- * the array elements of each argument in order
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T2.js
- * @description Checking this algorithm, items are objects and primitives
- */
+/*---
+info: >
+    When the concat method is called with zero or more arguments item1, item2,
+    etc., it returns an array containing the array elements of the object followed by
+    the array elements of each argument in order
+description: Checking this algorithm, items are objects and primitives
+---*/
 
 var x = [0];
 var y = new Object();
@@ -59,5 +58,4 @@ if (arr[6] !== "NaN") {
 //CHECK#8
 if (arr.length !== 7) {
   $ERROR('#8: var x = [0]; var y = new Object(); var z = new Array(1,2); var arr = x.concat(y,z, -1, true, "NaN"); arr.length === 7. Actual: ' + (arr.length));
-}                
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T3.js
index 13549592c..b34cfef00 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the concat method is called with zero or more arguments item1, item2,
- * etc., it returns an array containing the array elements of the object followed by
- * the array elements of each argument in order
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T3.js
- * @description Checking this algorithm with no items
- */
+/*---
+info: >
+    When the concat method is called with zero or more arguments item1, item2,
+    etc., it returns an array containing the array elements of the object followed by
+    the array elements of each argument in order
+description: Checking this algorithm with no items
+---*/
 
 var x = [0,1];
 var arr = x.concat();
@@ -37,5 +36,4 @@ if (arr.length !== 2) {
 //CHECK#4
 if (arr === x) {
   $ERROR('#4: var x = [0,1]; var arr = x.concat(); arr !== x');
-}              
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T4.js
index 3cf64d942..ffe256826 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the concat method is called with zero or more arguments item1, item2,
- * etc., it returns an array containing the array elements of the object followed by
- * the array elements of each argument in order
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A1_T4.js
- * @description Checking this algorithm, items are [], [,]
- */
+/*---
+info: >
+    When the concat method is called with zero or more arguments item1, item2,
+    etc., it returns an array containing the array elements of the object followed by
+    the array elements of each argument in order
+description: Checking this algorithm, items are [], [,]
+---*/
 
 var x = [,1];
 var arr = x.concat([], [,]);
@@ -37,5 +36,4 @@ if (arr[2] !== undefined) {
 //CHECK#4
 if (arr.length !== 3) {
   $ERROR('#4: var x = [,1]; var arr = x.concat([], [,]); arr.length === 3. Actual: ' + (arr.length));
-}             
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T1.js
index 3d4bc3a7d..82f2fe3fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The concat function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T1.js
- * @description Checking this for Object object, items are objects and primitives
- */
+/*---
+info: >
+    The concat function is intentionally generic.
+    It does not require that its this value be an Array object
+description: Checking this for Object object, items are objects and primitives
+---*/
 
 var x = {};
 x.concat = Array.prototype.concat;
@@ -59,5 +58,4 @@ if (arr[6] !== "NaN") {
 //CHECK#8
 if (arr.length !== 7) {
   $ERROR('#8: var x = {}; x.concat = Array.prototype.concat; var y = new Object(); var z = new Array(1,2); var arr = x.concat(y,z, -1, true, "NaN"); arr.length === 7. Actual: ' + (arr.length));
-}                
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T2.js
index 3677816a5..d7bd06034 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The concat function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A2_T2.js
- * @description Checking this for Object object with no items
- */
+/*---
+info: >
+    The concat function is intentionally generic.
+    It does not require that its this value be an Array object
+description: Checking this for Object object with no items
+---*/
 
 var x = {};
 x.concat = Array.prototype.concat;
@@ -27,5 +26,4 @@ if (arr[0] !== x) {
 //CHECK#2
 if (arr.length !== 1) {
   $ERROR('#2: var x = {}; x.concat = Array.prototype.concat; var arr = x.concat(); arr.length === 1. Actual: ' + (arr.length));
-}                
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A3_T1.js
index 761793dcf..96877b307 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A3_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = 1;
 var x = [0];
@@ -48,4 +48,3 @@ if (arr[1] !== 1) {
 if (arr.hasOwnProperty('1') !== false) {  
   $ERROR('#6: Object.prototype[1] = 1; Object.prototype.length = 2; Object.prototype.concat = Array.prototype.concat; x = {0:0}; var arr = x.concat(); arr.hasOwnProperty(\'1\') === false. Actual: ' + (arr.hasOwnProperty('1')));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.1.js
index 8f44f11ea..54a558e7a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of concat has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of concat has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.concat.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.concat){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.concat) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.2.js
index 383a57a33..5eb37da14 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of concat has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of concat has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.concat.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.concat.hasOwnProperty('length') !== true) {
 if (Array.prototype.concat.length === undefined) {
   $ERROR('#3: delete Array.prototype.concat.length; Array.prototype.concat.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.3.js
index e9006f4c7..73b1c6bbd 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of concat has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of concat has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.concat.length;
@@ -15,5 +13,3 @@ Array.prototype.concat.length = Infinity;
 if (Array.prototype.concat.length !== x) {
   $ERROR('#1: x = Array.prototype.concat.length; Array.prototype.concat.length = Infinity; Array.prototype.concat.length === x. Actual: ' + (Array.prototype.concat.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.4.js
index 7f2b32917..200187be2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of concat is 1
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.4.js
- * @description concat.length === 1
- */
+/*---
+info: The length property of concat is 1
+description: concat.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.concat.length !== 1) {
   $ERROR('#1: Array.prototype.concat.length === 1. Actual: ' + (Array.prototype.concat.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.5.js
index 236be1f96..bd972bb27 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The concat property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The concat property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('concat') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "concat") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.6.js
index bbd5df9e4..1a00b5b37 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The concat property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.6.js
- * @description Checking Array.prototype.concat.prototype
- */
+/*---
+info: The concat property of Array has not prototype property
+description: Checking Array.prototype.concat.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.concat.prototype !== undefined) {
   $ERROR('#1: Array.prototype.concat.prototype === undefined. Actual: ' + (Array.prototype.concat.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.7.js
index d17536462..9534a738d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The concat property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.4/S15.4.4.4_A4.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The concat property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.concat() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.1_T1.js
index bba921ab1..fbd09a1f1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If length is zero, return the empty string
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.1_T1.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: If length is zero, return the empty string
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -20,5 +18,4 @@ x[0] = 1;
 x.length = 0;
 if (x.join() !== "") {
   $ERROR('#2: x = []; x[0] = 1; x.length = 0; x.join() === "". Actual: ' + (x.join()));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T1.js
index 568468d1e..9f6cc3026 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If separator is undefined, a single comma is used as the separator
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T1.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: If separator is undefined, a single comma is used as the separator
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = new Array(0,1,2,3);
@@ -28,4 +26,3 @@ x[0] = 0;
 if (x.join() !== "0") {
   $ERROR('#3: x = []; x[0] = 0; x.join() === "0". Actual: ' + (x.join()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T2.js
index e09c2a115..7126de2c5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If separator is undefined, a single comma is used as the separator
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.2_T2.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: If separator is undefined, a single comma is used as the separator
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = new Array(0,1,2,3);
@@ -28,4 +26,3 @@ x[0] = 0;
 if (x.join(undefined) !== "0") {
   $ERROR('#3: x = []; x[0] = 0; x.join(undefined) === "0". Actual: ' + (x.join(undefined)));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.3_T1.js
index 4a95e6550..49800ad92 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If array element is undefined or null, use the empty string
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A1.3_T1.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: If array element is undefined or null, use the empty string
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = [];
@@ -27,4 +25,3 @@ x = Array(undefined,1,null,3);
 if (x.join() !== ",1,,3") {
   $ERROR('#3: x = Array(undefined,1,null,3); x.join() === ",1,,3". Actual: ' + (x.join()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T1.js
index 6895b5a24..5a767b2db 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T1.js
- * @description If ToUint32(length) is zero, return the empty string
- */
+/*---
+info: >
+    The join function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If ToUint32(length) is zero, return the empty string
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -46,4 +45,3 @@ if (obj.join() !== "") {
 if (obj.length !== null) {
   $ERROR('#6: var obj = {}; obj.length = null; obj.join = Array.prototype.join; obj.join(); obj.length === null. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T2.js
index 5b0b7d75d..3f0f9eeca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T2.js
- * @description If ToUint32(length) is zero, return the empty string
- */
+/*---
+info: >
+    The join function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If ToUint32(length) is zero, return the empty string
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -82,4 +81,3 @@ if (obj.join() !== "") {
 if (obj.length !== x) {
   $ERROR('#12: var x = new Number(0); var obj = {}; obj.length = x; obj.join = Array.prototype.join; obj.join(); obj.length === x. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T3.js
index e9ef09ede..41ab6e9e0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T3.js
- * @description If ToUint32(length) is zero, return the empty string
- */
+/*---
+info: >
+    The join function is intentionally generic.
+    It does not require that its this value be an Array object
+description: If ToUint32(length) is zero, return the empty string
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -52,5 +51,4 @@ if (obj.join() !== ",1,,") {
 //CHECK#6
 if (obj.length !== x) {
   $ERROR('#6: var obj = {}; var x = new Number(4.5); obj.length = x; obj[0] = undefined; obj[1] = 1; obj[2] = null; obj.join = Array.prototype.join; obj.join(); obj.length === x. Actual: ' + (obj.length));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T4.js
index d4072b782..fd12d67fa 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A2_T4.js
- * @description Operator use ToNumber from length.
- * If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: >
+    The join function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Operator use ToNumber from length.  If Type(value) is Object,
+    evaluate ToPrimitive(value, Number)
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -81,4 +81,3 @@ catch (e) {
     $ERROR('#8,2: obj.length = {valueOf: function() {return {}}, toString: function() {return {}}}  obj.join() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T1.js
index ee3563082..fe6704f03 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString from separator
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T1.js
- * @description Checking separator in ["", "\\", "&", true, Infinity, null, undefind, NaN]
- */
+/*---
+info: Operator use ToString from separator
+description: >
+    Checking separator in ["", "\\", "&", true, Infinity, null,
+    undefind, NaN]
+---*/
 
 //CHECK#0
 var x = new Array(0,1,2,3);
@@ -49,4 +49,3 @@ if (x.join(undefined) !== "0,1,2,3") {
 if (x.join(NaN) !== "0NaN1NaN2NaN3") {
   $ERROR('#7: x = new Array(0,1,2,3); x.join("NaN") === "0NaN1NaN2NaN3". Actual: ' + (x.join("NaN")));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T2.js
index a425c5c5e..2bc5b3ded 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString from separator
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.1_T2.js
- * @description If Type(separator) is Object, evaluate ToPrimitive(separator, String)
- */
+/*---
+info: Operator use ToString from separator
+description: >
+    If Type(separator) is Object, evaluate ToPrimitive(separator,
+    String)
+---*/
 
 var x = new Array(0,1,2,3);
 //CHECK#1
@@ -88,4 +88,4 @@ catch (e) {
     if (e !== "error") {
         $ERROR('#9.2: var object = {toString: function() {throw "error"}}; [].join(object) throw "error". Actual: ' + (e));
    }
-}
\ No newline at end of file
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T1.js
index b0bd01690..ca8b79e5c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString from array arguments
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T1.js
- * @description Checking arguments and separator in ["", "\\", "&", true, Infinity, null, undefind, NaN]
- */
+/*---
+info: Operator use ToString from array arguments
+description: >
+    Checking arguments and separator in ["", "\\", "&", true,
+    Infinity, null, undefind, NaN]
+---*/
 
 //CHECK#0
 var x = new Array("","","");
@@ -55,4 +55,3 @@ var x = new Array(NaN,NaN,NaN);
 if (x.join() !== "NaN,NaN,NaN") {
   $ERROR('#7: var x = new Array(NaN,NaN,NaN); x.join(NaN,NaN,NaN) === "NaN,NaN,NaN". Actual: ' + (x.join(NaN,NaN,NaN)));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T2.js
index e56188cd7..3fa4bdd57 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Operator use ToString from array arguments
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A3.2_T2.js
- * @description If Type(argument) is Object, evaluate ToPrimitive(argument, String)
- */
+/*---
+info: Operator use ToString from array arguments
+description: If Type(argument) is Object, evaluate ToPrimitive(argument, String)
+---*/
 
 //CHECK#1
 var object = {valueOf: function() {return "+"}};
@@ -84,4 +82,3 @@ catch (e) {
     $ERROR('#8.2: var object = {valueOf: function() {return {}}, toString: function() {return {}}} var x = new Array(object); x.join() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T1.js
index 40e1bc665..db9bc1060 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -23,4 +21,3 @@ if (obj.join("") !== "") {
 if (obj.length !== 4294967296) {
   $ERROR('#2: var obj = {}; obj.join = Array.prototype.join; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; obj.join(""); obj.length === 4294967296. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T2.js
index 23c4efff1..9fcc7fc44 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T2.js
- * @description length = 4294967297
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967297
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -24,4 +22,3 @@ if (obj.join("") !== "x") {
 if (obj.length !== 4294967297) {
   $ERROR('#2: var obj = {}; obj.join = Array.prototype.join; obj[0] = "x"; obj[1] = "y"; obj[4294967296] = "z"; obj.length = 4294967297; obj.join(""); obj.length === 4294967297. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T3.js
index df9eba293..d1bbeafba 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A4_T3.js
- * @description length = -4294967294
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -4294967294
+---*/
 
 var obj = {};
 obj.join = Array.prototype.join;
@@ -24,4 +22,3 @@ if (obj.join("") !== "xy") {
 if (obj.length !== -4294967294) {
   $ERROR('#2: var obj = {}; obj.join = Array.prototype.join; obj[0] = "x"; obj[1] = "y"; obj[2] = "z"; obj.length = -4294967294; obj.join(""); obj.length === -4294967294. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A5_T1.js
index a0ee319f9..ba858fd7b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A5_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 //CHECK#1
 Array.prototype[1] = 1;
@@ -24,4 +24,3 @@ x = {0:0};
 if (x.join() !== "0,1") {  
   $ERROR('#2: Object.prototype[1] = 1; Object.prototype.length = 2; Object.prototype.join = Array.prototype.join; x = {0:0}; x.join() === "0,1". Actual: ' + (x.join()));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.1.js
index 3066f805e..fdd9e5bd2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of join has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of join has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.join.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.join){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.join) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.2.js
index d415d2c6b..aa4a0d581 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of join has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of join has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.join.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.join.hasOwnProperty('length') !== true) {
 if (Array.prototype.join.length === undefined) {
   $ERROR('#3: delete Array.prototype.join.length; Array.prototype.join.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.3.js
index e56213508..7922bdec6 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of join has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of join has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.join.length;
@@ -15,5 +13,3 @@ Array.prototype.join.length = Infinity;
 if (Array.prototype.join.length !== x) {
   $ERROR('#1: x = Array.prototype.join.length; Array.prototype.join.length = Infinity; Array.prototype.join.length === x. Actual: ' + (Array.prototype.join.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.4.js
index 24514ff57..e4b11e507 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of join is 1
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.4.js
- * @description join.length === 1
- */
+/*---
+info: The length property of join is 1
+description: join.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.join.length !== 1) {
   $ERROR('#1: Array.prototype.join.length === 1. Actual: ' + (Array.prototype.join.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.5.js
index a6e48f0dd..213598ead 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The join property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('join') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "join") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.6.js
index 22378de7a..419bd6d77 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.6.js
- * @description Checking Array.prototype.join.prototype
- */
+/*---
+info: The join property of Array has not prototype property
+description: Checking Array.prototype.join.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.join.prototype !== undefined) {
   $ERROR('#1: Array.prototype.join.prototype === undefined. Actual: ' + (Array.prototype.join.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.7.js
index db85fdbee..8c25ae738 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The join property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.5/S15.4.4.5_A6.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The join property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.join() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.1_T1.js
index 2aaf5e384..14a0fcdca 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If length equal zero, call the [[Put]] method of this object
- * with arguments "length" and 0 and return undefined
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.1_T1.js
- * @description Checking this algorithm
- */
+/*---
+info: >
+    If length equal zero, call the [[Put]] method of this object
+    with arguments "length" and 0 and return undefined
+description: Checking this algorithm
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -32,5 +31,4 @@ if (pop !== undefined) {
 //CHECK#4
 if (x.length !== 0) {
   $ERROR('#4: var x = new Array(1,2,3); x.length = 0; x.pop(); x.length === 0. Actual: ' + (x.length));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.2_T1.js
index e28151d3f..2f0c5e0ce 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The last element of the array is removed from the array
- * and returned
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A1.2_T1.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: >
+    The last element of the array is removed from the array
+    and returned
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = new Array(0,1,2,3);
@@ -66,4 +65,3 @@ if (pop !== 0) {
 if (x.length !== 0) {
   $ERROR('#10: x = []; x[0] = 0; x[3] = 3; x.pop(); x.length = 1; x.pop(); x.length === 0. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T1.js
index 4f3151735..500d1c05e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T1.js
- * @description If ToUint32(length) equal zero, call the [[Put]] method
- * of this object with arguments "length" and 0 and return undefined
- */
+/*---
+info: >
+    The pop function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If ToUint32(length) equal zero, call the [[Put]] method  of this
+    object with arguments "length" and 0 and return undefined
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -50,4 +50,3 @@ if (pop !== undefined) {
 if (obj.length !== 0) {
   $ERROR('#6: var obj = {}; obj.length = null; obj.pop = Array.prototype.pop; obj.pop(); obj.length === 0. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T2.js
index 452ceb072..c23b59804 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T2.js
- * @description If ToUint32(length) equal zero, call the [[Put]] method
- * of this object with arguments "length" and 0 and return undefined
- */
+/*---
+info: >
+    The pop function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If ToUint32(length) equal zero, call the [[Put]] method  of this
+    object with arguments "length" and 0 and return undefined
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -88,4 +88,3 @@ if (pop !== undefined) {
 if (obj.length !== 0) {
   $ERROR('#12: var obj = {}; obj.length = new Number(0); obj.pop = Array.prototype.pop; obj.pop(); obj.length === 0. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T3.js
index 4bb20b983..104509956 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T3.js
- * @description The last element ToUint32(length) - 1 of the array is removed from the array
- * and returned
- */
+/*---
+info: >
+    The pop function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The last element ToUint32(length) - 1 of the array is removed from
+    the array  and returned
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -35,5 +35,4 @@ if (pop !== undefined) {
 //CHECK#3
 if (obj.length !== 1) {
   $ERROR('#12: var obj = {}; obj.length = new Number(2); obj.pop = Array.prototype.pop; obj.pop(); obj.length === 1. Actual: ' + (obj.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T4.js
index 88faf99a7..acb8e0362 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A2_T4.js
- * @description Operator use ToNumber from length.
- * If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: >
+    The pop function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Operator use ToNumber from length.  If Type(value) is Object,
+    evaluate ToPrimitive(value, Number)
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -95,4 +95,3 @@ catch (e) {
     $ERROR('#8.2: obj[0] = -1; obj.length = {valueOf: function() {return {}}, toString: function() {return {}}}  obj.pop() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T1.js
index 666f2c37e..782039cde 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -33,5 +31,4 @@ if (obj[0] !== "x") {
 //CHECK#4
 if (obj[4294967295] !== "y") {
    $ERROR('#4: var obj = {}; obj.pop = Array.prototype.pop; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; obj.pop(); obj[4294967295] === "y". Actual: ' + (obj[4294967295]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T2.js
index 910e5d94d..924727381 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T2.js
- * @description length = 4294967297
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967297
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -33,5 +31,4 @@ if (obj[0] !== undefined) {
 //CHECK#4
 if (obj[4294967296] !== "y") {
    $ERROR('#4: var obj = {}; obj.pop = Array.prototype.pop; obj[0] = "x"; obj[4294967296] = "y"; obj.length = 4294967297; obj.pop(); obj[4294967296] === "y". Actual: ' + (obj[4294967296]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T3.js
index 9eee4cee8..1facc9354 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A3_T3.js
- * @description length = -1
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -1
+---*/
 
 var obj = {};
 obj.pop = Array.prototype.pop;
@@ -27,5 +25,4 @@ if (obj.length !== 4294967294) {
 //CHECK#3
 if (obj[4294967294] !== undefined) {
    $ERROR('#3: var obj = {}; obj.pop = Array.prototype.pop; obj[4294967294] = "x"; obj.length = -1; obj.pop(); obj[4294967294] === undefined. Actual: ' + (obj[4294967294]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T1.js
index 16ed2eff2..ddc35118b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = 1;
 var x = [0];
@@ -49,4 +49,3 @@ delete x.length;
 if (x.length !== 2) {  
   $ERROR('#7: Object.prototype[1] = 1; Object.prototype.length = 2; Object.prototype.pop = Array.prototype.pop; x = {0:0}; x.pop(); delete x; x.length === 2. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T2.js
index cb3498573..2b020d358 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A4_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [0,1];
@@ -49,4 +49,3 @@ delete x.length;
 if (x.length !== 2) {  
   $ERROR('#7: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.pop = Array.prototype.pop; x = {0:0,1:1}; x.pop(); delete x; x.length === 2. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.1.js
index 601fc2156..fd00acfb8 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of pop has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of pop has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.pop.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.pop){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.pop) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.2.js
index 1e7e6e379..86a10ff86 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of pop has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of pop has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.pop.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.pop.hasOwnProperty('length') !== true) {
 if (Array.prototype.pop.length === undefined) {
   $ERROR('#3: delete Array.prototype.pop.length; Array.prototype.pop.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.3.js
index fa8898956..05953bf11 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of pop has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of pop has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.pop.length;
@@ -15,5 +13,3 @@ Array.prototype.pop.length = Infinity;
 if (Array.prototype.pop.length !== x) {
   $ERROR('#1: x = Array.prototype.pop.length; Array.prototype.pop.length = Infinity; Array.prototype.pop.length === x. Actual: ' + (Array.prototype.pop.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.4.js
index 27d696e24..bd4e383f4 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of pop is 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.4.js
- * @description pop.length === 1
- */
+/*---
+info: The length property of pop is 0
+description: pop.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.pop.length !== 0) {
   $ERROR('#1: Array.prototype.pop.length === 0. Actual: ' + (Array.prototype.pop.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.5.js
index 337db2071..85ed09b2b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The pop property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('pop') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "pop") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.6.js
index b159eac00..0d76d4699 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.6.js
- * @description Checking Array.prototype.pop.prototype
- */
+/*---
+info: The pop property of Array has not prototype property
+description: Checking Array.prototype.pop.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.pop.prototype !== undefined) {
   $ERROR('#1: Array.prototype.pop.prototype === undefined. Actual: ' + (Array.prototype.pop.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.7.js
index 7c1924c7a..3c89b4a37 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The pop property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.6/S15.4.4.6_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The pop property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.pop() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T1.js
index 283c8edce..7f54f909b 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The arguments are appended to the end of the array, in
- * the order in which they appear. The new length of the array is returned
- * as the result of the call
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T1.js
- * @description Checking case when push is given no arguments or one argument
- */
+/*---
+info: >
+    The arguments are appended to the end of the array, in
+    the order in which they appear. The new length of the array is returned
+    as the result of the call
+description: Checking case when push is given no arguments or one argument
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -47,5 +46,4 @@ if (x[1] !== -1) {
 //CHECK#7
 if (x.length !== 2) {
   $ERROR('#7: x = new Array(); x.push(1); x.push(); x.push(-1); x.length === 2. Actual: ' + (x.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T2.js
index e9a39ab72..ebf522283 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The arguments are appended to the end of the array, in
- * the order in which they appear. The new length of the array is returned
- * as the result of the call
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A1_T2.js
- * @description Checking case when push is given many arguments
- */
+/*---
+info: >
+    The arguments are appended to the end of the array, in
+    the order in which they appear. The new length of the array is returned
+    as the result of the call
+description: Checking case when push is given many arguments
+---*/
 
 //CHECK#1
 var x = [];
@@ -57,4 +56,3 @@ if (x[5] !== -1) {
 if (x.length !== 6) {
   $ERROR('#9: x = []; x[0] = 0; x.push(true, Number.POSITIVE_INFINITY, "NaN", "1", -1); x.length === 6. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T1.js
index 4adea71b6..7602b89a0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T1.js
- * @description The arguments are appended to the end of the array, in
- * the order in which they appear. The new length of the array is returned
- * as the result of the call
- */
+/*---
+info: >
+    The push function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The arguments are appended to the end of the array, in  the order
+    in which they appear. The new length of the array is returned  as
+    the result of the call
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -65,4 +65,3 @@ if (obj.length !== 1) {
 if (obj["0"] !== -7) {
   $ERROR('#9: var obj = {}; obj.length = null; obj.push = Array.prototype.push; obj.push(-7); obj["0"] === -7. Actual: ' + (obj["0"]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T2.js
index b294fae5b..172186733 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T2.js
- * @description The arguments are appended to the end of the array, in
- * the order in which they appear. The new length of the array is returned
- * as the result of the call
- */
+/*---
+info: >
+    The push function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The arguments are appended to the end of the array, in  the order
+    in which they appear. The new length of the array is returned  as
+    the result of the call
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -114,5 +114,4 @@ if (obj.length !== 1) {
 //CHECK#18
 if (obj["0"] !== -16) {
   $ERROR('#18: var obj = {}; obj.length = new Number(0); obj.push = Array.prototype.push; obj.push(-16); obj["0"] === -16. Actual: ' + (obj["0"]));
-}   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T3.js
index be3839d4d..ad950ee94 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A2_T3.js
- * @description Operator use ToNumber from length.
- * If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: >
+    The push function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Operator use ToNumber from length.  If Type(value) is Object,
+    evaluate ToPrimitive(value, Number)
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -90,4 +90,3 @@ catch (e) {
     $ERROR('#8.2:  obj.length = {valueOf: function() {return {}}, toString: function() {return {}}}  obj.push() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A3.js
index 910fe9f3c..9b3347c0d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A3.js
- * @description If ToUint32(length) !== length, throw RangeError
- */
+/*---
+info: Check ToUint32(length) for Array object
+description: If ToUint32(length) !== length, throw RangeError
+---*/
 
 var x = [];
 x.length = 4294967295;
@@ -36,4 +34,3 @@ if (x[4294967295] !== "x") {
 if (x.length !== 4294967295) {
    $ERROR('#4: x = []; x.length = 4294967295; try {x.push("x")}catch(e){}; x.length === 4294967295. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T1.js
index 73e59476f..be2a5b62c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -51,5 +49,4 @@ if (push !== 0) {
 //CHECK#7
 if (obj.length !== 0) {
   $ERROR('#7: var obj = {}; obj.push = Array.prototype.push; obj.length = 4294967296; obj.push(); obj.length === 0. Actual: ' + (obj.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T2.js
index 02e18ab0a..caa0ecef0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T2.js
- * @description length = 4294967295
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967295
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -36,5 +34,4 @@ if (obj[4294967296] !== "y") {
 //CHECK#5
 if (obj[4294967297] !== "z") {
    $ERROR('#5: var obj = {}; obj.push = Array.prototype.push; obj.length = 4294967295; obj.push("x", "y", "z"); obj[4294967297] === "z". Actual: ' + (obj[4294967297]));
-}    
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T3.js
index fdd6279da..7ad5df65c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A4_T3.js
- * @description length = -1
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -1
+---*/
 
 var obj = {};
 obj.push = Array.prototype.push;
@@ -36,5 +34,4 @@ if (obj[4294967296] !== "y") {
 //CHECK#5
 if (obj[4294967297] !== "z") {
    $ERROR('#5: var obj = {}; obj.push = Array.prototype.push; obj.length = -1; obj.push("x", "y", "z"); obj[4294967297] === "z". Actual: ' + (obj[4294967297]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A5_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A5_T1.js
index 925dfae4d..9735577fc 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A5_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A5_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Object.prototype[1] = -1;
 Object.prototype.length = 1;
@@ -40,5 +40,3 @@ delete x.length;
 if (x.length !== 1) {  
   $ERROR('#5: Object.prototype[1] = 1; Object.prototype.length = -1; Object.prototype.push = Array.prototype.push; x = {0:0}; delete x; x.push(1); x.length === 1. Actual: ' + (x.length));    
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.1.js
index 5cc513664..534f60c37 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of push has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of push has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.push.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.push){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.push) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.2.js
index 08da5d3d4..54fc6eb5e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of push has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of push has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.push.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.push.hasOwnProperty('length') !== true) {
 if (Array.prototype.push.length === undefined) {
   $ERROR('#3: delete Array.prototype.push.length; Array.prototype.push.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.3.js
index db6af4403..9f81ef7d0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of push has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of push has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.push.length;
@@ -15,5 +13,3 @@ Array.prototype.push.length = Infinity;
 if (Array.prototype.push.length !== x) {
   $ERROR('#1: x = Array.prototype.push.length; Array.prototype.push.length = Infinity; Array.prototype.push.length === x. Actual: ' + (Array.prototype.push.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.4.js
index 0218d4d99..840221667 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of push is 1
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.4.js
- * @description push.length === 1
- */
+/*---
+info: The length property of push is 1
+description: push.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.push.length !== 1) {
   $ERROR('#1: Array.prototype.push.length === 1. Actual: ' + (Array.prototype.push.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.5.js
index 3125dea3a..64b026f04 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The push property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('push') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "push") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.6.js
index b700eaaeb..ab91854b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.6.js
- * @description Checking Array.prototype.push.prototype
- */
+/*---
+info: The push property of Array has not prototype property
+description: Checking Array.prototype.push.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.push.prototype !== undefined) {
   $ERROR('#1: Array.prototype.push.prototype === undefined. Actual: ' + (Array.prototype.push.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.7.js
index 7f5ebac8f..512170817 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The push property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.7/S15.4.4.7_A6.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The push property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.push() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T1.js
index 25c897dca..1ccd28a83 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The elements of the array are rearranged so as to reverse their order.
- * The object is returned as the result of the call
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T1.js
- * @description Checking case when reverse is given no arguments or one argument
- */
+/*---
+info: >
+    The elements of the array are rearranged so as to reverse their order.
+    The object is returned as the result of the call
+description: Checking case when reverse is given no arguments or one argument
+---*/
 
 //CHECK#1
 var x = [];
@@ -44,5 +43,4 @@ if (x[1] !== 1) {
 //CHECK#6
 if (x.length !== 2) {
   $ERROR('#6: x = new Array(1,2); x.reverse(); x.length === 2. Actual: ' + (x.length));
-}              
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T2.js
index 94bcac925..c7f31277c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The elements of the array are rearranged so as to reverse their order.
- * The object is returned as the result of the call
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A1_T2.js
- * @description Checking this algorithm, elements are objects and primitives
- */
+/*---
+info: >
+    The elements of the array are rearranged so as to reverse their order.
+    The object is returned as the result of the call
+description: Checking this algorithm, elements are objects and primitives
+---*/
 
 //CHECK#1
 var x = [];
@@ -124,5 +123,3 @@ if (x[7] !== "NaN") {
 if (x[8] !== "-1") {
    $ERROR('#20: x = []; x[0] = true; x[2] = Infinity; x[4] = undefined; x[5] = undefined; x[8] = "NaN"; x[9] = "-1"; x.reverse(); x.length = 9; x.reverse(); x[8] === "-1". Actual: ' + (x[8]));
 }
-    
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T1.js
index eb98397d8..766551666 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T1.js
- * @description Checking this for Object object, elements are objects and primitives, length is integer
- */
+/*---
+info: >
+    The reverse function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Checking this for Object object, elements are objects and
+    primitives, length is integer
+---*/
 
 //CHECK#1
 var obj = {};
@@ -127,4 +128,3 @@ if (obj[7] !== "NaN") {
 if (obj[8] !== "-1") {
    $ERROR('#20: var obj = {}; obj.reverse = Array.prototype.reverse; obj.length = 10; obj[0] = true; obj[2] = Infinity; obj[4] = undefined; obj[5] = undefined; obj[8] = "NaN"; obj[9] = "-1"; obj.reverse(); obj.length = 9; obj.reverse(); obj[8] === "-1". Actual: ' + (obj[8]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T2.js
index fa42f9c54..af396845c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T2.js
- * @description Checking this for Object object, elements are objects and primitives, length is not integer
- */
+/*---
+info: >
+    The reverse function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Checking this for Object object, elements are objects and
+    primitives, length is not integer
+---*/
 
 //CHECK#1
 var obj = {};
@@ -127,4 +128,3 @@ if (obj[7] !== "NaN") {
 if (obj[8] !== "-1") {
    $ERROR('#20: var obj = {}; obj.reverse = Array.prototype.reverse; obj.length = 10.5; obj[0] = true; obj[2] = Infinity; obj[4] = undefined; obj[5] = undefined; obj[8] = "NaN"; obj[9] = "-1"; obj.reverse(); obj.length = new Number(9.5); obj.reverse(); obj[8] === "-1". Actual: ' + (obj[8]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T3.js
index 76e457d81..c09531f59 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A2_T3.js
- * @description Checking this for Object object, elements are objects and primitives, length is string
- */
+/*---
+info: >
+    The reverse function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Checking this for Object object, elements are objects and
+    primitives, length is string
+---*/
 
 //CHECK#1
 var obj = {};
@@ -127,4 +128,3 @@ if (obj[7] !== "NaN") {
 if (obj[8] !== "-1") {
    $ERROR('#20: var obj = {}; obj.reverse = Array.prototype.reverse; obj.length = "10"; obj[0] = true; obj[2] = Infinity; obj[4] = undefined; obj[5] = undefined; obj[8] = "NaN"; obj[9] = "-1"; obj.reverse(); obj.length = new String("9"); obj.reverse(); obj[8] === "-1". Actual: ' + (obj[8]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T1.js
index cd3e5e86b..7a4b00893 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T1.js
- * @description length = 4294967296
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967296
+---*/
 
 var obj = {};
 obj.reverse = Array.prototype.reverse;
@@ -34,4 +32,3 @@ if (obj[0] !== "x") {
 if (obj[4294967295] !== "y") {
   $ERROR('#4: var obj = {}; obj.reverse = Array.prototype.reverse; obj[] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; obj.reverse(); obj[4294967295] == "y"');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T2.js
index 46f2e7afe..763b0204a 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T2.js
- * @description length = 4294967298
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = 4294967298
+---*/
 
 var obj = {};
 obj.reverse = Array.prototype.reverse;
@@ -39,5 +37,4 @@ if (obj[1] !== "x") {
 //CHECK#5
 if (obj[4294967297] !== "z") {
   $ERROR('#5: var obj = {}; obj.reverse = Array.prototype.reverse; obj[0] = "x"; obj[1] = "y"; obj[4294967297] = "z"; obj.length = 4294967298; obj.reverse(); obj[4294967297] === "z". Actual: ' + (obj[4294967297]));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T3.js
index ab9eeaef2..adbcbe394 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A3_T3.js
- * @description length = -4294967294
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length = -4294967294
+---*/
 
 var obj = {};
 obj.reverse = Array.prototype.reverse;
@@ -39,5 +37,4 @@ if (obj[1] !== "x") {
 //CHECK#5
 if (obj[2] !== "z") {
   $ERROR('#5: var obj = {}; obj.reverse = Array.prototype.reverse; obj[0] = "x"; obj[1] = "y"; obj[2] = "z"; obj.length = -4294967294; obj.reverse(); obj[2] === "z". Actual: ' + (obj[2]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T1.js
index e352960e8..77b4c9575 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = 1;
 var x = [0];
@@ -63,4 +63,3 @@ if (x[0] !== undefined) {
 if (x[1] !== 1) {  
   $ERROR('#8: Object.prototype[1] = 1; Object.prototype.length = 2; Object.prototype.reverse = Array.prototype.reverse; x = {0:0}; x.reverse(); delete x[0]; delete x[1]; x[1] === 1. Actual: ' + (x[1]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T2.js
index 38c1dd819..da0394569 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A4_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [0,1];
@@ -63,4 +63,3 @@ if (x[0] !== undefined) {
 if (x[1] !== -1) {  
   $ERROR('#8: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.reverse = Array.prototype.reverse; x = {0:0,1:1}; x.reverse(); delete x[0]; delete x[1]; x[1] === -1. Actual: ' + (x[1]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.1.js
index 4842b008b..58a46bfe0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of reverse has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of reverse has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.reverse.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (p in Array.reverse){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.reverse) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.2.js
index c50b4df46..9cc7bcb2e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of reverse has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.2.js
- * @description Checking use hasOwnProperty, delete
- * @noStrict
- */
+/*---
+info: The length property of reverse has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.reverse.hasOwnProperty('length') !== true) {
@@ -25,6 +24,3 @@ if (Array.prototype.reverse.hasOwnProperty('length') !== true) {
 if (Array.prototype.reverse.length === undefined) {
   $ERROR('#3: delete Array.prototype.reverse.length; Array.prototype.reverse.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.3.js
index 697cd8efe..eded06be5 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of reverse has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of reverse has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.reverse.length;
@@ -15,5 +13,3 @@ Array.prototype.reverse.length = Infinity;
 if (Array.prototype.reverse.length !== x) {
   $ERROR('#1: x = Array.prototype.reverse.length; Array.prototype.reverse.length = Infinity; Array.prototype.reverse.length === x. Actual: ' + (Array.prototype.reverse.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.4.js
index 0a90c188c..a1d059eee 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of reverse is 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.4.js
- * @description reverse.length === 1
- */
+/*---
+info: The length property of reverse is 0
+description: reverse.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.reverse.length !== 0) {
   $ERROR('#1: Array.prototype.reverse.length === 0. Actual: ' + (Array.prototype.reverse.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.5.js
index cb1ddf4dc..a0264454f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The reverse property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('reverse') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "reverse") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.6.js
index af214f93a..eb82753b9 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.6.js
- * @description Checking Array.prototype.reverse.prototype
- */
+/*---
+info: The reverse property of Array has not prototype property
+description: Checking Array.prototype.reverse.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.reverse.prototype !== undefined) {
   $ERROR('#1: Array.prototype.reverse.prototype === undefined. Actual: ' + (Array.prototype.reverse.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.7.js
index 0fd08fc56..1e834c538 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The reverse property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.8/S15.4.4.8_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The reverse property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.reverse() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.1_T1.js
index b44ab8451..a4451eb09 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If length equal zero, call the [[Put]] method of this object
- * with arguments "length" and 0 and return undefined
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.1_T1.js
- * @description Checking this algorithm
- */
+/*---
+info: >
+    If length equal zero, call the [[Put]] method of this object
+    with arguments "length" and 0 and return undefined
+description: Checking this algorithm
+---*/
 
 //CHECK#1
 var x = new Array();
@@ -32,5 +31,4 @@ if (shift !== undefined) {
 //CHECK#4
 if (x.length !== 0) {
   $ERROR('#4: var x = new Array(1,2,3); x.length = 0; x.shift(); x.length === 0. Actual: ' + (x.length));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.2_T1.js
index 387255e37..c1d6bd314 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The first element of the array is removed from the array and
- * returned
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A1.2_T1.js
- * @description Checking this use new Array() and []
- */
+/*---
+info: >
+    The first element of the array is removed from the array and
+    returned
+description: Checking this use new Array() and []
+---*/
 
 //CHECK#1
 var x = new Array(0,1,2,3);
@@ -66,4 +65,3 @@ if (shift !== undefined) {
 if (x.length !== 0) {
   $ERROR('#10: x = []; x[0] = 0; x[3] = 3; x.shift(); x.length = 1; x.shift(); x.length === 0. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T1.js
index f5ee769f3..76d467117 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T1.js
- * @description If ToUint32(length) equal zero, call the [[Put]] method
- * of this object with arguments "length" and 0 and return undefined
- */
+/*---
+info: >
+    The shift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If ToUint32(length) equal zero, call the [[Put]] method  of this
+    object with arguments "length" and 0 and return undefined
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -50,4 +50,3 @@ if (shift !== undefined) {
 if (obj.length !== 0) {
   $ERROR('#6: var obj = {}; obj.length = null; obj.shift = Array.prototype.shift; obj.shift(); obj.length === 0. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T2.js
index 98dd6323c..06fcaefac 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T2.js
- * @description If ToUint32(length) equal zero, call the [[Put]] method
- * of this object with arguments "length" and 0 and return undefined
- */
+/*---
+info: >
+    The shift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    If ToUint32(length) equal zero, call the [[Put]] method  of this
+    object with arguments "length" and 0 and return undefined
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -88,4 +88,3 @@ if (shift !== undefined) {
 if (obj.length !== 0) {
   $ERROR('#12: var obj = {}; obj.length = new Number(0); obj.shift = Array.prototype.shift; obj.shift(); obj.length === 0. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T3.js
index a2f6381e7..19eb94e23 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T3.js
- * @description The first element of the array is removed from the array and
- * returned
- */
+/*---
+info: >
+    The shift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The first element of the array is removed from the array and
+    returned
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -35,5 +35,4 @@ if (shift !== undefined) {
 //CHECK#3
 if (obj.length !== 1) {
   $ERROR('#12: var obj = {}; obj.length = new Number(2); obj.shift = Array.prototype.shift; obj.shift(); obj.length === 1. Actual: ' + (obj.length));
-} 
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T4.js
index 3fa3d40a8..bd7c5ad0c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T4.js
- * @description The first element of the array is removed from the array and
- * returned
- */
+/*---
+info: >
+    The shift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    The first element of the array is removed from the array and
+    returned
+---*/
 
 var obj = {};
 obj["0"] = 0;
@@ -49,4 +49,3 @@ if (shift !== undefined) {
 if (obj.length !== 0) {
   $ERROR('#6: var obj = {}; obj["0"] = 0; obj["3"] = 3; obj.length = 4; obj.shift = Array.prototype.shift; obj.shift(); obj.shift(); obj.length = 1; obj.shift(); obj.length === 0. Actual: ' + (obj.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T5.js
index 51bff21c0..341407e8e 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T5.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift function is intentionally generic.
- * It does not require that its this value be an Array object
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A2_T5.js
- * @description Operator use ToNumber from length.
- * If Type(value) is Object, evaluate ToPrimitive(value, Number)
- */
+/*---
+info: >
+    The shift function is intentionally generic.
+    It does not require that its this value be an Array object
+description: >
+    Operator use ToNumber from length.  If Type(value) is Object,
+    evaluate ToPrimitive(value, Number)
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -95,4 +95,3 @@ catch (e) {
     $ERROR('#8.2: obj[0] = -1; obj.length = {valueOf: function() {return {}}, toString: function() {return {}}}  obj.shift() throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T1.js
index 030873f53..00ad8819f 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T1.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -33,5 +31,4 @@ if (obj[0] !== "x") {
 //CHECK#4
 if (obj[4294967295] !== "y") {
    $ERROR('#4: var obj = {}; obj.shift = Array.prototype.shift; obj[0] = "x"; obj[4294967295] = "y"; obj.length = 4294967296; obj.shift(); obj[4294967295] === "y". Actual: ' + (obj[4294967295]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T2.js
index c3b37cd62..75bf331af 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T2.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -39,5 +37,4 @@ if (obj[1] !== "y") {
 //CHECK#4
 if (obj[4294967296] !== "z") {
    $ERROR('#4: var obj = {}; obj.shift = Array.prototype.shift; obj[0] = "x"; obj[1] = "y"; obj[4294967296] = "z"; obj.length = 4294967297; obj.shift(); obj[4294967296] === "z". Actual: ' + (obj[4294967296]));
-}  
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T3.js
index 23243d7be..322bf92d7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Check ToUint32(length) for non Array objects
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A3_T3.js
- * @description length is arbitrarily
- */
+/*---
+info: Check ToUint32(length) for non Array objects
+description: length is arbitrarily
+---*/
 
 var obj = {};
 obj.shift = Array.prototype.shift;
@@ -33,5 +31,4 @@ if (obj[0] !== "y") {
 //CHECK#4
 if (obj[1] !== undefined) {
    $ERROR('#4: var obj = {}; obj.shift = Array.prototype.shift; obj[0] = "x" obj[1] = "y"; obj.length = -4294967294; obj.shift(); obj[1] === undefined. Actual: ' + (obj[1]));
-}    
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T1.js
index 7a3fed69e..e0d34b32c 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T1.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = 1;
 var x = [0];
@@ -59,4 +59,3 @@ delete x.length;
 if (x.length !== 2) {  
   $ERROR('#8: Object.prototype[1] = 1; Object.prototype.length = 2; Object.prototype.shift = Array.prototype.shift; x = {0:0}; x.shift(); delete x; x.length === 2. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T2.js
index e10ee72ec..bc0f94a0d 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * [[Get]], [[Delete]] from not an inherited property
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A4_T2.js
- * @description [[Prototype]] of Array instance is Array.prototype, [[Prototype] of Array.prototype is Object.prototype
- */
+/*---
+info: "[[Get]], [[Delete]] from not an inherited property"
+description: >
+    [[Prototype]] of Array instance is Array.prototype, [[Prototype]
+    of Array.prototype is Object.prototype
+---*/
 
 Array.prototype[1] = -1;
 var x = [0,1];
@@ -59,4 +59,3 @@ delete x.length;
 if (x.length !== 2) {  
   $ERROR('#8: Object.prototype[1] = -1; Object.prototype.length = 2; Object.prototype.shift = Array.prototype.shift; x = {0:0,1:1}; x.shift(); delete x; x.length === 2. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.1.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.1.js
index d498bc5b1..2e627bed7 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.1.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of shift has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.1.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The length property of shift has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.prototype.shift.propertyIsEnumerable('length') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array.shift){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array.shift) { if (p === "length") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.2.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.2.js
index 8a8530b9c..c2bffa8c0 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.2.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of shift has the attribute DontDelete
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.2.js
- * @description Checking use hasOwnProperty, delete
- */
+/*---
+info: The length property of shift has the attribute DontDelete
+description: Checking use hasOwnProperty, delete
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (Array.prototype.shift.hasOwnProperty('length') !== true) {
@@ -24,6 +23,3 @@ if (Array.prototype.shift.hasOwnProperty('length') !== true) {
 if (Array.prototype.shift.length === undefined) {
   $ERROR('#3: delete Array.prototype.shift.length; Array.prototype.shift.length !== undefined');
 }
-
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.3.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.3.js
index 43c540992..31eec52b1 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.3.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of shift has the attribute ReadOnly
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.3.js
- * @description Checking if varying the length property fails
- * @noStrict
- */
+/*---
+info: The length property of shift has the attribute ReadOnly
+description: Checking if varying the length property fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 var x = Array.prototype.shift.length;
@@ -15,5 +13,3 @@ Array.prototype.shift.length = Infinity;
 if (Array.prototype.shift.length !== x) {
   $ERROR('#1: x = Array.prototype.shift.length; Array.prototype.shift.length = Infinity; Array.prototype.shift.length === x. Actual: ' + (Array.prototype.shift.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.4.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.4.js
index 6e7f51972..e94a4a643 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.4.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of shift is 0
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.4.js
- * @description shift.length === 1
- */
+/*---
+info: The length property of shift is 0
+description: shift.length === 1
+---*/
 
 //CHECK#1
 if (Array.prototype.shift.length !== 0) {
   $ERROR('#1: Array.prototype.shift.length === 0. Actual: ' + (Array.prototype.shift.length));
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.5.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.5.js
index b52477433..8acd913f2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.5.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift property of Array has the attribute DontEnum
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.5.js
- * @description Checking use propertyIsEnumerable, for-in
- */
+/*---
+info: The shift property of Array has the attribute DontEnum
+description: Checking use propertyIsEnumerable, for-in
+---*/
 
 //CHECK#1
 if (Array.propertyIsEnumerable('shift') !== false) {
@@ -24,5 +22,3 @@ for (var p in Array){
 if (result !== true) {
   $ERROR('#2: result = true; for (p in Array) { if (p === "shift") result = false; }  result === true;');
 }
-
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.6.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.6.js
index c1e4ce641..fa49310b2 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.6.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.6.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift property of Array has not prototype property
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.6.js
- * @description Checking Array.prototype.shift.prototype
- */
+/*---
+info: The shift property of Array has not prototype property
+description: Checking Array.prototype.shift.prototype
+---*/
 
 //CHECK#1
 if (Array.prototype.shift.prototype !== undefined) {
   $ERROR('#1: Array.prototype.shift.prototype === undefined. Actual: ' + (Array.prototype.shift.prototype));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.7.js b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.7.js
index 24b8122a1..4f7aadbec 100644
--- a/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.7.js
+++ b/test/suite/ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The shift property of Array can't be used as constructor
- *
- * @path ch15/15.4/15.4.4/15.4.4.9/S15.4.4.9_A5.7.js
- * @description If property does not implement the internal [[Construct]] method, throw a TypeError exception
- */
+/*---
+info: The shift property of Array can't be used as constructor
+description: >
+    If property does not implement the internal [[Construct]] method,
+    throw a TypeError exception
+---*/
 
 //CHECK#1
 
@@ -18,4 +18,3 @@ try {
     $ERROR('#1.2: new Array.prototype.shift() throw TypeError. Actual: ' + (e));
   }
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T1.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T1.js
index 1ccbc5151..d939dbad5 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of
- * the Array prototype object is the Object prototype object
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A1.1_T1.js
- * @description Create new property of Function.prototype. When Array.prototype object has this property
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of
+    the Array prototype object is the Object prototype object
+description: >
+    Create new property of Function.prototype. When Array.prototype
+    object has this property
+---*/
 
 Object.prototype.myproperty = 1;
 
@@ -20,4 +21,3 @@ if (Array.prototype.myproperty !== 1) {
 if (Array.prototype.hasOwnProperty('myproperty') !== false) {
   $ERROR('#2: Object.prototype.myproperty = 1; Array.prototype.hasOwnProperty(\'myproperty\') === false. Actual: ' + (Array.prototype.hasOwnProperty('myproperty')));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T2.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T2.js
index c24c92cfc..c5b713082 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.4/15.4.4/S15.4.4_A1.1_T2.js
- * @description The Array prototype object is itself an array; its [[Class]] is "Array",
- */
+/*---
+description: >
+    The Array prototype object is itself an array; its [[Class]] is
+    "Array",
+---*/
 
 //CHECK#1
 if (Object.prototype.toString.call(Array.prototype) !== "[object Array]") {
   $ERROR('The Array prototype object is itself an array; its' +
          '[[Class]] is "Array".');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T3.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T3.js
index fe640adf1..3c5c5e920 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T3.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.1_T3.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of
- * the Array prototype object is the Object prototype object
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A1.1_T3.js
- * @description Checking use isPrototypeOf
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of
+    the Array prototype object is the Object prototype object
+description: Checking use isPrototypeOf
+---*/
 
 //CHECK#1
 if (Object.prototype.isPrototypeOf(Array.prototype) !== true) {
   $ERROR('#1: Object.prototype.isPrototypeOf(Array.prototype) === true. Actual: ' + (Object.prototype.isPrototypeOf(Array.prototype)));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.2_T1.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.2_T1.js
index 164069326..90ebb8ea4 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.2_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the Array prototype object is set to "Array"
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A1.2_T1.js
- * @description Checking use Object.prototype.toString
- */
+/*---
+info: The [[Class]] property of the Array prototype object is set to "Array"
+description: Checking use Object.prototype.toString
+---*/
 
 //CHECK#1
 Array.prototype.getClass = Object.prototype.toString;
 if (Array.prototype.getClass() !== "[object " + "Array" + "]") {
   $ERROR('#1: Array.prototype.getClass = Object.prototype.toString; Array.prototype is Array object. Actual: ' + (Array.prototype.getClass()));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.3_T1.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.3_T1.js
index 41d9961fa..4e626cedd 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Array prototype object has length property whose value is +0
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A1.3_T1.js
- * @description Array.prototype.length === 0
- */
+/*---
+info: Array prototype object has length property whose value is +0
+description: Array.prototype.length === 0
+---*/
 
 //CHECK#1
 if (Array.prototype.length !== 0) {
@@ -15,6 +13,4 @@ if (Array.prototype.length !== 0) {
   if (1 / Array.prototype.length !== Number.POSITIVE_INFINITY) {
     $ERROR('#1.2: Array.prototype.length === +0. Actual: ' + (Array.prototype.length));
   }
-} 
-   
-
+}
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T1.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T1.js
index d8e5c49a6..ca1004229 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array prototype object does not have a valueOf property of
- * its own; however, it inherits the valueOf property from the valueOf
- * property from the Object prototype Object
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A2.1_T1.js
- * @description Checking use hasOwnProperty
- */
+/*---
+info: >
+    The Array prototype object does not have a valueOf property of
+    its own; however, it inherits the valueOf property from the valueOf
+    property from the Object prototype Object
+description: Checking use hasOwnProperty
+---*/
 
 //CHECK#1
 if (Array.prototype.hasOwnProperty('valueOf') !== false) {
   $ERROR('#1: Array.prototype.hasOwnProperty(\'valueOf\') === false. Actual: ' + (Array.prototype.hasOwnProperty('valueOf')));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T2.js b/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T2.js
index 0fb1ba003..d981b15b2 100644
--- a/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.4/S15.4.4_A2.1_T2.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Array prototype object does not have a valueOf property of
- * its own; however, it inherits the valueOf property from the valueOf
- * property from the Object prototype Object
- *
- * @path ch15/15.4/15.4.4/S15.4.4_A2.1_T2.js
- * @description Change valueOf property of Object.prototype. When Array.prototype.valueOf also change
- */
+/*---
+info: >
+    The Array prototype object does not have a valueOf property of
+    its own; however, it inherits the valueOf property from the valueOf
+    property from the Object prototype Object
+description: >
+    Change valueOf property of Object.prototype. When
+    Array.prototype.valueOf also change
+---*/
 
 Object.prototype.valueOf = 1;
 
@@ -22,4 +23,3 @@ var x = new Array();
 if (x.valueOf !== 1) {
   $ERROR('#1: Object.prototype.valueOf = 1; x = new Array(); x.valueOf === 1. Actual: ' + (x.valueOf));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5-1.js b/test/suite/ch15/15.4/15.4.5/15.4.5-1.js
index 1b0620d58..509fa2618 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5-1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5-1.js

- * @description Array instances have [[Class]] set to 'Array'

- */

-

-

-function testcase() {

-  var a = [];

-  var s = Object.prototype.toString.call(a);

-  if (s === '[object Array]') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Array instances have [[Class]] set to 'Array'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var a = [];
+  var s = Object.prototype.toString.call(a);
+  if (s === '[object Array]') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-1.js
index dca90cd26..90bab2d1e 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-1.js

- * @description Throw RangeError if attempt to set array length property to 4294967296 (2**32)

- */

-

-

-function testcase() {

-  try {

-      [].length = 4294967296 ;

-  } catch (e) {

-	if (e instanceof RangeError) return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Throw RangeError if attempt to set array length property to
+    4294967296 (2**32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+      [].length = 4294967296 ;
+  } catch (e) {
+	if (e instanceof RangeError) return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-2.js
index e6806076a..710289d99 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-2.js

- * @description Throw RangeError if attempt to set array length property to 4294967297 (1+2**32)

- */

-

-

-function testcase() {

-  try {

-      [].length = 4294967297 ;

-  } catch (e) {

-	if (e instanceof RangeError) return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Throw RangeError if attempt to set array length property to
+    4294967297 (1+2**32)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+      [].length = 4294967297 ;
+  } catch (e) {
+	if (e instanceof RangeError) return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-3.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-3.js
index 73bbed31e..2efff9eee 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-3.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-3.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-3.d-3.js

- * @description Set array length property to max value 4294967295 (2**32-1,)

- */

-

-

-function testcase() {  

-  var a =[];

-  a.length = 4294967295 ;

-  return a.length===4294967295 ;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Set array length property to max value 4294967295 (2**32-1,)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {  
+  var a =[];
+  a.length = 4294967295 ;
+  return a.length===4294967295 ;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-1.js
index b4be081e5..8bffc3074 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-1.js

- * @description Defining a property named 4294967295 (2**32-1)(not an array element)

- */

-

-

-function testcase() {  

-  var a =[];

-  a[4294967295] = "not an array element" ;

-  return a[4294967295] === "not an array element";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Defining a property named 4294967295 (2**32-1)(not an array
+    element)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {  
+  var a =[];
+  a[4294967295] = "not an array element" ;
+  return a[4294967295] === "not an array element";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-2.js
index 5100aa8ad..374c78151 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.4/15.4.5/15.4.5.1/15.4.5.1-5-2.js

- * @description Defining a property named 4294967295 (2**32-1) doesn't change length of the array

- */

-

-

-function testcase() {  

-  var a =[0,1,2];

-  a[4294967295] = "not an array element" ;

-  return a.length===3;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Defining a property named 4294967295 (2**32-1) doesn't change
+    length of the array
+includes: [runTestCase.js]
+---*/
+
+function testcase() {  
+  var a =[0,1,2];
+  a[4294967295] = "not an array element" ;
+  return a.length===3;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T1.js
index 109ffa0e0..ff30b100a 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToUint32(length) !== ToNumber(length), throw RangeError
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T1.js
- * @description length in [4294967296, -1, 1.5]
- */
+/*---
+info: If ToUint32(length) !== ToNumber(length), throw RangeError
+description: length in [4294967296, -1, 1.5]
+---*/
 
 //CHECK#1
 try {
@@ -40,4 +38,3 @@ try {
     $ERROR('#3.2: x = []; x.length = 1.5 throw RangeError. Actual: ' + (e));
   }    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T2.js
index 1e8839749..bf03a9161 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToUint32(length) !== ToNumber(length), throw RangeError
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.1_T2.js
- * @description length in [NaN, Infinity, -Infinity, undefined]
- */
+/*---
+info: If ToUint32(length) !== ToNumber(length), throw RangeError
+description: length in [NaN, Infinity, -Infinity, undefined]
+---*/
 
 //CHECK#1
 try {
@@ -51,4 +49,3 @@ try {
     $ERROR('#4.2: x = []; x.length = undefined throw RangeError. Actual: ' + (e));
   }    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T1.js
index c85204eef..f227aa88a 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For every integer k that is less than the value of
- * the length property of A but not less than ToUint32(length),
- * if A itself has a property (not an inherited property) named ToString(k),
- * then delete that property
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T1.js
- * @description Change length of array
- */
+/*---
+info: >
+    For every integer k that is less than the value of
+    the length property of A but not less than ToUint32(length),
+    if A itself has a property (not an inherited property) named ToString(k),
+    then delete that property
+description: Change length of array
+---*/
 
 //CHECK#1
 var x = [0,,2,,4];
@@ -28,4 +27,3 @@ if (x[3] !== undefined) {
 if (x[2] !== 2) {  
   $ERROR('#3: x = [0,,2,,4]; x.length = 4; x.length = 3; x[2] === 2. Actual: ' + (x[2]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T2.js
index 7051e96f0..d552e1fbb 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For every integer k that is less than the value of
- * the length property of A but not less than ToUint32(length),
- * if A itself has a property (not an inherited property) named ToString(k),
- * then delete that property
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T2.js
- * @description Checking an inherited property
- */
+/*---
+info: >
+    For every integer k that is less than the value of
+    the length property of A but not less than ToUint32(length),
+    if A itself has a property (not an inherited property) named ToString(k),
+    then delete that property
+description: Checking an inherited property
+---*/
 
 //CHECK#1
 Array.prototype[2] = -1;
@@ -23,4 +22,3 @@ x.length = 2;
 if (x[2] !== -1) {  
   $ERROR('#2: Array.prototype[2] = -1; x = [0,1,3]; x.length = 2; x[2] === -1. Actual: ' + (x[2]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T3.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T3.js
index 85dd3cc1b..e78e83fa4 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T3.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T3.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For every integer k that is less than the value of
- * the length property of A but not less than ToUint32(length),
- * if A itself has a property (not an inherited property) named ToString(k),
- * then delete that property
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.2_T3.js
- * @description Checking an inherited property
- */
+/*---
+info: >
+    For every integer k that is less than the value of
+    the length property of A but not less than ToUint32(length),
+    if A itself has a property (not an inherited property) named ToString(k),
+    then delete that property
+description: Checking an inherited property
+---*/
 
 //CHECK#1
 Array.prototype[2] = 2;
@@ -24,4 +23,3 @@ x.length = 2;
 if (x[2] !== 2) {  
   $ERROR('#2: Array.prototype[2] = 2; x = [0,1]; x.length = 3; x.length = 2; x[2] === 2. Actual: ' + (x[2]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T1.js
index c771b9742..e68fead2a 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Set the value of property length of A to Uint32(length)
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T1.js
- * @description length is object or primitve
- */
+/*---
+info: Set the value of property length of A to Uint32(length)
+description: length is object or primitve
+---*/
 
 //CHECK#1
 var x = [];
@@ -49,4 +47,3 @@ x.length = new String("1");
 if (x.length !== 1) {  
   $ERROR('#6: x = []; x.length = new String("1"); x.length === 1. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T2.js
index ad9b74845..6a44027cb 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Set the value of property length of A to Uint32(length)
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A1.3_T2.js
- * @description Uint32 use ToNumber and ToPrimitve
- */
+/*---
+info: Set the value of property length of A to Uint32(length)
+description: Uint32 use ToNumber and ToPrimitve
+---*/
 
 //CHECK#1
 var x = [];
@@ -84,4 +82,3 @@ catch (e) {
     $ERROR('#8.2: x = []; x.length = {valueOf: function() {return {}}, toString: function() {return {}}}  x.length throw TypeError. Actual: ' + (e));
   } 
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.1_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.1_T1.js
index a1d805c34..70e1c2cfb 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.1_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If P is not an array index, return
- * (Create a property with name P, set its value to V and give it empty attributes)
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.1_T1.js
- * @description P in [4294967295, -1, true]
- */
+/*---
+info: >
+    If P is not an array index, return
+    (Create a property with name P, set its value to V and give it empty attributes)
+description: P in [4294967295, -1, true]
+---*/
 
 //CHECK#1
 var x = [];
@@ -41,4 +40,3 @@ if (x.length !== 0) {
 if (x[true] !== 1) {  
   $ERROR('#3.2: x = []; x[true] = 1; x[true] === 1. Actual: ' + (x[true]));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.2_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.2_T1.js
index cbb9dbe61..6520d32c1 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.2_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToUint32(P) is less than the value of
- * the length property of A, then return
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.2_T1.js
- * @description length === 100, P in [0, 98, 99]
- */
+/*---
+info: >
+    If ToUint32(P) is less than the value of
+    the length property of A, then return
+description: length === 100, P in [0, 98, 99]
+---*/
 
 //CHECK#1
 var x = Array(100);
@@ -27,4 +26,3 @@ x[99] = 1;
 if (x.length !== 100) {  
   $ERROR('#3: x = Array(100); x[0] = 1; x[98] = 1; x[99] = 1; x.length === 100. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.3_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.3_T1.js
index 42e13f392..b6c2a90b6 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.3_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If ToUint32(P) is less than the value of
- * the length property of A, change (or set) length to ToUint32(P)+1
- *
- * @path ch15/15.4/15.4.5/15.4.5.1/S15.4.5.1_A2.3_T1.js
- * @description length = 100, P in [100, 199]
- */
+/*---
+info: >
+    If ToUint32(P) is less than the value of
+    the length property of A, change (or set) length to ToUint32(P)+1
+description: length = 100, P in [100, 199]
+---*/
 
 //CHECK#1
 var x = Array(100);
@@ -21,4 +20,3 @@ x[199] = 1;
 if (x.length !== 200) {  
   $ERROR('#2: x = Array(100); x[100] = 1; x[199] = 1; x.length === 100. Actual: ' + (x.length));    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T1.js
index b34c630f1..56c2f2c94 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every Array object has a length property whose value is
- * always a nonnegative integer less than 2^32. The value of the length property is
- * numerically greater than the name of every property whose name is an array index
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T1.js
- * @description Checking boundary points
- */
+/*---
+info: >
+    Every Array object has a length property whose value is
+    always a nonnegative integer less than 2^32. The value of the length property is
+    numerically greater than the name of every property whose name is an array index
+description: Checking boundary points
+---*/
 
 //CHECK#1
 var x = [];
@@ -39,4 +38,3 @@ x[4294967294] = 1;
 if (x.length !== 4294967295) {      
   $ERROR('#5: x = []; x[0] = 1; x[1] = 1; x[2147483648] = 1; x[42949672954] = 1; x.length === 4294967295. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T2.js
index d6ecd91c5..543042a14 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every Array object has a length property whose value is
- * always a nonnegative integer less than 2^32. The value of the length property is
- * numerically greater than the name of every property whose name is an array index
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A1_T2.js
- * @description P = "2^32 - 1" is not index array
- */
+/*---
+info: >
+    Every Array object has a length property whose value is
+    always a nonnegative integer less than 2^32. The value of the length property is
+    numerically greater than the name of every property whose name is an array index
+description: P = "2^32 - 1" is not index array
+---*/
 
 //CHECK#1
 var x = [];
@@ -24,4 +23,3 @@ y[4294967295] = 1;
 if (y.length !== 2) {      
   $ERROR('#2: y = []; y[1] = 1; y[4294967295] = 1; y.length === 2. Actual: ' + (y.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A2_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A2_T1.js
index 5a892bfad..af31daefa 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A2_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If a property is added whose name is an array index,
- * the length property is changed
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A2_T1.js
- * @description Checking length property
- */
+/*---
+info: >
+    If a property is added whose name is an array index,
+    the length property is changed
+description: Checking length property
+---*/
 
 //CHECK#1
 var x = [];
@@ -32,4 +31,3 @@ x[9] = 1;
 if (x.length !== 10) {      
   $ERROR('#4: x = []; x[0] = 1; x[1] = 1; x[9] = 1; x.length === 10. Actual: ' + (x.length));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T1.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T1.js
index acffcd289..c544b0bf2 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T1.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length property is changed, every property whose name
- * is an array index whose value is not smaller than the new length is automatically deleted
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T1.js
- * @description If new length greater than the name of every property whose name
- * is an array index
- */
+/*---
+info: >
+    If the length property is changed, every property whose name
+    is an array index whose value is not smaller than the new length is automatically deleted
+description: >
+    If new length greater than the name of every property whose name
+    is an array index
+---*/
 
 //CHECK#1
 var x = [];
@@ -28,4 +28,3 @@ if (x.length !== 10) {
 if (x[5] !== 1) {      
   $ERROR('#3: x = []; x.length = 1; x[5] = 1; x.length = 10; x[5] = 1');
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T2.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T2.js
index 27b66f2df..894dd80df 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T2.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length property is changed, every property whose name
- * is an array index whose value is not smaller than the new length is automatically deleted
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T2.js
- * @description If new length greater than the name of every property whose name
- * is an array index
- */
+/*---
+info: >
+    If the length property is changed, every property whose name
+    is an array index whose value is not smaller than the new length is automatically deleted
+description: >
+    If new length greater than the name of every property whose name
+    is an array index
+---*/
 
 //CHECK#1
 var x = [];
@@ -47,4 +47,3 @@ x.length = 1;
 if (x[1] !== undefined) {      
   $ERROR('#6: x = []; x[1] = 1; x[3] = 3; x[5] = 5; x.length = 4; x.length = new Number(6); x.length = 0; x.length = 1; x[1] === undefined. Actual: ' + (x[1]));
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T3.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T3.js
index fc1c479b2..905fc9465 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T3.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length property is changed, every property whose name
- * is an array index whose value is not smaller than the new length is automatically deleted
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T3.js
- * @description [[Put]] (length, 4294967296)
- */
+/*---
+info: >
+    If the length property is changed, every property whose name
+    is an array index whose value is not smaller than the new length is automatically deleted
+description: "[[Put]] (length, 4294967296)"
+---*/
 
 //CHECK#1
 var x = [];
@@ -26,4 +25,3 @@ try {
     $ERROR('#2.2: x = []; x.length = 4294967296 throw RangeError. Actual: ' + (e));
   }    
 }
-
diff --git a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T4.js b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T4.js
index 124de64dc..27129cdb7 100644
--- a/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T4.js
+++ b/test/suite/ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the length property is changed, every property whose name
- * is an array index whose value is not smaller than the new length is automatically deleted
- *
- * @path ch15/15.4/15.4.5/15.4.5.2/S15.4.5.2_A3_T4.js
- * @description If new length greater than the name of every property whose name
- * is an array index
- */
+/*---
+info: >
+    If the length property is changed, every property whose name
+    is an array index whose value is not smaller than the new length is automatically deleted
+description: >
+    If new length greater than the name of every property whose name
+    is an array index
+---*/
 
 //CHECK#1
 var x = [0,1,2]; 
@@ -34,5 +34,3 @@ if (x[2] !== undefined) {
 if (x[4294967294] !== undefined) {  
   $ERROR('#4: x = [0,1,2]; x[4294967294] = 4294967294; x.length = 2; x[4294967294] === undefined. Actual: ' + (x[4294967294]));    
 }
-
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T1.js b/test/suite/ch15/15.4/S15.4_A1.1_T1.js
index d6873033b..0f9f3ebba 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T1.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T1.js
- * @description Checking for boolean primitive
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for boolean primitive
+---*/
 
 //CHECK#1
 x = [];
@@ -31,4 +30,3 @@ if (x[0] !== undefined) {
 if (x["false"] !== 0) {
   $ERROR('#4: x = []; x[false] = 1; x["false"] === 0. Actual: ' + (x["false"]));  
 }
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T10.js b/test/suite/ch15/15.4/S15.4_A1.1_T10.js
index 079051c04..ed3f33eac 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T10.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T10.js
- * @description Array index is power of two
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Array index is power of two
+---*/
 
 //CHECK#
 x = [];
@@ -24,4 +23,3 @@ for (i = 0; i < 32; i++) {
     $ERROR('#' + (k - 2) + ': ');
   }     
 }
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T2.js b/test/suite/ch15/15.4/S15.4_A1.1_T2.js
index d3392a921..1cb93e3ab 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T2.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T2.js
- * @description Checking for number primitive
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for number primitive
+---*/
 
 //CHECK#1
 x = [];
@@ -43,6 +42,4 @@ if (z[0] !== undefined) {
 //CHECK#6
 if (z["-Infinity"] !== 1) {
   $ERROR('#6: z = []; z[Number.NEGATIVE_INFINITY] = 1; z["-Infinity"] === 1. Actual: ' + (z["-Infinity"]));  
-} 
-
-
+}
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T3.js b/test/suite/ch15/15.4/S15.4_A1.1_T3.js
index e9b576d83..c80f65556 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T3.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T3.js
- * @description Checking for number primitive
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for number primitive
+---*/
 
 //CHECK#1
 x = [];
@@ -43,5 +42,4 @@ if (z[1] !== undefined) {
 //CHECK#6
 if (z["1.1"] !== 1) {
   $ERROR('#6: z = []; z[1.1] = 1; z["1.1"] === 1. Actual: ' + (z["1.1"]));  
-}  
-
+}
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T4.js b/test/suite/ch15/15.4/S15.4_A1.1_T4.js
index c0e937c22..195e646d0 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T4.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T4.js
- * @description Checking for string primitive
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for string primitive
+---*/
 
 //CHECK#1
 x = [];
@@ -22,5 +21,3 @@ y["1"] = 1;
 if (y[1] !== 1) {
   $ERROR('#2: y = []; y["1"] = 1; y[1] === 1. Actual: ' + (y[1]));  
 }
-
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T5.js b/test/suite/ch15/15.4/S15.4_A1.1_T5.js
index e188d2235..f5e33ef48 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T5.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T5.js
- * @description Checking for null and undefined
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for null and undefined
+---*/
 
 //CHECK#1
 x = [];
@@ -32,4 +31,3 @@ if (y[0] !== undefined) {
 if (y["undefined"] !== 0) {
   $ERROR('#4: y = []; y[undefined] = 1; y["undefined"] === 0. Actual: ' + (y["undefined"]));  
 }
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T6.js b/test/suite/ch15/15.4/S15.4_A1.1_T6.js
index 058a059a3..b14c080cb 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T6.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T6.js
- * @description Checking for Boolean object
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for Boolean object
+---*/
 
 //CHECK#1
 x = [];
@@ -31,5 +30,3 @@ if (x[0] !== undefined) {
 if (x["false"] !== 0) {
   $ERROR('#4: x = []; x[false] = 1; x["false"] === 0. Actual: ' + (x["false"]));  
 }
-
-
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T7.js b/test/suite/ch15/15.4/S15.4_A1.1_T7.js
index 36582886d..3e4db8f0f 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T7.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T7.js
- * @description Checking for Number object
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for Number object
+---*/
 
 //CHECK#1
 x = [];
@@ -28,5 +27,4 @@ z = [];
 z[new Number(1.1)] = 1;
 if (z["1.1"] !== 1) {
   $ERROR('#3: z = []; z[new Number(1.1)] = 1; z["1.1"] === 1. Actual: ' + (z["1.1"]));  
-}  
-
+}
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T8.js b/test/suite/ch15/15.4/S15.4_A1.1_T8.js
index 6777730d1..8ef83d02a 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T8.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T8.js
- * @description Checking for Number object
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: Checking for Number object
+---*/
 
 //CHECK#1
 x = [];
@@ -28,5 +27,4 @@ z = [];
 z[new String("1.1")] = 1;
 if (z["1.1"] !== 1) {
   $ERROR('#3: z = []; z[new String("1.1")] = 1; z["1.1"] === 1. Actual: ' + (z["1.1"]));  
-}  
-
+}
diff --git a/test/suite/ch15/15.4/S15.4_A1.1_T9.js b/test/suite/ch15/15.4/S15.4_A1.1_T9.js
index 61e1b8eed..58933a921 100644
--- a/test/suite/ch15/15.4/S15.4_A1.1_T9.js
+++ b/test/suite/ch15/15.4/S15.4_A1.1_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * A property name P (in the form of a string value) is an array index
- * if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
- *
- * @path ch15/15.4/S15.4_A1.1_T9.js
- * @description If Type(value) is Object, evaluate ToPrimitive(value, String)
- */
+/*---
+info: >
+    A property name P (in the form of a string value) is an array index
+    if and only if ToString(ToUint32(P)) is equal to P and ToUint32(P) is not equal to 2^32 - 1
+description: If Type(value) is Object, evaluate ToPrimitive(value, String)
+---*/
 
 //CHECK#1
 x = [];
@@ -90,5 +89,4 @@ catch (e) {
   if ((e instanceof TypeError) !== true) {
     $ERROR('#8.2: x = []; var object = {valueOf: function() {return {}}, toString: function() {return {}}}; x[object] throw TypeError. Actual: ' + (e));
   } 
-}  
-
+}
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T1.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T1.js
index d9f82eac1..a14f3b0b1 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T1.js
- * @description Call String(function(){}())
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(function(){}())
+---*/
 
 var __str = String(function(){}());
 
@@ -25,4 +25,3 @@ if (__str !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T10.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T10.js
index a093b4326..32914dac6 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T10.js
- * @description Call String(1) and String(-1)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(1) and String(-1)
+---*/
 
 var __str = String(1);
 
@@ -43,4 +43,3 @@ if (__str !== "-1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T11.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T11.js
index 5f3e116b7..e79ab732b 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T11.js
- * @description Call String(1/0) and String(-1/0), and call with +/-Infinity
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(1/0) and String(-1/0), and call with +/-Infinity
+---*/
 
 var __str = String(1/0);
 
@@ -115,4 +115,3 @@ if (__str !== "-Infinity") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T12.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T12.js
index 8e47c235f..c773f732f 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T12.js
- * @description Call String(1/"a"), String("b"* null) and String(Number.NaN)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(1/"a"), String("b"* null) and String(Number.NaN)
+---*/
 
 var __str = String(1/"a");
 
@@ -61,4 +61,3 @@ if (__str !== "NaN") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T13.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T13.js
index 32557ea22..ccf0e73c1 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T13.js
- * @description Call String(true) and String(false)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(true) and String(false)
+---*/
 
 var __str = String(true);
 
@@ -79,4 +79,3 @@ if (__str !== "false") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T14.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T14.js
index f361a0926..e6144dd9c 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T14.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T14.js
- * @description Call String(0) and String(-0)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(0) and String(-0)
+---*/
 
 var __str = String(0);
 
@@ -43,4 +43,3 @@ if (__str !== "0") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T15.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T15.js
index 0dd28d743..62a1e2fc9 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T15.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T15.js
- * @description Call String(string_object)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(string_object)
+---*/
 
 var __obj__str = "caps";
 
@@ -21,4 +21,3 @@ if (__str !== __obj__str) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T16.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T16.js
index dff10bbf5..b82cb215e 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T16.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T16.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T16.js
- * @description Call String() with .12345 and analogous numbers
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String() with .12345 and analogous numbers
+---*/
 
 var __str = String(.12345);
 
@@ -79,4 +79,3 @@ if (__str !== "1.2345e-7") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T17.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T17.js
index 7767f2b0b..25874ec0b 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T17.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T17.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T17.js
- * @description Call String() with numbers that have more than 1 significant digit after point
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: >
+    Call String() with numbers that have more than 1 significant digit
+    after point
+---*/
 
 var __str = String(1.2345);
 
@@ -61,4 +63,3 @@ if (__str !== "1.2345") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T18.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T18.js
index 7305b692e..ab45ed1a4 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T18.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T18.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T18.js
- * @description Call String() with numbers that have more than 1 significant digit
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String() with numbers that have more than 1 significant digit
+---*/
 
 __str = String(1000000000000000000000);  
      
@@ -43,4 +43,3 @@ if (__str !== "1e+22") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T19.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T19.js
index fff76aea8..9dd033a37 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T19.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T19.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T19.js
- * @description Call String() with Array of numbers
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String() with Array of numbers
+---*/
 
 var __str = String(new Array(1,2,3));
 
@@ -25,4 +25,3 @@ if (__str !== "1,2,3") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T2.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T2.js
index e8b294ded..81b1aa6cf 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T2.js
- * @description Call String(null)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(null)
+---*/
 
 var __str = String(null);
 
@@ -25,4 +25,3 @@ if (__str !== "null") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T3.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T3.js
index 72db1f779..adcf57701 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T3.js
- * @description Call String(void 0)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(void 0)
+---*/
 
 var __str = String(void 0);
 
@@ -25,4 +25,3 @@ if (__str !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T4.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T4.js
index b72214eaf..9b5d5cae0 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T4.js
- * @description Call String(undefined)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(undefined)
+---*/
 
 var __str = String(undefined);
 
@@ -25,4 +25,3 @@ if (__str !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T5.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T5.js
index f801ea03a..d3fc6d3e3 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T5.js
- * @description Call String(x), where x is undefined variable
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(x), where x is undefined variable
+---*/
 
 var __str = String(x);
 
@@ -27,4 +27,3 @@ if (__str !== "undefined") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T6.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T6.js
index f753c374e..d438d2637 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T6.js
- * @description Checking by using eval, Call String(eval());
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Checking by using eval, Call String(eval());
+---*/
 
 var __str = String(eval());
 
@@ -25,4 +25,3 @@ if (__str !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T7.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T7.js
index 2c1d0b526..8b8ba04a1 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T7.js
- * @description Call String({})
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String({})
+---*/
 
 var __str = String({});
 
@@ -25,4 +25,3 @@ if (__str !== "[object "+"Object"+"]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T8.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T8.js
index 333d6d971..04cdc5063 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T8.js
- * @description Call String(new Array)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(new Array)
+---*/
 
 var __old__Array__prototype__toString = Array.prototype.toString;
 
@@ -32,4 +32,3 @@ if (__str !== "__ARRAY__") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T9.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T9.js
index c1bebf769..977c697b8 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String is called as a function rather than as a constructor, it performs a type conversion
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A1_T9.js
- * @description Call String(this)
- */
+/*---
+info: >
+    When String is called as a function rather than as a constructor, it
+    performs a type conversion
+description: Call String(this)
+---*/
 
 var toString=function(){return "__THIS__";};
 
@@ -27,4 +27,3 @@ if (__str !== "__THIS__") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A2_T1.js b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A2_T1.js
index 6e866d410..bfee6abad 100644
--- a/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.1/S15.5.1.1_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If value is not supplied, the empty string "" is returned
- *
- * @path ch15/15.5/15.5.1/S15.5.1.1_A2_T1.js
- * @description Call String()
- */
+/*---
+info: If value is not supplied, the empty string "" is returned
+description: Call String()
+---*/
 
 var __str = String();
 
@@ -25,4 +23,3 @@ if (__str !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T1.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T1.js
index ffb6f0899..658a260ef 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T1.js
- * @description Creating string object with expression "new String"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with expression "new String"
+---*/
 
 var __str = new String;
 
@@ -42,4 +41,3 @@ if ( __str === "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T10.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T10.js
index 39144a863..c49cd82a2 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T10.js
- * @description Creating string object with "new String(function object)" as the function object's prototype.toString property was changed
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String(function object)" as the
+    function object's prototype.toString property was changed
+---*/
 
 function __FACTORY(){};
 
@@ -40,4 +41,3 @@ if (__str != "tostr") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T11.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T11.js
index 2e8dc240f..e450f3ea1 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T11.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T11.js
- * @description Creating string object with "new String(function object)" after changing function object's valueOf and toString properties
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String(function object)" after
+    changing function object's valueOf and toString properties
+---*/
 
 function __obj(){};
 
@@ -42,4 +43,3 @@ if (__str !="true") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T12.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T12.js
index 24a5e9ee2..5b2109f46 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T12.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T12.js
- * @description Creating string object with "new String(function object)", after changing the function object toString property, which causes exception throw
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String(function object)", after
+    changing the function object toString property, which causes
+    exception throw
+---*/
 
 var __obj = {toString:function(){throw "intostr"}};
 
@@ -25,6 +27,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T13.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T13.js
index 12297a0f9..e7d829c3f 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T13.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T13.js
- * @description Creating string object with "new String(function object)" after changing function object's valueOf property, which causes exception throw
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String(function object)" after
+    changing function object's valueOf property, which causes
+    exception throw
+---*/
 
 var __obj = {toString:function(){return f; function f(){}}};
 
@@ -25,6 +27,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T16.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T16.js
index 57e39eaa3..0c0973d63 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T16.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T16.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T16.js
- * @description Creating string object with "new String()" initialized with .12345 and other numbers
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String()" initialized with .12345
+    and other numbers
+---*/
 
 __str =new String(.12345);
 //////////////////////////////////////////////////////////////////////////////
@@ -108,4 +109,3 @@ if (__str !="1.2345e-7") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T17.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T17.js
index d6a1fd2aa..f824b9171 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T17.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T17.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T17.js
- * @description Creating string object with "new String()" initialized with numbers that have more than 1 significant digit following the point
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String()" initialized with
+    numbers that have more than 1 significant digit following the point
+---*/
 
 var __str = new String(1.2345);
 //////////////////////////////////////////////////////////////////////////////
@@ -83,4 +84,3 @@ if (__str !="1.2345") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T18.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T18.js
index dbb1f445b..aab7d096b 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T18.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T18.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T18.js
- * @description Create string object with "new String()" initialized with numbers that have more than 1 significant digit
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Create string object with "new String()" initialized with numbers
+    that have more than 1 significant digit
+---*/
 
 var __str = new String(1000000000000000000000);
 //////////////////////////////////////////////////////////////////////////////
@@ -58,4 +59,3 @@ if (__str !="1e+22") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T19.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T19.js
index 8a6a2a8af..73ff1e6e0 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T19.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T19.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T19.js
- * @description Creating string object with "new String()" initialized with Array of numbers
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String()" initialized with Array
+    of numbers
+---*/
 
 var __str = new String(new Array(1,2,3));
 //////////////////////////////////////////////////////////////////////////////
@@ -33,4 +34,3 @@ if (__str !="1,2,3") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T2.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T2.js
index e1f42859e..3515caf06 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T2.js
- * @description Creating string object with "new String()"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String()"
+---*/
 
 var __str = new String();
 
@@ -42,4 +41,3 @@ if ( __str === "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T3.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T3.js
index 0479539af..abe012fab 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T3.js
- * @description Creating string object with "new String("")"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String("")"
+---*/
 
 var __str = new String("");
 
@@ -42,4 +41,3 @@ if ( __str === "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T4.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T4.js
index 776c4ecac..84d734429 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T4.js
- * @description Create string object with "new String(1.0)"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Create string object with "new String(1.0)"
+---*/
 
 var __str = new String(1.0);
 
@@ -34,4 +33,3 @@ if (__str !=1.0+"") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T5.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T5.js
index 08cebc9c0..3d3705527 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T5.js
- * @description Creating string object with "new String(NaN)"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String(NaN)"
+---*/
 
 var __str = new String(NaN);
 
@@ -34,4 +33,3 @@ if (__str !=(1/"s")+"") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T6.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T6.js
index f185552b2..fe3a3d20d 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T6.js
- * @description Creating string object with "new String(false)"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String(false)"
+---*/
 
 var __str = new String(false);
 
@@ -34,4 +33,3 @@ if (__str !=false+"") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T7.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T7.js
index 6393b30cb..9edf6c05f 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T7.js
- * @description Creating string object with "new String({})"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String({})"
+---*/
 
 var __stored__Object__prototype__toString = Object.prototype.toString;
 
@@ -40,4 +39,3 @@ if (__str !="SHIFTED") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T8.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T8.js
index c5876c7d6..ad7705e81 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T8.js
- * @description Creating string object with "new String(function(){})"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: Creating string object with "new String(function(){})"
+---*/
 
 var __stored__Function__prototype__toString = Function.prototype.toString;
 
@@ -40,4 +39,3 @@ if (__str !="SHIFTED") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T9.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T9.js
index f3139e45f..3a18a0c8a 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A1_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
- * The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A1_T9.js
- * @description Creating string object with "new String(function(){return [1,2,3]}())"
- */
+/*---
+info: >
+    When "String" is called as part of a new expression, it is a constructor: it initialises the newly created object and
+    The [[Value]] property of the newly constructed object is set to ToString(value), or to the empty string if value is not supplied
+description: >
+    Creating string object with "new String(function(){return
+    [1,2,3]}())"
+---*/
 
 var __str = new String(function(){return [1,2,3]}());
 
@@ -34,4 +35,3 @@ if (__str !="1,2,3") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T1.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T1.js
index 2a6e024fb..6d4018236 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original String prototype object
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A2_T1.js
- * @description Creating string object with "new String(string)" to check prototype
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the
+    original String prototype object
+description: Creating string object with "new String(string)" to check prototype
+---*/
 
 var __str__obj = new String("abba");
 
@@ -17,6 +17,3 @@ if (!(String.prototype.isPrototypeOf(__str__obj))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T2.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T2.js
index 038796723..ca8b2d7cc 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A2_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object is set to the original String prototype object
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A2_T2.js
- * @description Creating string object with "new String(string)" adding custom property
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object is set to the
+    original String prototype object
+description: >
+    Creating string object with "new String(string)" adding custom
+    property
+---*/
 
 var __str__obj = new String("shocking blue");
 
@@ -27,6 +29,3 @@ if (__str__obj["__custom__prop"]!=="bor") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A3.js b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A3.js
index 189d30a64..4debdf8b3 100644
--- a/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A3.js
+++ b/test/suite/ch15/15.5/15.5.2/S15.5.2.1_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object is set to "String"
- *
- * @path ch15/15.5/15.5.2/S15.5.2.1_A3.js
- * @description Creating string object with "new String(string)" and changing toString property to Object.prototype.toString
- */
+/*---
+info: The [[Class]] property of the newly constructed object is set to "String"
+description: >
+    Creating string object with "new String(string)" and changing
+    toString property to Object.prototype.toString
+---*/
 
 var __str__obj = new String("seamaid");
 
@@ -19,5 +19,3 @@ if (__str__obj.toString() !== "[object "+"String"+"]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A1.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A1.js
index 454011157..9bdbd488a 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A1.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String has property prototype
- *
- * @path ch15/15.5/15.5.3/S15.5.3.1_A1.js
- * @description Checking String.hasOwnProperty('prototype')
- */
+/*---
+info: The String has property prototype
+description: Checking String.hasOwnProperty('prototype')
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,5 +13,3 @@ if (!(String.hasOwnProperty('prototype'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A2.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A2.js
index 792603838..061943eca 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A2.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.3/S15.5.3.1_A2.js
- * @description Checking if enumerating the String.prototype property fails
- */
+/*---
+info: The String.prototype property has the attribute DontEnum
+description: Checking if enumerating the String.prototype property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -39,4 +38,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A3.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A3.js
index 8f30173b9..f200aa69a 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A3.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A3.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.3/S15.5.3.1_A3.js
- * @description Checking if deleting the String.prototype property fails
- */
+/*---
+info: The String.prototype property has the attribute DontDelete
+description: Checking if deleting the String.prototype property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -25,4 +24,3 @@ if (!(String.hasOwnProperty('prototype'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A4.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A4.js
index 165005d98..180f0c486 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A4.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.1_A4.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.3/S15.5.3.1_A4.js
- * @description Checking if varying the String.prototype property fails
- */
+/*---
+info: The String.prototype property has the attribute ReadOnly
+description: Checking if varying the String.prototype property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +26,3 @@ if (String.prototype !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A1.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A1.js
index 20346f4a9..2fd21f247 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A1.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the fromCharCode function is 1
- *
- * @path ch15/15.5/15.5.3/S15.5.3.2_A1.js
- * @description Checking String.fromCharCode.length
- */
+/*---
+info: The length property of the fromCharCode function is 1
+description: Checking String.fromCharCode.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,5 +29,3 @@ if (String.fromCharCode.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A2.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A2.js
index 889136d04..752e85802 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A2.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.fromCharCode () returns empty string
- *
- * @path ch15/15.5/15.5.3/S15.5.3.2_A2.js
- * @description Call String.fromCharCode()
- */
+/*---
+info: String.fromCharCode () returns empty string
+description: Call String.fromCharCode()
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,5 +13,3 @@ if (String.fromCharCode() !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T1.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T1.js
index 4afacb8a9..247b9b92e 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.fromCharCode ( [ char0 [ , char1 [ , ... ] ] ] )
- *
- * @path ch15/15.5/15.5.3/S15.5.3.2_A3_T1.js
- * @description Call String.fromCharCode(65,66,66,65)
- */
+/*---
+info: String.fromCharCode ( [ char0 [ , char1 [ , ... ] ] ] )
+description: Call String.fromCharCode(65,66,66,65)
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,5 +13,3 @@ if (String.fromCharCode(65,66,66,65) !== "ABBA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T2.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T2.js
index 4018dabae..34ac369e4 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.fromCharCode ( [ char0 [ , char1 [ , ... ] ] ] )
- *
- * @path ch15/15.5/15.5.3/S15.5.3.2_A3_T2.js
- * @description Create function variable, that equal String.fromCharCode, delete original String.fromCharCode and use created variable
- */
+/*---
+info: String.fromCharCode ( [ char0 [ , char1 [ , ... ] ] ] )
+description: >
+    Create function variable, that equal String.fromCharCode, delete
+    original String.fromCharCode and use created variable
+---*/
 
 var __fcc__func = String.fromCharCode;
 
@@ -19,5 +19,3 @@ if (__fcc__func(65,66,66,65) !== "ABBA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A4.js b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A4.js
index fd9b0038e..079c1987e 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A4.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3.2_A4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.fromCharCode has not [[construct]] method
- *
- * @path ch15/15.5/15.5.3/S15.5.3.2_A4.js
- * @description Checking if creating "new String.fromCharCode" fails
- */
+/*---
+info: String.fromCharCode has not [[construct]] method
+description: Checking if creating "new String.fromCharCode" fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __fcc__func = String.fromCharCode;
 
@@ -16,10 +17,9 @@ 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');

-} catch (e) {

+  $FAIL('#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/suite/ch15/15.5/15.5.3/S15.5.3_A1.js b/test/suite/ch15/15.5/15.5.3/S15.5.3_A1.js
index 5eaf364af..2344b4888 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3_A1.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String has length property whose value is 1
- *
- * @path ch15/15.5/15.5.3/S15.5.3_A1.js
- * @description Checking String.length
- */
+/*---
+info: String has length property whose value is 1
+description: Checking String.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#
@@ -15,4 +13,3 @@ if (String.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T1.js b/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T1.js
index 12a237ae7..74ad13eaa 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the String constructor is the Function prototype object
- *
- * @path ch15/15.5/15.5.3/S15.5.3_A2_T1.js
- * @description Checking Function.prototype.isPrototypeOf(String)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the String
+    constructor is the Function prototype object
+description: Checking Function.prototype.isPrototypeOf(String)
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 // CHECK#
@@ -15,4 +15,3 @@ if (!(Function.prototype.isPrototypeOf(String))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T2.js b/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T2.js
index 04f5d10bb..4855d6499 100644
--- a/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.3/S15.5.3_A2_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the String constructor is the Function prototype object
- *
- * @path ch15/15.5/15.5.3/S15.5.3_A2_T2.js
- * @description Add custom property to Function.prototype and check it at String
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the String
+    constructor is the Function prototype object
+description: Add custom property to Function.prototype and check it at String
+---*/
 
 Function.prototype.indicator = 1;
 
@@ -17,4 +17,3 @@ if (String.indicator !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A10.js
index 12ed351f1..44fe65c26 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.match.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A10.js
- * @description Checking if varying the String.prototype.match.length property fails
- */
+/*---
+info: The String.prototype.match.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.match.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.match.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A11.js
index 00a77b454..f776175a8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the match method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A11.js
- * @description Checking String.prototype.match.length
- */
+/*---
+info: The length property of the match method is 1
+description: Checking String.prototype.match.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.match.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T1.js
index 03ce88418..f47e35fe5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T1.js
- * @description Arguments is true, and instance is object
- */
+/*---
+info: String.prototype.match (regexp)
+description: Arguments is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.match(true)[0] !== "true") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T10.js
index 652eac85b..0ea4ba2f1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T10.js
- * @description Call match (regexp) function with object argument
- */
+/*---
+info: String.prototype.match (regexp)
+description: Call match (regexp) function with object argument
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __str = "ABB\u0041BABAB";
@@ -22,4 +20,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T11.js
index 6da4ccc6d..e024bed54 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T11.js
- * @description Override toString function, toString throw exception, then call match (regexp) function with this object as argument
- */
+/*---
+info: String.prototype.match (regexp)
+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";}}
 var __str = {str__:"ABB\u0041BABAB"};
@@ -27,4 +28,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T12.js
index dd30ec677..76e6a631c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T12.js
- * @description Override toString and valueOf functions, valueOf throw exception, then call match (regexp) function with this object as argument
- */
+/*---
+info: String.prototype.match (regexp)
+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";}}
 var __str = new String("ABB\u0041BABAB");
@@ -25,4 +26,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T13.js
index dd5c41bde..0f0d2e7e5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T13.js
- * @description Override toString and valueOf functions, then call match (regexp) function with this object as argument
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Override toString and valueOf functions, then call match (regexp)
+    function with this object as argument
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 
@@ -25,4 +25,3 @@ if ("ABB\u0041B\u0031ABAB\u0031BBAA".match(__obj).length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T14.js
index 71dc0ec39..c61bd349c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T14.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T14.js
- * @description Call match (regexp) function with RegExp object as argument from string
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Call match (regexp) function with RegExp object as argument from
+    string
+---*/
 
 var __reg = new RegExp("77");
 
@@ -17,4 +17,3 @@ if ("ABB\u0041BABAB\u0037\u0037BBAA".match(__reg)[0] !== "77") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T2.js
index c586d46ca..19158f911 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T2.js
- * @description Argument is function that return boolean, and instance is Boolean object
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Argument is function that return boolean, and instance is Boolean
+    object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +19,3 @@ if (__instance.match(function(){return false;}())[0] !== "false") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T3.js
index 6eb2ff4b9..4f310fed0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T3.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.match (regexp)
+description: Checking by using eval
+includes: [fnGlobalObject.js]
+---*/
 
 var match = String.prototype.match.bind(fnGlobalObject());
 
@@ -22,4 +21,3 @@ if ((fnGlobalObject().toString === Object.prototype.toString)  && //Ensure we co
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T4.js
index 9d0dc15cb..d122aff5f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T4.js
- * @description Call match (regexp) function without arguments of string
- */
+/*---
+info: String.prototype.match (regexp)
+description: Call match (regexp) function without arguments of string
+---*/
 
 var __matched = "".match();
 
@@ -45,4 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T5.js
index 335857cde..cd973bd91 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T5.js
- * @description Call match (regexp) function with null argument of function object
- */
+/*---
+info: String.prototype.match (regexp)
+description: Call match (regexp) function with null argument of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "gnulluna"}().match(null)[0] !== "null") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T6.js
index d7d1f45cd..5c7fcb6f1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T6.js
- * @description Call match (regexp) function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Call match (regexp) function with x argument of new String object,
+    where x is undefined variable
+---*/
 
 var __matched = new String("undefined").match(x);
 
@@ -47,5 +47,3 @@ for(var index=0; index<__expected.length; index++) {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T7.js
index 399a988c3..bd421a573 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T7.js
- * @description Call match (regexp) function with undefined argument of string object
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Call match (regexp) function with undefined argument of string
+    object
+---*/
 
 var __matched = String("undefined").match(undefined);
 
@@ -45,4 +45,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T8.js
index 5876065c4..17dcfbec3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T8.js
- * @description Call match (regexp) function with void 0 argument of string object;
- */
+/*---
+info: String.prototype.match (regexp)
+description: Call match (regexp) function with void 0 argument of string object;
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -47,4 +45,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T9.js
index 11e81534e..8dafdbdb0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A1_T9.js
- * @description Call match (regexp) function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.match (regexp)
+description: >
+    Call match (regexp) function with function(){}() argument of
+    string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -50,4 +50,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T1.js
index cad2cf057..d2e38e793 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T1.js
- * @description Regular expression is 3
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is 3
+---*/
 
 var __string = "1234567890";
 
@@ -41,4 +39,3 @@ if (__string.match(3).input !==__string) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T10.js
index 20657116d..571f6cb61 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T10.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T10.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is undefined.
- * And regular expression object have property lastIndex = tested_string.lastIndexOf("0")
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is
+    undefined.  And regular expression object have property lastIndex
+    = tested_string.lastIndexOf("0")
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -42,4 +42,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T11.js
index 4ac24f9d5..b3a6a235b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T11.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T11.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is undefined.
- * And regular expression object have property lastIndex = tested_string.lastIndexOf("0")+1
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is
+    undefined.  And regular expression object have property lastIndex
+    = tested_string.lastIndexOf("0")+1
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -42,4 +42,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T12.js
index c87fc900b..22f3fe58b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T12.js
- * @description Regular expression is variable that have value /([\d]{5})([-\ ]?[\d]{4})?$/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is variable that have value /([\d]{5})([-\
+    ]?[\d]{4})?$/g
+---*/
 
 var __matches=["02134"];
 
@@ -29,4 +29,3 @@ if (__string.match(__re)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T13.js
index 6c081dc4a..347c68a5b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T13.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g.
- * And regular expression object have property lastIndex = 0
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g.  And regular
+    expression object have property lastIndex = 0
+---*/
 
 var __matches=["02134"];
 
@@ -31,4 +30,3 @@ if (__string.match(__re)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T14.js
index b3a64230d..3bfc3c487 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T14.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T14.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g.
- * And regular expression object have property lastIndex = tested_string.length
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g.  And regular
+    expression object have property lastIndex = tested_string.length
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -32,4 +31,3 @@ if (__string.match(__re)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T15.js
index 1de89816f..5517cdf7c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T15.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T15.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/.
- * And regular expression object have property lastIndex = tested_string.lastIndexOf("0")
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/.  And regular
+    expression object have property lastIndex =
+    tested_string.lastIndexOf("0")
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -32,4 +32,3 @@ if (__string.match(__re)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T16.js
index b0288c843..573412b82 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T16.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T16.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/.
- * And regular expression object have property lastIndex = tested_string.lastIndexOf("0")+1
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/.  And regular
+    expression object have property lastIndex =
+    tested_string.lastIndexOf("0")+1
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -32,4 +32,3 @@ if (__string.match(__re)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T17.js
index fcc582867..faa9cea11 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T17.js
- * @description Regular expression is /0./
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /0./
+---*/
 
 var __re = /0./;
 
@@ -47,4 +45,3 @@ if (__num.match(__re).input !==String(__num)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T18.js
index 56b4b77e8..2c8e0e516 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T18.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T18.js
- * @description Regular expression is /0./.
- * And regular expression object have property lastIndex = 0
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /0./.  And regular expression object have
+    property lastIndex = 0
+---*/
 
 var __re = /0./;
 
@@ -48,4 +47,3 @@ if (__num.match(__re).input !==String(__num)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T2.js
index 079ef838c..0d9d923e7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T2.js
- * @description Regular expression is /34/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /34/g
+---*/
 
 var __matches=["34","34","34"];
 
@@ -29,4 +27,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T3.js
index 8c0860ec8..c1a7d236b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T3.js
- * @description Regular expression is /\d{1}/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /\d{1}/g
+---*/
 
 var __matches=["1", "2", "3", "4", "5", "6", "7", "8", "9", "0"];
 
@@ -29,4 +27,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T4.js
index bb3d613f1..b823bbc1b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T4.js
- * @description Regular expression is /\d{2}/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /\d{2}/g
+---*/
 
 var __matches=["12", "34", "56", "78", "90"];
 
@@ -29,4 +27,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T5.js
index a454c7917..5d407a972 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T5.js
- * @description Regular expression is /\D{2}/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /\D{2}/g
+---*/
 
 var __matches=["ab", "cd"];
 
@@ -29,4 +27,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T6.js
index c6fb397c3..28740ff19 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T6.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is void 0
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is
+    void 0
+---*/
 
 var __string = "Boston, Mass. 02134";
 
@@ -57,4 +57,3 @@ if (__string.match(/([\d]{5})([-\ ]?[\d]{4})?$/).input !==__string) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T7.js
index 9dbf84f10..d9779e093 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T7.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/g
+---*/
 
 var __matches=["02134"];
 
@@ -27,4 +25,3 @@ if (__string.match(/([\d]{5})([-\ ]?[\d]{4})?$/g)[0]!==__matches[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T8.js
index 310063426..64b337af6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T8.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T8.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is undefined.
- * And regular expression object have property lastIndex = 0
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is
+    undefined.  And regular expression object have property lastIndex
+    = 0
+---*/
 
 var __matches=["02134", "02134", undefined];
 
@@ -41,4 +41,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T9.js
index 17dd188a7..71b6b9ca8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T9.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * match returns array as specified in 15.10.6.2
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A2_T9.js
- * @description Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is undefined.
- * And regular expression object have property lastIndex = tested_string.length
- */
+/*---
+info: match returns array as specified in 15.10.6.2
+description: >
+    Regular expression is /([\d]{5})([-\ ]?[\d]{4})?$/. Last match is
+    undefined.  And regular expression object have property lastIndex
+    = tested_string.length
+---*/
 
 var __string = "Boston, MA 02134";
 
@@ -42,4 +42,3 @@ for(var mi=0; mi<__matches.length; mi++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A6.js
index bfcb23d20..bbec43e2d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A6.js
- * @description Checking String.prototype.match.prototype
- */
+/*---
+info: String.prototype.match has not prototype property
+description: Checking String.prototype.match.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.match.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A7.js
index 11b66aabb..b2e532010 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A7.js
@@ -1,19 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.match can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A7.js
- * @description Checking if creating "String.prototype.match object" fails
- */
+/*---
+info: String.prototype.match can't be used as constructor
+description: Checking if creating "String.prototype.match object" fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 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');

-} catch (e) {

+  $FAIL('#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/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A8.js
index 733112233..7ef62c7e7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.match.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A8.js
- * @description Checking if enumerating the String.prototype.match.length property fails
- */
+/*---
+info: The String.prototype.match.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.match.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A9.js
index 2f057d4b0..710c1ea79 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.match.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.10/S15.5.4.10_A9.js
- * @description Checking if deleting the String.prototype.match.length property fails
- */
+/*---
+info: The String.prototype.match.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.match.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.match.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/15.5.4.11-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/15.5.4.11-1.js
index 861815b1d..6991cd299 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/15.5.4.11-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/15.5.4.11-1.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.11/15.5.4.11-1.js

- * @description 'this' object used by the replaceValue function of a String.prototype.replace invocation

- */

-

-

-

-

-function testcase() {

-  var retVal = 'x'.replace(/x/, 

-                           function() { 

-                               if (this===fnGlobalObject()) {

-                                   return 'y';

-                               } else {

-                                   return 'z';

-                               }

-                           });

-  return retVal==='y';

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    'this' object used by the replaceValue function of a
+    String.prototype.replace invocation
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+  var retVal = 'x'.replace(/x/, 
+                           function() { 
+                               if (this===fnGlobalObject()) {
+                                   return 'y';
+                               } else {
+                                   return 'z';
+                               }
+                           });
+  return retVal==='y';
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A10.js
index fd690fde5..e0486ebe1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.replace.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A10.js
- * @description Checking if varying the String.prototype.replace.length property fails
- */
+/*---
+info: The String.prototype.replace.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.replace.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.replace.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A11.js
index 9dfc6b0ab..cfe824030 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the replace method is 2
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A11.js
- * @description Checking String.prototype.replace.length
- */
+/*---
+info: The length property of the replace method is 2
+description: Checking String.prototype.replace.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.replace.length !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A12.js
index bc49e9f72..e38c443a3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A12.js
@@ -1,13 +1,12 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Call replaceValue passing undefined as the this value
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A12.js
- * @description replaceValue tests that its this value is undefined
- * @onlyStrict
- */
+/*---
+info: Call replaceValue passing undefined as the this value
+description: replaceValue tests that its this value is undefined
+flags: [onlyStrict]
+includes: [$FAIL.js]
+---*/
 
 var global = this;
 'x'.replace(/x/, function() {
@@ -22,4 +21,3 @@ var global = this;
   }
   return 'y';
 });
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T1.js
index 3d6dc48d8..c19aa065a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T1.js
- * @description Arguments are true and 1, and instance is object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: Arguments are true and 1, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.replace(true, 1) !== "1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T10.js
index 883af3105..8fe836042 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T10.js
- * @description Call replace (searchValue, replaceValue) function with object and function arguments of string. Object have overrided toString function
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with object and
+    function arguments of string. Object have overrided toString
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}};
 
@@ -23,4 +24,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T11.js
index 0916d41df..195494eb9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T11.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T11.js
- * @description Call replace (searchValue, replaceValue) function with objects arguments of string object. Objects have overrided toString function, that throw exception
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+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";}};
 var __obj2 = {toString:function(){throw "inreplaceValue";}};
@@ -28,4 +30,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T12.js
index f4f109baf..ee38725fa 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T12.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T12.js
- * @description Call replace (searchValue, replaceValue) function with objects arguments of String object.
- * First objects have overrided toString and valueOf functions, valueOf throw exception.
- * Second objects have overrided toString function, that throw exception
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with objects
+    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";}};
 var __obj2 = {toString:function(){throw "inreplaceValue";}};
@@ -28,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T13.js
index d42fcd52c..548853591 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T13.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T13.js
- * @description Call replace (searchValue, replaceValue) function with objects arguments of string.
- * First objects have overrided toString and valueOf functions.
- * Second objects have overrided toString function, that throw exception
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with objects
+    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;}};
 var __obj2 = {toString:function(){throw "inreplaceValue";}};
@@ -25,5 +26,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T14.js
index f715c3a8c..da2f5b08f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T14.js
- * @description Instance is string, searchValue is regular expression
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: Instance is string, searchValue is regular expression
+---*/
 
 var __reg = new RegExp("77");
 
@@ -17,4 +15,3 @@ if ("ABB\u0041BABAB\u0037\u0037BBAA".replace(__reg, 1) !== "ABBABABAB\u0031BBAA"
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T15.js
index 36dc58c8e..99baff069 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T15.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T15.js
- * @description Instance is Object, searchValue is regular expression
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: Instance is Object, searchValue is regular expression
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return /77/}};
 
@@ -26,4 +25,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T16.js
index b1b818f10..c3fb077f3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T16.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T16.js
- * @description Instance is Number, searchValue is regular expression
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: Instance is Number, searchValue is regular expression
+includes: [$FAIL.js]
+---*/
 
 var __re = /77/;
 
@@ -30,4 +29,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T17.js
index 954030870..03545d5be 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T17.js
- * @description Instance is String object, searchValue is regular expression
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: Instance is String object, searchValue is regular expression
+---*/
 
 var __re = new RegExp(x,"g");
 
@@ -22,4 +20,3 @@ if (__instance.replace(__re, __str) !== "1a1s1d1f1") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T2.js
index 05106a5e3..0d799f18b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T2.js
- * @description Argument is function that return boolean, and instance is Boolean object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Argument is function that return boolean, and instance is Boolean
+    object
+---*/
 
 var __instance = new Boolean;
 
@@ -21,4 +21,3 @@ if (__instance.replace(function(){return false;}(),x) !== "undefined") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T4.js
index db27d626c..47f1344a3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T4.js
- * @description Call replace (searchValue, replaceValue) function with null and function(a1,a2,a3){return a2+"";} arguments of function object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with null and
+    function(a1,a2,a3){return a2+"";} arguments of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (function(){return "gnulluna"}().replace(null,function(a1,a2,a3){return a2+""
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T5.js
index 4529aca01..7f21f2427 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T5.js
- * @description Call replace (searchValue, replaceValue) function with null and Function() arguments of function object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with null and
+    Function() arguments of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (function(){return "gnulluna"}().replace(null, Function()) !== "gundefineduna
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T6.js
index 53e1035ed..80ecee013 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T6.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T6.js
- * @description Call replace (searchValue, replaceValue) function with x and Function("return arguments[1]+42;") arguments of new String object. x is undefined variable
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with x and
+    Function("return arguments[1]+42;") arguments of new String
+    object. x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +18,3 @@ if (new String("undefined").replace(x,Function("return arguments[1]+42;")) !== "
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T7.js
index 523fe251d..c7327ff07 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T7.js
- * @description Call replace (searchValue, replaceValue) function with string and undefined arguments of String object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with string and
+    undefined arguments of String object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (String(void 0).replace("e",undefined) !== "undundefinedfined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T8.js
index 0ec4f5112..7cba92912 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T8.js
- * @description Call replace (searchValue, replaceValue) function with regular expression and void 0 arguments of String object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with regular
+    expression and void 0 arguments of String object
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -17,4 +17,3 @@ if (String(__obj).replace(/e/g,void 0) !== "undundefinedfinundefinedd") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T9.js
index 04c32b517..184890eec 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace (searchValue, replaceValue)
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A1_T9.js
- * @description Call replace (searchValue, replaceValue) function with functions arguments of new String object
- */
+/*---
+info: String.prototype.replace (searchValue, replaceValue)
+description: >
+    Call replace (searchValue, replaceValue) function with functions
+    arguments of new String object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -22,4 +22,3 @@ if (new String(__obj).replace(function(){}(),__func) !== "undefined0undefined")
 //////////////////////////////////////////////////////////////////////////////
 
 function __func(a1,a2,a3){return a1+a2+a3;};
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T1.js
index b6d706ce4..ac124314e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T1.js
- * @description Don`t use $ in replaceValue, searchValue is regular expression /sh/g
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: >
+    Don`t use $ in replaceValue, searchValue is regular expression
+    /sh/g
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/g;
@@ -19,4 +20,3 @@ if (__str.replace(__re,'sch')!=='She sells seaschells by the seaschore.') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T10.js
index 975150196..a985f6cac 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T10.js
- * @description Use $' in replaceValue, searchValue is regular expression /sh/
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $' in replaceValue, searchValue is regular expression /sh/
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$'" + 'sch')!=='She sells seaells by the seashore.schel
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T2.js
index e55216da0..c1a7bbb2b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T2.js
- * @description Use $$ in replaceValue, searchValue is regular expression /sh/g
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $$ in replaceValue, searchValue is regular expression /sh/g
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/g;
@@ -19,4 +18,3 @@ if (__str.replace(__re,"$$" + 'sch')!=='She sells sea$schells by the sea$schore.
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T3.js
index 7570c6a2c..10ee8b19a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T3.js
- * @description Use $& in replaceValue, searchValue is regular expression /sh/g
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $& in replaceValue, searchValue is regular expression /sh/g
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/g;
@@ -19,4 +18,3 @@ if (__str.replace(__re,"$&" + 'sch')!=='She sells seashschells by the seashschor
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T4.js
index eb1a58ac8..52104da73 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T4.js
- * @description Use $` in replaceValue, searchValue is regular expression /sh/g
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $` in replaceValue, searchValue is regular expression /sh/g
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/g;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$`" + 'sch')!=='She sells seaShe sells seaschells by th
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T5.js
index eb283fe7f..3715835f5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T5.js
- * @description Use $' in replaceValue, searchValue is regular expression /sh/g
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $' in replaceValue, searchValue is regular expression /sh/g
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/g;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$'" + 'sch')!=='She sells seaells by the seashore.schel
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T6.js
index 483eb10ee..45d8f2099 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T6.js
- * @description Don`t use $ in replaceValue, searchValue is regular expression /sh/
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Don`t use $ in replaceValue, searchValue is regular expression /sh/
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/;
@@ -19,4 +18,3 @@ if (__str.replace(__re, 'sch')!=='She sells seaschells by the seashore.') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T7.js
index 2dadba861..3ac73c354 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T7.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T7.js
- * @description Use $$ in replaceValue, searchValue is regular expression /sh/
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $$ in replaceValue, searchValue is regular expression /sh/
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$$" + 'sch')!=='She sells sea$schells by the seashore.'
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T8.js
index 0ba635ec3..3725b5f88 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T8.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T8.js
- * @description Use $& in replaceValue, searchValue is regular expression /sh/
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $& in replaceValue, searchValue is regular expression /sh/
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$&" + 'sch')!=='She sells seashschells by the seashore.
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T9.js
index 271ceb491..8207bd589 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T9.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The $ replacements are done left-to-right, and, once such are placement is performed, the new
- * replacement text is not subject to further replacements
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A2_T9.js
- * @description Use $` in replaceValue, searchValue is regular expression /sh/
- */
+/*---
+info: >
+    The $ replacements are done left-to-right, and, once such are placement is performed, the new
+    replacement text is not subject to further replacements
+description: Use $` in replaceValue, searchValue is regular expression /sh/
+---*/
 
 var __str = 'She sells seashells by the seashore.';
 var __re = /sh/;
@@ -19,4 +18,3 @@ if (__str.replace(__re, "$`" + 'sch')!=='She sells seaShe sells seaschells by th
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T1.js
index 355a962b8..4b26078df 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /(uid=)(\d+)/ returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T1.js
- * @description replaceValue is "$11" + 15
- */
+/*---
+info: replace with regexp /(uid=)(\d+)/ returns
+description: replaceValue is "$11" + 15
+---*/
 
 var __str = 'uid=31';
 var __re = /(uid=)(\d+)/;
@@ -18,4 +16,3 @@ if (__str.replace(__re, "$11" + 15)!=='uid=115') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T2.js
index f03d3cccf..0d5c81ead 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /(uid=)(\d+)/ returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T2.js
- * @description replaceValue is "$11" + '15'
- */
+/*---
+info: replace with regexp /(uid=)(\d+)/ returns
+description: replaceValue is "$11" + '15'
+---*/
 
 var __str = 'uid=31';
 var __re = /(uid=)(\d+)/;
@@ -18,4 +16,3 @@ if (__str.replace(__re, "$11" + '15')!=='uid=115') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T3.js
index e5da61e48..f81168ac3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /(uid=)(\d+)/ returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A3_T3.js
- * @description replaceValue is "$11" + 'A15'
- */
+/*---
+info: replace with regexp /(uid=)(\d+)/ returns
+description: replaceValue is "$11" + 'A15'
+---*/
 
 var __str = 'uid=31';
 var __re = /(uid=)(\d+)/;
@@ -18,4 +16,3 @@ if (__str.replace(__re, "$11" + 'A15')!=='uid=1A15' ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T1.js
index 989bb7f56..24e3e1131 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T1.js
- * @description searchValue is /([a-z]+)([0-9]+)/
- */
+/*---
+info: replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
+description: searchValue is /([a-z]+)([0-9]+)/
+---*/
 
 var __str = "abc12 def34";
 var __pattern = /([a-z]+)([0-9]+)/;
@@ -22,4 +20,3 @@ if (__str.replace(__pattern, __replFN)!=='12abc def34') {
 function __replFN() {
     return arguments[2] + arguments[1];
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T2.js
index 956a7c0e1..e92457087 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T2.js
- * @description searchValue is /([a-z]+)([0-9]+)/g
- */
+/*---
+info: replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
+description: searchValue is /([a-z]+)([0-9]+)/g
+---*/
 
 var __str = "abc12 def34";
 var __pattern = /([a-z]+)([0-9]+)/g;
@@ -22,4 +20,3 @@ if (__str.replace(__pattern, __replFN)!=='12abc 34def') {
 function __replFN() {
     return arguments[2] + arguments[1];
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T3.js
index 8eea7fe4b..9fece58f8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T3.js
- * @description searchValue is /([a-z]+)([0-9]+)/i
- */
+/*---
+info: replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
+description: searchValue is /([a-z]+)([0-9]+)/i
+---*/
 
 var __str = "aBc12 def34";
 var __pattern = /([a-z]+)([0-9]+)/i;
@@ -22,4 +20,3 @@ if (__str.replace(__pattern, __replFN)!=='12aBc def34') {
 function __replFN() {
     return arguments[2] + arguments[1];
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T4.js
index 70b421037..41e9f7a03 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A4_T4.js
- * @description searchValue is /([a-z]+)([0-9]+)/ig
- */
+/*---
+info: replace with regexp /([a-z]+)([0-9]+)/ and replace function returns
+description: searchValue is /([a-z]+)([0-9]+)/ig
+---*/
 
 var __str = "aBc12 dEf34";
 var __pattern = /([a-z]+)([0-9]+)/ig;
@@ -22,4 +20,3 @@ if (__str.replace(__pattern, __replFN)!=='12aBc 34dEf') {
 function __replFN() {
     return arguments[2] + arguments[1];
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A5_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A5_T1.js
index 917b9a68f..e4268138a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A5_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Use replace with regexp as searchValue and use $ in replaceValue
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A5_T1.js
- * @description searchValue is  regexp /^(a+)\1*,\1+$/ and replaceValue is "$1"
- */
+/*---
+info: Use replace with regexp as searchValue and use $ in replaceValue
+description: searchValue is  regexp /^(a+)\1*,\1+$/ and replaceValue is "$1"
+---*/
 
 var __str = "aaaaaaaaaa,aaaaaaaaaaaaaaa";
 var __pattern = /^(a+)\1*,\1+$/;
@@ -19,4 +17,3 @@ if (__str.replace(__pattern, __repl)!=='aaaaa') {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A6.js
index dc1d5acd1..6f13f25bd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A6.js
- * @description Checking String.prototype.replace.prototype;
- */
+/*---
+info: String.prototype.replace has not prototype property
+description: Checking String.prototype.replace.prototype;
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.replace.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A7.js
index 987862d13..c72f1f9da 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A7.js
@@ -1,19 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.replace can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A7.js
- * @description Checking if creating the String.prototype.replace object fails
- */
+/*---
+info: String.prototype.replace can't be used as constructor
+description: Checking if creating the String.prototype.replace object fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __FACTORY = String.prototype.replace;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.replace; "__instance = new __FACTORY" lead to throwing exception');

-} catch (e) {

+  $FAIL('#1: __FACTORY = String.prototype.replace; "__instance = new __FACTORY" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A8.js
index 692e4b0a2..2da8a3d0b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.replace.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A8.js
- * @description Checking if enumerating the String.prototype.replace.length property fails
- */
+/*---
+info: The String.prototype.replace.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.replace.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A9.js
index d594e357d..827a7c0ba 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.replace.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.11/S15.5.4.11_A9.js
- * @description Checking if deleting the String.prototype.replace.length property fails
- */
+/*---
+info: The String.prototype.replace.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.replace.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.replace.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1.1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1.1_T1.js
index cdfb5e6ae..201045b85 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1.1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1.1_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) without arguments behaves like with argument "undefined"
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1.1_T1.js
- * @description Call search() is the same search(undefined)
- */
+/*---
+info: >
+    String.prototype.search (regexp) without arguments behaves like with
+    argument "undefined"
+description: Call search() is the same search(undefined)
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var x = "".search();
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A10.js
index f7a5c751a..02db17b16 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.search.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A10.js
- * @description Checking if varying the String.prototype.search.length property fails
- */
+/*---
+info: The String.prototype.search.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.search.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.search.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A11.js
index ea0000ae2..285f975d0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the search method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A11.js
- * @description Checking String.prototype.search.length
- */
+/*---
+info: The length property of the search method is 1
+description: Checking String.prototype.search.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.search.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T1.js
index 20b98c292..43be4f93d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T1.js
- * @description Argument is true, and instance is object
- */
+/*---
+info: String.prototype.search (regexp)
+description: Argument is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.search(true) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T10.js
index f4ebbb3e9..827b4d21c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T10.js
- * @description Argument is object, and instance is string.
- * Object with overrided toString function
- */
+/*---
+info: String.prototype.search (regexp)
+description: >
+    Argument is object, and instance is string.  Object with overrided
+    toString function
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}};
 var __str = "ssABB\u0041BABAB";
@@ -23,4 +22,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T11.js
index 73d9777e4..0800ade36 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T11.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T11.js
- * @description Argument is object, and instance is string.
- * Object with overrided toString function, that throw exception
- */
+/*---
+info: String.prototype.search (regexp)
+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";}}
 var __str = {str__:"ABB\u0041BABAB"};
@@ -28,4 +28,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T12.js
index 29f288aa8..5c2c611a7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T12.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T12.js
- * @description Argument is object, and instance is string.
- * Object with overrided toString and valueOf functions, valueOf throw exception
- */
+/*---
+info: String.prototype.search (regexp)
+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";}}
 var __str = new String("ABB\u0041BABAB");
@@ -26,4 +26,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T13.js
index 0eec2d1c2..7aa5f37b9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T13.js
- * @description Argument is object, and instance is string.
- * Object with overrided toString and valueOf functions
- */
+/*---
+info: String.prototype.search (regexp)
+description: >
+    Argument is object, and instance is string.  Object with overrided
+    toString and valueOf functions
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 
@@ -18,4 +17,3 @@ if ("ABB\u0041B\u0031ABAB\u0031BBAA".search(__obj) !==5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T14.js
index 64168457b..8b99fe92a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T14.js
- * @description Instance is string, argument is regular expression
- */
+/*---
+info: String.prototype.search (regexp)
+description: Instance is string, argument is regular expression
+---*/
 
 var __reg = new RegExp("77");
 
@@ -17,4 +15,3 @@ if ("ABB\u0041BABAB\u0037\u0037BBAA".search(__reg) !== 9) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T2.js
index 8653f5a94..9396b9582 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T2.js
- * @description Argument is function call, and instance is Boolean
- */
+/*---
+info: String.prototype.search (regexp)
+description: Argument is function call, and instance is Boolean
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.search(function(){return false;}()) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T4.js
index e2ef99bb5..19d59138f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T4.js
- * @description Call search (regexp) without arguments
- */
+/*---
+info: String.prototype.search (regexp)
+description: Call search (regexp) without arguments
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -20,4 +18,3 @@ if ("--undefined--".search() != 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T5.js
index bde78afc7..9ce136770 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T5.js
- * @description Argument is null, and instance is function call, that return string
- */
+/*---
+info: String.prototype.search (regexp)
+description: Argument is null, and instance is function call, that return string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "gnulluna"}().search(null) !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T6.js
index 6a2c5c8d6..222cae5e7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T6.js
- * @description Argument is x, and instance is new String, x is undefined variable
- */
+/*---
+info: String.prototype.search (regexp)
+description: Argument is x, and instance is new String, x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +16,3 @@ if (new String("undefined").search(x) !== 0) {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T7.js
index adcd59886..94883bd93 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T7.js
- * @description Argument is undefined, and instance is new String
- */
+/*---
+info: String.prototype.search (regexp)
+description: Argument is undefined, and instance is new String
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (String("undefined").search(undefined) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T8.js
index da29abd7b..13255ad07 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T8.js
- * @description Argument is void 0, and instance is String object with overrided toString function
- */
+/*---
+info: String.prototype.search (regexp)
+description: >
+    Argument is void 0, and instance is String object with overrided
+    toString function
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -18,4 +18,3 @@ if (String(__obj).search(void 0) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T9.js
index 2148c921a..c8c4a363f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp)
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A1_T9.js
- * @description Argument is function call, and instance is String object with overrided toString and valueOf functions
- */
+/*---
+info: String.prototype.search (regexp)
+description: >
+    Argument is function call, and instance is String object with
+    overrided toString and valueOf functions
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -21,4 +21,3 @@ if (new String(__obj).search(function(){}()) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T1.js
index 5c8b29555..d698c8f4d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T1.js
- * @description Simple search substring inside string
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: Simple search substring inside string
+---*/
 
 var aString = new String("test string");
 
@@ -17,4 +15,3 @@ if (aString.search("string")!== 5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T2.js
index 0e6bea24e..92edc8f81 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T2.js
- * @description Checking case sensitive of search, argument is string
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: Checking case sensitive of search, argument is string
+---*/
 
 var aString = new String("test string");
 
@@ -17,4 +15,3 @@ if (aString.search("String")!== -1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T3.js
index c60edaa47..c0bac6a8c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T3.js
- * @description Checking disabling of case sensitive of search, argument is RegExp
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: Checking disabling of case sensitive of search, argument is RegExp
+---*/
 
 var aString = new String("test string");
 
@@ -17,4 +15,3 @@ if (aString.search(/String/i)!== 5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T4.js
index 5d441d68e..ef6f9e7b7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T4.js
- * @description Checking case sensitive of search, argument is RegExp with uppercase symbols
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: >
+    Checking case sensitive of search, argument is RegExp with
+    uppercase symbols
+---*/
 
 var bString = new String("one two three four five");
 var regExp = /Four/;
@@ -18,4 +18,3 @@ if (bString.search(regExp)!== -1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T5.js
index 7592416f5..d3fb06c5a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T5.js
- * @description Checking case sensitive of search, argument is RegExp without uppercase symbols
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: >
+    Checking case sensitive of search, argument is RegExp without
+    uppercase symbols
+---*/
 
 var bString = new String("one two three four five");
 var regExp = /four/;
@@ -18,4 +18,3 @@ if (bString.search(regExp)!== 14) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T6.js
index 340a555d2..50b7eb36e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T6.js
- * @description Searching the non-existent "notexist" substring
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: Searching the non-existent "notexist" substring
+---*/
 
 var aString = new String("test string");
 
@@ -17,4 +15,3 @@ if (aString.search("notexist")!== -1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T7.js
index 505ef416d..b4623e7e0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) returns ...
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A2_T7.js
- * @description Simple search sentence inside string
- */
+/*---
+info: String.prototype.search (regexp) returns ...
+description: Simple search sentence inside string
+---*/
 
 var aString = new String("test string probe");
 
@@ -17,4 +15,3 @@ if (aString.search("string pro")!== 5) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T1.js
index 8ee2ccba9..139601023 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) ignores global properties of regexp
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T1.js
- * @description Checking results of search regexp with and without global properties
- */
+/*---
+info: String.prototype.search (regexp) ignores global properties of regexp
+description: >
+    Checking results of search regexp with and without global
+    properties
+---*/
 
 var aString = new String("power of the power of the power of the power of the power of the power of the great sword");
 
@@ -17,4 +17,3 @@ if (aString.search(/the/)!== aString.search(/the/g)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T2.js
index 8b43a2afe..cae9f24bb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search (regexp) ignores global properties of regexp
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A3_T2.js
- * @description Checking results of search regexp with and without global properties. Unicode symbols used
- */
+/*---
+info: String.prototype.search (regexp) ignores global properties of regexp
+description: >
+    Checking results of search regexp with and without global
+    properties. Unicode symbols used
+---*/
 
 var aString = new String("power \u006F\u0066 the power of the power \u006F\u0066 the power of the power \u006F\u0066 the power of the great sword");
 
@@ -17,4 +17,3 @@ if (aString.search(/of/)!== aString.search(/of/g)) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A6.js
index 908cabbca..bee889b57 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A6.js
- * @description Checking String.prototype.search.prototype
- */
+/*---
+info: String.prototype.search has not prototype property
+description: Checking String.prototype.search.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.search.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A7.js
index 0e8f90cf9..309088d65 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.search can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A7.js
- * @description Checking if creating the String.prototype.search object fails
- */
+/*---
+info: String.prototype.search can't be used as constructor
+description: Checking if creating the String.prototype.search object fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.search;
 
@@ -19,4 +20,3 @@ try {
   }
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A8.js
index a24219f08..09b853eea 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.search.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A8.js
- * @description Checking if enumerating the String.prototype.search.length property fails
- */
+/*---
+info: The String.prototype.search.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.search.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A9.js
index 832b3670f..49d60e059 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.search.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.12/S15.5.4.12_A9.js
- * @description Checking if deleting the String.prototype.search.length property fails
- */
+/*---
+info: The String.prototype.search.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.search.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.search.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A10.js
index f42a3428e..7af1d8b0e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.slice.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A10.js
- * @description Checking if varying the String.prototype.slice.length property fails
- */
+/*---
+info: The String.prototype.slice.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.slice.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.slice.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A11.js
index 681f228c8..bca1f1d6f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the slice method is 2
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A11.js
- * @description Checking String.prototype.slice.length
- */
+/*---
+info: The length property of the slice method is 2
+description: Checking String.prototype.slice.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.slice.length !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T1.js
index e3a528aea..fe7fe0ba7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: String.prototype.slice (start, end)
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.slice(false, true) !== "t") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T10.js
index de499f4ca..a8afa314f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T10.js
- * @description Arguments are object and function call, and instance is String, object have overrided valueOf function
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are object and function call, and instance is String,
+    object have overrided valueOf function
+---*/
 
 var __obj = {valueOf:function(){return 2;}};
 
@@ -23,4 +23,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T11.js
index aed12d5c7..f5e8e3860 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T11.js
- * @description Arguments are objects, and instance is string, objects have overrided valueOf function, that return exception
- */
+/*---
+info: String.prototype.slice (start, end)
+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";}};
 var __obj2 = {valueOf:function(){throw "inend";}};
@@ -28,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T12.js
index 3060c5336..dae78c319 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T12.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T12.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided valueOf function and toString function, that return exception.
- * Second object have overrided valueOf function, that return exception
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are objects, and instance is string.  First object have
+    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";}};
 var __obj2 = {valueOf:function(){throw "inend";}};
@@ -28,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T13.js
index 6a89560d7..8039465ce 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T13.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T13.js
- * @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
- */
+/*---
+info: String.prototype.slice (start, end)
+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;}};
 var __obj2 = {toString:function(){throw "inend";}};
@@ -25,5 +25,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T14.js
index b48a36444..fa58eac16 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T14.js
- * @description Used one argument, that is function(){}(). Instance is string
- */
+/*---
+info: String.prototype.slice (start, end)
+description: Used one argument, that is function(){}(). Instance is string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("report".slice(function(){}()) !== "report") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T15.js
index d27cbb021..76bc98a06 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T15.js
- * @description Call slice without arguments. Instance is Number with prototype.slice = String.prototype.slice
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Call slice without arguments. Instance is Number with
+    prototype.slice = String.prototype.slice
+---*/
 
 var __num = 11.001002;
 
@@ -20,4 +20,3 @@ if (__num.slice()!=="11.001002") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T2.js
index e312f3649..17c51986b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T2.js
- * @description Arguments are function call and x, and instance is Boolean. x is undefined variable
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are function call and x, and instance is Boolean. x is
+    undefined variable
+---*/
 
 var __instance = new Boolean;
 
@@ -21,4 +21,3 @@ if (__instance.slice(function(){return true;}(),x) !== "alse") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T4.js
index 8b147e97a..e950d0212 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T4.js
- * @description Arguments are null and number, and instance is function call, that returned string
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are null and number, and instance is function call, that
+    returned string
+---*/
 
 //since ToInteger(null) yelds 0
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +16,3 @@ if (function(){return "gnulluna"}().slice(null, -3) !== "gnull") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T5.js
index ddc8dce24..50c57697c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T5.js
- * @description Arguments are null and call other slice(start, end), and instance is function object, that have overrided valueOf and toString functions
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are null and call other slice(start, end), and instance
+    is function object, that have overrided valueOf and toString
+    functions
+---*/
 
 __func.valueOf=function(){return "gnulluna"};
 __func.toString=function(){return __func;};
@@ -23,4 +24,3 @@ if (__func.slice(null, Function().slice(__func,5).length) !== "gnull") {
 //////////////////////////////////////////////////////////////////////////////
 
 function __func(){};
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T6.js
index 98f708f30..8f44fb558 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T6.js
- * @description Arguments are x and number, and instance is new String, x is undefined variable
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are x and number, and instance is new String, x is
+    undefined variable
+---*/
 
 //since ToInteger(undefined yelds 0)
 //////////////////////////////////////////////////////////////////////////////
@@ -18,4 +18,3 @@ if (new String("undefined").slice(x,3) !== "und") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T7.js
index 567fe0954..1913951e5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T7.js
- * @description Arguments are symbol and undefined, and instance is String
- */
+/*---
+info: String.prototype.slice (start, end)
+description: Arguments are symbol and undefined, and instance is String
+---*/
 
 //since ToInteger("e") yelds 0
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +14,3 @@ if (String(void 0).slice("e",undefined) !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T8.js
index 25572c8df..4f39ce3a3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T8.js
- * @description Arguments are negative number and void 0, and instance is String(object), object have overrided toString function
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are negative number and void 0, and instance is
+    String(object), object have overrided toString function
+---*/
 
 __obj = {toString:function(){}};
 
@@ -18,4 +18,3 @@ if (String(__obj).slice(-4,void 0) !== "ined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T9.js
index 3202857b6..472e7713d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A1_T9.js
- * @description Arguments are undefined and object, and instance is String(object), object have overrided valueOf and toString functions
- */
+/*---
+info: String.prototype.slice (start, end)
+description: >
+    Arguments are undefined and object, and instance is
+    String(object), object have overrided valueOf and toString
+    functions
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -21,4 +22,3 @@ if (new String(__obj).slice(/*(function(){})()*/undefined,__obj) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T1.js
index 07a5f0a30..3fea2a5ae 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T1.js
- * @description Checking type of slice()
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: Checking type of slice()
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (typeof __string.slice() !== "string") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T2.js
index b8b657d69..17fe3ef09 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T2.js
- * @description start is NaN, end is Infinity
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is NaN, end is Infinity
+---*/
 
 var __string = new String('this is a string object');
 
@@ -17,4 +15,3 @@ if (__string.slice(NaN, Infinity) !== "this is a string object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T3.js
index 37bc9b6c8..325852fb8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T3.js
- * @description Call slice from empty String object
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: Call slice from empty String object
+---*/
 
 var __string = new String("");
 
@@ -17,4 +15,3 @@ if (__string.slice(1,0) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T4.js
index a6749e9fc..c5cd57ed9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T4.js
- * @description start is Infinity, end is NaN
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is Infinity, end is NaN
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(Infinity, NaN) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T5.js
index 46bf31607..392edb2de 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T5.js
- * @description start is Infinity, end is Infinity
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is Infinity, end is Infinity
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(Infinity, Infinity) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T6.js
index 78aae2436..cf844d01c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T6.js
- * @description start is negative float number, end is 0
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is negative float number, end is 0
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(-0.01,0) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T7.js
index fef18302c..8480dc658 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T7.js
- * @description start is tested_string.length, end is tested_string.length
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is tested_string.length, end is tested_string.length
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(__string.length, __string.length) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T8.js
index 22406a791..66ded5095 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T8.js
- * @description start is tested_string.length+1, end is 0
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is tested_string.length+1, end is 0
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(__string.length+1, 0) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T9.js
index 96a95b82e..2d04063d4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A2_T9.js
- * @description start is -Infinity, end is -Infinity
- */
+/*---
+info: String.prototype.slice (start, end) returns a string value(not object)
+description: start is -Infinity, end is -Infinity
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.slice(-Infinity, -Infinity) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T1.js
index 0615be24d..21366be37 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) can be applied to object instances
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T1.js
- * @description Apply String.prototype.slice to Object instance
- */
+/*---
+info: String.prototype.slice (start, end) can be applied to object instances
+description: Apply String.prototype.slice to Object instance
+---*/
 
 var __instance = new Object();
 
@@ -19,4 +17,3 @@ if (__instance.slice(0,8) !== "[object ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T2.js
index 024898955..f90444f9a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) can be applied to object instances
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T2.js
- * @description Apply String.prototype.slice to Object instance, use other value for start and end values
- */
+/*---
+info: String.prototype.slice (start, end) can be applied to object instances
+description: >
+    Apply String.prototype.slice to Object instance, use other value
+    for start and end values
+---*/
 
 var __instance = new Object();
 
@@ -19,4 +19,3 @@ if (__instance.slice(8,__instance.toString().length) !== "Object]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T3.js
index 27003ec74..a73871f91 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) can be applied to object instances
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T3.js
- * @description Apply String.prototype.slice to Object instance, and call instance.slice(...).slice(...)
- */
+/*---
+info: String.prototype.slice (start, end) can be applied to object instances
+description: >
+    Apply String.prototype.slice to Object instance, and call
+    instance.slice(...).slice(...)
+---*/
 
 var __instance = { toString: function() { return "function(){}";} };
 
@@ -19,4 +19,3 @@ if (__instance.slice(-Infinity,8).slice(1,Infinity) !== "unction") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T4.js
index e5588d680..9135e67f1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice (start, end) can be applied to object instances
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A3_T4.js
- * @description Checknig if applying String.prototype.slice to Function object instance passes
- */
+/*---
+info: String.prototype.slice (start, end) can be applied to object instances
+description: >
+    Checknig if applying String.prototype.slice to Function object
+    instance passes
+---*/
 
 __FACTORY.prototype.toString = function() { return this.value+''; };
 
@@ -25,4 +25,3 @@ function __FACTORY( value ) {
     this.slice= String.prototype.slice;
     //this.substring = String.prototype.substring;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A6.js
index 136a65c52..2934cf252 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A6.js
- * @description Checking String.prototype.slice.prototype
- */
+/*---
+info: String.prototype.slice has not prototype property
+description: Checking String.prototype.slice.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.slice.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A7.js
index 51ffe1e20..032a8e7f7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.slice can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A7.js
- * @description Checking if creating the String.prototype.slice object fails
- */
+/*---
+info: String.prototype.slice can't be used as constructor
+description: Checking if creating the String.prototype.slice object fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.slice;
 
@@ -16,4 +17,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A8.js
index 940757173..77b028218 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.slice.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A8.js
- * @description Checking if enumerating the String.prototype.slice.length property fails
- */
+/*---
+info: The String.prototype.slice.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.slice.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A9.js
index c815772b2..f04a2154a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.slice.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.13/S15.5.4.13_A9.js
- * @description Checking if deleting the String.prototype.slice.length property fails
- */
+/*---
+info: The String.prototype.slice.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.slice.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.slice.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A10.js
index e3edc7ff6..e16a90cf6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.split.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A10.js
- * @description Checking if varying the String.prototype.split.length property fails
- */
+/*---
+info: The String.prototype.split.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.split.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.split.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A11.js
index 3a4762985..e63d84f3c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the split method is 2
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A11.js
- * @description Checking String.prototype.split.length
- */
+/*---
+info: The length property of the split method is 2
+description: Checking String.prototype.split.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.split.length !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T1.js
index e43860ce6..9cb5255ce 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -41,4 +40,3 @@ if (__split.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T10.js
index fbb18f0d9..fc0490945 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T10.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T10.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided toString function.
- * Second object have overrided valueOf function
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Arguments are objects, and instance is string.  First object have
+    overrided toString function.  Second object have overrided valueOf
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0042B";}}
 var __obj2 = {valueOf:function(){return true;}}
@@ -53,4 +53,3 @@ if (__split[0] !== "A") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T11.js
index cbe7816dd..3dbafa089 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T11.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T11.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided toString function.
- * Second object have overrided valueOf function, that throw exception
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+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";}}
 var __obj2 = {valueOf:function(){throw "intointeger";}}
@@ -34,4 +35,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T12.js
index d5dc7fbba..41fb416d9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T12.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T12.js
- * @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
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+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";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){throw "intointeger";}}
@@ -32,4 +33,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T13.js
index f9ef575f0..f0c989491 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T13.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T13.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided toString function.
- * Second object have overrided valueOf and toString functions
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Arguments are objects, and instance is string.  First object have
+    overrided toString function.  Second object have overrided valueOf
+    and toString functions
+---*/
 
 var __obj = {toString:function(){return "\u0042\u0042";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){return "2";}}
@@ -58,4 +58,3 @@ if (__split[1] !== "ABABA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T14.js
index cc6593660..b98f24bf4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T14.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T14.js
- * @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
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+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";}};
 var __obj2 = {valueOf:function(){throw "intoint";}};
@@ -33,4 +34,3 @@ with(__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T15.js
index 7e2e74c4f..c15edc4a4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T15.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T15.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided toString function and valueOf function, that throw exception.
- * Second object have overrided valueOf function, that throw exception
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Arguments are objects, and instance is string.  First object have
+    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";}};
 
@@ -40,4 +42,3 @@ function __FACTORY( value ) {
     this.toString = function() { return new Number; };
     this.valueOf=function(){return this.value+""};
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T16.js
index 9c58e0230..f16505f7a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T16.js
@@ -1,17 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T16.js
- * @description Argument is object, and instance is Number.
- * Object have overrided toString function, that return regexp
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+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;}};
 
@@ -25,4 +26,3 @@ try {
     $ERROR('#1.1: Exception is instance of TypeError. Actual: '+e);
   }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T17.js
index f8a406dc1..a7c096291 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T17.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T17.js
- * @description Argument is regexp, and instance is Number
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Argument is regexp, and instance is Number
+---*/
 
 var __re = /\u0037\u0037/g;
 
@@ -73,4 +72,3 @@ if (__split[3] !== "1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T18.js
index 3063102dc..f6f6e3106 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T18.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T18.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Checking by using eval
+---*/
 
 var __re =  new RegExp("00");
 
@@ -49,4 +48,3 @@ if (__split[0] !== "6776767677.") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T2.js
index 2a236cc00..22c690ff7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T2.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T2.js
- * @description Arguments are boolean expression, function call and null, and instance is Boolean
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Arguments are boolean expression, function call and null, and
+    instance is Boolean
+---*/
 
 var __instance = new Boolean;
 
@@ -41,4 +42,3 @@ if (__split.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T3.js
index 715a562cd..ac959bbdb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T3.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Checking by using eval
+---*/
 
 var split = String.prototype.split.bind(this);
 
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T4.js
index 0c5205cc5..f64dc5ac7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T4.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T4.js
- * @description Call split without arguments, and instance is empty string
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Call split without arguments, and instance is empty string
+---*/
 
 //since ToString() evaluates to "" split() evaluates to split("",0)
 var __split = "".split();
@@ -46,4 +45,3 @@ if (__split[0] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T5.js
index d5a72fbaa..3b7e7bf0b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T5.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T5.js
- * @description Argument is null, and instance is function call that returned string
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Argument is null, and instance is function call that returned
+    string
+---*/
 
 //since ToString(null) evaluates to "null" split(null) evaluates to split("null",0)
 var __split = function(){return "gnulluna"}().split(null);
@@ -54,4 +55,3 @@ if (__split[1] !== "una") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T6.js
index 7d3fcceb0..91ac07d80 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T6.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T6.js
- * @description Argument is x, and instance is new String. x is undefined variable
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Argument is x, and instance is new String. x is undefined variable
+---*/
 
 //since ToString(undefined) evaluates to "" split(undefined) evaluates to split("",0)
 var __split = new String("1undefined").split(x);
@@ -48,4 +47,3 @@ if (__split[0] !== "1undefined") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T7.js
index bf48c7656..20c9203dd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T7.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T7.js
- * @description Argument is undefined, and instance is String
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: Argument is undefined, and instance is String
+---*/
 
 var __split = String("undefinedd").split(undefined);
 
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T8.js
index 2feaba65b..f4a028ab4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T8.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T8.js
- * @description Argument is void 0, and instance is String(object), object have overrided toString function
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Argument is void 0, and instance is String(object), object have
+    overrided toString function
+---*/
 
 var __obj = {toString:function(){}};
 
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T9.js
index b50272419..4396b292a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T9.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split(separator, limit):
- * i) can be transferred to other kinds of objects for use as a method.
- * separator and limit can be any kinds of object since:
- * ii) if separator is not RegExp ToString(separator) performs and
- * iii) ToInteger(limit) performs
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A1_T9.js
- * @description Argument is function(){}(), and instance is String(object), object have overrided toString and valueOf functions
- */
+/*---
+info: >
+    String.prototype.split(separator, limit):
+    i) can be transferred to other kinds of objects for use as a method.
+    separator and limit can be any kinds of object since:
+    ii) if separator is not RegExp ToString(separator) performs and
+    iii) ToInteger(limit) performs
+description: >
+    Argument is function(){}(), and instance is String(object), object
+    have overrided toString and valueOf functions
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -51,4 +52,3 @@ if (__split[0] !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T1.js
index 3f2bfe61b..08fc8320a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T1.js
- * @description Call split(","), instance is String("one,two,three,four,five")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(","), instance is String("one,two,three,four,five")
+---*/
 
 var __string = new String("one,two,three,four,five");
 
@@ -70,4 +69,3 @@ if (__split[4] !== "five") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T10.js
index 54ab24f27..04c41babc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T10.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T10.js
- * @description Call split(123), instance is "this123is123a123string123object"
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(123), instance is "this123is123a123string123object"
+---*/
 
 var __string = "this123is123a123string123object";
 var __expected = ["this", "is", "a", "string", "object"];
@@ -41,5 +40,3 @@ for ( var i = 0; i < __expected.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T11.js
index 5dbe9631c..5bb280ecd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T11.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T11.js
- * @description Call split(":"), instance is String("one-1,two-2,four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: "Call split(\":\"), instance is String(\"one-1,two-2,four-4\")"
+---*/
 
 var __string = new String("one-1,two-2,four-4");
 
@@ -38,4 +37,3 @@ if (__split[0] !== "one-1,two-2,four-4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T12.js
index 0cfa3c726..4980a7005 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T12.js
- * @description Call split("r-42"), instance is String("one-1 two-2 four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("r-42"), instance is String("one-1 two-2 four-4")
+---*/
 
 var __string = new String("one-1 two-2 four-4");
 
@@ -38,4 +37,3 @@ if (__split[0] !== "one-1 two-2 four-4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T13.js
index 773dfa402..b9462e072 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T13.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T13.js
- * @description Call split("-4"), instance is String("one-1 two-2 four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("-4"), instance is String("one-1 two-2 four-4")
+---*/
 
 var __string = new String("one-1 two-2 four-4");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T14.js
index bab266a41..7c18049dc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T14.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T14.js
- * @description Call split("on"), instance is String("one-1 two-2 four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("on"), instance is String("one-1 two-2 four-4")
+---*/
 
 var __string = new String("one-1 two-2 four-4");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "e-1 two-2 four-4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T15.js
index 78186df29..bcf11d395 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T15.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T15.js
- * @description Call split(""), instance is empty String object
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(""), instance is empty String object
+---*/
 
 var __string = new String();
 
@@ -38,4 +37,3 @@ if (__split[0] !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T16.js
index 7f038bb5d..99a93ddb3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T16.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T16.js
- * @description Call split(" "), instance is empty String object
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(" "), instance is empty String object
+---*/
 
 var __string = new String();
 
@@ -38,4 +37,3 @@ if (__split[0] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T17.js
index 12356022d..ad88cb63d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T17.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T17.js
- * @description Call split(""), instance is String(" ")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(""), instance is String(" ")
+---*/
 
 var __string = new String(" ");
 
@@ -38,4 +37,3 @@ if (__split[0] !== " ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T18.js
index eb6e4c318..b235a1dac 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T18.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T18.js
- * @description Call split(" "), instance is String(" ")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(" "), instance is String(" ")
+---*/
 
 var __string = new String(" ");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T19.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T19.js
index f1e2c7a38..14bb38840 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T19.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T19.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T19.js
- * @description Call split("x"), instance is empty string
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("x"), instance is empty string
+---*/
 
 var __string = "";
 
@@ -38,4 +37,3 @@ if (__split[0] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T2.js
index 549271281..ae03873b7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T2.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T2.js
- * @description Call split(" "), instance is String("one two three four five")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(" "), instance is String("one two three four five")
+---*/
 
 var __string = new String("one two three four five");
 
@@ -70,4 +69,3 @@ if (__split[4] !== "five") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T20.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T20.js
index 8bd69c455..6c07f8d51 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T20.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T20.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T20.js
- * @description Call split(new RegExp)
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(new RegExp)
+---*/
 
 var __string = new String("one-1 two-2 three-3");
 
@@ -40,5 +39,3 @@ for ( var i = 0; i < __string.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T21.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T21.js
index b2011308d..b93833094 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T21.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T21.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T21.js
- * @description Call split("ll"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("ll"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -46,5 +45,3 @@ if (__split[1] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T22.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T22.js
index e6eca65fb..1176d6e16 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T22.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T22.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T22.js
- * @description Call split("l"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -54,5 +53,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T23.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T23.js
index 152c353e0..1a1a83a66 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T23.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T23.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T23.js
- * @description Call split("x"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("x"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -38,5 +37,3 @@ if (__split[0] !== "hello") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T24.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T24.js
index a7043bbd9..401f50dbc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T24.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T24.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T24.js
- * @description Call split("h"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("h"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -46,5 +45,3 @@ if (__split[1] !== "ello") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T25.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T25.js
index 65ee313aa..afd948155 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T25.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T25.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T25.js
- * @description Call split("o"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("o"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T26.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T26.js
index 760f7ff06..cc6b5eb6a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T26.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T26.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T26.js
- * @description Call split("hello"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("hello"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T27.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T27.js
index 515d9fbc5..4240d0a59 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T27.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T27.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T27.js
- * @description Call split(undefined), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(undefined), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -38,5 +37,3 @@ if (__split[0] !== "hello") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T28.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T28.js
index 84510d84c..bc307c94e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T28.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T28.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T28.js
- * @description Call split("hellothere"), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("hellothere"), instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -38,5 +37,3 @@ if (__split[0] !== "hello") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T29.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T29.js
index 1577a73cf..3ed93cf63 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T29.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T29.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T29.js
- * @description Call split(1), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -44,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T3.js
index 0dd458c65..2a317286f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T3.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T3.js
- * @description Call split(/ /,2), instance is String("one two three four five")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(/ /,2), instance is String("one two three four five")
+---*/
 
 var __string = new String("one two three four five");
 
@@ -46,4 +45,3 @@ if (__split[1] !== "two") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T30.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T30.js
index 056648273..2bc2d773a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T30.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T30.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T30.js
- * @description Call split(1,1), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,1), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -42,5 +41,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T31.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T31.js
index 973791e58..9bbdc9c0f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T31.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T31.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T31.js
- * @description Call split(1,2), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,2), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -44,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T32.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T32.js
index 878668c95..5a5a7fec1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T32.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T32.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T32.js
- * @description Call split(1,0), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,0), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -42,5 +41,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T33.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T33.js
index 66f3040ad..89ab0d96a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T33.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T33.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T33.js
- * @description Call split(1,100), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,100), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -44,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T34.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T34.js
index bde2c8a9a..330c83f2b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T34.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T34.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T34.js
- * @description Call split(1,void 0), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,void 0), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -44,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T35.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T35.js
index c6288390c..34a0383d9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T35.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T35.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T35.js
- * @description Call split(1, Math.pow(2,32)-1), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1, Math.pow(2,32)-1), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -44,5 +43,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T36.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T36.js
index 66aa50338..199c4cb98 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T36.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T36.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T36.js
- * @description Call split(1,"boo"), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,"boo"), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -42,5 +41,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T37.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T37.js
index f4d27e16c..39f320bd1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T37.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T37.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T37.js
- * @description Call split(1,-Math.pow(2,32)+1), instance is Number
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(1,-Math.pow(2,32)+1), instance is Number
+---*/
 
 var __instance = new Number(100111122133144155);
 
@@ -42,5 +41,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T38.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T38.js
index e072227a3..e2679c11a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T38.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T38.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T38.js
- * @description Call split("l",NaN), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",NaN), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -39,4 +38,3 @@ if (__split[0] !== __expected[0]) {
   $ERROR('#3: var __instance = new String("hello"); __split = __instance.split("l", NaN); __expected = []; __split[0] === '+__expected[0]+'. Actual: '+__split[index] );
 }
 //
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T39.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T39.js
index 86bd0b649..04fc0d965 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T39.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T39.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T39.js
- * @description Call split("l",0), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",0), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -39,4 +38,3 @@ if (__split[0] !== __expected[0]) {
   $ERROR('#3: var __instance = new String("hello"); __split = __instance.split("l", 0); __expected = []; __split[0] === '+__expected[0]+'. Actual: '+__split[index] );
 }
 //
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T4.js
index 7647c5239..850992a64 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T4.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T4.js
- * @description Call split(""), instance is String("one two three")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(""), instance is String("one two three")
+---*/
 
 var __string = new String("one two three");
 
@@ -62,4 +61,3 @@ if (__split[12] !== "e") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T40.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T40.js
index cb70140ae..ef3b4fc26 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T40.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T40.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T40.js
- * @description Call split("l",1), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",1), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -39,4 +38,3 @@ if (__split[0] !== __expected[0]) {
   $ERROR('#3: var __instance = new String("hello"); __split = __instance.split("l", 1); __expected = ["he"]; __split[0] === '+__expected[0]+'. Actual: '+__split[index] );
 }
 //
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T41.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T41.js
index db8302f67..29f3b8f68 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T41.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T41.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T41.js
- * @description Call split("l",2), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",2), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -42,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T42.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T42.js
index 5f5484098..540ec7b17 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T42.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T42.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T42.js
- * @description Call split("l",3), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",3), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -42,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T43.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T43.js
index 2f541ed5e..c0134ee56 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T43.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T43.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T43.js
- * @description Call split("l",4), instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split("l",4), instance is String("hello")
+---*/
 
 var __instance = new String("hello");
 
@@ -42,5 +41,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T5.js
index 1662c3b80..319100037 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T5.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T5.js
- * @description Call split(/,/), instance is String("one-1,two-2,four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(/,/), instance is String("one-1,two-2,four-4")
+---*/
 
 var __string = new String("one-1,two-2,four-4");
 
@@ -54,4 +53,3 @@ if (__split[2] !== "four-4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T6.js
index 308586fb1..2d260a3ce 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T6.js
- * @description Call split(''), instance is String("one-1 two-2 four-4")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(''), instance is String("one-1 two-2 four-4")
+---*/
 
 var __string = new String("one-1 two-2 three-3");
 
@@ -40,5 +39,3 @@ for ( var i = 0; i < __string.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T7.js
index 45b645767..798aef7c1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T7.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T7.js
- * @description Call split(void 0), instance is "thisundefinedisundefinedaundefinedstringundefinedobject"
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: >
+    Call split(void 0), instance is
+    "thisundefinedisundefinedaundefinedstringundefinedobject"
+---*/
 
 var __string = "thisundefinedisundefinedaundefinedstringundefinedobject";
 var __expected = [__string];
@@ -41,5 +42,3 @@ for ( var i = 0; i < __expected.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T8.js
index 33c8d4673..4011d4b29 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T8.js
- * @description Call split(null), instance is "thisnullisnullanullstringnullobject"
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(null), instance is "thisnullisnullanullstringnullobject"
+---*/
 
 var __string = "thisnullisnullanullstringnullobject";
 var __expected = ["this", "is", "a", "string", "object"];
@@ -41,5 +40,3 @@ for ( var i = 0; i < __expected.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T9.js
index 8f41d4292..8cd949d8c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T9.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. The substrings are determined by searching from left to right for occurrences of
- * separator; these occurrences are not part of any substring in the returned array, but serve to divide up
- * the string value. The value of separator may be a string of any length or it may be a RegExp object
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A2_T9.js
- * @description Call split(true), instance is "thistrueistrueatruestringtrueobject"
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. The substrings are determined by searching from left to right for occurrences of
+    separator; these occurrences are not part of any substring in the returned array, but serve to divide up
+    the string value. The value of separator may be a string of any length or it may be a RegExp object
+description: Call split(true), instance is "thistrueistrueatruestringtrueobject"
+---*/
 
 var __string = "thistrueistrueatruestringtrueobject";
 var __expected = ["this", "is", "a", "string", "object"];
@@ -41,5 +40,3 @@ for ( var i = 0; i < __expected.length; i++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T1.js
index 86a3c2fb6..d639cfcfc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T1.js
- * @description Instance is String("one,two,three,four,five")
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is String("one,two,three,four,five")
+---*/
 
 var __string = new String("one,two,three,four,five");
 
@@ -37,4 +36,3 @@ if (__split[0] !== "one,two,three,four,five") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T10.js
index 7425bdee2..28018b54f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T10.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T10.js
- * @description Instance is new String
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is new String
+---*/
 
 var __string = new String;
 
@@ -37,4 +36,3 @@ if (__split[0] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T11.js
index 7de1ea583..64c3c8ec8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T11.js
- * @description Instance is String(" ")
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is String(" ")
+---*/
 
 var __string = new String(" ");
 
@@ -37,4 +36,3 @@ if (__split[0] !== " ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T2.js
index fb00633fe..ad8f9dbce 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T2.js
- * @description Instance is Object()
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Object()
+---*/
 
 var __instance = new Object();
 
@@ -39,4 +38,3 @@ if (__split[0] !== "[object Object]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T3.js
index 51bcf1575..31ab94c60 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T3.js
- * @description Instance is function(){}
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is function(){}
+---*/
 
 var __instance = { toString: function() { return "function(){}";} };
 
@@ -39,4 +38,3 @@ if (__split[0].substring(0,8) !== "function") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T4.js
index d91cb47c9..371e0b71a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T4.js
- * @description Instance is Number(NaN)
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Number(NaN)
+---*/
 
 var __instance = new Number(NaN);
 
@@ -39,4 +38,3 @@ if (__split[0] !== "NaN") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T5.js
index caa50b3d9..b891fee68 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T5.js
- * @description Instance is Number(-1234567890)
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Number(-1234567890)
+---*/
 
 var __instance = new Number(-1234567890);
 
@@ -39,4 +38,3 @@ if (__split[0] !== "-1234567890") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T6.js
index e4421f66e..0950d258c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T6.js
- * @description Instance is Number(-1e21)
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Number(-1e21)
+---*/
 
 var __instance = new Number(-1e21);
 
@@ -39,4 +38,3 @@ if (__split[0] !== __instance.toString()) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T7.js
index bc09dd500..4f523680b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T7.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T7.js
- * @description Instance is Math
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Math
+---*/
 
 var __instance = Math;
 
@@ -39,4 +38,3 @@ if (__split[0] !== "[object Math]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T8.js
index 94ba1f1e9..24f3b2cd3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T8.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T8.js
- * @description Instance is Array(1,2,3,4,5)
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Array(1,2,3,4,5)
+---*/
 
 var __instance = new Array(1,2,3,4,5);
 
@@ -39,4 +38,3 @@ if (__split[0] !== "1,2,3,4,5") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T9.js
index a22f24ff9..69c99ffeb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T9.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split() returns an Array object with:
- *  i) length equaled to 1,
- * ii) [[Get]](0) equaled to the result of converting this object to a string
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A3_T9.js
- * @description Instance is Boolean
- */
+/*---
+info: >
+    String.prototype.split() returns an Array object with:
+    i) length equaled to 1,
+    ii) [[Get]](0) equaled to the result of converting this object to a string
+description: Instance is Boolean
+---*/
 
 var __instance = new Boolean;
 
@@ -39,4 +38,3 @@ if (__split[0] !== "false") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T1.js
index af74915a5..b6dd26fb5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T1.js
- * @description Argument is regexp /l/, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is regexp /l/, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -55,4 +54,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T10.js
index 4419ea3fe..37c5b4089 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T10.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T10.js
- * @description Argument is new RegExp, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is new RegExp, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T11.js
index e4d7f88f4..354cdbe7c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T11.js
- * @description Arguments are new RegExp and 0, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and 0, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -41,4 +40,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T12.js
index 68c519cfe..46b626514 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T12.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T12.js
- * @description Arguments are new RegExp and 1, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and 1, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -41,4 +40,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T13.js
index 887b4b420..e71a3b278 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T13.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T13.js
- * @description Arguments are new RegExp and 2, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and 2, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T14.js
index 513db31ff..3beeead16 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T14.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T14.js
- * @description Arguments are new RegExp and 3, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and 3, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T15.js
index 9811573ad..50d458ba0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T15.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T15.js
- * @description Arguments are new RegExp and 4, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and 4, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T16.js
index e3d3b9481..d49eddc1a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T16.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T16.js
- * @description Arguments are new RegExp and void 0, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Arguments are new RegExp and void 0, and instance is
+    String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +44,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T17.js
index a6ec2a0cf..231f0b06e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T17.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T17.js
- * @description Arguments are new RegExp and undefined, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Arguments are new RegExp and undefined, and instance is
+    String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +44,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T18.js
index d8e75a23a..5aa53e6de 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T18.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T18.js
- * @description Arguments are new RegExp and "hi", and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are new RegExp and "hi", and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T19.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T19.js
index ac8888615..00b37926c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T19.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T19.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T19.js
- * @description Argument is regexp /\s/, and instance is String("a b c de f")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is regexp /\s/, and instance is String("a b c de f")
+---*/
 
 var __string = new String("a b c de f");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T2.js
index b628639e7..5f7b49de5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T2.js
- * @description Arguments are regexp /l/ and 0, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and 0, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -31,4 +30,3 @@ if (__split.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T20.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T20.js
index 4a6a08fc1..d8e99c4fb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T20.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T20.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T20.js
- * @description Arguments are regexp /\s/ and 3, and instance is String("a b c de f")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Arguments are regexp /\s/ and 3, and instance is String("a b c de
+    f")
+---*/
 
 var __string = new String("a b c de f");
 
@@ -43,4 +44,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T21.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T21.js
index 9a433a323..4bc070943 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T21.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T21.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T21.js
- * @description Argument is regexp /\X/, and instance is String("a b c de f")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is regexp /\X/, and instance is String("a b c de f")
+---*/
 
 var __string = new String("a b c de f");
 
@@ -41,4 +40,3 @@ if (__split[0] !== __expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T22.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T22.js
index 23d71dce4..dd41fa7c9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T22.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T22.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T22.js
- * @description Argument is regexp /\d+/, and instance is String("dfe23iu 34 =+65--")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Argument is regexp /\d+/, and instance is String("dfe23iu 34
+    =+65--")
+---*/
 
 var __string = new String("dfe23iu 34 =+65--");
 
@@ -43,4 +44,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T23.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T23.js
index d68d6c2c9..822badbcd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T23.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T23.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T23.js
- * @description Argument is regexp RegExp('\\d+'), and instance is String("dfe23iu 34 =+65--")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Argument is regexp RegExp('\\d+'), and instance is String("dfe23iu
+    34 =+65--")
+---*/
 
 var __string = new String("dfe23iu 34 =+65--");
 
@@ -43,4 +44,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T24.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T24.js
index 1447f21b9..ec72df3f7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T24.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T24.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T24.js
- * @description Argument is regexp /[a-z]/, and instance is String("abc")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is regexp /[a-z]/, and instance is String("abc")
+---*/
 
 var __string = new String("abc");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T25.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T25.js
index 6ece183ab..9182afadc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T25.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T25.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T25.js
- * @description Argument is RegExp('[a-z]'), and instance is String("abc")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Argument is RegExp('[a-z]'), and instance is String("abc")
+---*/
 
 var __string = new String("abc");
 
@@ -43,4 +42,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T3.js
index 5485bca24..fac340668 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T3.js
- * @description Arguments are regexp /l/ and 1, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and 1, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -39,4 +38,3 @@ if (__split[0] !== "he") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T4.js
index 0a3e28803..9eb28c35e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T4.js
- * @description Arguments are regexp /l/ and 2, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and 2, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -47,4 +46,3 @@ if (__split[1] !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T5.js
index 42e9c4bc3..73d60eb0b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T5.js
- * @description Arguments are regexp /l/ and 3, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and 3, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -55,4 +54,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T6.js
index e476ccf7a..793e694e6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T6.js
- * @description Arguments are regexp /l/ and 4, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and 4, and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -55,4 +54,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T7.js
index f3b86a40d..419a9ccc6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T7.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T7.js
- * @description Arguments are regexp /l/ and void 0, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Arguments are regexp /l/ and void 0, and instance is
+    String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -55,4 +56,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T8.js
index 5eaa9100e..e8e9cbd6c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T8.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T8.js
- * @description Arguments are regexp /l/ and "hi", and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: Arguments are regexp /l/ and "hi", and instance is String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -31,4 +30,3 @@ if (__split.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T9.js
index ce010aef3..708232c7d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T9.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
- * been stored. If separator is a regular expression then
- * inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A4_T9.js
- * @description Arguments are regexp /l/ and undefined, and instance is String("hello")
- */
+/*---
+info: >
+    String.prototype.split (separator, limit) returns an Array object into which substrings of the result of converting this object to a string have
+    been stored. If separator is a regular expression then
+    inside of SplitMatch helper the [[Match]] method of R is called giving it the arguments corresponding
+description: >
+    Arguments are regexp /l/ and undefined, and instance is
+    String("hello")
+---*/
 
 var __string = new String("hello");
 
@@ -55,4 +56,3 @@ if (__split[2] !== "o") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A6.js
index ee3c4ff3a..d3d7ad7ad 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A6.js
- * @description Checking String.prototype.split.prototype
- */
+/*---
+info: String.prototype.split has not prototype property
+description: Checking String.prototype.split.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.split.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A7.js
index 10c5424aa..1a5b9805f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A7.js
@@ -1,19 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.split can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A7.js
- * @description Checking if creating the String.prototype.split object fails
- */
+/*---
+info: String.prototype.split can't be used as constructor
+description: Checking if creating the String.prototype.split object fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __FACTORY = String.prototype.split;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.split; "__instance = new __FACTORY" lead to throwing exception');

-} catch (e) {

+  $FAIL('#1: __FACTORY = String.prototype.split; "__instance = new __FACTORY" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A8.js
index 3cd8da66a..a5c233e2f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.split.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A8.js
- * @description Checking if enumerating the String.prototype.split.length property fails
- */
+/*---
+info: The String.prototype.split.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.split.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A9.js
index 6bd7ffb21..4e6f1877a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.split.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.14/S15.5.4.14_A9.js
- * @description Checking if deleting the String.prototype.split.length property fails
- */
+/*---
+info: The String.prototype.split.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.split.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.split.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A10.js
index 91c17b1ac..8e58e7b5e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.substring.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A10.js
- * @description Checking if varying the String.prototype.substring.length property fails
- */
+/*---
+info: The String.prototype.substring.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.substring.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.substring.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A11.js
index b7a8a57b1..22834e02b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the substring method is 2
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A11.js
- * @description Checking String.prototype.substring.length
- */
+/*---
+info: The length property of the substring method is 2
+description: Checking String.prototype.substring.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.substring.length !== 2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T1.js
index 8fb7701e7..b7590f6bc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: String.prototype.substring (start, end)
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.substring(false, true) !== "t") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T10.js
index 63fe45ac0..dcfadf4a0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T10.js
- * @description Arguments are object and function call, and instance is String, object have overrided valueOf function
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are object and function call, and instance is String,
+    object have overrided valueOf function
+---*/
 
 var __obj = {valueOf:function(){return 2;}};
 
@@ -23,4 +23,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T11.js
index dc2aebb6b..ffbb123f9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T11.js
- * @description Arguments are objects, and instance is string, objects have overrided valueOf function, that return exception
- */
+/*---
+info: String.prototype.substring (start, end)
+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";}};
 var __obj2 = {valueOf:function(){throw "inend";}};
@@ -28,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T12.js
index c45c3968a..c3d4d7f95 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T12.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T12.js
- * @description Arguments are objects, and instance is string.
- * First object have overrided valueOf function and toString function, that return exception.
- * Second object have overrided valueOf function, that return exception
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are objects, and instance is string.  First object have
+    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";}};
 var __obj2 = {valueOf:function(){throw "inend";}};
@@ -28,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T13.js
index 62fd05eda..fef3d3c92 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T13.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T13.js
- * @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
- */
+/*---
+info: String.prototype.substring (start, end)
+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;}};
 var __obj2 = {toString:function(){throw "inend";}};
@@ -25,5 +25,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T14.js
index 54e7e0495..fca43ee65 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T14.js
- * @description Used one argument, that is function(){}(). Instance is string
- */
+/*---
+info: String.prototype.substring (start, end)
+description: Used one argument, that is function(){}(). Instance is string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("report".substring(function(){}()) !== "report") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T15.js
index 22f9cf75a..94139c316 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T15.js
- * @description Call substring without arguments. Instance is Number with prototype.substring = String.prototype.substring
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Call substring without arguments. Instance is Number with
+    prototype.substring = String.prototype.substring
+---*/
 
 var __num = 11.001002;
 
@@ -20,4 +20,3 @@ if (__num.substring()!=="11.001002") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T2.js
index a46d973a4..e6b3877a4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T2.js
- * @description Arguments are function call and x, and instance is Boolean. x is undefined variable
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are function call and x, and instance is Boolean. x is
+    undefined variable
+---*/
 
 var __instance = new Boolean;
 
@@ -21,4 +21,3 @@ if (__instance.substring(function(){return true;}(),x) !== "alse") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T4.js
index 31205feb9..51a5eb141 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T4.js
- * @description Arguments are null and number, and instance is function call, that returned string
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are null and number, and instance is function call, that
+    returned string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (function(){return "gnulluna"}().substring(null, -3) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T5.js
index 097154be2..3b5d40a9b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T5.js
- * @description Arguments are null and Function(), and instance is function object, that have overrided valueOf function
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are null and Function(), and instance is function
+    object, that have overrided valueOf function
+---*/
 
 __func.valueOf=function(){return "gnulluna"};
 
@@ -22,4 +22,3 @@ if (__func.substring(null, Function()) !== "") {
 //////////////////////////////////////////////////////////////////////////////
 
 function __func(){};
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T6.js
index 81a2c9593..d7a7fbb97 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T6.js
- * @description Arguments are x and number, and instance is new String, x is undefined variable
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are x and number, and instance is new String, x is
+    undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -17,4 +17,3 @@ if (new String("undefined").substring(x,3) !== "und") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T7.js
index 252e70402..e0c53317a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T7.js
- * @description Arguments are symbol and undefined, and instance is String
- */
+/*---
+info: String.prototype.substring (start, end)
+description: Arguments are symbol and undefined, and instance is String
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String(void 0).substring("e",undefined) !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T8.js
index 700202785..dc164603b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T8.js
- * @description Arguments are negative number and void 0, and instance is String(object), object have overrided toString function
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are negative number and void 0, and instance is
+    String(object), object have overrided toString function
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -17,4 +17,3 @@ if (String(__obj).substring(-4,void 0) !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T9.js
index a9aafd294..841f89ced 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A1_T9.js
- * @description Arguments are undefined and object, and instance is new String(object), object have overrided valueOf and toString functions
- */
+/*---
+info: String.prototype.substring (start, end)
+description: >
+    Arguments are undefined and object, and instance is new
+    String(object), object have overrided valueOf and toString
+    functions
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -20,4 +21,3 @@ if (new String(__obj).substring(/*(function(){})()*/undefined,undefined) !== "un
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T1.js
index 919639a8b..fcbfcd0fc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T1.js
- * @description Checking type of substring()
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: Checking type of substring()
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (typeof __string.substring() !== "string") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T10.js
index 7467a3a74..2c8a8c2d0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T10.js
- * @description start is 0, end is 8
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is 0, end is 8
+---*/
 
 var __string = new String("this_is_a_string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(0,8) !== "this_is_") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T2.js
index a639bf7b1..c5ebe3dee 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T2.js
- * @description start is NaN, end is Infinity
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is NaN, end is Infinity
+---*/
 
 var __string = new String('this is a string object');
 
@@ -17,4 +15,3 @@ if (__string.substring(NaN, Infinity) !== "this is a string object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T3.js
index e6a911dfd..be8344a73 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T3.js
- * @description Call substring from empty String object
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: Call substring from empty String object
+---*/
 
 var __string = new String("");
 
@@ -17,4 +15,3 @@ if (__string.substring(1,0) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T4.js
index d79141d8e..b4657e424 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T4.js
- * @description start is Infinity, end is NaN
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is Infinity, end is NaN
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(Infinity, NaN) !== "this is a string object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T5.js
index cef78c101..72f670575 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T5.js
- * @description start is Infinity, end is Infinity
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is Infinity, end is Infinity
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(Infinity, Infinity) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T6.js
index 1437c87ce..c3dfad865 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T6.js
- * @description start is negative float number, end is 0
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is negative float number, end is 0
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(-0.01,0) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T7.js
index 140b4cc2a..f9b789604 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T7.js
- * @description start is tested_string.length, end is tested_string.length
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is tested_string.length, end is tested_string.length
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(__string.length, __string.length) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T8.js
index 9775b8fb2..4bb9adcc4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T8.js
- * @description start is tested_string.length+1, end is 0
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is tested_string.length+1, end is 0
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(__string.length+1, 0) !== "this is a string object") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T9.js
index b64f86b80..1a6d852d6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A2_T9.js
- * @description start is -Infinity, end is -Infinity
- */
+/*---
+info: String.prototype.substring (start, end) returns a string value(not object)
+description: start is -Infinity, end is -Infinity
+---*/
 
 var __string = new String("this is a string object");
 
@@ -17,4 +15,3 @@ if (__string.substring(-Infinity, -Infinity) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T1.js
index ee504ea67..de4a38f1d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T1.js
- * @description Apply String.prototype.substring to Array instance. Start is Infinity, end is -Infinity
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Array instance. Start is
+    Infinity, end is -Infinity
+---*/
 
 var __instance = new Array(1,2,3,4,5); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring(Infinity,-Infinity) !== "1,2,3,4,5") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T10.js
index 01935b3f8..767b14b6b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T10.js
- * @description Checknig if applying String.prototype.substring to Function object instance passes
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Checknig if applying String.prototype.substring to Function object
+    instance passes
+---*/
 
 __FACTORY.prototype.substring = String.prototype.substring;
 
@@ -25,4 +26,3 @@ function __FACTORY( value ) {
     this.value = value;
     this.toString = function() { return this.value+''; }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T11.js
index 92615a251..8da69fe2f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T11.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T11.js
- * @description Apply String.prototype.substring to Boolean instance. Start is new Array(), end is new Boolean(1)
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Boolean instance. Start is new
+    Array(), end is new Boolean(1)
+---*/
 
 var __instance = new Boolean();
  
@@ -20,4 +21,3 @@ if (__instance.substring(new Array(), new Boolean(1)) !== "f") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T2.js
index 728eea958..f9e39bc97 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T2.js
- * @description Apply String.prototype.substring to Array instance. Start is 9, end is -Infinity
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Array instance. Start is 9,
+    end is -Infinity
+---*/
 
 var __instance = new Array(1,2,3,4,5); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring(9,-Infinity) !== "1,2,3,4,5") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T3.js
index 814c1ad50..4a8645564 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T3.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T3.js
- * @description Apply String.prototype.substring to Array instance. Start is true, end is false
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Array instance. Start is true,
+    end is false
+---*/
 
 var __instance = new Array(1,2,3,4,5); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring(true, false) !== "1") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T4.js
index eb91e284f..17b285637 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T4.js
- * @description Apply String.prototype.substring to Array instance. Start is '4', end is '5'
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Array instance. Start is '4',
+    end is '5'
+---*/
 
 var __instance = new Array(1,2,3,4,5); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring('4', '5') !== "3") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T5.js
index 088bd137f..8cf99a921 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T5.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T5.js
- * @description Apply String.prototype.substring to Object instance. Start is 8, end is 0
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Object instance. Start is 8,
+    end is 0
+---*/
 
 var __instance = new Object(); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring(8,0) !== "[object ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T6.js
index ac3d0d150..9ea873315 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T6.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T6.js
- * @description Apply String.prototype.substring to Object instance. Start is 8, end is length of object.toString
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Object instance. Start is 8,
+    end is length of object.toString
+---*/
 
 var __instance = new Object(); 
 __instance.substring = String.prototype.substring;
@@ -19,4 +20,3 @@ if (__instance.substring(8, __instance.toString().length) !== "Object]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T7.js
index 2c91e0230..7fccbb9e3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T7.js
- * @description Apply String.prototype.substring to Object instance. Call instance.substring(...).substring(...)
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Object instance. Call
+    instance.substring(...).substring(...)
+---*/
 
 var __instance = { toString: function() { return "function(){}";} };
  
@@ -20,4 +21,3 @@ if (__instance.substring(-Infinity,8) !== "function") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T8.js
index a20213314..50def7239 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T8.js
- * @description Apply String.prototype.substring to Number instance. Start is Infinity, end is NaN
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Number instance. Start is
+    Infinity, end is NaN
+---*/
 
 var __instance = new Number(NaN);
  
@@ -20,4 +21,3 @@ if (__instance.substring(Infinity, NaN) !== "NaN") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T9.js
index 1d7aff7f1..a6c2da03c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring (start, end) can be applied to non String object instance and
- * returns a string value(not object)
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A3_T9.js
- * @description Apply String.prototype.substring to Math instance. Start is Math.PI, end is -10
- */
+/*---
+info: >
+    String.prototype.substring (start, end) can be applied to non String object instance and
+    returns a string value(not object)
+description: >
+    Apply String.prototype.substring to Math instance. Start is
+    Math.PI, end is -10
+---*/
 
 var __instance = Math;
  
@@ -20,4 +21,3 @@ if (__instance.substring(Math.PI, -10) !== "[ob") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A6.js
index fd7426628..533365433 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A6.js
- * @description Checking String.prototype.substring.prototype
- */
+/*---
+info: String.prototype.substring has not prototype property
+description: Checking String.prototype.substring.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.substring.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A7.js
index fc7c4c502..75a24af28 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.substring can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A7.js
- * @description Checking if creating the String.prototype.substring object fails
- */
+/*---
+info: String.prototype.substring can't be used as constructor
+description: Checking if creating the String.prototype.substring object fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.substring;
 
@@ -19,4 +20,3 @@ try {
   }
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A8.js
index 985519c11..854052dca 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.substring.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A8.js
- * @description Checking if enumerating the String.prototype.substring.length property fails
- */
+/*---
+info: The String.prototype.substring.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.substring.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A9.js
index 3c1690694..9c67e8306 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.substring.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.15/S15.5.4.15_A9.js
- * @description Checking if deleting the String.prototype.substring.length property fails
- */
+/*---
+info: >
+    The String.prototype.substring.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.substring.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.substring.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A10.js
index 1f44aace0..c538dae35 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLowerCase.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A10.js
- * @description Checking if varying the String.prototype.toLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLowerCase.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.toLowerCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +30,3 @@ if (String.prototype.toLowerCase.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A11.js
index dfb885899..f58edfc69 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toLowerCase method is 0
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A11.js
- * @description Checking String.prototype.toLowerCase.length
- */
+/*---
+info: The length property of the toLowerCase method is 0
+description: Checking String.prototype.toLowerCase.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.toLowerCase.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T1.js
index 203f7abed..d17b172b7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T1.js
- * @description Arguments is true, and instance is object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Arguments is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.toLowerCase() !== "true") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T10.js
index 26b9fb973..c0b520db1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T10.js
- * @description Call toLowerCase() function of object with overrode toString function
- */
+/*---
+info: String.prototype.toLowerCase()
+description: >
+    Call toLowerCase() function of object with overrode toString
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 __obj.toLowerCase = String.prototype.toLowerCase;
@@ -19,4 +19,3 @@ if (__obj.toLowerCase() !=="ab") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T11.js
index ec622d814..289cc944c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T11.js
- * @description Override toString function, toString throw exception, then call toLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: >
+    Override toString function, toString throw exception, then call
+    toLowerCase() function for this object
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}}
 __obj.toLowerCase = String.prototype.toLowerCase;
@@ -23,4 +24,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T12.js
index 4653f73fd..873e42752 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T12.js
- * @description Override toString and valueOf functions, valueOf throw exception, then call toLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLowerCase()
+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";}}
 __obj.toLowerCase = String.prototype.toLowerCase;
@@ -23,4 +24,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T13.js
index 234392148..5a711826a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T13.js
- * @description Override toString and valueOf functions, then call toLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: >
+    Override toString and valueOf functions, then call toLowerCase()
+    function for this object
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 __obj.toLowerCase = String.prototype.toLowerCase;
@@ -26,4 +26,3 @@ if (__obj.toLowerCase().length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T14.js
index 9ac4399d3..b2099317d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T14.js
- * @description Call toLowerCase() function for RegExp object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function for RegExp object
+---*/
 
 var __reg = new RegExp("ABC");
 __reg.toLowerCase = String.prototype.toLowerCase;
@@ -18,4 +16,3 @@ if (__reg.toLowerCase() !== "/abc/") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T2.js
index 47f82dac3..ce8faa0e8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T2.js
- * @description Instance is Boolean object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Instance is Boolean object
+---*/
 
 __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.toLowerCase() !== "false") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T3.js
index 54139f5dd..015f4763d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Checking by using eval
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (eval("\"BJ\"").toLowerCase() !== "bj") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T4.js
index 90bfba984..58afef573 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T4.js
- * @description Call toLowerCase() function without arguments of string and from empty string
- */
+/*---
+info: String.prototype.toLowerCase()
+description: >
+    Call toLowerCase() function without arguments of string and from
+    empty string
+---*/
 
 var __lowerCase = "".toLowerCase();
 
@@ -43,4 +43,3 @@ if (__lowerCase[0]!==__expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T5.js
index 5ce9cf486..20a595f09 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T5.js
- * @description Call toLowerCase() function for function call
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function for function call
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "GnulLuNa"}().toLowerCase() !== "gnulluna") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T6.js
index 74c3849c3..c3fcda5a8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T6.js
- * @description Call toLowerCase() function of Number.NEGATIVE_INFINITY
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function of Number.NEGATIVE_INFINITY
+---*/
 
 Number.prototype.toLowerCase = String.prototype.toLowerCase;
 
@@ -17,6 +15,3 @@ if ((Number.NEGATIVE_INFINITY).toLowerCase() !== "-infinity") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T7.js
index e348fe4bf..e35e78fa3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T7.js
- * @description Call toLowerCase() function of NaN
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function of NaN
+---*/
 
 Number.prototype.toLowerCase = String.prototype.toLowerCase;
 
@@ -17,4 +15,3 @@ if (NaN.toLowerCase()!== "nan") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T8.js
index 304e76947..b1445f301 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T8.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T8.js
- * @description Call toLowerCase() function of Infinity
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function of Infinity
+---*/
 
 Number.prototype.toLowerCase = String.prototype.toLowerCase;
 
 if (Infinity.toLowerCase()!== "infinity") {
   $ERROR('#1: Number.prototype.toLowerCase = String.prototype.toLowerCase; Infinity.toLowerCase()=== "infinity". Actual: '+Infinity.toLowerCase());
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T9.js
index 491617d2a..ec2411de4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A1_T9.js
- * @description Call toLowerCase() function of string object
- */
+/*---
+info: String.prototype.toLowerCase()
+description: Call toLowerCase() function of string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -50,4 +48,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A2_T1.js
index 1c9eb5102..dda7dc73e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase() return a string, but not a String object
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A2_T1.js
- * @description Checking returned result
- */
+/*---
+info: String.prototype.toLowerCase() return a string, but not a String object
+description: Checking returned result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,4 +29,3 @@ if ("Hello, WoRlD!".toLowerCase() ===new String("hello, world!")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A6.js
index c041b10fd..9c02bdde0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A6.js
- * @description Checking String.prototype.toLowerCase.prototype
- */
+/*---
+info: String.prototype.toLowerCase has not prototype property
+description: Checking String.prototype.toLowerCase.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.toLowerCase.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A7.js
index 263b4bc38..6ab66c205 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A7.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLowerCase can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A7.js
- * @description Checking if creating the String.prototype.toLowerCase object fails
- */
+/*---
+info: String.prototype.toLowerCase can't be used as constructor
+description: Checking if creating the String.prototype.toLowerCase object fails
+includes: [$FAIL.js]
+---*/
 
 var __FACTORY = String.prototype.toLowerCase;
 
@@ -18,5 +17,3 @@ try {
     $ERROR('#1.1: var __FACTORY = String.prototype.toLowerCase; "__instance = new __FACTORY" throws a TypeError. Actual: ' + (e));  
   }
 };
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A8.js
index 3c155cce3..5d9f8a0cc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLowerCase.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A8.js
- * @description Checking if enumerating the String.prototype.toLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLowerCase.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the String.prototype.toLowerCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +41,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A9.js
index f559e4c29..41f260e53 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLowerCase.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.16/S15.5.4.16_A9.js
- * @description Checking if deleting the String.prototype.toLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLowerCase.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.toLowerCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.toLowerCase.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A10.js
index a702ec2ce..d62d2583d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleLowerCase.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A10.js
- * @description Checking if varying the String.prototype.toLocaleLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleLowerCase.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.toLocaleLowerCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +30,3 @@ if (String.prototype.toLocaleLowerCase.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A11.js
index 3fd223e90..271836029 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toLocaleLowerCase method is 0
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A11.js
- * @description Checking String.prototype.toLocaleLowerCase.length
- */
+/*---
+info: The length property of the toLocaleLowerCase method is 0
+description: Checking String.prototype.toLocaleLowerCase.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.toLocaleLowerCase.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T1.js
index 84029609f..232d85382 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T1.js
- * @description Arguments is true, and instance is object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Arguments is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.toLocaleLowerCase() !== "true") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T10.js
index 73445f1a1..ae5c61bd4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T10.js
- * @description Call toLocaleLowerCase() function of object with overrode toString function
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: >
+    Call toLocaleLowerCase() function of object with overrode toString
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
@@ -18,4 +18,3 @@ if (__obj.toLocaleLowerCase() !=="ab") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T11.js
index 6b99d9775..e3e6c6347 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T11.js
- * @description Override toString function, toString throw exception, then call toLocaleLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: >
+    Override toString function, toString throw exception, then call
+    toLocaleLowerCase() function for this object
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}}
 __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
@@ -23,4 +24,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T12.js
index 20cfc2a60..5b2ea0185 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T12.js
- * @description Override toString and valueOf functions, valueOf throw exception, then call toLocaleLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+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";}}
 __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
@@ -23,4 +24,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T13.js
index 3a229454e..8a40856be 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T13.js
- * @description Override toString and valueOf functions, then call toLocaleLowerCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: >
+    Override toString and valueOf functions, then call
+    toLocaleLowerCase() function for this object
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 __obj.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
@@ -26,4 +26,3 @@ if (__obj.toLocaleLowerCase().length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T14.js
index 8e474fbb2..77e9475e9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T14.js
- * @description Call toLocaleLowerCase() function for RegExp object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function for RegExp object
+---*/
 
 var __reg = new RegExp("ABC");
 __reg.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
@@ -18,4 +16,3 @@ if (__reg.toLocaleLowerCase() !== "/abc/") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T2.js
index 125a18a77..8ad761234 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T2.js
- * @description Instance is Boolean object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Instance is Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.toLocaleLowerCase() !== "false") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T3.js
index e74aa0758..25f93c70e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Checking by using eval
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (eval("\"BJ\"").toLocaleLowerCase() !== "bj") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T4.js
index b229a10ee..c854a8191 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T4.js
- * @description Call toLocaleLowerCase() function without arguments of string and from empty string
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: >
+    Call toLocaleLowerCase() function without arguments of string and
+    from empty string
+---*/
 
 var __lowerCase = "".toLocaleLowerCase();
 
@@ -43,4 +43,3 @@ if (__lowerCase[0]!==__expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T5.js
index ebf6c4f41..5ff97afee 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T5.js
- * @description Call toLocaleLowerCase() function for function call
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function for function call
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "GnulLuNa"}().toLocaleLowerCase() !== "gnulluna") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T6.js
index 0f3a4999e..f84f37f24 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T6.js
- * @description Call toLocaleLowerCase() function of Number.NEGATIVE_INFINITY
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function of Number.NEGATIVE_INFINITY
+---*/
 
 Number.prototype.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
 
@@ -17,4 +15,3 @@ if ((Number.NEGATIVE_INFINITY).toLocaleLowerCase() !== "-infinity") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T7.js
index c85cbc297..68619e03d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T7.js
- * @description Call toLocaleLowerCase() function of NaN
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function of NaN
+---*/
 
 Number.prototype.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
 
@@ -17,4 +15,3 @@ if (NaN.toLocaleLowerCase()!== "nan") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T8.js
index 767b6f4af..0254c40ba 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T8.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T8.js
- * @description Call toLocaleLowerCase() function of Infinity
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function of Infinity
+---*/
 
 Number.prototype.toLocaleLowerCase = String.prototype.toLocaleLowerCase;
 
 if (Infinity.toLocaleLowerCase()!== "infinity") {
   $ERROR('#1: Number.prototype.toLocaleLowerCase = String.prototype.toLocaleLowerCase; Infinity.toLocaleLowerCase()=== "infinity". Actual: '+Infinity.toLocaleLowerCase());
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T9.js
index c73249b6c..e90df0c6d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A1_T9.js
- * @description Call toLocaleLowerCase() function of string object
- */
+/*---
+info: String.prototype.toLocaleLowerCase()
+description: Call toLocaleLowerCase() function of string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -51,4 +49,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A2_T1.js
index 012b0af9f..f18989b04 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase() return a string, but not a String object
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A2_T1.js
- * @description Checking returned result
- */
+/*---
+info: >
+    String.prototype.toLocaleLowerCase() return a string, but not a String
+    object
+description: Checking returned result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,4 +31,3 @@ if ("Hello, WoRlD!".toLocaleLowerCase() === new String("hello, world!")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A6.js
index 588d8b5cf..3f1372ce5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A6.js
- * @description Checking String.prototype.toLocaleLowerCase.prototype
- */
+/*---
+info: String.prototype.toLocaleLowerCase has not prototype property
+description: Checking String.prototype.toLocaleLowerCase.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.toLocaleLowerCase.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A7.js
index 7e7ad4d47..8fe77c3be 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A7.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleLowerCase can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A7.js
- * @description Checking if creating the String.prototype.toLocaleLowerCase object fails
- */
+/*---
+info: String.prototype.toLocaleLowerCase can't be used as constructor
+description: >
+    Checking if creating the String.prototype.toLocaleLowerCase object
+    fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.toLocaleLowerCase;
 
@@ -19,4 +22,3 @@ try {
   }
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A8.js
index f60e7d9e8..ef3ceec9e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleLowerCase.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A8.js
- * @description Checking if enumerating the String.prototype.toLocaleLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleLowerCase.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the
+    String.prototype.toLocaleLowerCase.length property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +41,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A9.js
index 9033c64c5..159fca472 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleLowerCase.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.17/S15.5.4.17_A9.js
- * @description Checking if deleting the String.prototype.toLocaleLowerCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleLowerCase.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.toLocaleLowerCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.toLocaleLowerCase.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A10.js
index 98f3bdd84..889c1968d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toUpperCase.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A10.js
- * @description Checking if varying the String.prototype.toUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toUpperCase.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.toUpperCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +30,3 @@ if (String.prototype.toUpperCase.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A11.js
index b6a2b2bf4..fa7a32f34 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toUpperCase method is 0
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A11.js
- * @description Checking String.prototype.toUpperCase.length
- */
+/*---
+info: The length property of the toUpperCase method is 0
+description: Checking String.prototype.toUpperCase.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.toUpperCase.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T1.js
index c67e6f9cd..c0ebce236 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T1.js
- * @description Arguments is true, and instance is object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Arguments is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.toUpperCase() !== "TRUE") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T10.js
index 95eadfd0a..6698abea2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T10.js
- * @description Call toUpperCase() function of object with overrode toString function
- */
+/*---
+info: String.prototype.toUpperCase()
+description: >
+    Call toUpperCase() function of object with overrode toString
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0041b";}}
 __obj.toUpperCase = String.prototype.toUpperCase;
@@ -18,4 +18,3 @@ if (__obj.toUpperCase() !=="AB") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T11.js
index ebc278f9b..1b56f26b4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T11.js
- * @description Override toString function, toString throw exception, then call toUpperCase() function for this object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: >
+    Override toString function, toString throw exception, then call
+    toUpperCase() function for this object
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}}
 __obj.toUpperCase = String.prototype.toUpperCase;
@@ -22,4 +23,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T12.js
index 2ffd076df..62faeaea4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T12.js
- * @description Override toString and valueOf functions, valueOf throw exception, then call toUpperCase() function for this object
- */
+/*---
+info: String.prototype.toUpperCase()
+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";}}
 __obj.toUpperCase = String.prototype.toUpperCase;
@@ -22,4 +23,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T13.js
index 943aaf196..7b15b6618 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T13.js
- * @description Override toString and valueOf functions, then call toUpperCase() function for this object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: >
+    Override toString and valueOf functions, then call toUpperCase()
+    function for this object
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 __obj.toUpperCase = String.prototype.toUpperCase;
@@ -26,4 +26,3 @@ if (__obj.toUpperCase().length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T14.js
index b292c07e4..54d358519 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T14.js
- * @description Call toUpperCase() function of RegExp object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of RegExp object
+---*/
 
 var __reg = new RegExp("abc");
 __reg.toUpperCase = String.prototype.toUpperCase;
@@ -17,4 +15,3 @@ if (__reg.toUpperCase() !== "/ABC/") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T2.js
index ab7f4a937..9f928e99f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T2.js
- * @description Instance is Boolean object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Instance is Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.toUpperCase() !== "FALSE") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T3.js
index 9718313ae..542a54e18 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Checking by using eval
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (eval("\"bj\"").toUpperCase() !== "BJ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T4.js
index 431961181..59c770313 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T4.js
- * @description Call toUpperCase() function without arguments of string and from empty string
- */
+/*---
+info: String.prototype.toUpperCase()
+description: >
+    Call toUpperCase() function without arguments of string and from
+    empty string
+---*/
 
 var __lowerCase = "".toUpperCase();
 
@@ -43,4 +43,3 @@ if (__lowerCase[0]!==__expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T5.js
index 00befc974..f1081bb1f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T5.js
- * @description Call toUpperCase() function of function call
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of function call
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "GnulLuNa"}().toUpperCase() !== "GNULLUNA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T6.js
index 5c48ce795..7908fb613 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T6.js
- * @description Call toUpperCase() function of Number.NEGATIVE_INFINITY
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of Number.NEGATIVE_INFINITY
+---*/
 
 Number.prototype.toUpperCase = String.prototype.toUpperCase;
 
@@ -17,4 +15,3 @@ if ((Number.NEGATIVE_INFINITY).toUpperCase() !== "-INFINITY") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T7.js
index 045d73371..b936cfda7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T7.js
- * @description Call toUpperCase() function of NaN
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of NaN
+---*/
 
 Number.prototype.toUpperCase = String.prototype.toUpperCase;
 
@@ -17,4 +15,3 @@ if (NaN.toUpperCase()!== "NAN") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T8.js
index 41f695e98..b4f6025a6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T8.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T8.js
- * @description Call toUpperCase() function of Infinity;
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of Infinity;
+---*/
 
 Number.prototype.toUpperCase = String.prototype.toUpperCase;
 
 if (Infinity.toUpperCase()!== "INFINITY") {
   $ERROR('#1: Number.prototype.toUpperCase = String.prototype.toUpperCase; Infinity.toUpperCase()=== "INFINITY". Actual: '+Infinity.toUpperCase());
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T9.js
index bdf3e1f0d..bd12a025e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A1_T9.js
- * @description Call toUpperCase() function of string object
- */
+/*---
+info: String.prototype.toUpperCase()
+description: Call toUpperCase() function of string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -50,4 +48,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A2_T1.js
index 2a3aee0e7..3da9e7c39 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase() return a string, but not a String object
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A2_T1.js
- * @description Checking returned result
- */
+/*---
+info: String.prototype.toUpperCase() return a string, but not a String object
+description: Checking returned result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,4 +29,3 @@ if ("Hello, WoRlD!".toUpperCase() ===new String("HELLO, WORLD!")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A6.js
index 236154391..7114cc1f5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A6.js
- * @description Checking String.prototype.toUpperCase.prototype
- */
+/*---
+info: String.prototype.toUpperCase has not prototype property
+description: Checking String.prototype.toUpperCase.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.toUpperCase.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A7.js
index 1f443008a..a9fd9dcaa 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A7.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toUpperCase can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A7.js
- * @description Checking if creating the String.prototype.toUpperCase object fails
- */
+/*---
+info: String.prototype.toUpperCase can't be used as constructor
+description: Checking if creating the String.prototype.toUpperCase object fails
+includes: [$FAIL.js]
+---*/
 
 var __FACTORY = String.prototype.toUpperCase;
 
@@ -18,4 +17,3 @@ try {
     $ERROR('#1.1: var __FACTORY = String.prototype.toUpperCase; "__instance = new __FACTORY" throw a TypeError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A8.js
index ffd0737e9..4ac33f5a6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toUpperCase.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A8.js
- * @description Checking if enumerating the String.prototype.toUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toUpperCase.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the String.prototype.toUpperCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +41,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A9.js
index 575fddb02..8f1e52932 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toUpperCase.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.18/S15.5.4.18_A9.js
- * @description Checking if deleting the String.prototype.toUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toUpperCase.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.toUpperCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.toUpperCase.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A10.js
index 8be67c2cc..e125038a1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleUpperCase.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A10.js
- * @description Checking if varying the String.prototype.toLocaleUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleUpperCase.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.toLocaleUpperCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +30,3 @@ if (String.prototype.toLocaleUpperCase.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A11.js
index 5d00ec411..e2cdb6330 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toLocaleUpperCase method is 0
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A11.js
- * @description Checking String.prototype.toLocaleUpperCase.length
- */
+/*---
+info: The length property of the toLocaleUpperCase method is 0
+description: Checking String.prototype.toLocaleUpperCase.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.toLocaleUpperCase.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T1.js
index 1a5c847ed..21f00e2ff 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T1.js
- * @description Arguments is true, and instance is object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Arguments is true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.toLocaleUpperCase() !== "TRUE") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T10.js
index 20d2f9ec1..0d1ae91ef 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T10.js
- * @description Call toLocaleUpperCase() function of object with overrode toString function
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: >
+    Call toLocaleUpperCase() function of object with overrode toString
+    function
+---*/
 
 var __obj = {toString:function(){return "\u0041b";}}
 __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
@@ -18,4 +18,3 @@ if (__obj.toLocaleUpperCase() !=="AB") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T11.js
index 2cb6d82e2..06cdf0848 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T11.js
- * @description Override toString function, toString throw exception, then call toLocaleUpperCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: >
+    Override toString function, toString throw exception, then call
+    toLocaleUpperCase() function for this object
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}}
 __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
@@ -22,4 +23,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T12.js
index 8f50b6ff7..033b094c9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T12.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T12.js
- * @description Override toString and valueOf functions, valueOf throw exception, then call toLocaleUpperCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+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";}}
 __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
@@ -22,4 +23,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T13.js
index ee407e2d5..48e1942c6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T13.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T13.js
- * @description Override toString and valueOf functions, then call toLocaleUpperCase() function for this object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: >
+    Override toString and valueOf functions, then call
+    toLocaleUpperCase() function for this object
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){return 1;}}
 __obj.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
@@ -25,4 +25,3 @@ if (__obj.toLocaleUpperCase().length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T14.js
index 62a343b5c..f54e98ef5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T14.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T14.js
- * @description Call toLocaleUpperCase() function for RegExp object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function for RegExp object
+---*/
 
 var __reg = new RegExp("abc");
 __reg.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
@@ -17,4 +15,3 @@ if (__reg.toLocaleUpperCase() !== "/ABC/") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T2.js
index 72acb65e3..536631282 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T2.js
- * @description Instance is Boolean object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Instance is Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.toLocaleUpperCase() !== "FALSE") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T3.js
index 021fe7abd..9acaebb78 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T3.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Checking by using eval
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (eval("\"bj\"").toLocaleUpperCase() !== "BJ") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T4.js
index 3f4280378..11f92119c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T4.js
- * @description Call toLocaleUpperCase() function without arguments of string and from empty string
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: >
+    Call toLocaleUpperCase() function without arguments of string and
+    from empty string
+---*/
 
 var __lowerCase = "".toLocaleUpperCase();
 var __expected = ""; 
@@ -42,4 +42,3 @@ if (__lowerCase[0]!==__expected[0]) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T5.js
index 1a341f4f0..b96342ae4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T5.js
- * @description Call toLocaleUpperCase() function of function call
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function of function call
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "GnulLuNa"}().toLocaleUpperCase() !== "GNULLUNA") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T6.js
index a365a6305..09cf28b66 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T6.js
- * @description Call toLocaleUpperCase() function of Number.NEGATIVE_INFINITY
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function of Number.NEGATIVE_INFINITY
+---*/
 
 Number.prototype.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
 
@@ -17,5 +15,3 @@ if ((Number.NEGATIVE_INFINITY).toLocaleUpperCase() !== "-INFINITY") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T7.js
index 24789c2fd..e71cadec9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T7.js
- * @description Call toLocaleUpperCase() function of NaN
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function of NaN
+---*/
 
 Number.prototype.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
 
@@ -17,4 +15,3 @@ if (NaN.toLocaleUpperCase()!== "NAN") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T8.js
index a1ab41573..d910279d1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T8.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T8.js
- * @description Call toLocaleUpperCase() function of Infinity
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function of Infinity
+---*/
 
 Number.prototype.toLocaleUpperCase = String.prototype.toLocaleUpperCase;
 
 if (Infinity.toLocaleUpperCase()!== "INFINITY") {
   $ERROR('#1: Number.prototype.toLocaleUpperCase = String.prototype.toLocaleUpperCase; Infinity.toLocaleUpperCase()=== "INFINITY". Actual: '+Infinity.toLocaleUpperCase());
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T9.js
index 39e3aef5a..2218566e2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T9.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase()
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A1_T9.js
- * @description Call toLocaleUpperCase() function of string object
- */
+/*---
+info: String.prototype.toLocaleUpperCase()
+description: Call toLocaleUpperCase() function of string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -50,4 +48,3 @@ for(var index=0; index<__expected.length; index++) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A2_T1.js
index 210ec9b82..223ca7e84 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A2_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase() return a string, but not a String object
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A2_T1.js
- * @description Checking returned result
- */
+/*---
+info: >
+    String.prototype.toLocaleUpperCase() return a string, but not a String
+    object
+description: Checking returned result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -31,4 +31,3 @@ if ("Hello, WoRlD!".toLocaleUpperCase() ===new String("HELLO, WORLD!")) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A6.js
index 59a8fb70a..39afb3b4f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A6.js
- * @description Checking String.prototype.toLocaleUpperCase.prototype
- */
+/*---
+info: String.prototype.toLocaleUpperCase has not prototype property
+description: Checking String.prototype.toLocaleUpperCase.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.toLocaleUpperCase.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A7.js
index d5ac01624..f4385bc29 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toLocaleUpperCase can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A7.js
- * @description Checking if creating the String.prototype.toLocaleUpperCase object fails
- */
+/*---
+info: String.prototype.toLocaleUpperCase can't be used as constructor
+description: >
+    Checking if creating the String.prototype.toLocaleUpperCase object
+    fails
+includes: [$FAIL.js]
+---*/
 
 var __FACTORY = String.prototype.toLocaleUpperCase;
 
@@ -18,4 +19,3 @@ try {
     $ERROR('#1.1:  var __instance = new __FACTORY;  Object has no construct lead  a TypeError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A8.js
index a2bea7095..ae4278b16 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleUpperCase.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A8.js
- * @description Checking if enumerating the String.prototype.toLocaleUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleUpperCase.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the
+    String.prototype.toLocaleUpperCase.length property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +41,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A9.js
index 05c09831e..ddab77368 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.toLocaleUpperCase.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.19/S15.5.4.19_A9.js
- * @description Checking if deleting the String.prototype.toLocaleUpperCase.length property fails
- */
+/*---
+info: >
+    The String.prototype.toLocaleUpperCase.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.toLocaleUpperCase.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.toLocaleUpperCase.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-1.js
index 79169e5ea..6ec0605ab 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-1.js

- * @description String.prototype.trim must exist as a function

- */

-

-

-function testcase() {

-  var f = String.prototype.trim;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = String.prototype.trim;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-2.js
index b398bbbfd..bed4f646b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-0-2.js

- * @description String.prototype.trim must exist as a function taking 0 parameters

- */

-

-

-function testcase() {

-  if (String.prototype.trim.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim must exist as a function taking 0 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (String.prototype.trim.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-1.js
index 25ed95e5e..919519085 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-1.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-1.js

- * @description String.prototype.trim throws TypeError when string is undefined

- */

-

-

-function testcase() {

-  try

-  {

-    String.prototype.trim.call(undefined); 

-    return false; 

-  }

-  catch(e)

-  {

-    return e instanceof TypeError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim throws TypeError when string is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    String.prototype.trim.call(undefined); 
+    return false; 
+  }
+  catch(e)
+  {
+    return e instanceof TypeError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-2.js
index 59fbdf1c0..f6bae3ed3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-2.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-2.js

- * @description String.prototype.trim throws TypeError when string is null

- */

-

-

-function testcase() {

-  try

-  {

-    String.prototype.trim.call(null);  

-    return false;

-  }

-  catch(e)

-  {

-    return e instanceof TypeError;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim throws TypeError when string is null
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    String.prototype.trim.call(null);  
+    return false;
+  }
+  catch(e)
+  {
+    return e instanceof TypeError;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-3.js
index 44d698147..cc416842a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-3.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-3.js

- * @description String.prototype.trim works for primitive type boolean

- */

-

-

-function testcase() {

-  try

-  {

-    if(String.prototype.trim.call(true) == "true")

-      return true;

-  }

-  catch(e)

-  {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim works for primitive type boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    if(String.prototype.trim.call(true) == "true")
+      return true;
+  }
+  catch(e)
+  {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-4.js
index 45427be32..5fbb5b8de 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-4.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-4.js

- * @description String.prototype.trim works for primitive type number

- */

-

-

-function testcase() {

-  try

-  {

-    if(String.prototype.trim.call(0) == "0") 

-      return true;

-  }

-  catch(e)

-  {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim works for primitive type number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    if(String.prototype.trim.call(0) == "0") 
+      return true;
+  }
+  catch(e)
+  {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-5.js
index 5a52aefb4..59c7b5ac0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-5.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-5.js

- * @description String.prototype.trim works for an Object

- */

-

-

-function testcase() {

-  try

-  {

-    if(String.prototype.trim.call({})=="[object Object]")

-      return true;

-  }

-  catch(e)

-  {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim works for an Object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    if(String.prototype.trim.call({})=="[object Object]")
+      return true;
+  }
+  catch(e)
+  {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-6.js
index 58cc06917..94ba05ac4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-6.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-6.js

- * @description String.prototype.trim works for an String

- */

-

-

-function testcase() {

-  try

-  {

-    if(String.prototype.trim.call(new String()) == "")

-      return true;

-  }

-  catch(e)

-  {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim works for an String
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    if(String.prototype.trim.call(new String()) == "")
+      return true;
+  }
+  catch(e)
+  {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-7.js
index eeba20fd9..f5e2ccfef 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-7.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-7.js

- * @description String.prototype.trim works for a primitive string

- */

-

-

-function testcase() {

-  try

-  {

-    if(String.prototype.trim.call("abc") === "abc")  

-      return true;

-  }

-  catch(e)

-  {

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim works for a primitive string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try
+  {
+    if(String.prototype.trim.call("abc") === "abc")  
+      return true;
+  }
+  catch(e)
+  {
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-8.js
index 834bcd3c8..332805171 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-8.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-8.js

- * @description String.prototype.trim works for a primitive string (value is '    abc') 

- */

-

-

-function testcase() {

-        var strObj = String("    abc");

-        return "abc" === strObj.trim() && strObj.toString() === "    abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim works for a primitive string (value is '
+    abc')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = String("    abc");
+        return "abc" === strObj.trim() && strObj.toString() === "    abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-9.js
index d7e1e1275..a647b72a9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-9.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-1-9.js

- * @description String.prototype.trim works for a String object which value is undefined

- */

-

-

-function testcase() {

-        var strObj = new String(undefined);

-        return strObj.trim() === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim works for a String object which value is
+    undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var strObj = new String(undefined);
+        return strObj.trim() === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-1.js
index 9c9163894..7f06cc45f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-1.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-1.js

- * @description String.prototype.trim - argument 'this' is a boolean whose value is false

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(false) === "false";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a boolean whose value
+    is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(false) === "false";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-10.js
index 799243a29..a67144e6d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-10.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-10.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is +Infinity)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(+Infinity) === "Infinity";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is +Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(+Infinity) === "Infinity";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-11.js
index 030844255..a1ca4451a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-11.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-11.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is -Infinity)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(-Infinity) === "-Infinity";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is -Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(-Infinity) === "-Infinity";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-12.js
index ee786b0bc..b7d881dd9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-12.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-12.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1(following 20 zeros))

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(100000000000000000000) === "100000000000000000000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1(following 20 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(100000000000000000000) === "100000000000000000000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-13.js
index 3018d93bf..d567456b8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-13.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-13.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1(following 21 zeros))

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1000000000000000000000) === "1e+21";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1(following 21 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1000000000000000000000) === "1e+21";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-14.js
index 9e7d0863f..ef235f30c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-14.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-14.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1(following 22 zeros))

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(10000000000000000000000) === "1e+22";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1(following 22 zeros))
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(10000000000000000000000) === "1e+22";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-15.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-15.js
index 01f322384..ec5a09815 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-15.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-15.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-15.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1e+20)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e+20) === "100000000000000000000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1e+20)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e+20) === "100000000000000000000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-16.js
index 49bbcae8d..2a5c14c36 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-16.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-16.js

- * @description String.prototype.trim - argument 'this' is a number that converts to string (value is 1e+21)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e+21) === "1e+21";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to string (value is 1e+21)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e+21) === "1e+21";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-17.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-17.js
index 311f85030..b28f0b6c9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-17.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-17.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-17.js

- * @description String.prototype.trim - argument 'this' is a number that converts to string (value is 1e+22)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e+22) === "1e+22";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to string (value is 1e+22)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e+22) === "1e+22";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-18.js
index a8338d4f3..c5bda3ded 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-18.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-18.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 0.000001)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(0.000001) === "0.000001";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 0.000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(0.000001) === "0.000001";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-19.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-19.js
index 1697f61ad..65937d246 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-19.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-19.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-19.js

- * @description String.prototype.trim - argument argument 'this' is a number that converts to a string (value is 0.0000001)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(0.0000001) === "1e-7";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument argument 'this' is a number that
+    converts to a string (value is 0.0000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(0.0000001) === "1e-7";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-2.js
index f92684bde..af7aa3125 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-2.js

- * @description String.prototype.trim - argument 'this' is a boolean whose value is true

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(true) === "true";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a boolean whose value
+    is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(true) === "true";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-20.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-20.js
index 80684263d..de2d9fac4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-20.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-20.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-20.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 0.00000001)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(0.00000001) === "1e-8";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 0.00000001)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(0.00000001) === "1e-8";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-21.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-21.js
index 2810c3826..ddc4812f3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-21.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-21.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-21.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1e-7)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e-7) === "1e-7";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1e-7)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e-7) === "1e-7";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-22.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-22.js
index e6f2f06b9..796b6495c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-22.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-22.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-22.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1e-6)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e-6) === "0.000001";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1e-6)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e-6) === "0.000001";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-23.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-23.js
index 7bbbc38c9..e2a3cc527 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-23.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-23.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-23.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1e-5)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(1e-5) === "0.00001";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1e-5)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(1e-5) === "0.00001";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-24.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-24.js
index 4fa0a9569..05819ae06 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-24.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-24.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-24.js

- * @description String.prototype.trim - argument 'this' is an integer that converts to a string (value is 123)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(123) === "123";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is an integer that
+    converts to a string (value is 123)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(123) === "123";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-25.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-25.js
index 6da83849f..2773ab7d8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-25.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-25.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-25.js

- * @description String.prototype.trim - argument 'this' is a decimal that converts to a string (value is 123.456)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(123.456) === "123.456";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a decimal that converts
+    to a string (value is 123.456)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(123.456) === "123.456";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-26.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-26.js
index 1897b31df..29d1a251a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-26.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-26.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-26.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 1(following 20 zeros).123)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(100000000000000000000.123) === "100000000000000000000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 1(following 20 zeros).123)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(100000000000000000000.123) === "100000000000000000000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-27.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-27.js
index 5016000aa..8fb9a1443 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-27.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-27.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-27.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 123.1234567)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(123.1234567) === "123.1234567";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 123.1234567)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(123.1234567) === "123.1234567";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-28.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-28.js
index 46d87e7b6..83144bddf 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-28.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-28.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-28.js

- * @description String.prototype.trim - argument 'this' is an empty string 

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("") === "";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - argument 'this' is an empty string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("") === "";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-29.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-29.js
index 9dcbb5eda..2a27d4b71 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-29.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-29.js
@@ -1,16 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-29.js

- * @description String.prototype.trim - argument 'this' is a string(value is 'AB

- * \cd')

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("AB\n\\cd") === "AB\n\\cd";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a string(value is 'AB
+    \cd')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("AB\n\\cd") === "AB\n\\cd";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-3.js
index 2430fdb00..1081fa4bd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-3.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-3.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is NaN)

- */

-

-function testcase() {

-        return String.prototype.trim.call(NaN) === "NaN";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is NaN)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(NaN) === "NaN";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-30.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-30.js
index 9008c60c4..fc9e1b38b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-30.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-30.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-30.js

- * @description String.prototype.trim - argument 'this' is a string(value is 'undefined') 

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("undefined") === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a string(value is
+    'undefined')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("undefined") === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-31.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-31.js
index 6b4dc4baf..0ae17a6f7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-31.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-31.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-31.js

- * @description String.prototype.trim - argument 'this' is a string(value is 'null') 

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("null") === "null";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a string(value is
+    'null')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("null") === "null";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-32.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-32.js
index c1cf69927..7e6ff1162 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-32.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-32.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-32.js

- * @description String.prototype.trim - argument 'this' is a string(value is '123#$%abc')

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("123#$%abc") === "123#$%abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a string(value is
+    '123#$%abc')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("123#$%abc") === "123#$%abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-33.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-33.js
index fc849ec9d..a30109d79 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-33.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-33.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-33.js

- * @description String.prototype.trim - argument 'this' is a string(value is '1')

- */

-

-

-function testcase() {

-        return String.prototype.trim.call("1") === "1";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - argument 'this' is a string(value is '1')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call("1") === "1";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-34.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-34.js
index 31cf3dfe7..d3a69d194 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-34.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-34.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-34.js

- * @description String.prototype.trim - 'this' is an array that converts to a string

- */

-

-

-function testcase() {

-        return (String.prototype.trim.call([1]) === '1');

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an array that converts to a
+    string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (String.prototype.trim.call([1]) === '1');
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-35.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-35.js
index 5dd2f142a..cf8ae4675 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-35.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-35.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-35.js

- * @description String.prototype.trim - 'this' is a String Object that converts to a string

- */

-

-

-function testcase() {

-        return (String.prototype.trim.call(new String("abc")) === "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a String Object that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (String.prototype.trim.call(new String("abc")) === "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-36.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-36.js
index 7ef134087..1faa6da30 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-36.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-36.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-36.js

- * @description String.prototype.trim - 'this' is a Boolean Object that converts to a string

- */

-

-

-function testcase() {

-        return (String.prototype.trim.call(new Boolean(false)) === "false");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a Boolean Object that converts
+    to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (String.prototype.trim.call(new Boolean(false)) === "false");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-37.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-37.js
index a10bfd477..b82981e7a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-37.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-37.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-37.js

- * @description String.prototype.trim - 'this' is a Number Object that converts to a string

- */

-

-

-function testcase() {

-        return (String.prototype.trim.call(new Number(123)) === "123");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a Number Object that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return (String.prototype.trim.call(new Number(123)) === "123");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-38.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-38.js
index dcdb7ec19..aa4a66cc8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-38.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-38.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-38.js

- * @description String.prototype.trim - 'this' is an object which has an own toString method

- */

-

-

-function testcase() {

-        var obj = {

-            toString: function () {

-                return "abc";

-            }

-        };

-

-        return (String.prototype.trim.call(obj) === "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an object which has an own
+    toString method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {
+            toString: function () {
+                return "abc";
+            }
+        };
+
+        return (String.prototype.trim.call(obj) === "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-39.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-39.js
index 5cc60088f..9a7239e02 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-39.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-39.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-39.js

- * @description String.prototype.trim - 'this' is an object which has an own valueOf method

- */

-

-

-function testcase() {

-        var obj = {

-            valueOf: function () {

-                return "abc";

-            }

-        };

-

-        return (String.prototype.trim.call(obj) === "[object Object]");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an object which has an own
+    valueOf method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = {
+            valueOf: function () {
+                return "abc";
+            }
+        };
+
+        return (String.prototype.trim.call(obj) === "[object Object]");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-4.js
index f8cf35917..834bd14f9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-4.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-4.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is 0)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(0) === "0";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is 0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(0) === "0";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-40.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-40.js
index b2b014641..a74b353c6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-40.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-40.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-40.js

- * @description String.prototype.trim - 'this' is an object that has an own toString method that returns an object and valueOf method that returns a primitive value

- */

-

-

-function testcase() {

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-        var obj = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "abc";

-            }

-        };

-        return (String.prototype.trim.call(obj) === "abc") && valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an object that has an own
+    toString method that returns an object and valueOf method that
+    returns a primitive value
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+        var obj = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "abc";
+            }
+        };
+        return (String.prototype.trim.call(obj) === "abc") && valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-41.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-41.js
index 16010f310..e3c218928 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-41.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-41.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-41.js

- * @description String.prototype.trim - 'this' is an object which has an own toString and valueOf method.

- */

-

-

-function testcase() {

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-        var obj = {

-            toString: function () {

-                toStringAccessed = true;

-                return "abc";

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return "cef";

-            }

-        };

-        return (String.prototype.trim.call(obj) === "abc") && !valueOfAccessed && toStringAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an object which has an own
+    toString and valueOf method.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+        var obj = {
+            toString: function () {
+                toStringAccessed = true;
+                return "abc";
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return "cef";
+            }
+        };
+        return (String.prototype.trim.call(obj) === "abc") && !valueOfAccessed && toStringAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-42.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-42.js
index 79276eb30..fddf7aef9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-42.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-42.js
@@ -1,32 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-42.js

- * @description String.prototype.trim - TypeError exception was thrown  when 'this' is an object that both toString and valueOf wouldn't return primitive value.

- */

-

-

-function testcase() {

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-        var obj = {

-            toString: function () {

-                toStringAccessed = true;

-                return {};

-            },

-            valueOf: function () {

-                valueOfAccessed = true;

-                return {};

-            }

-        };

-        try {

-            String.prototype.trim.call(obj);

-            return false;

-        } catch (e) {

-            return valueOfAccessed && toStringAccessed && (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - TypeError exception was thrown  when
+    'this' is an object that both toString and valueOf wouldn't return
+    primitive value.
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+        var obj = {
+            toString: function () {
+                toStringAccessed = true;
+                return {};
+            },
+            valueOf: function () {
+                valueOfAccessed = true;
+                return {};
+            }
+        };
+        try {
+            String.prototype.trim.call(obj);
+            return false;
+        } catch (e) {
+            return valueOfAccessed && toStringAccessed && (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-43.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-43.js
index a100e3dfa..96c548f72 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-43.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-43.js
@@ -1,34 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-43.js

- * @description String.prototype.trim - 'this' is an object with an own valueOf and inherited toString methods with hint string, verify inherited toString method will be called first

- */

-

-

-function testcase() {

-

-        var toStringAccessed = false;

-        var valueOfAccessed = false;

-

-        var proto = {

-            toString: function () {

-                toStringAccessed = true;

-                return "abc";

-            }

-        };

-

-        var Con = function () { };

-        Con.prototype = proto;

-

-        var child = new Con();

-        child.valueOf = function () {

-            valueOfAccessed = true;

-            return "efg";

-        };

-        return (String.prototype.trim.call(child) === "abc") && toStringAccessed && !valueOfAccessed;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is an object with an own valueOf
+    and inherited toString methods with hint string, verify inherited
+    toString method will be called first
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var toStringAccessed = false;
+        var valueOfAccessed = false;
+
+        var proto = {
+            toString: function () {
+                toStringAccessed = true;
+                return "abc";
+            }
+        };
+
+        var Con = function () { };
+        Con.prototype = proto;
+
+        var child = new Con();
+        child.valueOf = function () {
+            valueOfAccessed = true;
+            return "efg";
+        };
+        return (String.prototype.trim.call(child) === "abc") && toStringAccessed && !valueOfAccessed;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-44.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-44.js
index b92ed088a..c9d258329 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-44.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-44.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-44.js

- * @description String.prototype.trim - 'this' is a string that contains east Asian characters (value is 'SD咕噜')

- */

-

-

-function testcase() {

-        var str = "SD咕噜";

-        return str.trim() === str;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a string that contains east
+    Asian characters (value is 'SD咕噜')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = "SD咕噜";
+        return str.trim() === str;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-45.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-45.js
index 7d58bc7c9..133591c8b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-45.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-45.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-45.js

- * @description String.prototype.trim - 'this' is a string that contains white space, character, number, object and null characters

- */

-

-

-function testcase() {

-        var str = "abc" + "   " + 123 + "   " + {} + "    " + "\u0000";

-        var str1 = "    " + str + "    ";

-        return str1.trim() === str;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a string that contains white
+    space, character, number, object and null characters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var str = "abc" + "   " + 123 + "   " + {} + "    " + "\u0000";
+        var str1 = "    " + str + "    ";
+        return str1.trim() === str;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-46.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-46.js
index fec8f9e58..87a357bf7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-46.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-46.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-46.js

- * @description String.prototype.trim - 'this' is a Function Object that converts to a string

- */

-

-

-function testcase() {

-        var funObj = function () { return arguments; };

-        return typeof(String.prototype.trim.call(funObj)) === "string";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a Function Object that converts
+    to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var funObj = function () { return arguments; };
+        return typeof(String.prototype.trim.call(funObj)) === "string";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-47.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-47.js
index 6a27f832e..8a7811201 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-47.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-47.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-47.js

- * @description String.prototype.trim - 'this' is a object Object that converts to a string

- */

-

-

-function testcase() {

-        return String.prototype.trim.call({}) === "[object Object]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a object Object that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call({}) === "[object Object]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-49.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-49.js
index bce2031ee..884df0e5b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-49.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-49.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-49.js

- * @description String.prototype.trim - 'this' is a RegExp Object that converts to a string

- */

-

-

-function testcase() {

-        var regObj = new RegExp(/test/);

-        return String.prototype.trim.call(regObj) === "/test/";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a RegExp Object that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var regObj = new RegExp(/test/);
+        return String.prototype.trim.call(regObj) === "/test/";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-5.js
index d1c2a20b2..4d8d7bf47 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-5.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-5.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is +0)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(+0) === "0";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is +0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(+0) === "0";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-50.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-50.js
index 23f4a60b1..6beb07cfe 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-50.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-50.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-50.js

- * @description String.prototype.trim - 'this' is a Error Object that converts to a string

- */

-

-

-function testcase() {

-        var errObj = new Error("test");

-        return String.prototype.trim.call(errObj) === "Error: test";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a Error Object that converts to
+    a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var errObj = new Error("test");
+        return String.prototype.trim.call(errObj) === "Error: test";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-51.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-51.js
index d83df0ce9..c3d400cb7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-51.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-51.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-51.js

- * @description String.prototype.trim - 'this' is a Arguments Object that converts to a string

- */

-

-

-function testcase() {

-        var argObj = function () { return arguments; } (1, 2, true);

-        return String.prototype.trim.call(argObj) === "[object Arguments]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'this' is a Arguments Object that converts
+    to a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var argObj = function () { return arguments; } (1, 2, true);
+        return String.prototype.trim.call(argObj) === "[object Arguments]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-6.js
index 1db5fa422..8e8653c3e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-6.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-6.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is -0)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(-0) === "0";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is -0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(-0) === "0";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-7.js
index b57f0d9bd..068b16256 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-7.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-7.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is positive number)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(30) === "30";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is positive number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(30) === "30";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-8.js
index 3fc21f36a..44f5698bc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-8.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-8.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is negative number)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(-20) === "-20";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is negative number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(-20) === "-20";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-9.js
index 9d6336f3e..4b57e844b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-9.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-2-9.js

- * @description String.prototype.trim - argument 'this' is a number that converts to a string (value is Infinity)

- */

-

-

-function testcase() {

-        return String.prototype.trim.call(Infinity) === "Infinity";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - argument 'this' is a number that converts
+    to a string (value is Infinity)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return String.prototype.trim.call(Infinity) === "Infinity";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-1.js
index 9967f0ea9..c62f49e80 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-1.js

- * @description String.prototype.trim - 'S' is a string with all LineTerminator

- */

-

-

-function testcase() {

-

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        return (lineTerminatorsStr.trim() === "");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - 'S' is a string with all LineTerminator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        return (lineTerminatorsStr.trim() === "");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-10.js
index b580cc034..0a0b0a111 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-10.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-10.js

- * @description String.prototype.trim - 'S' is a string with null character ('\u0000')

- */

-

-

-function testcase() {

-        return "\u0000".trim() === "\u0000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string with null character
+    ('\u0000')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return "\u0000".trim() === "\u0000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-11.js
index 95de0a5b0..9f2e0a7f7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-11.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-11.js

- * @description String.prototype.trim - 'S' is a string that starts with null character

- */

-

-

-function testcase() {

-        return "\0\u0000abc".trim() === "\0\u0000abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string that starts with null
+    character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return "\0\u0000abc".trim() === "\0\u0000abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-12.js
index 6b139a5ff..49c8dc4f9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-12.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-12.js

- * @description String.prototype.trim - 'S' is a string that ends with null character

- */

-

-

-function testcase() {

-        return "abc\0\u0000".trim() === "abc\0\u0000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string that ends with null
+    character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return "abc\0\u0000".trim() === "abc\0\u0000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-13.js
index d71d3c9be..5ca57d6d3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-13.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-13.js

- * @description String.prototype.trim - 'S' is a string that starts with null character and ends with null character

- */

-

-

-function testcase() {

-        return "\0\u0000abc\0\u0000".trim() === "\0\u0000abc\0\u0000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string that starts with null
+    character and ends with null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return "\0\u0000abc\0\u0000".trim() === "\0\u0000abc\0\u0000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-14.js
index 473678549..01a6a98b5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-14.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-14.js

- * @description String.prototype.trim - 'S' is a string that has null character in the middle

- */

-

-

-function testcase() {

-            return "a\0\u0000bc".trim() === "a\0\u0000bc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string that has null character in
+    the middle
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            return "a\0\u0000bc".trim() === "a\0\u0000bc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-2.js
index b749a07f6..841b7ce83 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-2.js

- * @description String.prototype.trim - 'S' is a string with all WhiteSpace

- */

-

-

-function testcase() {

-

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        return (whiteSpacesStr.trim() === "");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - 'S' is a string with all WhiteSpace
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        return (whiteSpacesStr.trim() === "");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-3.js
index 38cadc9af..0d56ae5e2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-3.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-3.js

- * @description String.prototype.trim - 'S' is a string with all union of WhiteSpace and LineTerminator

- */

-

-

-function testcase() {

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        var str = whiteSpacesStr + lineTerminatorsStr;

-

-        return (str.trim() === "");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string with all union of
+    WhiteSpace and LineTerminator
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        var str = whiteSpacesStr + lineTerminatorsStr;
+
+        return (str.trim() === "");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-4.js
index 16388a382..d0ceb6a73 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-4.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-4.js

- * @description String.prototype.trim - 'S' is a string start with union of all LineTerminator and all WhiteSpace

- */

-

-

-function testcase() {

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        var str = whiteSpacesStr + lineTerminatorsStr + "abc";

-

-        return (str.trim() === "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string start with union of all
+    LineTerminator and all WhiteSpace
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        var str = whiteSpacesStr + lineTerminatorsStr + "abc";
+
+        return (str.trim() === "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-5.js
index c9311b9cc..0b48c7149 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-5.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-5.js

- * @description String.prototype.trim - 'S' is a string end with union of all LineTerminator and all WhiteSpace

- */

-

-

-function testcase() {

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        var str = "abc" + whiteSpacesStr + lineTerminatorsStr ;

-

-        return (str.trim() === "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string end with union of all
+    LineTerminator and all WhiteSpace
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        var str = "abc" + whiteSpacesStr + lineTerminatorsStr ;
+
+        return (str.trim() === "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-6.js
index 76ce302b9..f421b3c37 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-6.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-6.js

- * @description String.prototype.trim - 'S' is a string start with union of all LineTerminator and all WhiteSpace and end with union of all LineTerminator and all WhiteSpace

- */

-

-

-function testcase() {

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        var str = whiteSpacesStr + lineTerminatorsStr + "abc" + whiteSpacesStr + lineTerminatorsStr;

-

-        return (str.trim() === "abc");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string start with union of all
+    LineTerminator and all WhiteSpace and end with union of all
+    LineTerminator and all WhiteSpace
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        var str = whiteSpacesStr + lineTerminatorsStr + "abc" + whiteSpacesStr + lineTerminatorsStr;
+
+        return (str.trim() === "abc");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-7.js
index c2d4c891f..a4942766b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-7.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-7.js

- * @description String.prototype.trim - 'S' is a string that union of LineTerminator and WhiteSpace in the middle

- */

-

-

-function testcase() {

-        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";

-        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";

-        var str = "ab" + whiteSpacesStr + lineTerminatorsStr + "cd";

-

-        return (str.trim() === str);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim - 'S' is a string that union of
+    LineTerminator and WhiteSpace in the middle
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var lineTerminatorsStr = "\u000A\u000D\u2028\u2029";
+        var whiteSpacesStr = "\u0009\u000A\u000B\u000C\u000D\u0020\u00A0\u1680\u180E\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u2028\u2029\u202F\u205F\u3000\uFEFF";
+        var str = "ab" + whiteSpacesStr + lineTerminatorsStr + "cd";
+
+        return (str.trim() === str);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-8.js
index bf32bbf76..a8c755c41 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-8.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-8.js

- * @description String.prototype.trim - 'S' is a string with all null character

- */

-

-

-function testcase() {

-        return "\0\u0000".trim() === "\0\u0000";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - 'S' is a string with all null character
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return "\0\u0000".trim() === "\0\u0000";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-9.js
index f7ee64861..1c5f3e7d6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-9.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-3-9.js

- * @description String.prototype.trim - 'S' is a string with null character ('\0')

- */

-

-

-function testcase() {

-            return "\0".trim() === "\0";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: String.prototype.trim - 'S' is a string with null character ('\0')
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+            return "\0".trim() === "\0";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-1.js
index f565f96ad..e8a9a74f0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-1.js

- * @description String.prototype.trim handles multiline string with whitepace and lineterminators

- */

-

-

-function testcase() {

-var s = "\u0009a b\

-c \u0009"

-

-            

-  if (s.trim() === "a bc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles multiline string with whitepace and
+    lineterminators
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var s = "\u0009a b\
+c \u0009"
+
+            
+  if (s.trim() === "a bc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-10.js
index 5b17c7536..b19d15edc 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-10.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-10.js

- * @description String.prototype.trim handles whitepace and lineterminators (\uFEFFabc)

- */

-

-

-function testcase() {

-  return "\uFEFFabc".trim() === "abc";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\uFEFFabc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return "\uFEFFabc".trim() === "abc";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-11.js
index 254e14ad4..03dd4075c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-11.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-11.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u0009)

- */

-

-

-function testcase() {

-  if ("abc\u0009".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u0009)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u0009".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-12.js
index 0b948a0d7..3dae8de86 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-12.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-12.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u000B)

- */

-

-

-function testcase() {

-  if ("abc\u000B".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u000B)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u000B".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-13.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-13.js
index ee06d025b..50eac869b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-13.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-13.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-13.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u000C)

- */

-

-

-function testcase() {

-  if ("abc\u000C".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u000C)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u000C".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-14.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-14.js
index 99038992c..9219f9d09 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-14.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-14.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-14.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u0020)

- */

-

-

-function testcase() {

-  if ("abc\u0020".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u0020)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u0020".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-16.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-16.js
index 600ba4766..bc571b92b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-16.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-16.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-16.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u00A0)

- */

-

-

-function testcase() {

-  if ("abc\u00A0".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u00A0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u00A0".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-18.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-18.js
index 287fbd585..637463b1f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-18.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-18.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-18.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\uFEFF)

- */

-

-

-function testcase() {

-  return "abc\uFEFF".trim() === "abc";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\uFEFF)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return "abc\uFEFF".trim() === "abc";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-19.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-19.js
index a172918c1..72a0a75ce 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-19.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-19.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-19.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0009abc\u0009)

- */

-

-

-function testcase() {

-  if ("\u0009abc\u0009".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0009abc\u0009)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0009abc\u0009".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-2.js
index 9cfea3598..9e3837c87 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-2.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-2.js

- * @description String.prototype.trim handles whitepace and lineterminators ( \u0009abc \u0009)

- */

-

-

-function testcase() {

-  if (" \u0009abc \u0009".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators (
+    \u0009abc \u0009)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (" \u0009abc \u0009".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-20.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-20.js
index 4a30711de..e56a416f5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-20.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-20.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-20.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Babc\u000B)

- */

-

-

-function testcase() {

-  if ("\u000Babc\u000B".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Babc\u000B)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Babc\u000B".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-21.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-21.js
index 814a0a52d..f464103d2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-21.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-21.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-21.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Cabc\u000C)

- */

-

-

-function testcase() {

-  if ("\u000Cabc\u000C".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Cabc\u000C)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Cabc\u000C".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-22.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-22.js
index 112d1c185..725a75338 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-22.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-22.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-22.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0020abc\u0020)

- */

-

-

-function testcase() {

-  if ("\u0020abc\u0020".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0020abc\u0020)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0020abc\u0020".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-24.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-24.js
index 8fa1f4afa..2558db20b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-24.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-24.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-24.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u00A0abc\u00A0)

- */

-

-

-function testcase() {

-  if ("\u00A0abc\u00A0".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u00A0abc\u00A0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u00A0abc\u00A0".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-27.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-27.js
index a344dcfb2..852189fd4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-27.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-27.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-27.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0009\u0009)

- */

-

-

-function testcase() {

-  if ("\u0009\u0009".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0009\u0009)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0009\u0009".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-28.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-28.js
index 9db3f868c..7e157a2c2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-28.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-28.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-28.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000B\u000B)

- */

-

-

-function testcase() {

-  if ("\u000B\u000B".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000B\u000B)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000B\u000B".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-29.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-29.js
index cfcfd42a9..23870988b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-29.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-29.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-29.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000C\u000C)

- */

-

-

-function testcase() {

-  if ("\u000C\u000C".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000C\u000C)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000C\u000C".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-3.js
index b13ffbe4b..68a60d97d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-3.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-3.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0009abc)

- */

-

-

-function testcase() {

-  if ("\u0009abc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0009abc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0009abc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-30.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-30.js
index 08393f0e2..ae0f0a7eb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-30.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-30.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-30.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0020\u0020)

- */

-

-

-function testcase() {

-  if ("\u0020\u0020".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0020\u0020)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0020\u0020".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-32.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-32.js
index 3f77e5071..d60898490 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-32.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-32.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-32.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u00A0\u00A0)

- */

-

-

-function testcase() {

-  if ("\u00A0\u00A0".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u00A0\u00A0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u00A0\u00A0".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-34.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-34.js
index 79325a4c1..d2083b707 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-34.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-34.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-34.js

- * @description String.prototype.trim handles whitepace and lineterminators (\uFEFF\uFEFF)

- */

-

-

-function testcase() {

-  return "\uFEFF\uFEFF".trim() === "";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\uFEFF\uFEFF)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return "\uFEFF\uFEFF".trim() === "";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-35.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-35.js
index 454f94bda..c32c26f21 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-35.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-35.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-35.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u0009c)

- */

-

-

-function testcase() {

-  if ("ab\u0009c".trim() === "ab\u0009c") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u0009c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u0009c".trim() === "ab\u0009c") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-36.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-36.js
index 58cd7d1de..0e7bc4f8b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-36.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-36.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-36.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u000Bc)

- */

-

-

-function testcase() {

-  if ("ab\u000Bc".trim() === "ab\u000Bc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u000Bc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u000Bc".trim() === "ab\u000Bc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-37.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-37.js
index 9ab833133..8f463642f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-37.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-37.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-37.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u000Cc)

- */

-

-

-function testcase() {

-  if ("ab\u000Cc".trim() === "ab\u000Cc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u000Cc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u000Cc".trim() === "ab\u000Cc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-38.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-38.js
index 4807a06cc..0262fc1eb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-38.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-38.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-38.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u0020c)

- */

-

-

-function testcase() {

-  if ("ab\u0020c".trim() === "ab\u0020c") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u0020c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u0020c".trim() === "ab\u0020c") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-39.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-39.js
index 00cf510e9..f7d3d8c1a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-39.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-39.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-39.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u0085c)

- */

-

-

-function testcase() {

-  return "ab\u0085c".trim() === "ab\u0085c";

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u0085c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return "ab\u0085c".trim() === "ab\u0085c";
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-4.js
index 1b45f4214..196f79c69 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-4.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-4.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Babc)

- */

-

-

-function testcase() {

-  if ("\u000Babc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Babc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Babc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-40.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-40.js
index 45c1241ac..9bf195509 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-40.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-40.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-40.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u00A0c)

- */

-

-

-function testcase() {

-  if ("ab\u00A0c".trim() === "ab\u00A0c") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u00A0c)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u00A0c".trim() === "ab\u00A0c") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-41.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-41.js
index 2b2ec8ca7..35195ff3f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-41.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-41.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-41.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\u200Bc)

- */

-

-

-function testcase() {

-  if ("ab\u200Bc".trim() === "ab\u200Bc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\u200Bc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\u200Bc".trim() === "ab\u200Bc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-42.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-42.js
index 7e3ba26f1..52432527e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-42.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-42.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-42.js

- * @description String.prototype.trim handles whitepace and lineterminators (ab\uFEFFc)

- */

-

-

-function testcase() {

-  if ("ab\uFEFFc".trim() === "ab\uFEFFc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (ab\uFEFFc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("ab\uFEFFc".trim() === "ab\uFEFFc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-43.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-43.js
index 01e285095..d50c8b1e7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-43.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-43.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-43.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Aabc)

- */

-

-

-function testcase() {

-  if ("\u000Aabc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Aabc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Aabc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-44.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-44.js
index 7b114197a..12b3b053a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-44.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-44.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-44.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Dabc)

- */

-

-

-function testcase() {

-  if ("\u000Dabc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Dabc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Dabc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-45.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-45.js
index 2d8d044c6..acc59622e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-45.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-45.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-45.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2028abc)

- */

-

-

-function testcase() {

-  if ("\u2028abc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2028abc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2028abc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-46.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-46.js
index 133954a7b..9fc5a6062 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-46.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-46.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-46.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2029abc)

- */

-

-

-function testcase() {

-  if ("\u2029abc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2029abc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2029abc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-47.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-47.js
index 27b373537..55efddd5f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-47.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-47.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-47.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u000A)

- */

-

-

-function testcase() {

-  if ("abc\u000A".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u000A)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u000A".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-48.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-48.js
index 9d1ead565..1b966ac9c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-48.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-48.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-48.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u000D)

- */

-

-

-function testcase() {

-  if ("abc\u000D".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u000D)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u000D".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-49.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-49.js
index 306f013a3..af9e5a406 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-49.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-49.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-49.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u2028)

- */

-

-

-function testcase() {

-  if ("abc\u2028".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u2028)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u2028".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-5.js
index ccd87bc8c..7e5f97334 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-5.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-5.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Cabc)

- */

-

-

-function testcase() {

-  if ("\u000Cabc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Cabc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Cabc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-50.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-50.js
index 88a63f0e8..173b9cfdf 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-50.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-50.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-50.js

- * @description String.prototype.trim handles whitepace and lineterminators (abc\u2029)

- */

-

-

-function testcase() {

-  if ("abc\u2029".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (abc\u2029)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("abc\u2029".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-51.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-51.js
index a37979269..a2d08b275 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-51.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-51.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-51.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Aabc\u000A)

- */

-

-

-function testcase() {

-  if ("\u000Aabc\u000A".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Aabc\u000A)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Aabc\u000A".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-52.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-52.js
index 0fec37e4d..febbe8c6d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-52.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-52.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-52.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000Dabc\u000D)

- */

-

-

-function testcase() {

-  if ("\u000Dabc\u000D".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000Dabc\u000D)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000Dabc\u000D".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-53.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-53.js
index 24e439830..ce584ccab 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-53.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-53.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-53.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2028abc\u2028)

- */

-

-

-function testcase() {

-  if ("\u2028abc\u2028".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2028abc\u2028)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2028abc\u2028".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-54.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-54.js
index 930df3678..69c56908f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-54.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-54.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-54.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2029abc\u2029)

- */

-

-

-function testcase() {

-  if ("\u2029abc\u2029".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2029abc\u2029)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2029abc\u2029".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-55.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-55.js
index e1d75f23f..256d4be29 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-55.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-55.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-55.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000A\u000A)

- */

-

-

-function testcase() {

-  if ("\u000A\u000A".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000A\u000A)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000A\u000A".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-56.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-56.js
index 5b8591533..5d2bb518f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-56.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-56.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-56.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u000D\u000D)

- */

-

-

-function testcase() {

-  if ("\u000D\u000D".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u000D\u000D)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u000D\u000D".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-57.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-57.js
index fc88fbfa5..8727b561e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-57.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-57.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-57.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2028\u2028)

- */

-

-

-function testcase() {

-  if ("\u2028\u2028".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2028\u2028)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2028\u2028".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-58.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-58.js
index 8effdb4d7..2c4916cd7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-58.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-58.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-58.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2029\u2029)

- */

-

-

-function testcase() {

-  if ("\u2029\u2029".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2029\u2029)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u2029\u2029".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-59.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-59.js
index ce66909c9..25567ab4e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-59.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-59.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-59.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u2029abc as a multiline string)

- */

-

-

-function testcase() {

-  var s = "\u2029\

-           abc";

-  if (s.trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u2029abc as a multiline string)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = "\u2029\
+           abc";
+  if (s.trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-6.js
index d7481bad3..93e25d550 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-6.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-6.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u0020abc)

- */

-

-

-function testcase() {

-  if ("\u0020abc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u0020abc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u0020abc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-60.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-60.js
index 496f6bc9f..0b9c1bb94 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-60.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-60.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-60.js

- * @description String.prototype.trim handles whitepace and lineterminators (string with just blanks)

- */

-

-

-function testcase() {

-  if ("    ".trim() === "") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (string with just blanks)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("    ".trim() === "") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-8.js
index 3bbfd0638..7a7d6be2e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-8.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.5/15.5.4/15.5.4.20/15.5.4.20-4-8.js

- * @description String.prototype.trim handles whitepace and lineterminators (\u00A0abc)

- */

-

-

-function testcase() {

-  if ("\u00A0abc".trim() === "abc") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    String.prototype.trim handles whitepace and lineterminators
+    (\u00A0abc)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if ("\u00A0abc".trim() === "abc") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1.1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1.1.js
index d0dce498d..9f1b85c5f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1.1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt() can accept many arguments
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1.1.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.charAt() can accept many arguments
+description: Checking by using eval
+---*/
 
 function __FACTORY(){this.toString = function(){ return "wizard";};};
 
@@ -23,5 +21,3 @@ with(__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A10.js
index f8295541b..f7ae92504 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charAt.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A10.js
- * @description Checking if varying the String.prototype.charAt.length property fails
- */
+/*---
+info: The String.prototype.charAt.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.charAt.length property
+    fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +27,3 @@ if (String.prototype.charAt.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A11.js
index 2dc2f275e..add28685c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the charAt method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A11.js
- * @description Checking String.prototype.charAt.length
- */
+/*---
+info: The length property of the charAt method is 1
+description: Checking String.prototype.charAt.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.charAt.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T1.js
index 0d6472672..1fe579655 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T1.js
- * @description pos is false and true, and instance is object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: pos is false and true, and instance is object
+---*/
 
 var __instance = new Object(42);
 
@@ -19,4 +17,3 @@ if (__instance.charAt(false)+__instance.charAt(true) !== "42") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T10.js
index 5f8113595..298428bab 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T10.js
- * @description Call charAt() function with object argument
- */
+/*---
+info: String.prototype.charAt(pos)
+description: Call charAt() function with object argument
+---*/
 
 var __obj = {toString:function(){return 1;}}
 var __str = "lego";
@@ -20,4 +18,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T2.js
index d162e3961..577566ee4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T2.js
- * @description pos is equation with false and true, and instance is Boolean object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: pos is equation with false and true, and instance is Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +17,3 @@ if (__instance.charAt(false)+__instance.charAt(true)+__instance.charAt(true+1) !
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T4.js
index e20809a4d..29caf3712 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T4.js
- * @description Call charAt() function without argument of string object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: Call charAt() function without argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if ("lego".charAt() !== "l") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T5.js
index 4ec3eb8e2..de4440c48 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T5.js
- * @description Call charAt() function with null argument of function object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: Call charAt() function with null argument of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "lego"}().charAt(null) !== "l") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T6.js
index 02d4ffec4..319c47597 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T6.js
- * @description Call charAt() function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.charAt(pos)
+description: >
+    Call charAt() function with x argument of new String object, where
+    x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ if (new String("lego").charAt(x) !== "l") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T7.js
index 978a9d750..52345a6b2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T7.js
- * @description Call charAt() function with undefined argument of string object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: Call charAt() function with undefined argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (String("lego").charAt(undefined) !== "l") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T8.js
index e70523eb4..dd0ad5f4e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T8.js
- * @description Call charAt() function with void 0 argument of string object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: Call charAt() function with void 0 argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (String(42).charAt(void 0) !== "4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T9.js
index 8ad6dd314..11c43441e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A1_T9.js
- * @description Call charAt() function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.charAt(pos)
+description: >
+    Call charAt() function with function(){}() argument of string
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (new String(42).charAt(function(){}()) !== "4") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A2.js
index 1752c563b..e40ac01ee 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charAt(pos) calls if ToInteger(pos) less than 0 the empty string returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A2.js
- * @description Call charAt(pos) with negative pos
- */
+/*---
+info: >
+    When String.prototype.charAt(pos) calls if ToInteger(pos) less than 0 the
+    empty string returns
+description: Call charAt(pos) with negative pos
+---*/
 
 function __FACTORY(){};
 
@@ -21,4 +21,3 @@ if (__instance.charAt(-1) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A3.js
index c41c5e1f4..b12bd142d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charAt(pos) calls if ToInteger(pos) not less than ToString(this value) the empty string returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A3.js
- * @description pos is bigger of string length
- */
+/*---
+info: >
+    When String.prototype.charAt(pos) calls if ToInteger(pos) not less than
+    ToString(this value) the empty string returns
+description: pos is bigger of string length
+---*/
 
 var __instance = new String("ABC");
 
@@ -17,4 +17,3 @@ if (__instance.charAt(3) !== "") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T1.js
index c361749ac..ddb2d5602 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pos is a value of Number type that is an integer, then the result of x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T1.js
- * @description Compare results of x.charAt(pos) and x.substring(pos, pos+1)
- */
+/*---
+info: >
+    If pos is a value of Number type that is an integer, then the result of
+    x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
+description: Compare results of x.charAt(pos) and x.substring(pos, pos+1)
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ for(var i=0; i<6; i++) {
     
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T2.js
index 8b4b7441c..58057d991 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pos is a value of Number type that is an integer, then the result of x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T2.js
- * @description Compare results of x.charAt(pos) and x.substring(pos, pos+1), wheb pos is smaller of zero
- */
+/*---
+info: >
+    If pos is a value of Number type that is an integer, then the result of
+    x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
+description: >
+    Compare results of x.charAt(pos) and x.substring(pos, pos+1), wheb
+    pos is smaller of zero
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +20,3 @@ for(var i=-2; i<0; i++) {
     
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T3.js
index ca9a1369d..0bdff2dd2 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If pos is a value of Number type that is an integer, then the result of x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A4_T3.js
- * @description Compare results of x.charAt(pos) and x.substring(pos, pos+1), wheb pos is bigger string length
- */
+/*---
+info: >
+    If pos is a value of Number type that is an integer, then the result of
+    x.charAt(pos) is equal to the result of x.substring(pos, pos+1)
+description: >
+    Compare results of x.charAt(pos) and x.substring(pos, pos+1), wheb
+    pos is bigger string length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +20,3 @@ for(var i=6; i<8; i++) {
     
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A5.js
index 778e5ea21..8b7564996 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charAt(pos) calls first calls ToString, giving it the this value as its argument
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A5.js
- * @description Change toString function, it trow exception, and call charAt()
- */
+/*---
+info: >
+    When String.prototype.charAt(pos) calls first calls ToString, giving it
+    the this value as its argument
+description: Change toString function, it trow exception, and call charAt()
+includes: [$FAIL.js]
+---*/
 
 var __obj={
     valueOf:1,
@@ -26,4 +27,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A6.js
index 570f90a12..5bc3eeb41 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A6.js
- * @description Checking String.prototype.charAt.prototype
- */
+/*---
+info: String.prototype.charAt has not prototype property
+description: Checking String.prototype.charAt.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.charAt.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A7.js
index 94494102a..3e67dc3e0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A7.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charAt can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A7.js
- * @description Checking if creating the String.prototype.charAt object fails
- */
+/*---
+info: String.prototype.charAt can't be used as constructor
+description: Checking if creating the String.prototype.charAt object fails
+includes: [$FAIL.js]
+---*/
 
 var __FACTORY = String.prototype.charAt;
 
@@ -18,4 +17,3 @@ try {
     $ERROR('#1.2: undefined = 1 throw a TypeError. Actual: ' + (e));  
   }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A8.js
index 00a617631..709c370e6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charAt.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A8.js
- * @description Checking if enumerating the String.prototype.charAt.length property fails
- */
+/*---
+info: The String.prototype.charAt.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.charAt.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +38,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A9.js
index d810d56e0..5aa7ab981 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charAt.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.4/S15.5.4.4_A9.js
- * @description Checking if deleting the String.prototype.charAt.length property fails
- */
+/*---
+info: The String.prototype.charAt.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.charAt.length property
+    fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +31,3 @@ if (!(String.prototype.charAt.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1.1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1.1.js
index d296397c9..9e59855af 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1.1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1.1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt() can accept many arguments
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1.1.js
- * @description Checking by using eval
- */
+/*---
+info: String.prototype.charCodeAt() can accept many arguments
+description: Checking by using eval
+---*/
 
 function __FACTORY(){this.toString = function(){ return "wizard";};};
 
@@ -24,5 +22,3 @@ with(__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A10.js
index c6d1a559f..744c123a4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charCodeAt.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A10.js
- * @description Checking if varying the String.prototype.charCodeAt.length property fails
- */
+/*---
+info: The String.prototype.charCodeAt.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.charCodeAt.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +27,3 @@ if (String.prototype.charCodeAt.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A11.js
index 2a39c6bee..400dd4ed0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the charCodeAt method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A11.js
- * @description Checking String.prototype.charCodeAt.length
- */
+/*---
+info: The length property of the charCodeAt method is 1
+description: Checking String.prototype.charCodeAt.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.charCodeAt.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T1.js
index 3a639267a..ee9ae3fa8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T1.js
- * @description pos is false and true, and instance is object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: pos is false and true, and instance is object
+---*/
 
 var __instance = new Object(42);
 
@@ -19,4 +17,3 @@ if ((__instance.charCodeAt(false) !== 52)||(__instance.charCodeAt(true) !== 50))
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T10.js
index 048869d36..cdce7f878 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T10.js
- * @description Call charCodeAt() function with object argument
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: Call charCodeAt() function with object argument
+---*/
 
 var __obj = {toString:function(){return 1;}}
 var __str = "lego";
@@ -20,4 +18,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T2.js
index c4e3f2ad4..bb80e6788 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T2.js
- * @description pos is equation with false and true, and instance is Boolean object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: pos is equation with false and true, and instance is Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -35,4 +33,3 @@ if (__instance.charCodeAt(true+1) !== 0x6C) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T4.js
index 04aed9862..276eeb2d1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T4.js
- * @description Call charCodeAt() function without argument of string object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: Call charCodeAt() function without argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if ("smart".charCodeAt() !== 0x73) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T5.js
index 6f0c0aaa4..4582048c4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T5.js
- * @description Call charCodeAt() function with null argument of function object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: Call charCodeAt() function with null argument of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (function(){return "lego"}().charCodeAt(null) !== 0x6C) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T6.js
index 8f54a0d00..4ab9ef370 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T6.js
- * @description Call charCodeAt() function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: >
+    Call charCodeAt() function with x argument of new String object,
+    where x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ if (new String("lego").charCodeAt(x) !== 0x6C) {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T7.js
index c3c521cdb..bcffca07b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T7.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T7.js
- * @description Call charCodeAt() function with undefined argument of string object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: Call charCodeAt() function with undefined argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (String("lego").charCodeAt(undefined) !== 0x6C) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T8.js
index 9e3d73988..70d2d9a56 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T8.js
- * @description Call charCodeAt() function with void 0 argument of string object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: Call charCodeAt() function with void 0 argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if (String(42).charCodeAt(void 0) !== 0x34) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T9.js
index 4c9b24faf..d56cefb7d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt(pos)
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A1_T9.js
- * @description Call charCodeAt() function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.charCodeAt(pos)
+description: >
+    Call charCodeAt() function with function(){}() argument of string
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (new String(42).charCodeAt(function(){}()) !== 0x34) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A2.js
index 39e833fd7..1734ae3f0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charCodeAt(pos) calls if ToInteger(pos) less than 0 the NaN returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A2.js
- * @description Call charCodeAt(pos) with negative pos
- */
+/*---
+info: >
+    When String.prototype.charCodeAt(pos) calls if ToInteger(pos) less than 0
+    the NaN returns
+description: Call charCodeAt(pos) with negative pos
+---*/
 
 function __FACTORY(){};
 
@@ -21,4 +21,3 @@ if (!isNaN(__instance.charCodeAt(-1))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A3.js
index a5d6a8fe4..7aacb5554 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charCodeAt(pos) calls if ToInteger(pos) not less than ToString(this value) the NaN returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A3.js
- * @description pos is bigger of string length
- */
+/*---
+info: >
+    When String.prototype.charCodeAt(pos) calls if ToInteger(pos) not less
+    than ToString(this value) the NaN returns
+description: pos is bigger of string length
+---*/
 
 var __instance = new String("ABC");
 
@@ -17,4 +17,3 @@ if (!isNaN(__instance.charCodeAt(3))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A4.js
index 884d6322d..357fca005 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When String.prototype.charCodeAt(pos) calls first calls ToString, giving it the this value as its argument
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A4.js
- * @description Change toString function, it trow exception, and call charCodeAt()
- */
+/*---
+info: >
+    When String.prototype.charCodeAt(pos) calls first calls ToString, giving
+    it the this value as its argument
+description: Change toString function, it trow exception, and call charCodeAt()
+includes: [$FAIL.js]
+---*/
 
 var __obj={
     valueOf:1,
@@ -26,4 +27,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A6.js
index dc78648b2..9542efcd5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A6.js
- * @description Checking String.prototype.charCodeAt.prototype
- */
+/*---
+info: String.prototype.charCodeAt has not prototype property
+description: Checking String.prototype.charCodeAt.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.charCodeAt.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A7.js
index 5a97c5746..b00f453b9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A7.js
@@ -1,19 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.charCodeAt can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A7.js
- * @description Checking if creating the String.prototype.charCodeAt object fails
- */
+/*---
+info: String.prototype.charCodeAt can't be used as constructor
+description: Checking if creating the String.prototype.charCodeAt object fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __FACTORY = String.prototype.charCodeAt;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.charCodeAt; "__instance = new __FACTORY" lead to throwing exception');

-} catch (e) {

+  $FAIL('#1: __FACTORY = String.prototype.charCodeAt; "__instance = new __FACTORY" lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A8.js
index ed4c5bd03..6dbd37ed3 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charCodeAt.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A8.js
- * @description Checking if enumerating the String.prototype.charCodeAt.length property fails
- */
+/*---
+info: The String.prototype.charCodeAt.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.charCodeAt.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A9.js
index f561d1795..f2296302e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.charCodeAt.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.5/S15.5.4.5_A9.js
- * @description Checking if deleting the String.prototype.charCodeAt.length property fails
- */
+/*---
+info: >
+    The String.prototype.charCodeAt.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.charCodeAt.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.charCodeAt.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A10.js
index aa6112d32..d9fbd26ba 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.concat.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A10.js
- * @description Checking if varying the String.prototype.concat.length property fails
- */
+/*---
+info: The String.prototype.concat.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.concat.length property
+    fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +27,3 @@ if (String.prototype.concat.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A11.js
index d0a4b4401..1f17e5ea8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the concat method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A11.js
- * @description Checking String.prototype.concat.length
- */
+/*---
+info: The length property of the concat method is 1
+description: Checking String.prototype.concat.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.concat.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T1.js
index bb6d8f785..e4d9d3584 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(42);
 
@@ -19,4 +17,3 @@ if (__instance.concat(false,true) !== "42falsetrue") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T10.js
index e0c7a56ed..8338e5eb7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T10.js
- * @description Call concat([,[...]]) function with object arguments
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: Call concat([,[...]]) function with object arguments
+---*/
 
 var __obj = {toString:function(){return "\u0041";}}
 var __obj2 = {toString:function(){return true;}}
@@ -24,4 +22,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T2.js
index bc5b6f965..e9a55e38a 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T2.js
- * @description Arguments are equation with false and true, and instance is Boolean object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Arguments are equation with false and true, and instance is
+    Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +19,3 @@ if (__instance.concat("\u0041",true,true+1) !== "falseAtrue2") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T4.js
index 6f2d37b1b..1d5e4274c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T4.js
- * @description Call concat([,[...]]) function without argument of string object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: Call concat([,[...]]) function without argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +14,3 @@ if ("lego".concat() !== "lego") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T5.js
index 31fa8ba2b..d607d6505 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T5.js
- * @description Call concat([,[...]]) function with null argument of function object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Call concat([,[...]]) function with null argument of function
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (function(){return "lego"}().concat(null) !== "legonull") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T6.js
index fbe70c6ab..babc7e3e0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T6.js
- * @description Call concat([,[...]]) function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Call concat([,[...]]) function with x argument of new String
+    object, where x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ if (new String("lego").concat(x) !== "legoundefined") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T7.js
index 9d6f30e01..5cf0d8371 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T7.js
- * @description Call concat([,[...]]) function with undefined argument of string object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Call concat([,[...]]) function with undefined argument of string
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (String("lego").concat(undefined) !== "legoundefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T8.js
index 96b703405..11dfc6474 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T8.js
- * @description Call concat([,[...]]) function with void 0 argument of string object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Call concat([,[...]]) function with void 0 argument of string
+    object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (String(42).concat(void 0) !== "42undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T9.js
index ecde3e026..ad6562509 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]])
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A1_T9.js
- * @description Call concat([,[...]]) function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.concat([,[...]])
+description: >
+    Call concat([,[...]]) function with function(){}() argument of
+    string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (new String(42).concat(function(){}()) !== "42undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A2.js
index da3c06241..162d3d6e9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]]) can accept at least 128
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A2.js
- * @description Call concat([,[...]]) function with 128 arguments
- */
+/*---
+info: String.prototype.concat([,[...]]) can accept at least 128
+description: Call concat([,[...]]) function with 128 arguments
+---*/
 
 var __instance = new Number();
 
@@ -28,6 +26,3 @@ if (__instance.concat(
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A3.js
index 7f61e7520..3e40f3d3d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat([,[...]]) can't change the instance to be applied
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A3.js
- * @description Checking if varying the instance that is applied fails
- */
+/*---
+info: String.prototype.concat([,[...]]) can't change the instance to be applied
+description: Checking if varying the instance that is applied fails
+---*/
 
 var __instance = new String("one");
 
@@ -19,4 +17,3 @@ if (__instance != "one") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T1.js
index d1d203452..4acde3862 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.concat([,[...]]) is called first Call ToString, giving it the this value as its argument
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T1.js
- * @description Override toString function
- */
+/*---
+info: >
+    when String.prototype.concat([,[...]]) is called first Call ToString,
+    giving it the this value as its argument
+description: Override toString function
+---*/
 
 var __instance = {toString:function(){return "one"}};
 
@@ -21,6 +21,3 @@ if (__instance.concat("two",x) !== "onetwoundefined") {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T2.js
index db3dc169c..87aa25567 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.concat([,[...]]) is called first Call ToString, giving it the this value as its argument
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A4_T2.js
- * @description Override toString function onto function, that throw exception
- */
+/*---
+info: >
+    when String.prototype.concat([,[...]]) is called first Call ToString,
+    giving it the this value as its argument
+description: Override toString function onto function, that throw exception
+includes: [$FAIL.js]
+---*/
 
 var __instance = {toString:function(){throw "intostring";}};
 var __obj = {toString:function(){throw "infirstarg";}};
@@ -27,7 +28,3 @@ try {
 //////////////////////////////////////////////////////////////////////////////
 
 var notexist;
-
-
-
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A6.js
index 23a4bcdb9..7803cae0c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A6.js
- * @description Checking String.prototype.concat.prototype
- */
+/*---
+info: String.prototype.concat has not prototype property
+description: Checking String.prototype.concat.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.concat.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A7.js
index 62267a230..9fea9992f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A7.js
@@ -1,19 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.concat can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A7.js
- * @description Checking if creating the String.prototype.concat object fails
- */
+/*---
+info: String.prototype.concat can't be used as constructor
+description: Checking if creating the String.prototype.concat object fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __FACTORY = String.prototype.concat;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.concat; "__instance = new __FACTORY" lead throwing exception');

-} catch (e) {

+  $FAIL('#1: __FACTORY = String.prototype.concat; "__instance = new __FACTORY" lead throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A8.js
index 48db4fe12..abdd06da0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.concat.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A8.js
- * @description Checking if enumerating the String.prototype.concat.length property fails
- */
+/*---
+info: The String.prototype.concat.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.concat.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +39,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A9.js
index 38b441520..baeb50094 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.concat.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.6/S15.5.4.6_A9.js
- * @description Checking if deleting the String.prototype.concat.length property fails
- */
+/*---
+info: The String.prototype.concat.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.concat.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.concat.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A10.js
index 97fa3828d..faf463d24 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.indexOf.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A10.js
- * @description Checking if varying the String.prototype.indexOf.length property fails
- */
+/*---
+info: The String.prototype.indexOf.length property has the attribute ReadOnly
+description: >
+    Checking if varying the String.prototype.indexOf.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +28,3 @@ if (String.prototype.indexOf.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A11.js
index 7531afe14..4a84304b5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the indexOf method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A11.js
- * @description Checking String.prototype.indexOf.length
- */
+/*---
+info: The length property of the indexOf method is 1
+description: Checking String.prototype.indexOf.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.indexOf.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T1.js
index fdfd829ac..2f8f0890c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.indexOf(true, false) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T10.js
index d43e2b48c..e05e2fddd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T10.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T10.js
- * @description Call indexOf(searchString, position) function with object arguments
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: Call indexOf(searchString, position) function with object arguments
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return true;}}
@@ -23,4 +21,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T11.js
index f952ceb23..7cd35bef6 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T11.js
- * @description Instance is Date(0) object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: Instance is Date(0) object
+---*/
 
 var __instance = new Date(0);
 
@@ -19,4 +17,3 @@ if ((__instance.getTimezoneOffset()>0 ? __instance.indexOf('31') : __instance.in
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T12.js
index f6bbcde90..99ff9a8ee 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T12.js
- * @description Argument is string, and instance is array of strings
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: Argument is string, and instance is array of strings
+---*/
 
 var __instance = new Array('new','zoo','revue');
 
@@ -25,4 +23,3 @@ if (__instance.indexOf('zoo') !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T2.js
index 0e4fc8da5..972c4a7dd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T2.js
- * @description Arguments are boolean equation, function and null, and instance is Boolean object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Arguments are boolean equation, function and null, and instance is
+    Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +19,3 @@ if (__instance.indexOf("A"!=="\u0041", function(){return 0;}(),null) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T4.js
index 1339dda27..4051930f8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T4.js
- * @description Call indexOf(searchString, position) function without arguments of string
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function without arguments of
+    string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if ("".indexOf() !== -1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T5.js
index b397ff385..aea257a42 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T5.js
- * @description Call indexOf(searchString, position) function with null argument of function object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function with null argument
+    of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (function(){return "gnulluna"}().indexOf(null) !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T6.js
index 97c926bba..2e7367345 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T6.js
- * @description Call indexOf(searchString, position) function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function with x argument of
+    new String object, where x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ if (new String("undefined").indexOf(x) !== 0) {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T7.js
index 4b18ea23f..88e8b63d8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T7.js
- * @description Call indexOf(searchString, position) function with undefined argument of string object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function with undefined
+    argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (String("undefined").indexOf(undefined) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T8.js
index 14219aa0d..a21b2966d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T8.js
- * @description Call indexOf(searchString, position) function with void 0 argument of string object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function with void 0 argument
+    of string object
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -18,4 +18,3 @@ if (String(__obj).indexOf(void 0) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T9.js
index c13d6c4de..1c1e375e7 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A1_T9.js
- * @description Call indexOf(searchString, position) function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.indexOf(searchString, position)
+description: >
+    Call indexOf(searchString, position) function with function(){}()
+    argument of string object
+---*/
 
 var __obj = {
     valueOf:function(){},
@@ -21,4 +21,3 @@ if (new String(__obj).indexOf(function(){}()) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T1.js
index e7f880dd7..4a8782131 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When length of searchString less than length of ToString(this) -1 returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T1.js
- * @description Call "abcd".indexOf("abcdab") and check result
- */
+/*---
+info: When length of searchString less than length of ToString(this) -1 returns
+description: Call "abcd".indexOf("abcdab") and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("abcd".indexOf("abcdab")!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T2.js
index 65087c437..7a607130c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When length of searchString less than length of ToString(this) -1 returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T2.js
- * @description Call "abcd".indexOf("abcdab",0) and check result
- */
+/*---
+info: When length of searchString less than length of ToString(this) -1 returns
+description: Call "abcd".indexOf("abcdab",0) and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("abcd".indexOf("abcdab",0)!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T3.js
index 8420f3402..6e64c0870 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When length of searchString less than length of ToString(this) -1 returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T3.js
- * @description Call "abcd".indexOf("abcdab",99) and check result
- */
+/*---
+info: When length of searchString less than length of ToString(this) -1 returns
+description: Call "abcd".indexOf("abcdab",99) and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("abcd".indexOf("abcdab",99)!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T4.js
index 28c766db7..941f4ab06 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When length of searchString less than length of ToString(this) -1 returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A2_T4.js
- * @description Call "abcd".indexOf("abcdab",NaN) and check result
- */
+/*---
+info: When length of searchString less than length of ToString(this) -1 returns
+description: Call "abcd".indexOf("abcdab",NaN) and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if ("abcd".indexOf("abcdab",NaN)!==-1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T1.js
index 5264ebdc0..6954ab70f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0 indexOf(searchString,0) returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T1.js
- * @description Call "$$abcdabcd".indexOf("ab",NaN) and check result
- */
+/*---
+info: >
+    Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0
+    indexOf(searchString,0) returns
+description: Call "$$abcdabcd".indexOf("ab",NaN) and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if ("$$abcdabcd".indexOf("ab",NaN)!==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T2.js
index 4820875d3..4a1ca4cc1 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0 indexOf(searchString,0) returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T2.js
- * @description Call "$$abcdabcd".indexOf("ab",eval("\"-99\"")) and check result
- */
+/*---
+info: >
+    Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0
+    indexOf(searchString,0) returns
+description: Call "$$abcdabcd".indexOf("ab",eval("\"-99\"")) and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if ("$$abcdabcd".indexOf("ab",eval("\"-99\""))!==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T3.js
index bccc2e6b3..7917bb914 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T3.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0 indexOf(searchString,0) returns
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A3_T3.js
- * @description Call "$$abcdabcd".indexOf("ab",function(){return -Infinity;}()) and check result
- */
+/*---
+info: >
+    Since we deal with max(ToInteger(pos), 0) if ToInteger(pos) less than 0
+    indexOf(searchString,0) returns
+description: >
+    Call "$$abcdabcd".indexOf("ab",function(){return -Infinity;}())
+    and check result
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +17,3 @@ if ("$$abcdabcd".indexOf("ab", function(){return -Infinity;}())!==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T1.js
index d47dfdf7d..014f6f3ba 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T1.js
- * @description Override toString and valueOf functions, valueOf throw exception
- */
+/*---
+info: >
+    when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions, valueOf throw exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){throw "intointeger";}}
@@ -29,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T2.js
index 0960e05f3..8808c0815 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T2.js
- * @description Override toString and valueOf functions, second toString throw exception
- */
+/*---
+info: >
+    when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: >
+    Override toString and valueOf functions, second toString throw
+    exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){throw "intointeger";}}
@@ -27,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T3.js
index 978293a6f..623291646 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T3.js
- * @description Override toString and valueOf functions
- */
+/*---
+info: >
+    when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){return "1";}}
@@ -19,4 +18,3 @@ if ("ABB\u0041BABAB".indexOf(__obj, __obj2)!==3) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T4.js
index 3783f73c6..b18a57532 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T4.js
- * @description Override toString and valueOf functions, and they throw exceptions
- */
+/*---
+info: >
+    when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions, and they throw exceptions
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}};
 var __obj2 = {valueOf:function(){throw "intoint";}};
@@ -28,4 +28,3 @@ with(__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T5.js
index 1bd6fcb86..b50363b04 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T5.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A4_T5.js
- * @description Override toString and valueOf functions, first and second valueOf throw exception
- */
+/*---
+info: >
+    when String.prototype.indexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: >
+    Override toString and valueOf functions, first and second valueOf
+    throw exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}};
 
@@ -35,4 +37,3 @@ function __FACTORY( value ) {
     this.toString = function() { return new Number; };
     this.valueOf=function(){return this.value+""};
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T1.js
index a71670742..345d861a0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T1.js
- * @description Search one symbol from begin of string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search one symbol from begin of string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for (var  k = 0, i = 0x0020; i < 0x007e; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T2.js
index bb5170215..be2955e0e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T2.js
- * @description Search one symbol from it`s position in the string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search one symbol from it`s position in the string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for (var  k = 0, i = 0x0020; i < 0x007e; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T3.js
index 63ac59304..1e441620f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T3.js
- * @description Search one symbol from it`s position+1 in the string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search one symbol from it`s position+1 in the string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for ( var k = 0, i = 0x0020; i < 0x007e; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T4.js
index acb405bd5..35c82e264 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T4.js
- * @description Search substring from begin of string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search substring from begin of string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for (var k = 0, i = 0x0020; i < 0x007d; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T5.js
index 4882bd16c..9f584d83b 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T5.js
- * @description Search substring from it`s position in the string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search substring from it`s position in the string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for ( var k = 0, i = 0x0020; i < 0x007d; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T6.js
index 46ee650e8..5008611b5 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf works properly
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A5_T6.js
- * @description Search substring from it`s position+1 in the string
- */
+/*---
+info: String.prototype.indexOf works properly
+description: Search substring from it`s position+1 in the string
+---*/
 
 var TEST_STRING = new String( " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~" );
 
@@ -19,4 +17,3 @@ for (var k = 0, i = 0x0020; i < 0x007d; i++, k++ ) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A6.js
index b7b2773fe..4a92be07e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A6.js
- * @description Checking String.prototype.indexOf.prototype
- */
+/*---
+info: String.prototype.indexOf has not prototype property
+description: Checking String.prototype.indexOf.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.indexOf.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A7.js
index e9fda93c9..912a7c2de 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.indexOf can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A7.js
- * @description Checking if creating the String.prototype.indexOf object fails
- */
+/*---
+info: String.prototype.indexOf can't be used as constructor
+description: Checking if creating the String.prototype.indexOf object fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.indexOf;
 
@@ -19,4 +20,3 @@ try {
   }
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A8.js
index 99a509ed3..15a710450 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.indexOf.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A8.js
- * @description Checking if enumerating the String.prototype.indexOf.length property fails
- */
+/*---
+info: The String.prototype.indexOf.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the String.prototype.indexOf.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +38,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A9.js
index 61f691344..3dedb7661 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.indexOf.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.7/S15.5.4.7_A9.js
- * @description Checking if deleting the String.prototype.indexOf.length property fails
- */
+/*---
+info: The String.prototype.indexOf.length property has the attribute DontDelete
+description: >
+    Checking if deleting the String.prototype.indexOf.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +32,3 @@ if (!(String.prototype.indexOf.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A10.js
index 8d512c175..1dd433923 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A10.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.lastIndexOf.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A10.js
- * @description Checking if varying the String.prototype.lastIndexOf.length property fails
- */
+/*---
+info: >
+    The String.prototype.lastIndexOf.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.lastIndexOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +30,3 @@ if (String.prototype.lastIndexOf.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A11.js
index 63bbf1728..136cb5f62 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the lastIndexOf method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A11.js
- * @description Checking String.prototype.lastIndexOf.length
- */
+/*---
+info: The length property of the lastIndexOf method is 1
+description: Checking String.prototype.lastIndexOf.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.lastIndexOf.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T1.js
index 490bbeedb..9ff18d9fd 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T1.js
- * @description Arguments are false and true, and instance is object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: Arguments are false and true, and instance is object
+---*/
 
 var __instance = new Object(true);
 
@@ -19,4 +17,3 @@ if (__instance.lastIndexOf(true, false) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T10.js
index 54ce2d778..b52a49134 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T10.js
- * @description Call lastIndexOf(searchString, position) function with object arguments
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with object
+    arguments
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return NaN;}}
@@ -23,4 +23,3 @@ with(__str){
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T12.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T12.js
index 5b7750d71..191742099 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T12.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T12.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T12.js
- * @description Argument is string, and instance is array of strings
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: Argument is string, and instance is array of strings
+---*/
 
 var __instance = new Array('new','zoo','revue');
 
@@ -25,4 +23,3 @@ if (__instance.lastIndexOf('zoo') !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T2.js
index bda402f77..929fb51f4 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T2.js
- * @description Arguments are boolean equation, function and null, and instance is Boolean object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Arguments are boolean equation, function and null, and instance is
+    Boolean object
+---*/
 
 var __instance = new Boolean;
 
@@ -19,4 +19,3 @@ if (__instance.lastIndexOf("A"!=="\u0041", function(){return 0;}(),null) !== 0)
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T4.js
index 954db0d24..9520585af 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T4.js
- * @description Call lastIndexOf(searchString, position) function without arguments of string
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function without
+    arguments of string
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if ("".lastIndexOf() !== -1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T5.js
index 5cfab859c..0e337d756 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T5.js
- * @description Call lastIndexOf(searchString, position) function with null argument of function object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with null
+    argument of function object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (function(){return "gnullunazzgnull"}().lastIndexOf(null) !== 11) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T6.js
index 43b0243f4..fe4648312 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T6.js
- * @description Call lastIndexOf(searchString, position) function with x argument of new String object, where x is undefined variable
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with x argument
+    of new String object, where x is undefined variable
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -18,4 +18,3 @@ if (new String("undefined").lastIndexOf(x) !== 0) {
 //////////////////////////////////////////////////////////////////////////////
 
 var x;
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T7.js
index 5699bdfdb..ff7577fbb 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T7.js
- * @description Call lastIndexOf(searchString, position) function with undefined argument of string object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with undefined
+    argument of string object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -16,4 +16,3 @@ if (String("undefined").lastIndexOf(undefined) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T8.js
index a13e7c461..897852854 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T8.js
- * @description Call lastIndexOf(searchString, position) function with void 0 argument of string object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with void 0
+    argument of string object
+---*/
 
 var __obj = {toString:function(){}};
 
@@ -18,4 +18,3 @@ if (String(__obj).lastIndexOf(void 0) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T9.js
index 2d971ac68..f15118430 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf(searchString, position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A1_T9.js
- * @description Call lastIndexOf(searchString, position) function with function(){}() argument of string object
- */
+/*---
+info: String.prototype.lastIndexOf(searchString, position)
+description: >
+    Call lastIndexOf(searchString, position) function with
+    function(){}() argument of string object
+---*/
 
 var __obj = {
   valueOf:function(){},
@@ -21,4 +21,3 @@ if (new String(__obj).lastIndexOf(function(){}()) !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T1.js
index 54a783ac0..67515caa8 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T1.js
- * @description Override toString and valueOf functions, valueOf throw exception
- */
+/*---
+info: >
+    when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions, valueOf throw exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){throw "intointeger";}}
@@ -29,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T2.js
index 6c50f3b73..16fd7b0c0 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T2.js
- * @description Override toString and valueOf functions, second toString throw exception
- */
+/*---
+info: >
+    when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: >
+    Override toString and valueOf functions, second toString throw
+    exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){throw "intointeger";}}
@@ -27,4 +29,3 @@ with(__str){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T3.js
index 59d0efe87..6815f9b79 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T3.js
- * @description Override toString and valueOf functions
- */
+/*---
+info: >
+    when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions
+---*/
 
 var __obj = {toString:function(){return "\u0041B";}}
 var __obj2 = {valueOf:function(){return {};},toString:function(){}}
@@ -19,4 +18,3 @@ if ("ABB\u0041BABAB".lastIndexOf(__obj, __obj2)!==7) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T4.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T4.js
index 83d2414b0..d75e9c743 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T4.js
- * @description Override toString and valueOf functions, and they throw exceptions
- */
+/*---
+info: >
+    when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: Override toString and valueOf functions, and they throw exceptions
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){throw "intostr";}};
 var __obj2 = {valueOf:function(){throw "intoint";}};
@@ -28,4 +28,3 @@ with(__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T5.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T5.js
index cf34fa1dc..07ad24b8e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T5.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T5.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
- * Then Call ToString(searchString) and Call ToNumber(position)
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A4_T5.js
- * @description Override toString and valueOf functions, first and second valueOf throw exception
- */
+/*---
+info: >
+    when String.prototype.lastIndexOf(searchString, position) is called first Call ToString, giving it the this value as its argument.
+    Then Call ToString(searchString) and Call ToNumber(position)
+description: >
+    Override toString and valueOf functions, first and second valueOf
+    throw exception
+includes: [$FAIL.js]
+---*/
 
 var __obj = {toString:function(){return {};},valueOf:function(){throw "intostr";}};
 
@@ -35,4 +37,3 @@ function __FACTORY( value ) {
     this.toString = function() { return new Number; };
     this.valueOf=function(){return this.value+""};
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A6.js
index ce738c725..e14813385 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A6.js
- * @description Checking String.prototype.lastIndexOf.prototype
- */
+/*---
+info: String.prototype.lastIndexOf has not prototype property
+description: Checking String.prototype.lastIndexOf.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.lastIndexOf.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A7.js
index 3f83ddd9a..d110a7cf9 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.lastIndexOf can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A7.js
- * @description Checking if creating the String.prototype.lastIndexOf object fails
- */
+/*---
+info: String.prototype.lastIndexOf can't be used as constructor
+description: Checking if creating the String.prototype.lastIndexOf object fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var __FACTORY = String.prototype.lastIndexOf;
 
@@ -16,4 +17,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A8.js
index 130206520..9ac8fa671 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A8.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.lastIndexOf.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A8.js
- * @description Checking if enumerating the String.prototype.lastIndexOf.length property fails
- */
+/*---
+info: >
+    The String.prototype.lastIndexOf.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the String.prototype.lastIndexOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +41,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A9.js
index de01ba9f7..f4f5b71ed 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.lastIndexOf.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.8/S15.5.4.8_A9.js
- * @description Checking if deleting the String.prototype.lastIndexOf.length property fails
- */
+/*---
+info: >
+    The String.prototype.lastIndexOf.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.lastIndexOf.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +34,3 @@ if (!(String.prototype.lastIndexOf.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_3.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_3.js
index 441166c9f..d11266a83 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_3.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_3.js
@@ -1,11 +1,12 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare treats a missing
- *     "that" argument, undefined, and "undefined" as equivalent.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that String.prototype.localeCompare treats a missing  "that"
+    argument, undefined, and "undefined" as equivalent.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = ["a", "t", "u", "undefined", "UNDEFINED", "nicht definiert", "xyz", "未定义"];
 
@@ -19,4 +20,3 @@ for (i = 0; i < thisValues.length; i++) {
         $ERROR("String.prototype.localeCompare does not treat undefined 'that' argument as \"undefined\".");
     }
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_CE.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_CE.js
index 4eda191bc..ad9fa7b68 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_CE.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/15.5.4.9_CE.js
@@ -3,12 +3,13 @@
 // Copyright 2013 Microsoft Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare
- *     returns 0 when comparing Strings that are considered canonically equivalent
- *     by the Unicode standard.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that String.prototype.localeCompare  returns 0 when
+    comparing Strings that are considered canonically equivalent  by
+    the Unicode standard.
+author: Norbert Lindenberg
+---*/
 
 // pairs with characters not in Unicode 3.0 are commented out
 var pairs = [
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A10.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A10.js
index e2ced33f6..9ef85188f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A10.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A10.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.localeCompare.length property has the attribute ReadOnly
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A10.js
- * @description Checking if varying the String.prototype.localeCompare.length property fails
- */
+/*---
+info: >
+    The String.prototype.localeCompare.length property has the attribute
+    ReadOnly
+description: >
+    Checking if varying the String.prototype.localeCompare.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -27,4 +29,3 @@ if (String.prototype.localeCompare.length !== __obj) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A11.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A11.js
index 7af91d484..50325219f 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A11.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the localeCompare method is 1
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A11.js
- * @description Checking String.prototype.localeCompare.length
- */
+/*---
+info: The length property of the localeCompare method is 1
+description: Checking String.prototype.localeCompare.length
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -23,4 +21,3 @@ if (String.prototype.localeCompare.length !== 1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T1.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T1.js
index 5bab3d318..016994515 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.localeCompare(that)
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T1.js
- * @description This string is symbol and arguments are symbols
- */
+/*---
+info: String.prototype.localeCompare(that)
+description: This string is symbol and arguments are symbols
+---*/
 
 var str1 = new String("h"); 
 //CHECK#1
@@ -26,4 +24,3 @@ var str2 = new String ("h");
 if  (str1.localeCompare(str2)!==0){
   $ERROR('#3: var str1 = new String("h"); var str2 = new String ("h"); str1.localeCompare(str2)===0. Actual: '+str1.localeCompare(str2));
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T2.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T2.js
index 1b4c561b1..e1e2bc52c 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.localeCompare(that)
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A1_T2.js
- * @description Call string_1.localeCompare(string_2) is equal -string_2.localeCompare(string_1)
- */
+/*---
+info: String.prototype.localeCompare(that)
+description: >
+    Call string_1.localeCompare(string_2) is equal
+    -string_2.localeCompare(string_1)
+---*/
 
 //CHECK#1
 var str1 = "h";
@@ -14,4 +14,3 @@ var str2 = "H";
 if (str1.localeCompare(str2)!==-str2.localeCompare(str1)){
   $ERROR('#1.1: var str1 = "h"; var str2 = "H"; str1.localeCompare(str2)===-str2.localeCompare(str1). Actual: '+str1.localeCompare(str2));
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A6.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A6.js
index fb01cb121..2c8122791 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A6.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A6.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.localeCompare has not prototype property
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A6.js
- * @description Checking String.prototype.localeCompare.prototype
- */
+/*---
+info: String.prototype.localeCompare has not prototype property
+description: Checking String.prototype.localeCompare.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +13,3 @@ if (String.prototype.localeCompare.prototype !== undefined) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A7.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A7.js
index 42ef95947..8b9950f1d 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A7.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A7.js
@@ -1,19 +1,21 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.localeCompare can't be used as constructor
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A7.js
- * @description Checking if creating the String.prototype.localeCompare object fails
- */
+/*---
+info: String.prototype.localeCompare can't be used as constructor
+description: >
+    Checking if creating the String.prototype.localeCompare object
+    fails
+includes:
+    - $FAIL.js
+    - Test262Error.js
+---*/
 
 var __FACTORY = String.prototype.localeCompare;
 
 try {
   var __instance = new __FACTORY;
-  $FAIL('#1: __FACTORY = String.prototype.localeCompare; __instance = new __FACTORY lead to throwing exception');

-} catch (e) {

+  $FAIL('#1: __FACTORY = String.prototype.localeCompare; __instance = new __FACTORY lead to throwing exception');
+} catch (e) {
     if (e instanceof Test262Error) throw e;
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A8.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A8.js
index 4d25c0a1c..cfc773090 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A8.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.localeCompare.length property has the attribute DontEnum
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A8.js
- * @description Checking if enumerating the String.prototype.localeCompare.length property fails
- */
+/*---
+info: >
+    The String.prototype.localeCompare.length property has the attribute
+    DontEnum
+description: >
+    Checking if enumerating the String.prototype.localeCompare.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -38,4 +40,3 @@ if (count !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A9.js b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A9.js
index 41f76f7ab..ac2503b1e 100644
--- a/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A9.js
+++ b/test/suite/ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A9.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String.prototype.localeCompare.length property has the attribute DontDelete
- *
- * @path ch15/15.5/15.5.4/15.5.4.9/S15.5.4.9_A9.js
- * @description Checking if deleting the String.prototype.localeCompare.length property fails
- */
+/*---
+info: >
+    The String.prototype.localeCompare.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the String.prototype.localeCompare.length
+    property fails
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#0
@@ -31,4 +33,3 @@ if (!(String.prototype.localeCompare.hasOwnProperty('length'))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T1.js
index 5a7b583ab..eba9fcfc9 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of String.prototype.constructor is the built-in String constructor
- *
- * @path ch15/15.5/15.5.4/S15.5.4.1_A1_T1.js
- * @description Checking String.prototype.constructor
- */
+/*---
+info: >
+    The initial value of String.prototype.constructor is the built-in String
+    constructor
+description: Checking String.prototype.constructor
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (String.prototype.constructor !== String) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T2.js
index c4e2b175c..95a1fcbde 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.1_A1_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of String.prototype.constructor is the built-in String constructor
- *
- * @path ch15/15.5/15.5.4/S15.5.4.1_A1_T2.js
- * @description Create new String.prototype.constructor object and check it
- */
+/*---
+info: >
+    The initial value of String.prototype.constructor is the built-in String
+    constructor
+description: Create new String.prototype.constructor object and check it
+---*/
 
 var __constr = String.prototype.constructor;
 
@@ -47,4 +47,3 @@ if (__instance.toString() !== __to_string_result) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T1.js
index 66934a4ac..a175c07a5 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A1_T1.js
- * @description Create new String(number) and check it`s method toString()
- */
+/*---
+info: String.prototype.toString() returns this string value
+description: Create new String(number) and check it`s method toString()
+---*/
 
 var __string__obj = new String(1);
 
@@ -17,4 +15,3 @@ if (__string__obj.toString() !== ""+1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T2.js
index b8c88ac62..ac43b0af6 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A1_T2.js
- * @description Create new String(boolean) and check it`s method toString()
- */
+/*---
+info: String.prototype.toString() returns this string value
+description: Create new String(boolean) and check it`s method toString()
+---*/
 
 var __string__obj = new String(true);
 
@@ -17,4 +15,3 @@ if (__string__obj.toString() !== ""+true) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T3.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T3.js
index 0099e68c7..40f34e309 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A1_T3.js
- * @description Create new String(string) and check it`s method toString()
- */
+/*---
+info: String.prototype.toString() returns this string value
+description: Create new String(string) and check it`s method toString()
+---*/
 
 var __string__obj = new String("metal");
 
@@ -17,4 +15,3 @@ if (__string__obj.toString() !== "metal") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T4.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T4.js
index ce76b13ec..3f4b1defb 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A1_T4.js
- * @description Create new String(function(){}()) and check it`s method toString()
- */
+/*---
+info: String.prototype.toString() returns this string value
+description: Create new String(function(){}()) and check it`s method toString()
+---*/
 
 var __string__obj = new String(function(){}());
 
@@ -17,4 +15,3 @@ if (__string__obj.toString() !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T1.js
index 07385a3ec..7da0b2ca3 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a String object. Therefore, it cannot be transferred to other kinds of objects for use as a method
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A2_T1.js
- * @description Checking if creating variable String.prototype.toString fails
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a String object. Therefore, it cannot be
+    transferred to other kinds of objects for use as a method
+description: Checking if creating variable String.prototype.toString fails
+includes: [$FAIL.js]
+---*/
 
 var __toString = String.prototype.toString;
 
@@ -31,4 +33,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T2.js
index fee77c5f2..e060fbbf1 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A2_T2.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a String object. Therefore, it cannot be transferred to other kinds of objects for use as a method
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A2_T2.js
- * @description Checking if creating the object String.prototype.toString fails
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a String object. Therefore, it cannot be
+    transferred to other kinds of objects for use as a method
+description: Checking if creating the object String.prototype.toString fails
+includes: [$FAIL.js]
+---*/
 
 var __obj={toString : String.prototype.toString};
 
@@ -31,4 +33,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A3_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A3_T1.js
index 5d95ca6cb..8c2491976 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A3_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString() is equal String.prototype.valueOf()
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A3_T1.js
- * @description Create new String() with various arguments and compare returned results of toString() and valueOf()
- */
+/*---
+info: String.prototype.toString() is equal String.prototype.valueOf()
+description: >
+    Create new String() with various arguments and compare returned
+    results of toString() and valueOf()
+---*/
 
 //CHECK#1
 var str = new String();
@@ -27,4 +27,3 @@ if(!(str.valueOf() == str.toString()))
 str = new String(Math.PI);
 if(!(str.valueOf() == str.toString()))
   $ERROR('#4: str = new String(Math.PI),str.valueOf() == str.toString()');
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A4_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A4_T1.js
index 6a0ca09ad..0ac79f88e 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A4_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.2_A4_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.toString have length property and it is equal 0
- *
- * @path ch15/15.5/15.5.4/S15.5.4.2_A4_T1.js
- * @description Checking String.prototype.toString.length property
- */
+/*---
+info: String.prototype.toString have length property and it is equal 0
+description: Checking String.prototype.toString.length property
+---*/
 
 //CHECK#1
 if (String.prototype.toString.hasOwnProperty('length')!==true){
@@ -17,4 +15,3 @@ else{
 if (String.prototype.toString.length!==0)
   $ERROR('#2: String.prototype.toString.length===0. Actual: String.prototype.toString.length==='+String.prototype.toString.length); 
 }
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T1.js
index 94c2e9738..61b71f4f3 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.valueOf() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A1_T1.js
- * @description Create String object as new String(1) and check it`s valueOf()
- */
+/*---
+info: String.prototype.valueOf() returns this string value
+description: Create String object as new String(1) and check it`s valueOf()
+---*/
 
 var __string__obj = new String(1);
 
@@ -17,4 +15,3 @@ if (__string__obj.valueOf() !== ""+1) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T2.js
index 8ce7a26ce..8ada1b821 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.valueOf() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A1_T2.js
- * @description Create String object as new String(true) and check it`s valueOf()
- */
+/*---
+info: String.prototype.valueOf() returns this string value
+description: Create String object as new String(true) and check it`s valueOf()
+---*/
 
 var __string__obj = new String(true);
 
@@ -17,4 +15,3 @@ if (__string__obj.valueOf() !== ""+true) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T3.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T3.js
index 974ee4347..86447cc53 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T3.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.valueOf() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A1_T3.js
- * @description Create String object as new String(string) and check it`s valueOf()
- */
+/*---
+info: String.prototype.valueOf() returns this string value
+description: Create String object as new String(string) and check it`s valueOf()
+---*/
 
 var __string__obj = new String("metal");
 
@@ -17,4 +15,3 @@ if (__string__obj.valueOf() !== "metal") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T4.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T4.js
index ec4b40103..906d66782 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T4.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A1_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String.prototype.valueOf() returns this string value
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A1_T4.js
- * @description Create String object as new String(function(){}()) and check it`s valueOf()
- */
+/*---
+info: String.prototype.valueOf() returns this string value
+description: >
+    Create String object as new String(function(){}()) and check it`s
+    valueOf()
+---*/
 
 var __string__obj = new String(function(){}());
 
@@ -17,4 +17,3 @@ if (__string__obj.valueOf() !== "undefined") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T1.js
index daefea484..934387e0d 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic; it throws a TypeError exception if its this value is not a String object.
- * Therefore, it cannot be transferred to other kinds of objects for use as a method
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A2_T1.js
- * @description Checking if creating variable String.prototype.valueOf fails
- */
+/*---
+info: >
+    The valueOf function is not generic; it throws a TypeError exception if its this value is not a String object.
+    Therefore, it cannot be transferred to other kinds of objects for use as a method
+description: Checking if creating variable String.prototype.valueOf fails
+includes: [$FAIL.js]
+---*/
 
 var __valueOf = String.prototype.valueOf;
 
@@ -32,4 +32,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T2.js
index e411d04a7..84d6bab66 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4.3_A2_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic; it throws a TypeError exception if its this value is not a String object.
- * Therefore, it cannot be transferred to other kinds of objects for use as a method
- *
- * @path ch15/15.5/15.5.4/S15.5.4.3_A2_T2.js
- * @description Checking if creating the object String.prototype.valueOf fails
- */
+/*---
+info: >
+    The valueOf function is not generic; it throws a TypeError exception if its this value is not a String object.
+    Therefore, it cannot be transferred to other kinds of objects for use as a method
+description: Checking if creating the object String.prototype.valueOf fails
+includes: [$FAIL.js]
+---*/
 
 var __obj={valueOf : String.prototype.valueOf};
 
@@ -32,4 +32,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4_A1.js b/test/suite/ch15/15.5/15.5.4/S15.5.4_A1.js
index a7a22899e..ff0f79dfc 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4_A1.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4_A1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String prototype object is itself a String object (its [[Class]] is "String")
- *
- * @path ch15/15.5/15.5.4/S15.5.4_A1.js
- * @description first we delete String.prototype.toString cause it overrides Object prototype toString.
- * Object.prototype.toString returns [object+[[class]]+]
- */
+/*---
+info: >
+    The String prototype object is itself a String object (its [[Class]] is
+    "String")
+description: >
+    first we delete String.prototype.toString cause it overrides
+    Object prototype toString.  Object.prototype.toString returns
+    [object+[[class]]+]
+---*/
 
 delete String.prototype.toString;
 
@@ -18,4 +20,3 @@ if (String.prototype.toString() !== "[object "+"String"+"]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4_A2.js b/test/suite/ch15/15.5/15.5.4/S15.5.4_A2.js
index 06ec51459..f1aa02334 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4_A2.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The String prototype object is itself a String object whose value is an empty string
- *
- * @path ch15/15.5/15.5.4/S15.5.4_A2.js
- * @description Checking String.prototype
- */
+/*---
+info: >
+    The String prototype object is itself a String object whose value is an
+    empty string
+description: Checking String.prototype
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -15,4 +15,3 @@ if (String.prototype !="") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.4/S15.5.4_A3.js b/test/suite/ch15/15.5/15.5.4/S15.5.4_A3.js
index 1f8df3820..738afcf86 100644
--- a/test/suite/ch15/15.5/15.5.4/S15.5.4_A3.js
+++ b/test/suite/ch15/15.5/15.5.4/S15.5.4_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the String prototype object is the Object prototype object (15.2.3.1)
- *
- * @path ch15/15.5/15.5.4/S15.5.4_A3.js
- * @description Checking Object.prototype.isPrototypeOf(String.prototype)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the String prototype
+    object is the Object prototype object (15.2.3.1)
+description: Checking Object.prototype.isPrototypeOf(String.prototype)
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -25,4 +25,3 @@ if (String.prototype.toString() != "[object "+"String"+"]") {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-1.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-1.js
index 054db6236..bbd9c08be 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-1.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-1.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-1.js

- * @description String object supports bracket notation to lookup of data properties

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-  s.foo = 1;

-  

-  if (s["foo"] === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object supports bracket notation to lookup of data
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+  s.foo = 1;
+  
+  if (s["foo"] === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-2.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-2.js
index 29cd56e9f..aed4de489 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-2.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-2.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-1-2.js

- * @description String value supports bracket notation to lookup data properties

- */

-

-

-function testcase() {

-  var s = String("hello world");

-  

-  if (s["foo"] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: String value supports bracket notation to lookup data properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+  
+  if (s["foo"] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-1.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-1.js
index 676b19df4..4df659061 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-1.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-1.js

- * @description String object indexing returns undefined for missing data properties

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-  

-  if (s["foo"] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined for missing data
+    properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+  
+  if (s["foo"] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-2.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-2.js
index d21cd552e..a262a0aaa 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-2.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-2.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-2.js

- * @description String value indexing returns undefined for missing data properties

- */

-

-

-function testcase() {

-  var s = String("hello world");

-  

-  if (s["foo"] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: String value indexing returns undefined for missing data properties
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+  
+  if (s["foo"] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-3.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-3.js
index 2f4e0fc80..7d6b5dc2a 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-3.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-3.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-3.js

- * @description String object indexing returns undefined if the numeric index (NaN) is not an array index

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-

-  if (s[NaN] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined if the numeric index
+    (NaN) is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+
+  if (s[NaN] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-4.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-4.js
index 3e014dccc..08e3a0fce 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-4.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-4.js

- * @description String object indexing returns undefined if the numeric index (Infinity) is not an array index

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-

-  if (s[Infinity] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined if the numeric index
+    (Infinity) is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+
+  if (s[Infinity] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-5.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-5.js
index df7af1bab..054113a11 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-5.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-5.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-5.js

- * @description String object indexing returns undefined if the numeric index ( 2^32-1) is not an array index

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-

-  if (s[Math.pow(2, 32)-1]===undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined if the numeric index (
+    2^32-1) is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+
+  if (s[Math.pow(2, 32)-1]===undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-6.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-6.js
index 0ff361ca6..0b52dc662 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-6.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-6.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-6.js

- * @description String value indexing returns undefined if the numeric index (NaN) is not an array index

- */

-

-

-function testcase() {

-  var s = String("hello world");

-

-  if (s[NaN] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String value indexing returns undefined if the numeric index (NaN)
+    is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+
+  if (s[NaN] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-7.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-7.js
index 1d30edcf4..c2543eea0 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-7.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-7.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-7.js

- * @description String value indexing returns undefined if the numeric index (Infinity) is not an array index

- */

-

-

-function testcase() {

-  var s = String("hello world");

-

-  if (s[Infinity] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String value indexing returns undefined if the numeric index
+    (Infinity) is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+
+  if (s[Infinity] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-8.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-8.js
index d2363cd13..d8aa657c2 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-8.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-8.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-3-8.js

- * @description String value indexing returns undefined if the numeric index ( >= 2^32-1) is not an array index

- */

-

-

-function testcase() {

-  var s = String("hello world");

-

-  if (s[Math.pow(2, 32)-1]===undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String value indexing returns undefined if the numeric index ( >=
+    2^32-1) is not an array index
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+
+  if (s[Math.pow(2, 32)-1]===undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-1.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-1.js
index fbc563c11..e5887888a 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-1.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-1.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-1.js

- * @description String object indexing returns undefined if the numeric index is less than 0

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-

-  if (s[-1] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined if the numeric index is
+    less than 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+
+  if (s[-1] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-2.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-2.js
index 3d0a47288..1d77026f3 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-2.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-2.js

- * @description String value indexing returns undefined if the numeric index is less than 0

- */

-

-

-function testcase() {

-  var s = String("hello world");

-

-  if (s[-1] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String value indexing returns undefined if the numeric index is
+    less than 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+
+  if (s[-1] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-3.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-3.js
index 07bb26557..efb3cd40c 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-3.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-3.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-3.js

- * @description String object indexing returns undefined if the numeric index is greater than the string length

- */

-

-

-function testcase() {

-  var s = new String("hello world");

-

-  if (s[11] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String object indexing returns undefined if the numeric index is
+    greater than the string length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = new String("hello world");
+
+  if (s[11] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-4.js b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-4.js
index 712f38737..650200d7a 100644
--- a/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-4.js
+++ b/test/suite/ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-4.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing

- * notation to look up non numeric property names.

- *

- * @path ch15/15.5/15.5.5/15.5.5.2/15.5.5.5.2-7-4.js

- * @description String value indexing returns undefined if the numeric index is greater than the string length

- */

-

-

-function testcase() {

-  var s = String("hello world");

-

-  if (s[11] === undefined) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.5.5.2 defines [[GetOwnProperty]] for Strings. It supports using indexing
+    notation to look up non numeric property names.
+description: >
+    String value indexing returns undefined if the numeric index is
+    greater than the string length
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var s = String("hello world");
+
+  if (s[11] === undefined) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A1.js b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A1.js
index 90cf55b6f..45101aa06 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A1.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * length property contains the number of characters in the String value represented by this String object
- *
- * @path ch15/15.5/15.5.5/S15.5.5.1_A1.js
- * @description Create strings and check its length
- */
+/*---
+info: >
+    length property contains the number of characters in the String value
+    represented by this String object
+description: Create strings and check its length
+---*/
 
 var __str__instance = new String("ABC\u0041\u0042\u0043");
 
@@ -27,4 +27,3 @@ if (__str__instance.length !== 0) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A2.js b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A2.js
index 3de19c475..80cccb074 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A2.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * length property has the attributes {DontEnum}
- *
- * @path ch15/15.5/15.5.5/S15.5.5.1_A2.js
- * @description Checking if enumerating the length property of String fails
- */
+/*---
+info: length property has the attributes {DontEnum}
+description: Checking if enumerating the length property of String fails
+---*/
 
 var __str__instance = new String("globglob");
 
@@ -27,4 +25,3 @@ for(prop in __str__instance){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A3.js b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A3.js
index 79daa3c66..d53162299 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A3.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * length property has the attributes {DontDelete}
- *
- * @path ch15/15.5/15.5.5/S15.5.5.1_A3.js
- * @description Checking if deleting the length property of String fails
- */
+/*---
+info: length property has the attributes {DontDelete}
+description: Checking if deleting the length property of String fails
+---*/
 
 var __str__instance = new String("globglob");
 
@@ -33,4 +31,3 @@ if (!(__str__instance.hasOwnProperty("length"))) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A4.js b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A4.js
index ccc5253ad..c44e2ebba 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A4.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * length property has the attributes {ReadOnly}
- *
- * @path ch15/15.5/15.5.5/S15.5.5.1_A4.js
- * @description Checking if varying the length property of String fails
- */
+/*---
+info: length property has the attributes {ReadOnly}
+description: Checking if varying the length property of String fails
+---*/
 
 var __str__instance = new String("globglob");
 
@@ -56,4 +54,3 @@ if (__str__instance.length !== 8) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A5.js b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A5.js
index d5cc38bd9..1cf004c87 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A5.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5.1_A5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Once a String object is created, the length property is unchanging
- *
- * @path ch15/15.5/15.5.5/S15.5.5.1_A5.js
- * @description Change valueOf and toString of String object and check length property
- */
+/*---
+info: Once a String object is created, the length property is unchanging
+description: >
+    Change valueOf and toString of String object and check length
+    property
+---*/
 
 var __str__instance = new String("ABC\u0041\u0042\u0043");
 
@@ -36,4 +36,3 @@ if (__str__instance.length !== 6) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T1.js b/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T1.js
index 33aaacb49..a70ea6ab4 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T1.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T1.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String instance has not [[call]] property
- *
- * @path ch15/15.5/15.5.5/S15.5.5_A1_T1.js
- * @description Create new String and try call it
- */
+/*---
+info: String instance has not [[call]] property
+description: Create new String and try call it
+includes: [$FAIL.js]
+---*/
 
 var __str = new String;
 
@@ -22,4 +21,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T2.js b/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T2.js
index 6396fadb8..e3f93a9d2 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T2.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String instance has not [[call]] property
- *
- * @path ch15/15.5/15.5.5/S15.5.5_A1_T2.js
- * @description Checking if creating new "String("a|b")()" fails
- */
+/*---
+info: String instance has not [[call]] property
+description: Checking if creating new "String("a|b")()" fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -20,4 +19,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T1.js b/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T1.js
index dea7b8d37..1c6021517 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T1.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T1.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String instance has not [[construct]] property
- *
- * @path ch15/15.5/15.5.5/S15.5.5_A2_T1.js
- * @description Create new string object and try new created_string
- */
+/*---
+info: String instance has not [[construct]] property
+description: Create new string object and try new created_string
+includes: [$FAIL.js]
+---*/
 
 var __str = new Object("");
 
@@ -22,4 +21,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T2.js b/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T2.js
index fb2595662..d8ac954fb 100644
--- a/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T2.js
+++ b/test/suite/ch15/15.5/15.5.5/S15.5.5_A2_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * String instance has not [[construct]] property
- *
- * @path ch15/15.5/15.5.5/S15.5.5_A2_T2.js
- * @description Checking if creating "new String" fails
- */
+/*---
+info: String instance has not [[construct]] property
+description: Checking if creating "new String" fails
+includes: [$FAIL.js]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -20,4 +19,3 @@ try {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T1.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T1.js
index 6dae5ce9d..9e3728867 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T1.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T1.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Returns a boolean value (not a Boolean object) computed by
- * ToBoolean(value)
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A1_T1.js
- * @description Used values 1, new String("1"), new Object(1) and called without argument
- */
+/*---
+info: >
+    Returns a boolean value (not a Boolean object) computed by
+    ToBoolean(value)
+description: >
+    Used values 1, new String("1"), new Object(1) and called without
+    argument
+---*/
 
 //CHECK#1
 if( typeof Boolean() !== "boolean" ) {
@@ -28,5 +29,3 @@ if( typeof Boolean(new String("1")) !== "boolean" ) {
 if( typeof Boolean(new Object(1)) !== "boolean" ) {
   $ERROR('#4: typeof Boolean(new Object(1)) should be "boolean", actual is "'+typeof Boolean(new Object(1))+'"');
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T2.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T2.js
index 21593718c..6ac17ef33 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T2.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Returns a boolean value (not a Boolean object) computed by
- * ToBoolean(value)
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A1_T2.js
- * @description Used various number values as argument
- */
+/*---
+info: >
+    Returns a boolean value (not a Boolean object) computed by
+    ToBoolean(value)
+description: Used various number values as argument
+---*/
 
 //CHECK#1
 if( typeof Boolean(0) !== "boolean" ) {
@@ -40,4 +39,3 @@ if( typeof Boolean(NaN) !== "boolean" ) {
 if( Boolean(NaN) !== false ) {
   $ERROR('#4.2: Boolean(NaN) should be false, actual is '+Boolean(NaN));
 }
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T3.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T3.js
index 2e943849e..4b18022d8 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T3.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Returns a boolean value (not a Boolean object) computed by
- * ToBoolean(value)
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A1_T3.js
- * @description Used various string values as argument
- */
+/*---
+info: >
+    Returns a boolean value (not a Boolean object) computed by
+    ToBoolean(value)
+description: Used various string values as argument
+---*/
 
 //CHECK#1
 if( typeof Boolean("0") !== "boolean" ) {
@@ -48,4 +47,3 @@ if( typeof Boolean("true") !== "boolean" ) {
 if( Boolean("true") !== true ) {
   $ERROR('#5.2: Boolean("true") should be true');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T4.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T4.js
index bef38a5cb..7fc4c58a8 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T4.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Returns a boolean value (not a Boolean object) computed by
- * ToBoolean(value)
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A1_T4.js
- * @description Used various undefined values and null as argument
- */
+/*---
+info: >
+    Returns a boolean value (not a Boolean object) computed by
+    ToBoolean(value)
+description: Used various undefined values and null as argument
+---*/
 
 //CHECK#1
 if( typeof Boolean(undefined) !== "boolean" ) {
@@ -49,4 +48,3 @@ if( Boolean(x) !== false ) {
   $ERROR('#5.2: var x; Boolean(x) should be false');
 }
 var x;
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T5.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T5.js
index 015ef1f72..8fb90a449 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T5.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A1_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Returns a boolean value (not a Boolean object) computed by
- * ToBoolean(value)
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A1_T5.js
- * @description Used various assigning values to any variable as argument
- */
+/*---
+info: >
+    Returns a boolean value (not a Boolean object) computed by
+    ToBoolean(value)
+description: Used various assigning values to any variable as argument
+---*/
 
 //CHECK#1
 if( typeof Boolean(x=0) !== "boolean" ) {
@@ -48,4 +47,3 @@ if( typeof Boolean(x=null) !== "boolean" ) {
 if( Boolean(x=null) !== false ) {
   $ERROR('#5.2: Boolean(x=null) should be false');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A2.js b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A2.js
index b27d14f4b..3e5eef2f2 100644
--- a/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A2.js
+++ b/test/suite/ch15/15.6/15.6.1/S15.6.1.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean() returns false
- *
- * @path ch15/15.6/15.6.1/S15.6.1.1_A2.js
- * @description Call Boolean() and check result
- */
+/*---
+info: Boolean() returns false
+description: Call Boolean() and check result
+---*/
 
 //CHECK#1
 if( typeof Boolean() !== "boolean" ) {
@@ -17,4 +15,3 @@ if( typeof Boolean() !== "boolean" ) {
 if( Boolean() !== false ) {
   $ERROR('#2: Boolean() should be false');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A1.js b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A1.js
index e7dc655bf..80fb7bccf 100644
--- a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A1.js
+++ b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Boolean is called as part of a new expression it is
- * a constructor: it initialises the newly created object
- *
- * @path ch15/15.6/15.6.2/S15.6.2.1_A1.js
- * @description Checking type of the newly created object and it value
- */
+/*---
+info: >
+    When Boolean is called as part of a new expression it is
+    a constructor: it initialises the newly created object
+description: Checking type of the newly created object and it value
+---*/
 
 //CHECK#1
 if (typeof new Boolean() !== "object") {
@@ -52,4 +51,3 @@ var x8 = new Boolean(1);
 if(x8 === undefined){
   $ERROR("#8: new Boolean(1) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A2.js b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A2.js
index 1d5c38097..76257d4cb 100644
--- a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A2.js
+++ b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Boolean prototype object, the one that is the
- * initial value of Boolean.prototype
- *
- * @path ch15/15.6/15.6.2/S15.6.2.1_A2.js
- * @description Checking prototype property of the newly created object
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Boolean prototype object, the one that is the
+    initial value of Boolean.prototype
+description: Checking prototype property of the newly created object
+---*/
 
 // CHECK#1
 var x1 = new Boolean(1);
@@ -27,4 +26,3 @@ var x3 = new Boolean(3);
 if (Boolean.prototype !== x3.constructor.prototype) {
   $ERROR('#3: Boolean.prototype === x3.constructor.prototype');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A3.js b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A3.js
index 0f34d486d..0d562500f 100644
--- a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A3.js
+++ b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set to ToBoolean(value)
- *
- * @path ch15/15.6/15.6.2/S15.6.2.1_A3.js
- * @description Checking value of the newly created object
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set to ToBoolean(value)
+description: Checking value of the newly created object
+---*/
 
 // CHECK#1
 var x1 = new Boolean(1);
@@ -32,4 +31,3 @@ var x2 = new Boolean(new Object());
 if (x2.valueOf() !== true) {
   $ERROR('#4: var x2 = new Boolean(new Object()); x2.valueOf() === true');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A4.js b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A4.js
index 34f32b9eb..2e24fa739 100644
--- a/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A4.js
+++ b/test/suite/ch15/15.6/15.6.2/S15.6.2.1_A4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Boolean"
- *
- * @path ch15/15.6/15.6.2/S15.6.2.1_A4.js
- * @description For testing toString function is used
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Boolean"
+description: For testing toString function is used
+---*/
 
 delete Boolean.prototype.toString;
 
@@ -17,4 +16,3 @@ var obj = new Boolean();
 if (obj.toString() !== "[object Boolean]") {
   $ERROR('#1: The [[Class]] property of the newly constructed object is set to "Boolean"');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A1.js b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A1.js
index dc02388d8..7ae52739b 100644
--- a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A1.js
+++ b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Boolean.prototype is the Boolean
- * prototype object
- *
- * @path ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A1.js
- * @description Checking Boolean.prototype property
- */
+/*---
+info: >
+    The initial value of Boolean.prototype is the Boolean
+    prototype object
+description: Checking Boolean.prototype property
+---*/
 
 //CHECK#1
 if (typeof Boolean.prototype !== "object") {
@@ -24,4 +23,3 @@ delete Boolean.prototype.toString;
 if (Boolean.prototype.toString() !== "[object Boolean]") {
   $ERROR('#3: The [[Class]] property of the Boolean prototype object is set to "Boolean"');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A2.js b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A2.js
index 5a18d22ac..758811e8d 100644
--- a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A2.js
+++ b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean.prototype has the attribute ReadOnly
- *
- * @path ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A2.js
- * @description Checking if varying the Boolean.prototype property fails
- */
+/*---
+info: Boolean.prototype has the attribute ReadOnly
+description: Checking if varying the Boolean.prototype property fails
+---*/
 
 // CHECK#1
 x = Boolean.prototype;
@@ -14,4 +12,3 @@ Boolean.prototype = 1;
 if (Boolean.prototype !== x) {
   $ERROR('#1: Boolean.prototype has the attribute ReadOnly');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A3.js b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A3.js
index 7b9c12669..293e776fc 100644
--- a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A3.js
+++ b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A3.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean.prototype has the attribute DontDelete
- *
- * @path ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A3.js
- * @description Checking if deleting the Boolean.prototype property fails
- */
+/*---
+info: Boolean.prototype has the attribute DontDelete
+description: Checking if deleting the Boolean.prototype property fails
+---*/
 
 // CHECK#1
 if (delete Boolean.prototype !== false) {
   $ERROR('#1: Boolean.prototype has the attribute DontDelete');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A4.js b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A4.js
index e4d13be3d..cf9f213d7 100644
--- a/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A4.js
+++ b/test/suite/ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean.prototype has the attribute DontEnum
- *
- * @path ch15/15.6/15.6.3/15.6.3.1/S15.6.3.1_A4.js
- * @description Checking if enumerating the Boolean.prototype property fails
- */
+/*---
+info: Boolean.prototype has the attribute DontEnum
+description: Checking if enumerating the Boolean.prototype property fails
+---*/
 
 //CHECK#1
 for(x in Boolean) {
@@ -18,4 +16,3 @@ for(x in Boolean) {
 if (Boolean.propertyIsEnumerable('prototype')) {
   $ERROR('#2: Boolean.prototype has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/S15.6.3_A1.js b/test/suite/ch15/15.6/15.6.3/S15.6.3_A1.js
index 9ec6428d8..fa13ef9bb 100644
--- a/test/suite/ch15/15.6/15.6.3/S15.6.3_A1.js
+++ b/test/suite/ch15/15.6/15.6.3/S15.6.3_A1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Boolean constructor has the property "prototype"
- *
- * @path ch15/15.6/15.6.3/S15.6.3_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Boolean constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Boolean.hasOwnProperty("prototype")){
   $ERROR('#1: The Boolean constructor has the property "prototype"');
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.3/S15.6.3_A2.js b/test/suite/ch15/15.6/15.6.3/S15.6.3_A2.js
index edf988cd8..a5b814fff 100644
--- a/test/suite/ch15/15.6/15.6.3/S15.6.3_A2.js
+++ b/test/suite/ch15/15.6/15.6.3/S15.6.3_A2.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Boolean
- * constructor is the Function prototype object
- *
- * @path ch15/15.6/15.6.3/S15.6.3_A2.js
- * @description Checking prototype of the Boolean constructor
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Boolean
+    constructor is the Function prototype object
+description: Checking prototype of the Boolean constructor
+---*/
 
 //CHECK#1
 if (!(Function.prototype.isPrototypeOf(Boolean))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Boolean constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.3/S15.6.3_A3.js b/test/suite/ch15/15.6/15.6.3/S15.6.3_A3.js
index 7f926f384..5b6df8b14 100644
--- a/test/suite/ch15/15.6/15.6.3/S15.6.3_A3.js
+++ b/test/suite/ch15/15.6/15.6.3/S15.6.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean constructor has length property whose value is 1
- *
- * @path ch15/15.6/15.6.3/S15.6.3_A3.js
- * @description Checking Boolean.length property
- */
+/*---
+info: Boolean constructor has length property whose value is 1
+description: Checking Boolean.length property
+---*/
 
 //CHECK#1
 if (!Boolean.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if (!Boolean.hasOwnProperty("length")){
 if (Boolean.length !== 1) {
   $ERROR('#2: Boolean constructor length property value is 1');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.1_A1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.1_A1.js
index 8b8615920..478246a4c 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.1_A1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.1_A1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Boolean.prototype.constructor is the
- * built-in Boolean constructor
- *
- * @path ch15/15.6/15.6.4/S15.6.4.1_A1.js
- * @description Compare Boolean.prototype.constructor with Boolean
- */
+/*---
+info: >
+    The initial value of Boolean.prototype.constructor is the
+    built-in Boolean constructor
+description: Compare Boolean.prototype.constructor with Boolean
+---*/
 
 //CHECK#1
 if(Boolean.prototype.constructor !== Boolean){
   $ERROR('#1: Boolean.prototype.constructor === Boolean');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T1.js
index f21a1c484..14597edbf 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If this boolean value is true, then the string "true"
- * is returned, otherwise, this boolean value must be false, and the string
- * "false" is returned
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A1_T1.js
- * @description no arguments
- */
+/*---
+info: >
+    toString: If this boolean value is true, then the string "true"
+    is returned, otherwise, this boolean value must be false, and the string
+    "false" is returned
+description: no arguments
+---*/
 
 //CHECK#1
 if(Boolean.prototype.toString() !== "false"){
@@ -44,4 +43,3 @@ if((new Boolean(0)).toString() !== "false"){
 if((new Boolean(new Object())).toString() !== "true"){
   $ERROR('#7: (new Boolean(new Object())).toString() === "true"');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T2.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T2.js
index 8f172dfc5..ba7cd1add 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T2.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If this boolean value is true, then the string "true"
- * is returned, otherwise, this boolean value must be false, and the string
- * "false" is returned
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A1_T2.js
- * @description with some argument
- */
+/*---
+info: >
+    toString: If this boolean value is true, then the string "true"
+    is returned, otherwise, this boolean value must be false, and the string
+    "false" is returned
+description: with some argument
+---*/
 
 //CHECK#1
 if(Boolean.prototype.toString(true) !== "false"){
@@ -44,4 +43,3 @@ if((new Boolean(0)).toString(true) !== "false"){
 if((new Boolean(new Object())).toString(false) !== "true"){
   $ERROR('#7: (new Boolean(new Object())).toString(false) === "true"');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T1.js
index 120544dac..7ba9f2548 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A2_T1.js
- * @description transferring to the String objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the String objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.toString on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T2.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T2.js
index c19ed8b05..f0c8a388d 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T2.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A2_T2.js
- * @description transferring to the Number objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Number objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.toString on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T3.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T3.js
index ea99aa276..1125851e8 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T3.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A2_T3.js
- * @description transferring to the Date objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Date objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.toString on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T4.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T4.js
index f79b981ea..b32031757 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T4.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A2_T4.js
- * @description transferring to the Object objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Object objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.toString on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T5.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T5.js
index 877b5847b..5e7ec337d 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T5.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.2_A2_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.2_A2_T5.js
- * @description transferring to the other objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the other objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.toString on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T1.js
index 64d80c169..1990925c3 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean.prototype.valueOf() returns this boolean value
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A1_T1.js
- * @description no arguments
- */
+/*---
+info: Boolean.prototype.valueOf() returns this boolean value
+description: no arguments
+---*/
 
 //CHECK#1
 if(Boolean.prototype.valueOf() !== false){
@@ -37,5 +35,3 @@ if((new Boolean(1)).valueOf() !== true){
 if((new Boolean(new Object())).valueOf() !== true){
   $ERROR('#6: (new Boolean(new Object())).valueOf() === true');
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T2.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T2.js
index 1277467b8..be7cc07e3 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T2.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Boolean.prototype.valueOf() returns this boolean value
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A1_T2.js
- * @description calling with argument
- */
+/*---
+info: Boolean.prototype.valueOf() returns this boolean value
+description: calling with argument
+---*/
 
 //CHECK#1
 if(Boolean.prototype.valueOf(true) !== false){
@@ -37,5 +35,3 @@ if((new Boolean(1)).valueOf(false) !== true){
 if((new Boolean(new Object())).valueOf(false) !== true){
   $ERROR('#6: (new Boolean(new Object())).valueOf(false) === true');
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T1.js
index 962b420bb..fa529439b 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A2_T1.js
- * @description transferring to the String objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the String objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.valueOf on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T2.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T2.js
index 34b102599..cb1152616 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T2.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A2_T2.js
- * @description transferring to the Number objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Number objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.valueOf on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T3.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T3.js
index 44579bdcc..79ebdffc1 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T3.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A2_T3.js
- * @description transferring to the Date objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Date objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.valueOf on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T4.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T4.js
index 535287f93..d7c8c457f 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T4.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A2_T4.js
- * @description transferring to the Object objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the Object objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.valueOf on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T5.js b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T5.js
index ef3c07c39..e9f52c750 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T5.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4.3_A2_T5.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Boolean object
- *
- * @path ch15/15.6/15.6.4/S15.6.4.3_A2_T5.js
- * @description transferring to the other objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Boolean object
+description: transferring to the other objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Boolean.prototype.valueOf on not a Boolean object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4_A1.js b/test/suite/ch15/15.6/15.6.4/S15.6.4_A1.js
index eb030d876..87825f152 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4_A1.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Boolean prototype object is itself a Boolean object
- * (its [[Class]] is "Boolean") whose value is false
- *
- * @path ch15/15.6/15.6.4/S15.6.4_A1.js
- * @description Checking type and value of Boolean.prototype
- */
+/*---
+info: >
+    The Boolean prototype object is itself a Boolean object
+    (its [[Class]] is "Boolean") whose value is false
+description: Checking type and value of Boolean.prototype
+---*/
 
 //CHECK#1
 if (typeof Boolean.prototype !== "object") {
@@ -24,4 +23,3 @@ delete Boolean.prototype.toString;
 if (Boolean.prototype.toString() !== "[object Boolean]") {
   $ERROR('#3: The [[Class]] property of the Boolean prototype object is set to "Boolean"');
 }
-
diff --git a/test/suite/ch15/15.6/15.6.4/S15.6.4_A2.js b/test/suite/ch15/15.6/15.6.4/S15.6.4_A2.js
index d7c8c429f..c3f459531 100644
--- a/test/suite/ch15/15.6/15.6.4/S15.6.4_A2.js
+++ b/test/suite/ch15/15.6/15.6.4/S15.6.4_A2.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Boolean
- * prototype object is the Object prototype object
- *
- * @path ch15/15.6/15.6.4/S15.6.4_A2.js
- * @description Checking Object.prototype.isPrototypeOf(Boolean.prototype)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Boolean
+    prototype object is the Object prototype object
+description: Checking Object.prototype.isPrototypeOf(Boolean.prototype)
+---*/
 
 //CHECK#1
 if (!Object.prototype.isPrototypeOf(Boolean.prototype)) {
   $ERROR('#1: Object prototype object is the prototype of Boolean prototype object');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A1.js b/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A1.js
index 01658e53f..ae7a08040 100644
--- a/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A1.js
+++ b/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number([value]) returns a number value (not a Number object) computed by ToNumber(value) if value was supplied
- *
- * @path ch15/15.7/15.7.1/S15.7.1.1_A1.js
- * @description Used values "10", 10, new String("10"), new Object(10) and "abc"
- */
+/*---
+info: >
+    Number([value]) returns a number value (not a Number object) computed by
+    ToNumber(value) if value was supplied
+description: Used values "10", 10, new String("10"), new Object(10) and "abc"
+---*/
 
 //CHECK#1
 if( typeof Number("10") !== "number" ) {
@@ -37,4 +37,3 @@ if( typeof Number("abc") !== "number" ) {
 if( !isNaN(Number("abc"))) {
 	$ERROR('#6: Number("abc")) should be NaN');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A2.js b/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A2.js
index 2c0f3e05e..43ab8b85d 100644
--- a/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A2.js
+++ b/test/suite/ch15/15.7/15.7.1/S15.7.1.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number() returns +0
- *
- * @path ch15/15.7/15.7.1/S15.7.1.1_A2.js
- * @description Call Number() and check result
- */
+/*---
+info: Number() returns +0
+description: Call Number() and check result
+---*/
 
 //CHECK#1
 if( typeof Number() !== "number" ) {
@@ -19,5 +17,3 @@ if( Number() !== 0 ) {
 } else if( 1/Number() !== Number.POSITIVE_INFINITY ) {
   $ERROR('#2: Number() === +0, actual is '+Number());
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A1.js b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A1.js
index fef5538a3..e84748060 100644
--- a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A1.js
+++ b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Number is called as part of a new expression it is
- * a constructor: it initialises the newly created object
- *
- * @path ch15/15.7/15.7.2/S15.7.2.1_A1.js
- * @description Checking type of the newly created object and it value
- */
+/*---
+info: >
+    When Number is called as part of a new expression it is
+    a constructor: it initialises the newly created object
+description: Checking type of the newly created object and it value
+---*/
 
 //CHECK#1
 if (typeof new Number() !== "object") {
@@ -52,4 +51,3 @@ var x8 = new Number(10);
 if(x8 === undefined){
   $ERROR("#8: new Number(10) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A2.js b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A2.js
index e5c73a3b8..62b40cf31 100644
--- a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A2.js
+++ b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Number prototype object, the one that is the
- * initial value of Number.prototype
- *
- * @path ch15/15.7/15.7.2/S15.7.2.1_A2.js
- * @description Checking prototype property of the newly created objects
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Number prototype object, the one that is the
+    initial value of Number.prototype
+description: Checking prototype property of the newly created objects
+---*/
 
 // CHECK#1
 var x1 = new Number(1);
@@ -27,4 +26,3 @@ var x3 = new Number(3);
 if (Number.prototype !== x3.constructor.prototype) {
   $ERROR('#3: Number.prototype === x3.constructor.prototype');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A3.js b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A3.js
index 685e88cb5..55a7096f1 100644
--- a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A3.js
+++ b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set to ToNumber(value) if value was supplied, else to +0
- *
- * @path ch15/15.7/15.7.2/S15.7.2.1_A3.js
- * @description Checking value of the newly created object
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set to ToNumber(value) if value was supplied, else to +0
+description: Checking value of the newly created object
+---*/
 
 //CHECK#1
 var x1 = new Number(1);
@@ -22,4 +21,3 @@ if (x2.valueOf() !== 0) {
 } else if( 1/x2.valueOf() !== Number.POSITIVE_INFINITY ) {
   $ERROR('#2.2: var x2 = new Number(); x2.valueOf() === +0');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A4.js b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A4.js
index f060047b1..20a142a58 100644
--- a/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A4.js
+++ b/test/suite/ch15/15.7/15.7.2/S15.7.2.1_A4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Number"
- *
- * @path ch15/15.7/15.7.2/S15.7.2.1_A4.js
- * @description For testing toString function is used
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Number"
+description: For testing toString function is used
+---*/
 
 delete Number.prototype.toString;
 
@@ -17,4 +16,3 @@ var obj = new Number();
 if (obj.toString() !== "[object Number]") {
   $ERROR('#1: The [[Class]] property of the newly constructed object is set to "Number"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3-1.js b/test/suite/ch15/15.7/15.7.3/15.7.3-1.js
index 0b53c4524..52888347c 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3-1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.7/15.7.3/15.7.3-1.js

- * @description Number constructor - [[Prototype]] is the Function prototype object

- */

-

-

-function testcase() {

-  if (Function.prototype.isPrototypeOf(Number) === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Number constructor - [[Prototype]] is the Function prototype object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Function.prototype.isPrototypeOf(Number) === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3-2.js b/test/suite/ch15/15.7/15.7.3/15.7.3-2.js
index e1e158975..01b8fe4a5 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3-2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3-2.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.7/15.7.3/15.7.3-2.js

- * @description Number constructor - [[Prototype]] is the Function prototype object (using getPrototypeOf)

- */

-

-

-function testcase() {

-  var p = Object.getPrototypeOf(Number);

-  if (p === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Number constructor - [[Prototype]] is the Function prototype
+    object (using getPrototypeOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var p = Object.getPrototypeOf(Number);
+  if (p === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-1.js
index b0d8d8934..cf81025fb 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-1.js

- * @description Number.prototype is a data property with default attribute values (false)

- */

-

-

-function testcase() {

-  var d = Object.getOwnPropertyDescriptor(Number, 'prototype');

-  

-  if (d.writable === false &&

-      d.enumerable === false &&

-      d.configurable === false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Number.prototype is a data property with default attribute values
+    (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(Number, 'prototype');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-2.js
index 16a01753a..29588a9ec 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-2.js
@@ -1,16 +1,16 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.7/15.7.3/15.7.3.1/15.7.3.1-2.js

- * @description Number.prototype, initial value is the Number prototype object

- */

-

-

-function testcase() {

-  // assume that Number.prototype has not been modified.

-  return Object.getPrototypeOf(new Number(42))===Number.prototype;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Number.prototype, initial value is the Number prototype object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // assume that Number.prototype has not been modified.
+  return Object.getPrototypeOf(new Number(42))===Number.prototype;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T1.js
index a33041998..84e4b969a 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T1.js
- * @description Checking if varying the Number.prototype property fails
- */
+/*---
+info: >
+    The Number property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking if varying the Number.prototype property fails
+---*/
 
 //CHECK#1
 var x = Number.prototype;
@@ -14,4 +14,3 @@ Number.prototype = 1;
 if (Number.prototype !== x) {
   $ERROR('#1: The Number.prototype property has the attributes ReadOnly');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T2.js
index 2916cbe49..f8fe6ee9b 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T2.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T2.js
- * @description Checking if deleting the Number.prototype property fails
- * @noStrict
- */
+/*---
+info: >
+    The Number property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking if deleting the Number.prototype property fails
+flags: [noStrict]
+includes: [$FAIL.js]
+---*/
 
 // CHECK#1
 if (delete Number.prototype !== false) {
@@ -17,4 +18,3 @@ if (delete Number.prototype !== false) {
 if (!Number.hasOwnProperty('prototype')) {
   $FAIL('#2: The Number.prototype property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T3.js
index 3246804d7..ba1902f99 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A1_T3.js
- * @description Checking if enumerating the Number.prototype property fails
- */
+/*---
+info: >
+    The Number property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking if enumerating the Number.prototype property fails
+---*/
 
 if (Number.propertyIsEnumerable('prototype')) {
   $ERROR('#1: The Number.prototype property has the attribute DontEnum');
@@ -17,4 +17,3 @@ for(x in Number) {
     $ERROR('#2: The Number.prototype has the attribute DontEnum');
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T1.js
index a2acd1076..3388d1d31 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.prototype is itself Number object
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T1.js
- * @description Checking type of Number.prototype property - test based on
- * deleting Number.prototype.toString
- */
+/*---
+info: Number.prototype is itself Number object
+description: >
+    Checking type of Number.prototype property - test based on
+    deleting Number.prototype.toString
+---*/
 
 //CHECK#1
 if (typeof Number.prototype !== "object") {
@@ -19,4 +18,3 @@ delete Number.prototype.toString;
 if (Number.prototype.toString() !== "[object Number]") {
   $ERROR('#3: The [[Class]] property of the Number prototype object is set to "Number"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T2.js
index 89477243f..48879313c 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.prototype is itself Number object
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A2_T2.js
- * @description Checking type of Number.prototype property - test based on
- * overwriting of Number.prototype.toString
- */
+/*---
+info: Number.prototype is itself Number object
+description: >
+    Checking type of Number.prototype property - test based on
+    overwriting of Number.prototype.toString
+---*/
 
 //CHECK#1
 if (typeof Number.prototype !== "object") {
@@ -19,4 +18,3 @@ Number.prototype.toString = Object.prototype.toString;
 if (Number.prototype.toString() !== "[object Number]") {
   $ERROR('#3: The [[Class]] property of the Number prototype object is set to "Number"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A3.js
index 8e9d04066..fe4e73732 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.prototype value is +0
- *
- * @path ch15/15.7/15.7.3/15.7.3.1/S15.7.3.1_A3.js
- * @description Checking value of Number.prototype property
- */
+/*---
+info: Number.prototype value is +0
+description: Checking value of Number.prototype property
+---*/
 
 //CHECK#1
 if (Number.prototype != 0) {
@@ -14,4 +12,3 @@ if (Number.prototype != 0) {
 } else if( 1/Number.prototype != Number.POSITIVE_INFINITY){
   $ERROR('#2: Number.prototype == +0');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A1.js
index fe2dbedda..9a127682a 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MAX_VALUE is approximately 1.7976931348623157e308
- *
- * @path ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A1.js
- * @description Checking Number.MAX_VALUE value
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Number.MAX_VALUE is approximately 1.7976931348623157e308
+description: Checking Number.MAX_VALUE value
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Number.MAX_VALUE, 1.7976931348623157e308)) {
   $ERROR('#1: Number.MAX_VALUE approximately equal to 1.7976931348623157e308');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A2.js
index fff38d959..5fc45da38 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MAX_VALUE is ReadOnly
- *
- * @path ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A2.js
- * @description Checking if varying Number.MAX_VALUE fails
- */
+/*---
+info: Number.MAX_VALUE is ReadOnly
+description: Checking if varying Number.MAX_VALUE fails
+---*/
 
 // CHECK#1
 var x = Number.MAX_VALUE;
@@ -14,4 +12,3 @@ Number.MAX_VALUE = 1;
 if (Number.MAX_VALUE !== x) {
   $ERROR('#1: x = Number.MAX_VALUE; Number.MAX_VALUE = 1; Number.MAX_VALUE === x');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A3.js
index 8e67d8072..1f7049d1d 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MAX_VALUE is DontDelete
- *
- * @path ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A3.js
- * @description Checking if deleting Number.MAX_VALUE fails
- * @noStrict
- */
+/*---
+info: Number.MAX_VALUE is DontDelete
+description: Checking if deleting Number.MAX_VALUE fails
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Number.MAX_VALUE !== false) {
   $ERROR('#1: delete Number.MAX_VALUE === false');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A4.js b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A4.js
index e821e473b..0e473eced 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MAX_VALUE has the attribute DontEnum
- *
- * @path ch15/15.7/15.7.3/15.7.3.2/S15.7.3.2_A4.js
- * @description Checking if enumerating Number.MAX_VALUE fails
- */
+/*---
+info: Number.MAX_VALUE has the attribute DontEnum
+description: Checking if enumerating Number.MAX_VALUE fails
+---*/
 
 //CHECK#1
 for(var x in Number) {
@@ -18,4 +16,3 @@ for(var x in Number) {
 if (Number.propertyIsEnumerable('MAX_VALUE')) {
   $ERROR('#2: Number.MAX_VALUE has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A1.js
index 055986060..ecb35cf39 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MIN_VALUE is approximately 5e-324
- *
- * @path ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A1.js
- * @description Checking Number.MIN_VALUE value
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Number.MIN_VALUE is approximately 5e-324
+description: Checking Number.MIN_VALUE value
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Number.MIN_VALUE, 5e-324)) {
   $ERROR('#1: Number.MIN_VALUE approximately equal to 5e-324');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A2.js
index 52bb7abf5..62614b27f 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MIN_VALUE is ReadOnly
- *
- * @path ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A2.js
- * @description Checking if varying Number.MIN_VALUE fails
- */
+/*---
+info: Number.MIN_VALUE is ReadOnly
+description: Checking if varying Number.MIN_VALUE fails
+---*/
 
 // CHECK#1
 var x = Number.MIN_VALUE;
@@ -14,4 +12,3 @@ Number.MIN_VALUE = 1;
 if (Number.MIN_VALUE !== x) {
   $ERROR('#1: x = Number.MIN_VALUE; Number.MIN_VALUE = 1; Number.MIN_VALUE === x');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A3.js
index 71ab7260f..626c37c92 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MIN_VALUE is DontDelete
- *
- * @path ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A3.js
- * @description Checking if deleting Number.MIN_VALUE fails
- * @noStrict
- */
+/*---
+info: Number.MIN_VALUE is DontDelete
+description: Checking if deleting Number.MIN_VALUE fails
+flags: [noStrict]
+---*/
 
 //CHECK#1
 if (delete Number.MIN_VALUE !== false) {
   $ERROR('#1: delete Number.MIN_VALUE === false');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A4.js b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A4.js
index 9efd91a3a..6644cbcbe 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.MIN_VALUE has the attribute DontEnum
- *
- * @path ch15/15.7/15.7.3/15.7.3.3/S15.7.3.3_A4.js
- * @description Checking if enumerating Number.MIN_VALUE fails
- */
+/*---
+info: Number.MIN_VALUE has the attribute DontEnum
+description: Checking if enumerating Number.MIN_VALUE fails
+---*/
 
 //CHECK#1
 for(var x in Number) {
@@ -18,4 +16,3 @@ for(var x in Number) {
 if (Number.propertyIsEnumerable('MIN_VALUE')) {
   $ERROR('#2: Number.MIN_VALUE has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A1.js
index 57e011335..9af448887 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A1.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NaN is Not-a-Number
- *
- * @path ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A1.js
- * @description Checking isNaN(Number.NaN)
- */
+/*---
+info: Number.NaN is Not-a-Number
+description: Checking isNaN(Number.NaN)
+---*/
 
 // CHECK#1
 if (isNaN(Number.NaN) !== true) {
   $ERROR('#1: Number.NaN === Not-a-Number');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A2.js
index f682f4822..3c13a89b8 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A2.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NaN is ReadOnly
- *
- * @path ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A2.js
- * @description Checking if varying Number.NaN fails
- */
+/*---
+info: Number.NaN is ReadOnly
+description: Checking if varying Number.NaN fails
+---*/
 
 // CHECK#1
 Number.NaN = 1;
 if (isNaN(Number.NaN) !== true) {
   $ERROR('#1: Number.NaN = 1; Number.NaN === Not-a-Number');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A3.js
index 4a6e03dcf..41a5e6358 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NaN is DontDelete
- *
- * @path ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A3.js
- * @description Checking if deleting Number.NaN fails
- * @noStrict
- */
+/*---
+info: Number.NaN is DontDelete
+description: Checking if deleting Number.NaN fails
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Number.NaN !== false) {
   $ERROR('#1: delete Number.NaN === false');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A4.js b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A4.js
index 06af8d28a..b389876b1 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NaN has the attribute DontEnum
- *
- * @path ch15/15.7/15.7.3/15.7.3.4/S15.7.3.4_A4.js
- * @description Checking if enumerating Number.NaN fails
- */
+/*---
+info: Number.NaN has the attribute DontEnum
+description: Checking if enumerating Number.NaN fails
+---*/
 
 //CHECK#1
 for(var x in Number) {
@@ -18,4 +16,3 @@ for(var x in Number) {
 if (Number.propertyIsEnumerable('NaN')) {
   $ERROR('#2: Number.NaN has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A1.js
index 145e447b9..4e4eb1d85 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NEGATIVE_INFINITY is -Infinity
- *
- * @path ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A1.js
- * @description Checking sign and finiteness of Number.NEGATIVE_INFINITY
- */
+/*---
+info: Number.NEGATIVE_INFINITY is -Infinity
+description: Checking sign and finiteness of Number.NEGATIVE_INFINITY
+---*/
 
 // CHECK#1
 if (isFinite(Number.NEGATIVE_INFINITY) !== false) {
@@ -16,4 +14,3 @@ if (isFinite(Number.NEGATIVE_INFINITY) !== false) {
     $ERROR('#1: Number.NEGATIVE_INFINITY === -Infinity');
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A2.js
index 78a8102e2..eb2f07090 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NEGATIVE_INFINITY is ReadOnly
- *
- * @path ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A2.js
- * @description Checking if varying Number.NEGATIVE_INFINITY fails
- */
+/*---
+info: Number.NEGATIVE_INFINITY is ReadOnly
+description: Checking if varying Number.NEGATIVE_INFINITY fails
+---*/
 
 // CHECK#1
 Number.NEGATIVE_INFINITY = 1;
@@ -17,4 +15,3 @@ if (isFinite(Number.NEGATIVE_INFINITY)) {
     $ERROR('#1: Number.NEGATIVE_INFINITY = 1; Number.NEGATIVE_INFINITY === -Infinity');
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A3.js
index 7b1c69353..a47e0e13b 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NEGATIVE_INFINITY is DontDelete
- *
- * @path ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A3.js
- * @description Checking if deleting Number.NEGATIVE_INFINITY fails
- * @noStrict
- */
+/*---
+info: Number.NEGATIVE_INFINITY is DontDelete
+description: Checking if deleting Number.NEGATIVE_INFINITY fails
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Number.NEGATIVE_INFINITY !== false) {
   $ERROR('#1: delete Number.NEGATIVE_INFINITY === false');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A4.js b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A4.js
index f2620409b..68e42de24 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.NEGATIVE_INFINITY has the attribute DontEnum
- *
- * @path ch15/15.7/15.7.3/15.7.3.5/S15.7.3.5_A4.js
- * @description Checking if enumerating Number.NEGATIVE_INFINITY fails
- */
+/*---
+info: Number.NEGATIVE_INFINITY has the attribute DontEnum
+description: Checking if enumerating Number.NEGATIVE_INFINITY fails
+---*/
 
 //CHECK#1
 for(var x in Number) {
@@ -18,4 +16,3 @@ for(var x in Number) {
 if (Number.propertyIsEnumerable('NEGATIVE_INFINITY')) {
   $ERROR('#2: Number.NEGATIVE_INFINITY has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A1.js b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A1.js
index 2e925aba2..d5d9e608f 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.POSITIVE_INFINITY is +Infinity
- *
- * @path ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A1.js
- * @description Checking sign and finiteness of Number.POSITIVE_INFINITY
- */
+/*---
+info: Number.POSITIVE_INFINITY is +Infinity
+description: Checking sign and finiteness of Number.POSITIVE_INFINITY
+---*/
 
 // CHECK#1
 if (isFinite(Number.POSITIVE_INFINITY) !== false) {
@@ -16,4 +14,3 @@ if (isFinite(Number.POSITIVE_INFINITY) !== false) {
     $ERROR('#1: Number.POSITIVE_INFINITY === +Infinity');
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A2.js b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A2.js
index e02714978..32cbb7d78 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.POSITIVE_INFINITY is ReadOnly
- *
- * @path ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A2.js
- * @description Checking if varying Number.POSITIVE_INFINITY fails
- */
+/*---
+info: Number.POSITIVE_INFINITY is ReadOnly
+description: Checking if varying Number.POSITIVE_INFINITY fails
+---*/
 
 // CHECK#1
 Number.POSITIVE_INFINITY = 1;
@@ -17,4 +15,3 @@ if (isFinite(Number.POSITIVE_INFINITY)) {
     $ERROR('#1: Number.POSITIVE_INFINITY = 1; Number.POSITIVE_INFINITY === +Infinity');
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A3.js b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A3.js
index c2ac39b6d..e4b3ed34b 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.POSITIVE_INFINITY is DontDelete
- *
- * @path ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A3.js
- * @description Checking if deleting Number.POSITIVE_INFINITY fails
- * @noStrict
- */
+/*---
+info: Number.POSITIVE_INFINITY is DontDelete
+description: Checking if deleting Number.POSITIVE_INFINITY fails
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Number.POSITIVE_INFINITY !== false) {
   $ERROR('#1: delete Number.POSITIVE_INFINITY === false');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A4.js b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A4.js
index 9698a86ea..44d8068fe 100644
--- a/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.POSITIVE_INFINITY has the attribute DontEnum
- *
- * @path ch15/15.7/15.7.3/15.7.3.6/S15.7.3.6_A4.js
- * @description Checking if enumerating Number.POSITIVE_INFINITY fails
- */
+/*---
+info: Number.POSITIVE_INFINITY has the attribute DontEnum
+description: Checking if enumerating Number.POSITIVE_INFINITY fails
+---*/
 
 //CHECK#1
 for(var x in Number) {
@@ -18,4 +16,3 @@ for(var x in Number) {
 if (Number.propertyIsEnumerable('POSITIVE_INFINITY')) {
   $ERROR('#2: Number.POSITIVE_INFINITY has the attribute DontEnum');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A1.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A1.js
index cb7687c49..c2fbf76d1 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A1.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "prototype"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Number constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Number.hasOwnProperty("prototype")){
   $ERROR('#1: The Number constructor has the property "prototype"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A2.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A2.js
index 74e50c6e5..e58e02c2a 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A2.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A2.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "MAX_VALUE"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A2.js
- * @description Checking existence of the property "MAX_VALUE"
- */
+/*---
+info: The Number constructor has the property "MAX_VALUE"
+description: Checking existence of the property "MAX_VALUE"
+---*/
 
 if(!Number.hasOwnProperty("MAX_VALUE")){
   $ERROR('#1: The Number constructor has the property "MAX_VALUE"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A3.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A3.js
index 70c456a3b..afd08899e 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A3.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A3.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "MIN_VALUE"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A3.js
- * @description Checking existence of the property "MIN_VALUE"
- */
+/*---
+info: The Number constructor has the property "MIN_VALUE"
+description: Checking existence of the property "MIN_VALUE"
+---*/
 
 if(!Number.hasOwnProperty("MIN_VALUE")){
   $ERROR('#1: The Number constructor has the property "MIN_VALUE"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A4.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A4.js
index ff12e13bf..4d3865cef 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A4.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A4.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "NaN"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A4.js
- * @description Checking existence of the property "NaN"
- */
+/*---
+info: The Number constructor has the property "NaN"
+description: Checking existence of the property "NaN"
+---*/
 
 if(!Number.hasOwnProperty("NaN")){
   $ERROR('#1: The Number constructor has the property "NaN"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A5.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A5.js
index b5ed3997a..3061d4d59 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A5.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A5.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "NEGATIVE_INFINITY"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A5.js
- * @description Checking existence of the property "NEGATIVE_INFINITY"
- */
+/*---
+info: The Number constructor has the property "NEGATIVE_INFINITY"
+description: Checking existence of the property "NEGATIVE_INFINITY"
+---*/
 
 if(!Number.hasOwnProperty("NEGATIVE_INFINITY")){
   $ERROR('#1: The Number constructor has the property "NEGATIVE_INFINITY"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A6.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A6.js
index fc9a3a7a6..0025b3437 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A6.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A6.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number constructor has the property "POSITIVE_INFINITY"
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A6.js
- * @description Checking existence of the property "POSITIVE_INFINITY"
- */
+/*---
+info: The Number constructor has the property "POSITIVE_INFINITY"
+description: Checking existence of the property "POSITIVE_INFINITY"
+---*/
 
 if(!Number.hasOwnProperty("POSITIVE_INFINITY")){
   $ERROR('#1: The Number constructor has the property "POSITIVE_INFINITY"');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A7.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A7.js
index c8573feca..70f257972 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A7.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A7.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Number
- * constructor is the Function prototype object
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A7.js
- * @description Checking Function.prototype.isPrototypeOf(Number)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Number
+    constructor is the Function prototype object
+description: Checking Function.prototype.isPrototypeOf(Number)
+---*/
 
 //CHECK#1
 if (!(Function.prototype.isPrototypeOf(Number))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Number constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.3/S15.7.3_A8.js b/test/suite/ch15/15.7/15.7.3/S15.7.3_A8.js
index 45f79ab61..064e71678 100644
--- a/test/suite/ch15/15.7/15.7.3/S15.7.3_A8.js
+++ b/test/suite/ch15/15.7/15.7.3/S15.7.3_A8.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number constructor has length property whose value is 1
- *
- * @path ch15/15.7/15.7.3/S15.7.3_A8.js
- * @description Checking Number.length property
- */
+/*---
+info: Number constructor has length property whose value is 1
+description: Checking Number.length property
+---*/
 
 //CHECK#1
 if (!Number.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if (!Number.hasOwnProperty("length")){
 if (Number.length !== 1) {
   $ERROR('#2: Number constructor length property value is 1');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4-1.js b/test/suite/ch15/15.7/15.7.4/15.7.4-1.js
index ee47bc3c8..773e78179 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4-1.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4-1.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.7/15.7.4/15.7.4-1.js

- * @description Number prototype object: its [[Class]] must be 'Number'

- */

-

-

-function testcase() {

-  var numProto = Object.getPrototypeOf(new Number(42));

-  var s = Object.prototype.toString.call(numProto );

-  return (s === '[object Number]') ;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: "Number prototype object: its [[Class]] must be 'Number'"
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var numProto = Object.getPrototypeOf(new Number(42));
+  var s = Object.prototype.toString.call(numProto );
+  return (s === '[object Number]') ;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.1/S15.7.4.1_A1.js b/test/suite/ch15/15.7/15.7.4/15.7.4.1/S15.7.4.1_A1.js
index d93a6f25e..c1c885bad 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.1/S15.7.4.1_A1.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.1/S15.7.4.1_A1.js
@@ -1,17 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Number.prototype.constructor is the
- * built-in Number constructor
- *
- * @path ch15/15.7/15.7.4/15.7.4.1/S15.7.4.1_A1.js
- * @description Compare Number.prototype.constructor with Number
- */
+/*---
+info: >
+    The initial value of Number.prototype.constructor is the
+    built-in Number constructor
+description: Compare Number.prototype.constructor with Number
+---*/
 
 //CHECK#1
 if(Number.prototype.constructor !== Number){
   $ERROR('#1: Number.prototype.constructor === Number');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T01.js
index 9b7d35ba0..b1165e760 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T01.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is the number 10 or undefined, then this
- * number value is given as an argument to the ToString operator.
- * the resulting string value is returned
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T01.js
- * @description undefined radix
- */
+/*---
+info: >
+    toString: If radix is the number 10 or undefined, then this
+    number value is given as an argument to the ToString operator.
+    the resulting string value is returned
+description: undefined radix
+---*/
 
 //CHECK#1
 if(Number.prototype.toString() !== "0"){
@@ -49,4 +48,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString() !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString() !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString() === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T02.js
index f06663410..d0d85a35f 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T02.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is the number 10 or undefined, then this
- * number value is given as an argument to the ToString operator.
- * the resulting string value is returned
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T02.js
- * @description radix is 10
- */
+/*---
+info: >
+    toString: If radix is the number 10 or undefined, then this
+    number value is given as an argument to the ToString operator.
+    the resulting string value is returned
+description: radix is 10
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(10) !== "0"){
@@ -49,4 +48,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(10) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(10) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(10) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T03.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T03.js
index 53a05b8f7..99f9bae43 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T03.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T03.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is the number 10 or undefined, then this
- * number value is given as an argument to the ToString operator.
- * the resulting string value is returned
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A1_T03.js
- * @description radix is undefined value
- */
+/*---
+info: >
+    toString: If radix is the number 10 or undefined, then this
+    number value is given as an argument to the ToString operator.
+    the resulting string value is returned
+description: radix is undefined value
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(undefined) !== "0"){
@@ -49,4 +48,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(undefined) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(undefined) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(undefined) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T01.js
index d4529f5ab..98f4896e7 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T01.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T01.js
- * @description radix is 2
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 2
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(2) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(2) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(2) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(2) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T02.js
index d2f762c93..435f2f78a 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T02.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T02.js
- * @description radix is 3
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 3
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(3) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(3) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(3) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(3) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T03.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T03.js
index d922d5155..5fb0039da 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T03.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T03.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T03.js
- * @description radix is 4
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 4
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(4) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(4) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(4) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(4) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T04.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T04.js
index 61bd6f463..6a294f2e9 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T04.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T04.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T04.js
- * @description radix is 5
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 5
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(5) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(5) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(5) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(5) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T05.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T05.js
index 4155f4b91..7ed3b4436 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T05.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T05.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T05.js
- * @description radix is 6
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 6
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(6) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(6) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(6) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(6) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T06.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T06.js
index fcb3273d8..299085f35 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T06.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T06.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T06.js
- * @description radix is 7
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 7
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(7) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(7) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(7) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(7) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T07.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T07.js
index 6e518975c..237053bd4 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T07.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T07.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T07.js
- * @description radix is 8
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 8
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(8) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(8) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(8) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(8) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T08.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T08.js
index 629807511..03ba63a21 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T08.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T08.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T08.js
- * @description radix is 9
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 9
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(9) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(9) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(9) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(9) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T09.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T09.js
index 50c465bc6..c05717492 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T09.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T09.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T09.js
- * @description radix is 11
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 11
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(11) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(11) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(11) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(11) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T10.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T10.js
index 7369f25df..2a4fdd54e 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T10.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T10.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T10.js
- * @description radix is 12
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 12
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(12) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(12) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(12) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(12) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T11.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T11.js
index c1b8e8efe..223b5c117 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T11.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T11.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T11.js
- * @description radix is 13
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 13
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(13) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(13) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(13) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(13) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T12.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T12.js
index eca23c38e..c474dfc45 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T12.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T12.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T12.js
- * @description radix is 14
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 14
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(14) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(14) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(14) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(14) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T13.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T13.js
index 0ab87ca81..49b8b6ce7 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T13.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T13.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T13.js
- * @description radix is 15
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 15
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(15) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(15) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(15) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(15) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T14.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T14.js
index 77b074644..c2a16315b 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T14.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T14.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T14.js
- * @description radix is 16
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 16
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(16) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(16) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(16) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(16) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T15.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T15.js
index a08d488ba..dd61f337f 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T15.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T15.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T15.js
- * @description radix is 17
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 17
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(17) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(17) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(17) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(17) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T16.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T16.js
index 5dc506949..99a6bded0 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T16.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T16.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T16.js
- * @description radix is 18
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 18
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(18) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(18) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(18) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(18) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T17.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T17.js
index 526b0f6e3..c177a3ad6 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T17.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T17.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T17.js
- * @description radix is 19
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 19
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(19) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(19) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(19) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(19) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T18.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T18.js
index 7a021ec38..45a901743 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T18.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T18.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T18.js
- * @description radix is 20
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 20
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(20) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(20) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(20) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(20) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T19.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T19.js
index 7e28d6e30..4ee1f75e5 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T19.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T19.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T19.js
- * @description radix is 21
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 21
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(21) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(21) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(21) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(21) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T20.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T20.js
index 04585ea88..145a1b728 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T20.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T20.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T20.js
- * @description radix is 22
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 22
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(22) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(22) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(22) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(22) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T21.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T21.js
index 9dfe4528c..818b5eca9 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T21.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T21.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T21.js
- * @description radix is 23
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 23
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(23) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(23) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(23) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(23) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T22.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T22.js
index a41759382..6ecc83ea9 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T22.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T22.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T22.js
- * @description radix is 24
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 24
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(24) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(24) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(24) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(24) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T23.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T23.js
index 456dbc194..b3c668ccd 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T23.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T23.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T23.js
- * @description radix is 25
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 25
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(25) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(25) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(25) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(25) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T24.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T24.js
index 85605a108..fefe51ade 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T24.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T24.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T24.js
- * @description radix is 26
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 26
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(26) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(26) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(26) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(26) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T25.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T25.js
index 35c9f31ed..80bf8e804 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T25.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T25.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T25.js
- * @description radix is 27
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 27
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(27) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(27) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(27) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(27) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T26.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T26.js
index 819bbacd5..926ae1d17 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T26.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T26.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T26.js
- * @description radix is 28
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 28
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(28) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(28) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(28) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(28) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T27.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T27.js
index 3e1b1105e..db9f8c330 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T27.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T27.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T27.js
- * @description radix is 29
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 29
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(29) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(29) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(29) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(29) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T28.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T28.js
index 99e7d5d88..4e6ddc6fa 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T28.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T28.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T28.js
- * @description radix is 30
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 30
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(30) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(30) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(30) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(30) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T29.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T29.js
index 7b96fcb62..dc66d2417 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T29.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T29.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T29.js
- * @description radix is 31
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 31
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(31) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(31) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(31) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(31) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T30.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T30.js
index b6f8ea59f..b36276b21 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T30.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T30.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T30.js
- * @description radix is 32
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 32
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(32) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(32) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(32) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(32) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T31.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T31.js
index f8bff8418..9fa035cac 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T31.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T31.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T31.js
- * @description radix is 33
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 33
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(33) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(33) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(33) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(33) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T32.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T32.js
index ac8063e54..50f623ff8 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T32.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T32.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T32.js
- * @description radix is 34
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 34
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(34) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(34) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(34) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(34) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T33.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T33.js
index 031b29860..cae48b066 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T33.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T33.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T33.js
- * @description radix is 35
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 35
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(35) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(35) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(35) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(35) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T34.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T34.js
index 64e646432..ffcf8bfd3 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T34.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T34.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: If radix is an integer from 2 to 36, but not 10,
- * the result is a string, the choice of which is implementation-dependent
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A2_T34.js
- * @description radix is 36
- */
+/*---
+info: >
+    toString: If radix is an integer from 2 to 36, but not 10,
+    the result is a string, the choice of which is implementation-dependent
+description: radix is 36
+---*/
 
 //CHECK#1
 if(Number.prototype.toString(36) !== "0"){
@@ -48,4 +47,3 @@ if((new Number(Number.POSITIVE_INFINITY)).toString(36) !== "Infinity"){
 if((new Number(Number.NEGATIVE_INFINITY)).toString(36) !== "-Infinity"){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).toString(36) === "-Infinity"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T01.js
index 80c38b0d5..d82871343 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T01.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: radix should be an integer between 2 and 36
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T01.js
- * @description radix is 1
- */
+/*---
+info: "toString: radix should be an integer between 2 and 36"
+description: radix is 1
+---*/
 
 //CHECK#1
 try{
@@ -71,4 +69,3 @@ try{
 }
 catch(e){
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T02.js
index 6063aa8d7..c7f0f28bd 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T02.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: radix should be an integer between 2 and 36
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T02.js
- * @description radix is 37
- */
+/*---
+info: "toString: radix should be an integer between 2 and 36"
+description: radix is 37
+---*/
 
 //CHECK#1
 try{
@@ -71,4 +69,3 @@ try{
 }
 catch(e){
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T03.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T03.js
index 176b5614a..ccafbfdf4 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T03.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T03.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: radix should be an integer between 2 and 36
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T03.js
- * @description radix is null value
- */
+/*---
+info: "toString: radix should be an integer between 2 and 36"
+description: radix is null value
+---*/
 
 //CHECK#1
 try{
@@ -71,4 +69,3 @@ try{
 }
 catch(e){
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T04.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T04.js
index 2d3c4450b..a8fa4d5c6 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T04.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T04.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * toString: radix should be an integer between 2 and 36
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A3_T04.js
- * @description radix is 0
- */
+/*---
+info: "toString: radix should be an integer between 2 and 36"
+description: radix is 0
+---*/
 
 //CHECK#1
 try{
@@ -71,4 +69,3 @@ try{
 }
 catch(e){
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T01.js
index 6ec64e5df..2256da3e2 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T01.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T01.js
- * @description transferring to the String objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the String objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.toString on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T02.js
index 37e66f09d..88755c59e 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T02.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T02.js
- * @description transferring to the Boolean objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Boolean objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.toString on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T03.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T03.js
index 078161d1c..e39674a41 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T03.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T03.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T03.js
- * @description transferring to the Date objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Date objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.toString on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T04.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T04.js
index 516bf803d..a3d7590b0 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T04.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T04.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T04.js
- * @description transferring to the Object objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Object objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.toString on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T05.js b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T05.js
index d6e5a5e9c..2272d03b8 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T05.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T05.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.2/S15.7.4.2_A4_T05.js
- * @description transferring to the other objects
- */
+/*---
+info: >
+    The toString function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the other objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.toString on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T01.js
index 70ff9881a..cf77fb74e 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T01.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.prototype.valueOf() returns this number value
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T01.js
- * @description Call without argument
- */
+/*---
+info: Number.prototype.valueOf() returns this number value
+description: Call without argument
+---*/
 
 //CHECK#1
 if(Number.prototype.valueOf() !== 0){
@@ -47,4 +45,3 @@ if((new Number(Number.POSITIVE_INFINITY)).valueOf() !== Number.POSITIVE_INFINITY
 if((new Number(Number.NEGATIVE_INFINITY)).valueOf() !== Number.NEGATIVE_INFINITY){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).valueOf() === -Infinity');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T02.js
index 65be18bbe..4fb66eadc 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T02.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number.prototype.valueOf() returns this number value
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A1_T02.js
- * @description calling with argument
- */
+/*---
+info: Number.prototype.valueOf() returns this number value
+description: calling with argument
+---*/
 
 //CHECK#1
 if(Number.prototype.valueOf("argument") !== 0){
@@ -47,4 +45,3 @@ if((new Number(Number.POSITIVE_INFINITY)).valueOf("argument") !== Number.POSITIV
 if((new Number(Number.NEGATIVE_INFINITY)).valueOf("argument") !== Number.NEGATIVE_INFINITY){
   $ERROR('#8: (new Number(Number.NEGATIVE_INFINITY)).valueOf("argument") === -Infinity');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T01.js
index 1b3ab07f8..20c67f2ef 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T01.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T01.js
- * @description transferring to the String objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the String objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.valueOf on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T02.js
index e5e6e812d..e9b171614 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T02.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T02.js
- * @description transferring to the Boolean objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Boolean objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.valueOf on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T03.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T03.js
index 33647a130..b06609ae4 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T03.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T03.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T03.js
- * @description transferring to the Date objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Date objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.valueOf on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T04.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T04.js
index ba2692b26..ea12810c8 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T04.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T04.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T04.js
- * @description transferring to the Object objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the Object objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.valueOf on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T05.js b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T05.js
index aafc4e9dc..efccf2fb4 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T05.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T05.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The valueOf function is not generic, it cannot be transferred
- * to other kinds of objects for use as a method and there is should be
- * a TypeError exception if its this value is not a Number object
- *
- * @path ch15/15.7/15.7.4/15.7.4.4/S15.7.4.4_A2_T05.js
- * @description transferring to the other objects
- */
+/*---
+info: >
+    The valueOf function is not generic, it cannot be transferred
+    to other kinds of objects for use as a method and there is should be
+    a TypeError exception if its this value is not a Number object
+description: transferring to the other objects
+---*/
 
 //CHECK#1
 try{
@@ -35,5 +34,3 @@ catch(e){
     $ERROR('#2: Number.prototype.valueOf on not a Number object should throw TypeError, not '+e);
   }
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T01.js
index 8459ab708..d96fc445d 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T01.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Step 1: Let f be ToInteger(fractionDigits). (If fractionDigits
- * is undefined, this step produces the value 0)
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T01.js
- * @description calling on Number prototype object
- */
+/*---
+info: >
+    Step 1: Let f be ToInteger(fractionDigits). (If fractionDigits
+    is undefined, this step produces the value 0)
+description: calling on Number prototype object
+---*/
 
 //CHECK#1
 if(Number.prototype.toFixed() !== "0"){
@@ -68,4 +67,3 @@ try{
 catch(e){
   $ERROR('#10: Number.prototype.toFixed(-0.1) should not throw '+e);
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T02.js
index 163f32746..9d686b242 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T02.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Step 1: Let f be ToInteger(fractionDigits). (If fractionDigits
- * is undefined, this step produces the value 0)
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.1_T02.js
- * @description calling on Number object
- */
+/*---
+info: >
+    Step 1: Let f be ToInteger(fractionDigits). (If fractionDigits
+    is undefined, this step produces the value 0)
+description: calling on Number object
+---*/
 
 //CHECK#1
 if((new Number(1)).toFixed() !== "1"){
@@ -68,4 +67,3 @@ try{
 catch(e){
   $ERROR('#10: (new Number(1)).toFixed(-0.1) should not throw '+e);
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T01.js
index 595e213af..734844fd4 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T01.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Step 4: If this number value is NaN, return the string "NaN"
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T01.js
- * @description NaN is computed by new Number("string")
- */
+/*---
+info: "Step 4: If this number value is NaN, return the string \"NaN\""
+description: NaN is computed by new Number("string")
+---*/
 
 //CHECK#1
 if((new Number("a")).toFixed() !== "NaN"){
@@ -68,4 +66,3 @@ catch(e){
     $ERROR('#10: (new Number("a")).toFixed(Number.POSITIVE_INFINITY) should throw RangeError, not '+e);
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T02.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T02.js
index 48a44dd49..4adea814e 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T02.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T02.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Step 4: If this number value is NaN, return the string "NaN"
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.3_T02.js
- * @description direct usage of NaN
- */
+/*---
+info: "Step 4: If this number value is NaN, return the string \"NaN\""
+description: direct usage of NaN
+---*/
 
 //CHECK#1
 if(Number.NaN.toFixed() !== "NaN"){
@@ -68,4 +66,3 @@ catch(e){
     $ERROR('#10: Number.NaN.toFixed(Number.POSITIVE_INFINITY) should throw RangeError, not '+e);
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.4_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.4_T01.js
index b949ba46b..507e10ee3 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.4_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.4_T01.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Step 9: If x >= 10^21, let m = ToString(x)
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A1.4_T01.js
- * @description x is 10^21
- */
+/*---
+info: "Step 9: If x >= 10^21, let m = ToString(x)"
+description: x is 10^21
+---*/
 
 //CHECK#1
 if((new Number(1e21)).toFixed() !== String(1e21)){
@@ -68,4 +66,3 @@ catch(e){
     $ERROR('#10: (new Number(1e21)).toFixed(Number.POSITIVE_INFINITY) should throw RangeError, not '+e);
   }
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A2_T01.js b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A2_T01.js
index 5b42eddc7..75529a7e2 100644
--- a/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A2_T01.js
+++ b/test/suite/ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A2_T01.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toFixed method is 1
- *
- * @path ch15/15.7/15.7.4/15.7.4.5/S15.7.4.5_A2_T01.js
- * @description Checking Number prototype itself
- */
+/*---
+info: The length property of the toFixed method is 1
+description: Checking Number prototype itself
+---*/
 
 //CHECK#1
 if(Number.prototype.toFixed.hasOwnProperty("length") !== true){
@@ -17,4 +15,3 @@ if(Number.prototype.toFixed.hasOwnProperty("length") !== true){
 if(Number.prototype.toFixed.length !== 1){
   $ERROR('#2: The length property of the toFixed method is 1');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A1.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A1.js
index 0944bde05..efe3a57fe 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A1.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object is itself a Number object
- * (its [[Class]] is "Number") whose value is +0
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A1.js
- * @description Checking type and value of Number.prototype property
- */
+/*---
+info: >
+    The Number prototype object is itself a Number object
+    (its [[Class]] is "Number") whose value is +0
+description: Checking type and value of Number.prototype property
+---*/
 
 //CHECK#1
 if (typeof Number.prototype !== "object") {
@@ -26,4 +25,3 @@ delete Number.prototype.toString;
 if (Number.prototype.toString() !== "[object Number]") {
   $ERROR('#3: The [[Class]] property of the Number prototype object is set to "Number"');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A2.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A2.js
index 522f79aa1..41ac12d28 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A2.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A2.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Number
- * prototype object is the Object prototype object
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A2.js
- * @description Checking Object.prototype.isPrototypeOf(Number.prototype)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Number
+    prototype object is the Object prototype object
+description: Checking Object.prototype.isPrototypeOf(Number.prototype)
+---*/
 
 //CHECK#1
 if (!Object.prototype.isPrototypeOf(Number.prototype)) {
   $ERROR('#1: Object prototype object is the prototype of Number prototype object');
 }
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.1.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.1.js
index 67d9ba10d..9262fdef1 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.1.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.1.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property constructor
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.1.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property constructor
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("constructor") !== true){
   $ERROR('#1: The Number prototype object has the property constructor');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.2.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.2.js
index 9f4b3856b..680df8808 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.2.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.2.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property toString
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.2.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property toString
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("toString") !== true){
   $ERROR('#1: The Number prototype object has the property toString');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.3.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.3.js
index f34849d56..46b921b65 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.3.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.3.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property toLocaleString
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.3.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property toLocaleString
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("toLocaleString") !== true){
   $ERROR('#1: The Number prototype object has the property toLocaleString');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.4.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.4.js
index 7dcd08cb0..20fed633d 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.4.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.4.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property valueOf
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.4.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property valueOf
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("valueOf") !== true){
   $ERROR('#1: The Number prototype object has the property valueOf');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.5.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.5.js
index 0a889e11c..1a2aa370b 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.5.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.5.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property toFixed
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.5.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property toFixed
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("toFixed") !== true){
   $ERROR('#1: The Number prototype object has the property toFixed');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.6.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.6.js
index 06e87826f..d94013ec8 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.6.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.6.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property toExponential
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.6.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property toExponential
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("toExponential") !== true){
   $ERROR('#1: The Number prototype object has the property toExponential');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.7.js b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.7.js
index 8bd611dbc..e117947cf 100644
--- a/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.7.js
+++ b/test/suite/ch15/15.7/15.7.4/S15.7.4_A3.7.js
@@ -1,16 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Number prototype object has the property toPrecision
- *
- * @path ch15/15.7/15.7.4/S15.7.4_A3.7.js
- * @description The test uses hasOwnProperty() method
- */
+/*---
+info: The Number prototype object has the property toPrecision
+description: The test uses hasOwnProperty() method
+---*/
 
 //CHECK#1
 if(Number.prototype.hasOwnProperty("toPrecision") !== true){
   $ERROR('#1: The Number prototype object has the property toPrecision');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T01.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T01.js
index 924bae0a1..2f365c8c7 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T01.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T01.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T01.js
- * @description Checking property constructor
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property constructor
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("constructor") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("constructor") !== false){
 if((new Number()).constructor !== Number.prototype.constructor){
   $ERROR('#2: Number instance property "constructor" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T02.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T02.js
index e024a1801..fb900c4bf 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T02.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T02.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T02.js
- * @description Checking property toString
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property toString
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("toString") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("toString") !== false){
 if((new Number()).toString !== Number.prototype.toString){
   $ERROR('#2: Number instance property "toString" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T03.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T03.js
index ccf17d883..ea2dd2372 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T03.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T03.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T03.js
- * @description Checking property toLocaleString
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property toLocaleString
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("toLocaleString") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("toLocaleString") !== false){
 if((new Number()).toLocaleString !== Number.prototype.toLocaleString){
   $ERROR('#2: Number instance property "toLocaleString" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T04.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T04.js
index 88967d992..d0449717d 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T04.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T04.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T04.js
- * @description Checking property valueOf
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property valueOf
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("valueOf") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("valueOf") !== false){
 if((new Number()).valueOf !== Number.prototype.valueOf){
   $ERROR('#2: Number instance property "valueOf" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T05.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T05.js
index 7a32219d0..f6e74fae7 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T05.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T05.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T05.js
- * @description Checking property toFixed
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property toFixed
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("toFixed") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("toFixed") !== false){
 if((new Number()).toFixed !== Number.prototype.toFixed){
   $ERROR('#2: Number instance property "toFixed" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T06.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T06.js
index 41bfbff61..5d28b36d1 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T06.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T06.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T06.js
- * @description Checking property toExponential
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property toExponential
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("toExponential") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("toExponential") !== false){
 if((new Number()).toExponential !== Number.prototype.toExponential){
   $ERROR('#2: Number instance property "toExponential" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T07.js b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T07.js
index 22700c5c0..edbc9529e 100644
--- a/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T07.js
+++ b/test/suite/ch15/15.7/15.7.5/S15.7.5_A1_T07.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Number instances have no special properties beyond those
- * inherited from the Number prototype object
- *
- * @path ch15/15.7/15.7.5/S15.7.5_A1_T07.js
- * @description Checking property toPrecision
- */
+/*---
+info: >
+    Number instances have no special properties beyond those
+    inherited from the Number prototype object
+description: Checking property toPrecision
+---*/
 
 //CHECK#1
 if((new Number()).hasOwnProperty("toPrecision") !== false){
@@ -18,5 +17,3 @@ if((new Number()).hasOwnProperty("toPrecision") !== false){
 if((new Number()).toPrecision !== Number.prototype.toPrecision){
   $ERROR('#2: Number instance property "toPrecision" must be inherited from Number prototype object');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A1.js
index a117d9f59..096b6b4be 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.E is approximately 2.7182818284590452354
- *
- * @path ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A1.js
- * @description Comparing Math.E with 2.7182818284590452354
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.E is approximately 2.7182818284590452354
+description: Comparing Math.E with 2.7182818284590452354
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.E, 2.7182818284590452354)) {
   $ERROR('#1: \'Math.E is not approximately equal to 2.7182818284590452354\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A2.js
index 3a2364793..bd41c5367 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property E of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A2.js
- * @description Checking if Math.E property has the attribute DontEnum
- */
+/*---
+info: Value Property E of the Math Object has the attribute DontEnum
+description: Checking if Math.E property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property E of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="E"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A3.js
index e83fd2809..44a78d7bf 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property E of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A3.js
- * @description Checking if Math.E property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property E of the Math Object has the attribute DontDelete
+description: Checking if Math.E property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.E === true) {
     $ERROR('#1: Value Property E of the Math Object hasn\'t attribute DontDelete: \'Math.E === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A4.js
index 0db827bd1..f0ca58a84 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property E of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.1/S15.8.1.1_A4.js
- * @description Checking if Math.E property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property E of the Math Object has the attribute ReadOnly
+description: Checking if Math.E property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.E;
@@ -15,4 +13,3 @@ Math.E = 1;
 if (Math.E !== x) {
   $ERROR('#1: Math.E hasn\'t ReadOnly: \'x = Math.E;Math.E = 1;Math.E === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A1.js
index 95dd0039f..704eb22a8 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.LN10 is approximately 2.302585092994046
- *
- * @path ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A1.js
- * @description Comparing Math.LN10 with 2.302585092994046
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.LN10 is approximately 2.302585092994046
+description: Comparing Math.LN10 with 2.302585092994046
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.LN10, 2.302585092994046)) {
   $ERROR('#1: \'Math.LN10 is not approximately equal to 2.302585092994046\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A2.js
index 78a5571f9..04d3fe240 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN10 of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A2.js
- * @description Checking if Math.LN10 property has the attribute DontEnum
- */
+/*---
+info: Value Property LN10 of the Math Object has the attribute DontEnum
+description: Checking if Math.LN10 property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property LN10 of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="LN10"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A3.js
index 72b2af50a..258319aba 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN10 of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A3.js
- * @description Checking if Math.LN10 property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property LN10 of the Math Object has the attribute DontDelete
+description: Checking if Math.LN10 property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.LN10 === true) {
   $ERROR('#1: Value Property LN10 of the Math Object hasn\'t attribute DontDelete: \'Math.LN10 === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A4.js
index c3b35c1e9..b92699764 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN10 of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.2/S15.8.1.2_A4.js
- * @description Checking if Math.LN10 property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property LN10 of the Math Object has the attribute ReadOnly
+description: Checking if Math.LN10 property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.LN10;
@@ -15,4 +13,3 @@ Math.LN10 = 1;
 if (Math.LN10 !== x) {
   $ERROR('#1: Math.LN10 hasn\'t ReadOnly: \'x = Math.LN10;Math.LN10 = 1;Math.LN10 === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A1.js
index abbe41435..9688a0b4a 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.LN2 is approximately 0.6931471805599453
- *
- * @path ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A1.js
- * @description Comparing Math.LN2 with 0.6931471805599453
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.LN2 is approximately 0.6931471805599453
+description: Comparing Math.LN2 with 0.6931471805599453
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.LN2, 0.6931471805599453)) {
   $ERROR('#1: \'Math.LN2 is not approximately equal to 0.6931471805599453\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A2.js
index 79fd3aa3a..720a5d87d 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN2 of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A2.js
- * @description Checking if Math.LN2 property has the attribute DontEnum
- */
+/*---
+info: Value Property LN2 of the Math Object has the attribute DontEnum
+description: Checking if Math.LN2 property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property LN2 of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="LN2"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A3.js
index 8f603a38a..650d5cce1 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN2 of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A3.js
- * @description Checking if Math.LN2 property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property LN2 of the Math Object has the attribute DontDelete
+description: Checking if Math.LN2 property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.LN2 === true) {
     $ERROR('#1: Value Property LN2 of the Math Object hasn\'t attribute DontDelete: \'Math.LN2 === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A4.js
index 04fd6e2ae..4d75fe3a5 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LN2 of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.3/S15.8.1.3_A4.js
- * @description Checking if Math.LN2 property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property LN2 of the Math Object has the attribute ReadOnly
+description: Checking if Math.LN2 property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.LN2;
@@ -15,4 +13,3 @@ Math.LN2 = 1;
 if (Math.LN2 !== x) {
   $ERROR('#1: Math.LN2 hasn\'t ReadOnly: \'x = Math.LN2;Math.LN2 = 1;Math.LN2 === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A1.js
index 46f1c564f..037862680 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.LOG2E is approximately 1.4426950408889634
- *
- * @path ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A1.js
- * @description Comparing Math.LOG2E with 1.4426950408889634
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.LOG2E is approximately 1.4426950408889634
+description: Comparing Math.LOG2E with 1.4426950408889634
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.LOG2E, 1.4426950408889634)) {
   $ERROR('#1: \'Math.LOG2E is not approximatley equal to 1.4426950408889634\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A2.js
index d6f5850e4..ed655e2d5 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG2E of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A2.js
- * @description Checking if Math.LOG2E property has the attribute DontEnum
- */
+/*---
+info: Value Property LOG2E of the Math Object has the attribute DontEnum
+description: Checking if Math.LOG2E property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property LOG2E of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="LOG2E"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A3.js
index 5a591c0bf..b9e331800 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG2E of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A3.js
- * @description Checking if Math.LOG2E property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property LOG2E of the Math Object has the attribute DontDelete
+description: Checking if Math.LOG2E property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.LOG2E === true) {
     $ERROR('#1: Value Property LOG2E of the Math Object hasn\'t attribute DontDelete: \'Math.LOG2E === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A4.js
index b709f1476..037e29602 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG2E of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.4/S15.8.1.4_A4.js
- * @description Checking if Math.LOG2E property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property LOG2E of the Math Object has the attribute ReadOnly
+description: Checking if Math.LOG2E property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.LOG2E;
@@ -15,4 +13,3 @@ Math.LOG2E = 1;
 if (Math.LOG2E !== x) {
   $ERROR('#1: Math.LOG2E hasn\'t ReadOnly: \'x = Math.LOG2E;Math.LOG2E = 1;Math.LOG2E === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A1.js
index 44d3d1deb..7654d637c 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A1.js
@@ -1,18 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.LOG10E is approximately 0.4342944819032518
- *
- * @path ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A1.js
- * @description Comparing Math.LOG10E with 0.4342944819032518
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.LOG10E is approximately 0.4342944819032518
+description: Comparing Math.LOG10E with 0.4342944819032518
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.LOG10E, 0.4342944819032518)) {
   $ERROR('#1: \'Math.LOG10E is not approximatley equal to  0.4342944819032518\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A2.js
index 6b9ea3fbc..833b979bb 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG10E of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A2.js
- * @description Checking if Math.LOG10E property has the attribute DontEnum
- */
+/*---
+info: Value Property LOG10E of the Math Object has the attribute DontEnum
+description: Checking if Math.LOG10E property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property LOG10E of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="LOG10E"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A3.js
index 02c6230a1..42d4f41d0 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG10E of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A3.js
- * @description Checking if Math.LOG10E property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property LOG10E of the Math Object has the attribute DontDelete
+description: Checking if Math.LOG10E property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.LOG10E === true) {
     $ERROR('#1: Value Property LOG10E of the Math Object hasn\'t attribute DontDelete: \'Math.LOG10E === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A4.js
index 5eedffafe..1980a01c7 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property LOG10E of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.5/S15.8.1.5_A4.js
- * @description Checking if Math.LOG10E property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property LOG10E of the Math Object has the attribute ReadOnly
+description: Checking if Math.LOG10E property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.LOG10E;
@@ -15,4 +13,3 @@ Math.LOG10E = 1;
 if (Math.LOG10E !== x) {
   $ERROR('#1: Math.LOG10E hasn\'t ReadOnly: \'x = Math.LOG10E;Math.LOG10E = 1;Math.LOG10E === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A1.js
index 50acce0f0..59479e3b1 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A1.js
@@ -1,19 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.PI is approximately 3.1415926535897932
- *
- * @path ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A1.js
- * @description Comparing Math.PI with 3.1415926535897932
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.PI is approximately 3.1415926535897932
+description: Comparing Math.PI with 3.1415926535897932
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.PI, 3.1415926535897932)) {
   $ERROR('#1: \'Math.PI is not approximatley equal to 3.1415926535897932\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A2.js
index b6a266646..749183252 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property PI of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A2.js
- * @description Checking if Math.PI property has the attribute DontEnum
- */
+/*---
+info: Value Property PI of the Math Object has the attribute DontEnum
+description: Checking if Math.PI property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property PI of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="PI"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A3.js
index cded51a38..7ea15aa7d 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property PI of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A3.js
- * @description Checking if Math.PI property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property PI of the Math Object has the attribute DontDelete
+description: Checking if Math.PI property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.PI === true) {
     $ERROR('#1: Value Property PI of the Math Object hasn\'t attribute DontDelete: \'Math.PI === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A4.js
index 96fc4fd81..fd98a81b8 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property PI of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.6/S15.8.1.6_A4.js
- * @description Checking if Math.PI property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property PI of the Math Object has the attribute ReadOnly
+description: Checking if Math.PI property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.PI;
@@ -15,4 +13,3 @@ Math.PI = 1;
 if (Math.PI !== x) {
   $ERROR('#1: Math.PI hasn\'t ReadOnly: \'x = Math.PI;Math.PI = 1;Math.PI === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A1.js
index 23c8e37a8..2d503c65f 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A1.js
@@ -1,19 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.SQRT1_2 is approximately 0.7071067811865476
- *
- * @path ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A1.js
- * @description Comparing Math.SQRT1_2 with 0.7071067811865476
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.SQRT1_2 is approximately 0.7071067811865476
+description: Comparing Math.SQRT1_2 with 0.7071067811865476
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.SQRT1_2, 0.7071067811865476)) {
   $ERROR('#1: \'Math.SQRT1_2 is not approximatley equal to  0.7071067811865476\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A2.js
index 6d619d021..a709712c7 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT1_2 of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A2.js
- * @description Checking if Math.SQRT1_2 property has the attribute DontEnum
- */
+/*---
+info: Value Property SQRT1_2 of the Math Object has the attribute DontEnum
+description: Checking if Math.SQRT1_2 property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property SQRT1_2 of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="SQRT1_2"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A3.js
index 3042c87b4..3494c5002 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT1_2 of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A3.js
- * @description Checking if Math.SQRT1_2 property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property SQRT1_2 of the Math Object has the attribute DontDelete
+description: Checking if Math.SQRT1_2 property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.SQRT1_2 === true) {
   $ERROR("#1: Value Property SQRT1_2 of the Math Object hasn't attribute DontDelete: 'Math.SQRT1_2 === true'");
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A4.js
index ec4a44bbe..17a374c55 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT1_2 of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.7/S15.8.1.7_A4.js
- * @description Checking if Math.SQRT1_2 property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property SQRT1_2 of the Math Object has the attribute ReadOnly
+description: Checking if Math.SQRT1_2 property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.SQRT1_2;
@@ -15,4 +13,3 @@ Math.SQRT1_2 = 1;
 if (Math.SQRT1_2 !== x) {
   $ERROR('#1: Math.SQRT1_2 hasn\'t ReadOnly: \'x = Math.SQRT1_2;Math.SQRT1_2 = 1;Math.SQRT1_2 === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A1.js b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A1.js
index 72a47f5d9..cdd911574 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A1.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A1.js
@@ -1,19 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.SQRT2 is approximately 1.4142135623730951
- *
- * @path ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A1.js
- * @description Comparing Math.SQRT2 with 1.4142135623730951
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: Math.SQRT2 is approximately 1.4142135623730951
+description: Comparing Math.SQRT2 with 1.4142135623730951
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 if (!isEqual(Math.SQRT2, 1.4142135623730951)) {
   $ERROR('#1: \'Math.SQRT2 is not approximatley equal to 1.4142135623730951\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A2.js b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A2.js
index 067186028..03ac76dff 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A2.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT2 of the Math Object has the attribute DontEnum
- *
- * @path ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A2.js
- * @description Checking if Math.SQRT2 property has the attribute DontEnum
- */
+/*---
+info: Value Property SQRT2 of the Math Object has the attribute DontEnum
+description: Checking if Math.SQRT2 property has the attribute DontEnum
+---*/
 
 // CHECK#1
 for(x in Math) {
@@ -14,5 +12,3 @@ for(x in Math) {
     $ERROR('#1: Value Property SQRT2 of the Math Object hasn\'t attribute DontEnum: \'for(x in Math) {x==="SQRT2"}\'');
   }
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A3.js b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A3.js
index baa8a0375..b8cad59f6 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A3.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A3.js
@@ -1,17 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT2 of the Math Object has the attribute DontDelete
- *
- * @path ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A3.js
- * @description Checking if Math.SQRT2 property has the attribute DontDelete
- * @noStrict
- */
+/*---
+info: Value Property SQRT2 of the Math Object has the attribute DontDelete
+description: Checking if Math.SQRT2 property has the attribute DontDelete
+flags: [noStrict]
+---*/
 
 // CHECK#1
 if (delete Math.SQRT2 === true) {
     $ERROR('#1: Value Property SQRT2 of the Math Object hasn\'t attribute DontDelete: \'Math.SQRT2 === true\'');
 }
-
-
diff --git a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A4.js b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A4.js
index 4a7aec579..b21c5e7a4 100644
--- a/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A4.js
+++ b/test/suite/ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A4.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Value Property SQRT2 of the Math Object has the attribute ReadOnly
- *
- * @path ch15/15.8/15.8.1/15.8.1.8/S15.8.1.8_A4.js
- * @description Checking if Math.SQRT2 property has the attribute ReadOnly
- * @noStrict
- */
+/*---
+info: Value Property SQRT2 of the Math Object has the attribute ReadOnly
+description: Checking if Math.SQRT2 property has the attribute ReadOnly
+flags: [noStrict]
+---*/
 
 // CHECK#1
 var x = Math.SQRT2;
@@ -15,4 +13,3 @@ Math.SQRT2 = 1;
 if (Math.SQRT2 !== x) {
   $ERROR('#1: Math.SQRT2 hasn\'t ReadOnly: \'x = Math.SQRT2;Math.SQRT2 = 1;Math.SQRT2 === x\'');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A1.js
index d828fae96..42c0fe06d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.abs(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A1.js
- * @description Checking if Math.abs(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.abs(x) is NaN
+description: Checking if Math.abs(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.abs(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.abs(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A2.js
index a34300770..c0e9fe018 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.abs(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A2.js
- * @description Checking if Math.abs(-0) equals to +0
- */
+/*---
+info: If x is -0, Math.abs(x) is +0
+description: Checking if Math.abs(-0) equals to +0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.abs(x) !== +0)
 {
 	$ERROR("#1: 'var x=-0; Math.abs(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A3.js
index b30afca1b..3e8166b25 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.abs(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.1/S15.8.2.1_A3.js
- * @description Checking if Math.abs(-Infinity) equals to +Infinity
- */
+/*---
+info: If x is -Infinity, Math.abs(x) is +Infinity
+description: Checking if Math.abs(-Infinity) equals to +Infinity
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (Math.abs(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x=-Infinity; Math.abs(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A1.js
index 46143c2a0..470cd1759 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.log(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A1.js
- * @description Checking if Math.log(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.log(x) is NaN
+description: Checking if Math.log(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.log(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.log(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A2.js
index 494a73b66..2697f936c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than 0, Math.log(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A2.js
- * @description Checking if Math.log(x) is NaN, where x is less than 0
- */
+/*---
+info: If x is less than 0, Math.log(x) is NaN
+description: Checking if Math.log(x) is NaN, where x is less than 0
+---*/
 
 // CHECK#1
 var x = -0.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.log(x)))
 {
 	$ERROR("#1: 'var x=-Infinity; isNaN(Math.log(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A3.js
index 426090c8f..5f082ff2d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0 or -0, Math.log(x) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A3.js
- * @description Checking if Math.log(+0) and Math.log(-0) equals to -Infinity
- */
+/*---
+info: If x is +0 or -0, Math.log(x) is -Infinity
+description: Checking if Math.log(+0) and Math.log(-0) equals to -Infinity
+---*/
 
 // CHECK#1
 var x = +0;
@@ -21,4 +19,3 @@ if (Math.log(x) !== -Infinity)
 {
 	$ERROR("#1: 'var x=-0; Math.log(x) !== -Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A4.js
index af4e9c311..ddeac3512 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is 1, Math.log(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A4.js
- * @description Checking if Math.log(1) equals to +0
- */
+/*---
+info: If x is 1, Math.log(x) is +0
+description: Checking if Math.log(1) equals to +0
+---*/
 
 // CHECK#1
 var x = 1;
@@ -14,4 +12,3 @@ if (Math.log(x) !== +0)
 {
 	$ERROR("#1: 'var x=1; Math.log(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A5.js
index 05cd7db47..d79e25e10 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.log(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A5.js
- * @description Checking if Math.log(+Infinity) equals to +Infinity
- */
+/*---
+info: If x is +Infinity, Math.log(x) is +Infinity
+description: Checking if Math.log(+Infinity) equals to +Infinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.log(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x=+Infinity; Math.log(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A6.js
index 15f7abd7d..76443de65 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A6.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.log, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.10/S15.8.2.10_A6.js
- * @description Checking if Math.log is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.log, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.log is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -157,4 +160,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.log(x) = " + y[i] + "\nMath.log(x) = " + Math.log(x[i]) + "\nMath.abs(libc.log(x) - Math.log(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.11/15.8.2.11-1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.11/15.8.2.11-1.js
index b6ce99935..ab0b45d79 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.11/15.8.2.11-1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.11/15.8.2.11-1.js
@@ -1,18 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.8/15.8.2/15.8.2.11/15.8.2.11-1.js

- * @description Math.max({}) is NaN

- */

-

-

-

-

-

-function testcase() {

-    return isNaN(Math.max({}));

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Math.max({}) is NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return isNaN(Math.max({}));
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A1.js
index 741d35728..64b909b43 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If no arguments are given, Math.max() is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A1.js
- * @description Checking if Math.max() equals to -Infinity
- */
+/*---
+info: If no arguments are given, Math.max() is -Infinity
+description: Checking if Math.max() equals to -Infinity
+---*/
 
 // CHECK#1
 if (Math.max() != -Infinity)
 {
 	$ERROR("#1: 'Math.max() != -Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A2.js
index 512e60544..fa81a0d53 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If any value is NaN, the result of Math.max is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A2.js
- * @description The script tests Math.max giving 1, 2 and 3 arguments to the function where at least one of the arguments is NaN
- */
+/*---
+info: If any value is NaN, the result of Math.max is NaN
+description: >
+    The script tests Math.max giving 1, 2 and 3 arguments to the
+    function where at least one of the arguments is NaN
+---*/
 
 // CHECK#1
 if (!isNaN(Math.max(NaN)))
@@ -65,4 +65,3 @@ for (i = 0; i <= 2; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A3.js
index 906d9bf57..dd8068a22 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * +0 is considered to be larger than -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A3.js
- * @description Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to +0
- */
+/*---
+info: +0 is considered to be larger than -0
+description: Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to +0
+---*/
 
 // CHECK#1
 if (Math.max(-0, +0) !== +0)
@@ -19,4 +17,3 @@ if (Math.max(+0, -0) !== +0)
 {
 	$ERROR("#2: 'Math.max(+0, -0) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A4.js
index f6729a2ff..bde6ba006 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the Math.max method is 2
- *
- * @path ch15/15.8/15.8.2/15.8.2.11/S15.8.2.11_A4.js
- * @description Checking if Math.max.length property is defined and equals to 2
- */
+/*---
+info: The length property of the Math.max method is 2
+description: Checking if Math.max.length property is defined and equals to 2
+---*/
 
 // CHECK#1
 if (typeof Math.max !== "function") {
@@ -22,4 +20,3 @@ if (typeof Math.max.length === "undefined") {
 if (Math.max.length !== 2) {
 	$ERROR('#3: The length property of the Math.max method is not 2');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.12/15.8.2.12-1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.12/15.8.2.12-1.js
index 4a612a65b..d00069bd2 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.12/15.8.2.12-1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.12/15.8.2.12-1.js
@@ -1,18 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.8/15.8.2/15.8.2.12/15.8.2.12-1.js

- * @description Math.min({}) is NaN

- */

-

-

-

-

-

-function testcase() {

-    return isNaN(Math.min({}));

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Math.min({}) is NaN
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    return isNaN(Math.min({}));
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A1.js
index 94f87343b..339610893 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If no arguments are given, Math.min() is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A1.js
- * @description Checking if Math.min() equals to +Infinity
- */
+/*---
+info: If no arguments are given, Math.min() is +Infinity
+description: Checking if Math.min() equals to +Infinity
+---*/
 
 // CHECK#1
 if (Math.min() != +Infinity)
 {
 	$ERROR("#1: 'Math.min() != +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A2.js
index 362958bd3..ba3215440 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If any value is NaN, the result of Math.min is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A2.js
- * @description The script tests Math.min giving 1, 2 and 3 arguments to the function where at least one of the arguments is NaN
- */
+/*---
+info: If any value is NaN, the result of Math.min is NaN
+description: >
+    The script tests Math.min giving 1, 2 and 3 arguments to the
+    function where at least one of the arguments is NaN
+---*/
 
 // CHECK#1
 if (!isNaN(Math.min(NaN)))
@@ -65,4 +65,3 @@ for (i = 0; i <= 2; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A3.js
index 01150d8c2..218fe0388 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * +0 is considered to be larger than -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A3.js
- * @description Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to -0
- */
+/*---
+info: +0 is considered to be larger than -0
+description: Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to -0
+---*/
 
 // CHECK#1
 if (Math.max(-0, +0) !== -0)
@@ -19,4 +17,3 @@ if (Math.max(+0, -0) !== -0)
 {
 	$ERROR("#2: 'Math.max(+0, -0) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A4.js
index d563445b5..906690857 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the Math.min method is 2
- *
- * @path ch15/15.8/15.8.2/15.8.2.12/S15.8.2.12_A4.js
- * @description Checking if Math.min.length property is defined and equals to 2
- */
+/*---
+info: The length property of the Math.min method is 2
+description: Checking if Math.min.length property is defined and equals to 2
+---*/
 
 // CHECK#1
 if (typeof Math.min !== "function") {
@@ -22,4 +20,3 @@ if (typeof Math.min.length === "undefined") {
 if (Math.min.length !== 2) {
 	$ERROR('#3: The length property of the Math.min method is not 2');
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A1.js
index 3e60d5bd7..2034dcdc1 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is NaN, Math.pow(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A1.js
- * @description Checking if Math.pow(x,y) is NaN, where y is NaN
- */
+/*---
+info: If y is NaN, Math.pow(x,y) is NaN
+description: Checking if Math.pow(x,y) is NaN, where y is NaN
+---*/
 
 // CHECK#1
 
@@ -30,4 +28,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A10.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A10.js
index 427669056..9ed848608 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A10.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)<1 and y is -Infinity, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A10.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where abs(x)<1 and y is -Infinity
- */
+/*---
+info: If abs(x)<1 and y is -Infinity, Math.pow(x,y) is +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where abs(x)<1 and
+    y is -Infinity
+---*/
 
 // CHECK#1
 
@@ -27,4 +27,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", " + y + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A11.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A11.js
index 0b2b93b32..ff96542ac 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A11.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A11.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity and y>0, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A11.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where x is +Infinity and y>0
- */
+/*---
+info: If x is +Infinity and y>0, Math.pow(x,y) is +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where x is
+    +Infinity and y>0
+---*/
 
 // CHECK#1
 
@@ -25,4 +25,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A12.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A12.js
index 8fa5c81df..9caefb57b 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A12.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A12.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity and y<0, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A12.js
- * @description Checking if Math.pow(x,y) equals to +0, where x is +Infinity and y<0
- */
+/*---
+info: If x is +Infinity and y<0, Math.pow(x,y) is +0
+description: >
+    Checking if Math.pow(x,y) equals to +0, where x is +Infinity and
+    y<0
+---*/
 
 // CHECK#1
 
@@ -25,4 +25,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A13.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A13.js
index 03813cf51..e6a5d54cd 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A13.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A13.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and y>0 and y is an odd integer, Math.pow(x,y) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A13.js
- * @description Checking if Math.pow(x,y) equals to -Infinity, where x is -Infinity and y>0
- */
+/*---
+info: >
+    If x is -Infinity and y>0 and y is an odd integer, Math.pow(x,y) is
+    -Infinity
+description: >
+    Checking if Math.pow(x,y) equals to -Infinity, where x is
+    -Infinity and y>0
+---*/
 
 // CHECK#1
 
@@ -24,4 +26,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== -Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A14.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A14.js
index 705a519a1..51bd37078 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A14.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A14.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and y>0 and y is NOT an odd integer, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A14.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where x is -Infinity and y>0
- */
+/*---
+info: >
+    If x is -Infinity and y>0 and y is NOT an odd integer, Math.pow(x,y) is
+    +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where x is
+    -Infinity and y>0
+---*/
 
 // CHECK#1
 
@@ -26,4 +28,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A15.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A15.js
index 5611285c8..cea4591cb 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A15.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A15.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and y<0 and y is an odd integer, Math.pow(x,y) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A15.js
- * @description Checking if Math.pow(x,y) equals to -0, where x is -Infinity and y<0
- */
+/*---
+info: If x is -Infinity and y<0 and y is an odd integer, Math.pow(x,y) is -0
+description: >
+    Checking if Math.pow(x,y) equals to -0, where x is -Infinity and
+    y<0
+---*/
 
 // CHECK#1
 
@@ -24,4 +24,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== -0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A16.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A16.js
index 48d92a917..f7bbcbaff 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A16.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A16.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity and y<0 and y is NOT an odd integer, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A16.js
- * @description Checking if Math.pow(x,y) equals to +0, where x is -Infinity and y<0
- */
+/*---
+info: If x is -Infinity and y<0 and y is NOT an odd integer, Math.pow(x,y) is +0
+description: >
+    Checking if Math.pow(x,y) equals to +0, where x is -Infinity and
+    y<0
+---*/
 
 // CHECK#1
 
@@ -26,4 +26,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A17.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A17.js
index 4826b3fb9..8009d9d63 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A17.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A17.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0 and y>0, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A17.js
- * @description Checking if Math.pow(x,y) equals to +0, where x is +0 and y>0
- */
+/*---
+info: If x is +0 and y>0, Math.pow(x,y) is +0
+description: Checking if Math.pow(x,y) equals to +0, where x is +0 and y>0
+---*/
 
 // CHECK#1
 
@@ -25,4 +23,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A18.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A18.js
index 186ef2be7..c51ffbb49 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A18.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A18.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0 and y<0, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A18.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where x is +0 and y<0
- */
+/*---
+info: If x is +0 and y<0, Math.pow(x,y) is +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where x is +0 and
+    y<0
+---*/
 
 // CHECK#1
 
@@ -25,4 +25,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A19.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A19.js
index 793223661..da2efc15d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A19.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A19.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0 and y>0 and y is an odd integer, Math.pow(x,y) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A19.js
- * @description Checking if Math.pow(x,y) equals to -0, where x is -0 and y>0
- */
+/*---
+info: If x is -0 and y>0 and y is an odd integer, Math.pow(x,y) is -0
+description: Checking if Math.pow(x,y) equals to -0, where x is -0 and y>0
+---*/
 
 // CHECK#1
 
@@ -24,4 +22,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== -0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A2.js
index 653651a24..ab9571fc7 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +0, Math.pow(x,y) is 1, even if x is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A2.js
- * @description Checking if Math.pow(x,y) equals to 1, where y is +0 and x is number or NaN
- */
+/*---
+info: If y is +0, Math.pow(x,y) is 1, even if x is NaN
+description: >
+    Checking if Math.pow(x,y) equals to 1, where y is +0 and x is
+    number or NaN
+---*/
 
 // CHECK#1
 
@@ -30,4 +30,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", " + y + ") !== 1");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A20.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A20.js
index 730d1dec3..c1fa35c6a 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A20.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A20.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0 and y>0 and y is NOT an odd integer, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A20.js
- * @description Checking if Math.pow(x,y) equals to +0, where x is -0 and y>0 and y is NOT an odd integer
- */
+/*---
+info: If x is -0 and y>0 and y is NOT an odd integer, Math.pow(x,y) is +0
+description: >
+    Checking if Math.pow(x,y) equals to +0, where x is -0 and y>0 and
+    y is NOT an odd integer
+---*/
 
 // CHECK#1
 
@@ -26,4 +26,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A21.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A21.js
index 556c46dd6..4a35bd952 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A21.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A21.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0 and y<0 and y is an odd integer, Math.pow(x,y) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A21.js
- * @description Checking if Math.pow(x,y) equals to -Infinity, where x is -0 and y is an odd integer
- */
+/*---
+info: If x is -0 and y<0 and y is an odd integer, Math.pow(x,y) is -Infinity
+description: >
+    Checking if Math.pow(x,y) equals to -Infinity, where x is -0 and y
+    is an odd integer
+---*/
 
 // CHECK#1
 
@@ -24,4 +24,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== -Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A22.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A22.js
index fb1eb0771..5d9be14f4 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A22.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A22.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0 and y<0 and y is NOT an odd integer, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A22.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where x is -0 and y<0 and y is NOT an odd integer
- */
+/*---
+info: If x is -0 and y<0 and y is NOT an odd integer, Math.pow(x,y) is +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where x is -0 and
+    y<0 and y is NOT an odd integer
+---*/
 
 // CHECK#1
 
@@ -26,4 +26,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: Math.pow(" + x + ", " + y[i] + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A23.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A23.js
index 3ff4ef3a9..9c2b5f5ff 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A23.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A23.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x<0 and x is finite and y is finite and y is not an integer, Math.pow(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A23.js
- * @description Checking if Math.pow(x,y) is NaN, where x<0 and x is finite and y is finite and y is not an integer
- */
+/*---
+info: >
+    If x<0 and x is finite and y is finite and y is not an integer,
+    Math.pow(x,y) is NaN
+description: >
+    Checking if Math.pow(x,y) is NaN, where x<0 and x is finite and y
+    is finite and y is not an integer
+---*/
 
 // CHECK#1
 
@@ -32,4 +34,3 @@ for (i = 0; i < xnum; i++)
 	for (j = 0; j < ynum; j++)
 		if (!isNaN(Math.pow(x[i],y[j])))
 			$ERROR("#1: isNaN(Math.pow(" + x[i] + ", " + y[j] + ")) === false");
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A24.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A24.js
index 4ffd6b4e6..8e2aa4e86 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A24.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A24.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.pow, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A24.js
- * @description Checking if Math.pow(argument1, argument2) is approximately equals to its mathematical value on the set of 64 argument1 values and 64 argument2 values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.pow, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.pow(argument1, argument2) is approximately equals
+    to its mathematical value on the set of 64 argument1 values and 64
+    argument2 values; all the sample values is calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -225,4 +228,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx1 = " + x1[i] + "\nx2 = " + x2[i] + "\nlibc.pow(x1,x2) = " + y[i] + "\nMath.pow(x1,x2) = " + Math.pow(x1[i], x2[i]) + "\nMath.abs(libc.pow(x1,x2) - Math.pow(x1,x2)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A3.js
index 5929d427c..b9c75b834 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -0, Math.pow(x,y) is 1, even if x is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A3.js
- * @description Checking if Math.pow(x,y) equals to 1, where x is number or NaN and y is -0
- */
+/*---
+info: If y is -0, Math.pow(x,y) is 1, even if x is NaN
+description: >
+    Checking if Math.pow(x,y) equals to 1, where x is number or NaN
+    and y is -0
+---*/
 
 // CHECK#1
 
@@ -30,4 +30,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", -0) !== 1");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A4.js
index f8a0c51bb..9f67d55ec 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN and y is nonzero, Math.pow(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A4.js
- * @description Checking if Math.pow(x,y) is NaN, where x is NaN and y is nonzero
- */
+/*---
+info: If x is NaN and y is nonzero, Math.pow(x,y) is NaN
+description: Checking if Math.pow(x,y) is NaN, where x is NaN and y is nonzero
+---*/
 
 // CHECK#1
 
@@ -28,4 +26,3 @@ for (i = 0; i < ynum; i++)
 		$ERROR("#1: isNaN(Math.pow(" + x + ", " + y[i] + ")) === false");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A5.js
index d11b6178b..07f230386 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)>1 and y is +Infinity, Math.pow(x,y) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A5.js
- * @description Checking if Math.pow(x,y) equals to +Infinity, where abs(x)>1 and y is +Infinity
- */
+/*---
+info: If abs(x)>1 and y is +Infinity, Math.pow(x,y) is +Infinity
+description: >
+    Checking if Math.pow(x,y) equals to +Infinity, where abs(x)>1 and
+    y is +Infinity
+---*/
 
 // CHECK#1
 
@@ -27,4 +27,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", " + y + ") !== +Infinity");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A6.js
index a5b816dc6..d9a263320 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)>1 and y is -Infinity, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A6.js
- * @description Checking if Math.pow(x,y) equals to +0, where abs(x)>1 and y is -Infinity
- */
+/*---
+info: If abs(x)>1 and y is -Infinity, Math.pow(x,y) is +0
+description: >
+    Checking if Math.pow(x,y) equals to +0, where abs(x)>1 and y is
+    -Infinity
+---*/
 
 // CHECK#1
 
@@ -27,4 +27,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", " + y + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A7.js
index 7ab8b5599..1d0fb839d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)==1 and y is +Infinity, Math.pow(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A7.js
- * @description Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is +Infinity
- */
+/*---
+info: If abs(x)==1 and y is +Infinity, Math.pow(x,y) is NaN
+description: >
+    Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is
+    +Infinity
+includes: [$FAIL.js]
+---*/
 
 // CHECK#1
 
@@ -23,4 +24,3 @@ for (i = 0; i < xnum; i++)
 		$FAIL("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A8.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A8.js
index 976fed4af..97a219a86 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A8.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)==1 and y is -Infinity, Math.pow(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A8.js
- * @description Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is -Infinity
- */
+/*---
+info: If abs(x)==1 and y is -Infinity, Math.pow(x,y) is NaN
+description: >
+    Checking if Math.pow(x,y) is NaN, where abs(x)==1 and y is
+    -Infinity
+includes: [$FAIL.js]
+---*/
 
 // CHECK#1
 
@@ -23,4 +24,3 @@ for (i = 0; i < xnum; i++)
 		$FAIL("#1: isNaN(Math.pow(" + x[i] + ", " + y + ")) === false");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A9.js b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A9.js
index 01acce302..7f750627d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A9.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If abs(x)<1 and y is +Infinity, Math.pow(x,y) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.13/S15.8.2.13_A9.js
- * @description Checking if Math.pow(x,y) equals to +0, where abs(x)<1 and y is +Infinity
- */
+/*---
+info: If abs(x)<1 and y is +Infinity, Math.pow(x,y) is +0
+description: >
+    Checking if Math.pow(x,y) equals to +0, where abs(x)<1 and y is
+    +Infinity
+---*/
 
 // CHECK#1
 
@@ -27,4 +27,3 @@ for (i = 0; i < xnum; i++)
 		$ERROR("#1: Math.pow(" + x[i] + ", " + y + ") !== +0");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.14/S15.8.2.14_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.14/S15.8.2.14_A1.js
index c3679abcb..a6b8b4ed8 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.14/S15.8.2.14_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.14/S15.8.2.14_A1.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.random() returns a number value with positive sign, greater than or equal to 0 but less than 1
- *
- * @path ch15/15.8/15.8.2/15.8.2.14/S15.8.2.14_A1.js
- * @description Checking if Math.random() is a number between 0 and 1, calling Math.random() 100 times
- */
+/*---
+info: >
+    Math.random() returns a number value with positive sign, greater than or
+    equal to 0 but less than 1
+description: >
+    Checking if Math.random() is a number between 0 and 1, calling
+    Math.random() 100 times
+---*/
 
 // CHECK#1
 for (i = 0; i < 100; i++)
@@ -17,4 +19,3 @@ for (i = 0; i < 100; i++)
 		$ERROR("#1: Math.random() = " + val);
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A1.js
index bdb449fce..5c9476558 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.round(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A1.js
- * @description Checking if Math.round(x) is NaN, where x is NaN
- */
+/*---
+info: If x is NaN, Math.round(x) is NaN
+description: Checking if Math.round(x) is NaN, where x is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.round(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.round(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A2.js
index 9b6db1778..0eff41bb6 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.round(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A2.js
- * @description Checking if Math.round(x) equals to +0, where x is +0
- */
+/*---
+info: If x is +0, Math.round(x) is +0
+description: Checking if Math.round(x) equals to +0, where x is +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.round(x) !== +0)
 {
 	$ERROR("#1: 'var x=+0; Math.round(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A3.js
index 7c32e99db..cbd714752 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.round(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A3.js
- * @description Checking if Math.round(x) equals to -0, where x is -0
- */
+/*---
+info: If x is -0, Math.round(x) is -0
+description: Checking if Math.round(x) equals to -0, where x is -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.round(x) !== -0)
 {
 	$ERROR("#1: 'var x=-0; Math.round(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A4.js
index 5b9fe86a8..4dbe47c6c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.round(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A4.js
- * @description Checking if Math.round(x) is +Infinity, where x is +Infinity
- */
+/*---
+info: If x is +Infinity, Math.round(x) is +Infinity
+description: Checking if Math.round(x) is +Infinity, where x is +Infinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.round(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x=+Infinity; Math.round(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A5.js
index abf47375d..524c9a4d4 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.round(x) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A5.js
- * @description Checking if Math.round(x) is -Infinity, where x is -Infinity
- */
+/*---
+info: If x is -Infinity, Math.round(x) is -Infinity
+description: Checking if Math.round(x) is -Infinity, where x is -Infinity
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (Math.round(x) !== -Infinity)
 {
 	$ERROR("#1: 'var x=-Infinity; Math.round(x) !== -Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A6.js
index 3b54f7c94..44229615e 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A6.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is equal to 0 or greater than 0, or if x is less than -0.5, Math.round(x) is equal to Math.floor(x+0.5)
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A6.js
- * @description Checking if Math.round(x) is equal to Math.floor(x+0.5), where x equals to 0, greater than 0, or is less than -0.5; this check is performed on 2000 argument x values
- */
+/*---
+info: >
+    If x is equal to 0 or greater than 0, or if x is less than -0.5,
+    Math.round(x) is equal to Math.floor(x+0.5)
+description: >
+    Checking if Math.round(x) is equal to Math.floor(x+0.5), where x
+    equals to 0, greater than 0, or is less than -0.5; this check is
+    performed on 2000 argument x values
+---*/
 
 // CHECK#1
 for (i = 0; i <= 1000; i++)
@@ -33,4 +36,3 @@ for (i = -5; i >= -1000; i--)
 		$ERROR("#2: 'x = " + x + "; Math.round(x) !== Math.floor(x + 0.5)'")
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A7.js
index ffa7ba6da..c1bf43cd5 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than or equal to -0 and x is greater than or equal to -0.5, Math.round(x) is equal to -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.15/S15.8.2.15_A7.js
- * @description Checking if Math.round(x) is equal -0, where x is equal to 0, equal to -0.5, or less than -0 while greater than -0.5
- */
+/*---
+info: >
+    If x is less than or equal to -0 and x is greater than or equal to -0.5,
+    Math.round(x) is equal to -0
+description: >
+    Checking if Math.round(x) is equal -0, where x is equal to 0,
+    equal to -0.5, or less than -0 while greater than -0.5
+---*/
 
 // CHECK#1
 if (Math.round(-0) !== -0)
@@ -25,4 +27,3 @@ if (Math.round(-0.25) !== -0)
 {
 	$ERROR("#3: 'Math.round(-0.25) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A1.js
index e8596f18f..75470f036 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.sin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A1.js
- * @description Checking if Math.sin(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.sin(x) is NaN
+description: Checking if Math.sin(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.sin(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.sin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A3.js
index d2687c704..85025585a 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.sin(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A3.js
- * @description Checking if Math.sin(-0) equals to -0
- */
+/*---
+info: If x is -0, Math.sin(x) is -0
+description: Checking if Math.sin(-0) equals to -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.sin(x) !== -0)
 {
 	$ERROR("#1: 'var x = -0; Math.sin(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A4.js
index f76c2b33f..897c46520 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.sin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A4.js
- * @description Checking if Math.sin(+Infinity) is NaN
- */
+/*---
+info: If x is +Infinity, Math.sin(x) is NaN
+description: Checking if Math.sin(+Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.sin(x)))
 {
 	$ERROR("#1: 'var x = +Infinity; isNaN(Math.sin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A5.js
index 8115e744f..f09453de1 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.sin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A5.js
- * @description Checking if Math.sin(-Infinity) is NaN
- */
+/*---
+info: If x is -Infinity, Math.sin(x) is NaN
+description: Checking if Math.sin(-Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.sin(x)))
 {
 	$ERROR("#1: 'var x = -Infinity; isNaN(Math.sin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A6.js
index 544e31760..2243664ed 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Sine is a periodic function with period 2*PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A6.js
- * @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
- */
+/*---
+info: Sine is a periodic function with period 2*PI
+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
   prec = 0.000000000003;
@@ -43,4 +45,3 @@ for (i = 0; i < snum; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A7.js
index 8ec58a852..4a53393b0 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A7.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.sin it is recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.16/S15.8.2.16_A7.js
- * @description Checking if Math.sin is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.sin it is recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.sin is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -159,4 +162,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.sin(x) = " + y[i] + "\nMath.sin(x) = " + Math.sin(x[i]) + "\nMath.abs(libc.sin(x) - Math.sin(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A1.js
index f726cede5..d9a8fa8aa 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.sqrt(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A1.js
- * @description Checking if Math.sqrt(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.sqrt(x) is NaN
+description: Checking if Math.sqrt(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.sqrt(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.sqrt(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A2.js
index fbc4bebac..318a21baf 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x less than 0, Math.sqrt(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A2.js
- * @description Checking if Math.sqrt(x) is NaN, where x is less than 0
- */
+/*---
+info: If x less than 0, Math.sqrt(x) is NaN
+description: Checking if Math.sqrt(x) is NaN, where x is less than 0
+---*/
 
 // CHECK#1
 var x = -0.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.sqrt(x)))
 {
 	$ERROR("#3: 'var x=-Infinity; isNaN(Math.sqrt(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A3.js
index 7fa820d9d..6da30e582 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is equal to +0, Math.sqrt(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A3.js
- * @description Checking if Math.sqrt(+0) equals to +0
- */
+/*---
+info: If x is equal to +0, Math.sqrt(x) is +0
+description: Checking if Math.sqrt(+0) equals to +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.sqrt(x) !== +0)
 {
 	$ERROR("#1: 'var x=+0; Math.sqrt(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A4.js
index 1caf03dcd..b765f4bc6 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is equal to -0, Math.sqrt(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A4.js
- * @description Checking if Math.sqrt(-0) equals to -0
- */
+/*---
+info: If x is equal to -0, Math.sqrt(x) is -0
+description: Checking if Math.sqrt(-0) equals to -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.sqrt(x) !== -0)
 {
 	$ERROR("#1: 'var x=-0; Math.sqrt(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A5.js
index 3bff31a19..639c5d8e5 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is equal to +Infinity, Math.sqrt(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A5.js
- * @description Checking if Math.sqrt(+Infinity) is +Infinity
- */
+/*---
+info: If x is equal to +Infinity, Math.sqrt(x) is +Infinity
+description: Checking if Math.sqrt(+Infinity) is +Infinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.sqrt(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x=+Infinity; Math.sqrt(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A6.js
index f668a1519..1dcaa3591 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A6.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.sqrt, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.17/S15.8.2.17_A6.js
- * @description Checking if Math.sqrt is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.sqrt, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.sqrt is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -157,4 +160,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.sqrt(x) = " + y[i] + "\nMath.sqrt(x) = " + Math.sqrt(x[i]) + "\nMath.abs(libc.sqrt(x) - Math.sqrt(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A1.js
index f8a7e24b3..71cd709da 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.tan(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A1.js
- * @description Checking if Math.tan(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.tan(x) is NaN
+description: Checking if Math.tan(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.tan(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.tan(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A2.js
index d8c4ffc39..e701abdb5 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.tan(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A2.js
- * @description Checking if Math.tan(+0) equals to +0
- */
+/*---
+info: If x is +0, Math.tan(x) is +0
+description: Checking if Math.tan(+0) equals to +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.tan(x) !== +0)
 {
 	$ERROR("#1: 'var x=+0; Math.tan(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A3.js
index 4c75e6e70..38d0eb849 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.tan(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A3.js
- * @description Checking if Math.tan(-0) equals to -0
- */
+/*---
+info: If x is -0, Math.tan(x) is -0
+description: Checking if Math.tan(-0) equals to -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.tan(x) !== -0)
 {
 	$ERROR("#1: 'var x=-0; Math.tan(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A4.js
index 2b249a595..7fad25279 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.tan(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A4.js
- * @description Checking if Math.tan(+Infinity) is NaN
- */
+/*---
+info: If x is +Infinity, Math.tan(x) is NaN
+description: Checking if Math.tan(+Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.tan(x)))
 {
 	$ERROR("#1: 'var x=+Infinity; isNaN(Math.tan(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A5.js
index 97add1b8c..7d1c0f6a8 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.tan(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A5.js
- * @description Checking if Math.tan(-Infinity) is NaN
- */
+/*---
+info: If x is -Infinity, Math.tan(x) is NaN
+description: Checking if Math.tan(-Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.tan(x)))
 {
 	$ERROR("#1: 'var x=-Infinity; isNaN(Math.tan(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A6.js
index db326caa2..563958e11 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Tangent is a periodic function with period PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A6.js
- * @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
- */
+/*---
+info: Tangent is a periodic function with period PI
+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
   prec = 0.00000000003;
@@ -43,4 +45,3 @@ for (i = 0; i < snum; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A7.js
index 8f1c0a647..c8893e564 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A7.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.tan, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.18/S15.8.2.18_A7.js
- * @description Checking if Math.tan is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.tan, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.tan is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -161,4 +164,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.tan(x) = " + y[i] + "\nMath.tan(x) = " + Math.tan(x[i]) + "\nMath.abs(libc.tan(x) - Math.tan(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A1.js
index e3433a7db..eb4b69f08 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.acos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A1.js
- * @description Checking if Math.acos(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.acos(x) is NaN
+description: Checking if Math.acos(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.acos(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.acos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A2.js
index 61c575734..f5e84ae26 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is greater than 1, Math.acos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A2.js
- * @description Checking if Math.acos(x) is NaN, where x is greater than 1
- */
+/*---
+info: If x is greater than 1, Math.acos(x) is NaN
+description: Checking if Math.acos(x) is NaN, where x is greater than 1
+---*/
 
 // CHECK#1
 var x = 1.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.acos(x)))
 {
 	$ERROR("#3: 'x = +Infinity; isNaN(Math.acos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A3.js
index 8bc72db91..57a56de52 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than -1, Math.acos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A3.js
- * @description Checking if Math.acos(x) is NaN, where x is less than -1
- */
+/*---
+info: If x is less than -1, Math.acos(x) is NaN
+description: Checking if Math.acos(x) is NaN, where x is less than -1
+---*/
 
 // CHECK#1
 var x = -1.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.acos(x)))
 {
 	$ERROR("#3: 'x = -Infinity; isNaN(Math.acos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A4.js
index 74130ce0e..bf9e01cdb 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is exactly 1, Math.acos(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A4.js
- * @description Checking if Math.acos(1) equals to +0
- */
+/*---
+info: If x is exactly 1, Math.acos(x) is +0
+description: Checking if Math.acos(1) equals to +0
+---*/
 
 // CHECK#1
 var x = 1;
@@ -14,4 +12,3 @@ if (Math.acos(x) !== +0)
 {
 	$ERROR("#1: 'var x = 1; Math.acos(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A5.js
index 10c664f13..0315bf7a9 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A5.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.acos, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.2/S15.8.2.2_A5.js
- * @description Checking if Math.acos is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.acos, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.acos is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -160,4 +163,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.acos(x) = " + y[i] + "\nMath.acos(x) = " + Math.acos(x[i]) + "\nMath.abs(libc.acos(x) - Math.acos(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A1.js
index a58beb8f7..be7a40283 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.asin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A1.js
- * @description Checking if Math.asin(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.asin(x) is NaN
+description: Checking if Math.asin(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.asin(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.asin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A2.js
index 3d30373b6..2c8778dab 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is greater than 1, Math.asin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A2.js
- * @description Checking if Math.asin(x) is NaN, where x is greater than 1
- */
+/*---
+info: If x is greater than 1, Math.asin(x) is NaN
+description: Checking if Math.asin(x) is NaN, where x is greater than 1
+---*/
 
 // CHECK#1
 var x = 1.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.asin(x)))
 {
 	$ERROR("#3: 'x = +Infinity; isNaN(Math.asin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A3.js
index 3e7537110..a31139964 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than -1, Math.asin(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A3.js
- * @description Checking if Math.asin(x) is NaN, where x is less than -1
- */
+/*---
+info: If x is less than -1, Math.asin(x) is NaN
+description: Checking if Math.asin(x) is NaN, where x is less than -1
+---*/
 
 // CHECK#1
 var x = -1.000000000000001;
@@ -28,4 +26,3 @@ if (!isNaN(Math.asin(x)))
 {
 	$ERROR("#3: 'x = -Infinity; isNaN(Math.asin(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A4.js
index ccef8681f..632d4ffcd 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.asin(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A4.js
- * @description Checking if Math.asin(+0) equals +0
- */
+/*---
+info: If x is +0, Math.asin(x) is +0
+description: Checking if Math.asin(+0) equals +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.asin(x) !== +0)
 {
 	$ERROR("#1: 'var x = +0; Math.asin(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A5.js
index afb2455ea..a9633d960 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.asin(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A5.js
- * @description Checking if Math.asin(-0) equals to -0
- */
+/*---
+info: If x is -0, Math.asin(x) is -0
+description: Checking if Math.asin(-0) equals to -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.asin(x) !== -0)
 {
 	$ERROR("#1: 'var x = -0; Math.asin(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A6.js
index 1cd817dfa..0d295a937 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A6.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.asin, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.3/S15.8.2.3_A6.js
- * @description Checking if Math.asin is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.asin, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.asin is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -159,4 +162,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.asin(x) = " + y[i] + "\nMath.asin(x) = " + Math.asin(x[i]) + "\nMath.abs(libc.asin(x) - Math.asin(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A1.js
index bffcb6f6d..995217cf5 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.atan(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A1.js
- * @description Checking if Math.atan(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.atan(x) is NaN
+description: Checking if Math.atan(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.atan(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.atan(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A2.js
index 7e5112d1e..625c2829d 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.atan(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A2.js
- * @description Checking if Math.atan(+0) equals to +0
- */
+/*---
+info: If x is +0, Math.atan(x) is +0
+description: Checking if Math.atan(+0) equals to +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.atan(x) !== +0)
 {
 	$ERROR("#1: 'var x = +0; Math.atan(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A3.js
index 586ab1ea1..434cf5c84 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.atan(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A3.js
- * @description Checking if Math.atan(-0) equals to -0
- */
+/*---
+info: If x is -0, Math.atan(x) is -0
+description: Checking if Math.atan(-0) equals to -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.atan(x) !== -0)
 {
 	$ERROR("#1: 'var x = -0; Math.atan(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A4.js
index 3a755aa91..43fde5775 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A4.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.atan(x) is an implementation-dependent approximation to +PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A4.js
- * @description Checking if Math.atan(+Infinity) is an approximation to +PI/2
- */
+/*---
+info: >
+    If x is +Infinity, Math.atan(x) is an implementation-dependent
+    approximation to +PI/2
+description: Checking if Math.atan(+Infinity) is an approximation to +PI/2
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 
 var x = +Infinity;
@@ -18,4 +18,3 @@ if (!isEqual(Math.atan(x),Math.PI/2))
 {
 	$ERROR("#1: '!isEqual(Math.atan(+Infinity), Math.PI/2)'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A5.js
index ff1794311..2806d4fde 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A5.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.atan(x) is an implementation-dependent approximation to -PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A5.js
- * @description Checking if Math.atan(-Infinity) is an approximation to -PI/2
- */
+/*---
+info: >
+    If x is -Infinity, Math.atan(x) is an implementation-dependent
+    approximation to -PI/2
+description: Checking if Math.atan(-Infinity) is an approximation to -PI/2
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 
 var x = -Infinity;
@@ -18,4 +18,3 @@ if (!isEqual(Math.atan(x), -Math.PI/2))
 {
 	$ERROR("#1: '!isEqual(Math.atan(-Infinity), -Math.PI/2)'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A6.js
index d710a244e..5fda28897 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A6.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.atan, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.4/S15.8.2.4_A6.js
- * @description Checking if Math.atan is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.atan, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.atan is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -159,4 +162,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.atan(x) = " + y[i] + "\nMath.atan(x) = " + Math.atan(x[i]) + "\nMath.abs(libc.atan(x) - Math.atan(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A1.js
index 084f53c7e..d09c59e97 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If either x or y is NaN, Math(x,y) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A1.js
- * @description Checking if Math.atan2(NaN,y) and Math.atan2(x,NaN) is NaN for different x and y values
- */
+/*---
+info: If either x or y is NaN, Math(x,y) is NaN
+description: >
+    Checking if Math.atan2(NaN,y) and Math.atan2(x,NaN) is NaN for
+    different x and y values
+---*/
 
 // CHECK#1
 
@@ -33,4 +33,3 @@ for (i = 0; i < 2; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A10.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A10.js
index 5f88e1eea..b10260670 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A10.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A10.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -0 and x is -0, Math.atan2(y,x) is an implementation-dependent approximation to -PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A10.js
- * @description Checking if Math.atan2(-0,-0) is an approximation to -PI
- */
+/*---
+info: >
+    If y is -0 and x is -0, Math.atan2(y,x) is an implementation-dependent
+    approximation to -PI
+description: Checking if Math.atan2(-0,-0) is an approximation to -PI
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 //prec = 0.00000000000001;
 y = -0;
 x = -0;
 if (!isEqual(Math.atan2(y,x), -Math.PI))
 	$ERROR("#1: !isEqual(Math.atan2(-0,-0), -Math.PI)");
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A11.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A11.js
index 505353821..a06f643e6 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A11.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A11.js
@@ -1,16 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to -0 and x<0, Math.atan2(y,x) is an implementation-dependent approximation to -PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A11.js
- * @description Checking if Math.atan2(-0,x) is an approximation to -PI, where x<0
- */
+/*---
+info: >
+    If y is equal to -0 and x<0, Math.atan2(y,x) is an
+    implementation-dependent approximation to -PI
+description: Checking if Math.atan2(-0,x) is an approximation to -PI, where x<0
+includes:
+    - $FAIL.js
+    - math_precision.js
+    - math_isequal.js
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 y = -0;
 //prec = 0.00000000000001;
@@ -25,4 +26,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A12.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A12.js
index 6796e7dcf..5c958d965 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A12.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A12.js
@@ -1,16 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y<0 and x is +0, Math.atan2(y,x) is an implementation-dependent approximation to -PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A12.js
- * @description Checking if Math.atan2(y,+0) is an approximation to -PI/2, where y<0
- */
+/*---
+info: >
+    If y<0 and x is +0, Math.atan2(y,x) is an implementation-dependent
+    approximation to -PI/2
+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
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 x = +0;
 //prec = 0.00000000000001;
@@ -25,4 +28,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A13.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A13.js
index 76510d1a2..325ee37ee 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A13.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A13.js
@@ -1,16 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y<0 and x is -0, Math.atan2(y,x) is an implementation-dependent approximation to -PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A13.js
- * @description Checking if Math.atan2(y,-0) is an approximation to -PI/2, where y<0
- */
+/*---
+info: >
+    If y<0 and x is -0, Math.atan2(y,x) is an implementation-dependent
+    approximation to -PI/2
+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
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 x = -0;
 //prec = 0.00000000000001;
@@ -25,4 +28,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A14.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A14.js
index 51490acf8..a37446cf4 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A14.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A14.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y>0 and y is finite and x is equal to +Infinity, Math.atan2(y,x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A14.js
- * @description Checking if Math.atan2(y,x) equals to +0, where y>0 and y is finite and x is equal to +Infinity
- */
+/*---
+info: If y>0 and y is finite and x is equal to +Infinity, Math.atan2(y,x) is +0
+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
 x = +Infinity;
@@ -21,4 +22,3 @@ for (i = 0; i < ynum; i++)
 	if (Math.atan2(y[i],x) !== +0)
 		$FAIL("#1: Math.atan2(" + y[i] + ", " + x + ") !== +0");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A15.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A15.js
index d6dc4d203..1468a90ac 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A15.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A15.js
@@ -1,16 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y>0 and y is finite and x is equal to -Infinity, Math.atan2(y,x) is an implementation-dependent approximation to +PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A15.js
- * @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
- */
+/*---
+info: >
+    If y>0 and y is finite and x is equal to -Infinity, Math.atan2(y,x) is an
+    implementation-dependent approximation to +PI
+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
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 x = -Infinity;
 y = new Array();
@@ -24,4 +27,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A16.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A16.js
index 9421fdb00..1fa0b3e6c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A16.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A16.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y<0 and y is finite and x is equal to +Infinity, Math.atan2(y,x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A16.js
- * @description Checking if Math.atan2(y,x) is -0, where y<0 and y is finite and x is equal to +Infinity
- */
+/*---
+info: If y<0 and y is finite and x is equal to +Infinity, Math.atan2(y,x) is -0
+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
 x = +Infinity;
@@ -21,4 +22,3 @@ for (i = 0; i < ynum; i++)
 	if (Math.atan2(y[i],x) !== -0)
 		$FAIL("#1: Math.atan2(" + y[i] + ", " + x + ") !== -0");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A17.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A17.js
index 233cbb418..f4c4138bc 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A17.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A17.js
@@ -1,16 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y<0 and y is finite and x is equal to -Infinity, Math.atan2(y,x) is an implementation-dependent approximation to -PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A17.js
- * @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
- */
+/*---
+info: >
+    If y<0 and y is finite and x is equal to -Infinity, Math.atan2(y,x) is an
+    implementation-dependent approximation to -PI
+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
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 x = -Infinity;
 y = new Array();
@@ -24,4 +27,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A18.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A18.js
index e20cffff7..d6ecab0df 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A18.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A18.js
@@ -1,16 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +Infinity and x is finite, Math.atan2(y,x) is an implementation-dependent approximation to +PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A18.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI/2, where y is +Infinity and x is finite
- */
+/*---
+info: >
+    If y is +Infinity and x is finite, Math.atan2(y,x) is an
+    implementation-dependent approximation to +PI/2
+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
+---*/
 
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
- 
 // CHECK#1
 y = +Infinity;
 x = new Array();
@@ -28,4 +31,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A19.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A19.js
index 96973b30c..7a084323c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A19.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A19.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -Infinity and x is finite, Math.atan2(y,x) is an implementation-dependent approximation to -PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A19.js
- * @description Checking if Math.atan2(y,x) is an approximation to -PI/2, where y is -Infinity and x is finite
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is -Infinity and x is finite, Math.atan2(y,x) is an
+    implementation-dependent approximation to -PI/2
+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
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -29,4 +32,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A2.js
index 96f385242..6291cd015 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A2.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y>0 and x is +0, Math.atan2(y,x) is an implementation-dependent approximation to +PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A2.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI/2, where y>0 and x is +0
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y>0 and x is +0, Math.atan2(y,x) is an implementation-dependent
+    approximation to +PI/2
+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
+---*/
 
 // CHECK#1
 x = +0;
@@ -25,4 +28,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A20.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A20.js
index 5bedc82c7..51909c99f 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A20.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A20.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to +Infinity and x is equal to +Infinity, Math.atan2(y,x) is an implementation-dependent approximation to +PI/4
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A20.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI/4, where y is equal to +Infinity and x is equal to +Infinity
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is equal to +Infinity and x is equal to +Infinity, Math.atan2(y,x)
+    is an implementation-dependent approximation to +PI/4
+description: >
+    Checking if Math.atan2(y,x) is an approximation to +PI/4, where y
+    is equal to +Infinity and x is equal to +Infinity
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -18,4 +20,3 @@ x = +Infinity;
 
 if (!isEqual(Math.atan2(y,x),(Math.PI)/4))
 	$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x + ") - (Math.PI/4)) >= " + prec);
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A21.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A21.js
index 058b5109f..fe37ec9ca 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A21.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A21.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to +Infinity and x is equal to -Infinity, Math.atan2(y,x) is an implementation-dependent approximation to +3*PI/4
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A21.js
- * @description Checking if Math.atan2(y,x) is an approximation to +3*PI/4, where y is equal to +Infinity and x is equal to -Infinity
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is equal to +Infinity and x is equal to -Infinity, Math.atan2(y,x)
+    is an implementation-dependent approximation to +3*PI/4
+description: >
+    Checking if Math.atan2(y,x) is an approximation to +3*PI/4, where
+    y is equal to +Infinity and x is equal to -Infinity
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -18,4 +20,3 @@ x = -Infinity;
 
 if (!isEqual(Math.atan2(y,x), (3*Math.PI)/4))
 	$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x + ") - (3*Math.PI/4)) >= " + prec);
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A22.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A22.js
index ddf8dc3fe..6bfb04c88 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A22.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A22.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to -Infinity and x is equal to +Infinity, Math.atan2(y,x) is an implementation-dependent approximation to -PI/4
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A22.js
- * @description Checking if Math.atan2(y,x) is an approximation to -PI/4, where y is equal to -Infinity and x is equal to +Infinity
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is equal to -Infinity and x is equal to +Infinity, Math.atan2(y,x)
+    is an implementation-dependent approximation to -PI/4
+description: >
+    Checking if Math.atan2(y,x) is an approximation to -PI/4, where y
+    is equal to -Infinity and x is equal to +Infinity
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -18,4 +20,3 @@ x = +Infinity;
 
 if (!isEqual(Math.atan2(y,x),- (Math.PI)/4))
 	$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x + ") + (Math.PI/4)) >= " + prec);
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A23.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A23.js
index 29bf2e98a..a2dca08cb 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A23.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A23.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to -Infinity and x is equal to -Infinity, Math.atan2(y,x) is an implementation-dependent approximation to -3*PI/4
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A23.js
- * @description Checking if Math.atan2(y,x) is an approximation to -3*PI/4, where y is equal to -Infinity and x is equal to -Infinity
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is equal to -Infinity and x is equal to -Infinity, Math.atan2(y,x)
+    is an implementation-dependent approximation to -3*PI/4
+description: >
+    Checking if Math.atan2(y,x) is an approximation to -3*PI/4, where
+    y is equal to -Infinity and x is equal to -Infinity
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -18,4 +20,3 @@ x = -Infinity;
 
 if (!isEqual(Math.atan2(y,x), -(3*Math.PI)/4))
 	$ERROR("#1: Math.abs(Math.atan2(" + y + ", " + x + ") + (3*Math.PI/4)) >= " + prec);
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A24.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A24.js
index c966766dd..db4ec4f4a 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A24.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A24.js
@@ -1,15 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.atan2, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A24.js
- * @description Checking if Math.atan2(argument1, argument2) is approximately equals to its mathematical values on the set of 64 argument1 values and 64 argument2 values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.atan2, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.atan2(argument1, argument2) is approximately
+    equals to its mathematical values on the set of 64 argument1
+    values and 64 argument2 values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -224,4 +228,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx1 = " + x1[i] + "\nx2 = " + x2[i] + "\nlibc.atan2(x1,x2) = " + y[i] + "\nMath.atan2(x1,x2) = " + Math.atan2(x1[i],x2[i]) + "\nMath.abs(libc.atan2(x1,x2) - Math.atan2(x1,x2)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A3.js
index 925ae06a7..ca965d6ba 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A3.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y>0 and x is -0, Math.atan2(y,x) is an implementation-dependent approximation to +PI/2
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A3.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI/2, where y>0 and x is -0
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y>0 and x is -0, Math.atan2(y,x) is an implementation-dependent
+    approximation to +PI/2
+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
+---*/
 
 // CHECK#1
 x = -0;
@@ -25,4 +28,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A4.js
index 33697a84a..19f1e7a4e 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A4.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +0 and x>0, Math.atan2(y,x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A4.js
- * @description Checking if Math.atan2(y,x) equals to +0, where y is +0 and x>0
- */
+/*---
+info: If y is +0 and x>0, Math.atan2(y,x) is +0
+description: Checking if Math.atan2(y,x) equals to +0, where y is +0 and x>0
+includes: [$FAIL.js]
+---*/
 
 // CHECK#1
 y = +0;
@@ -21,4 +20,3 @@ for (i = 0; i < xnum; i++)
 	if (Math.atan2(y,x[i]) !== +0)
 		$FAIL("#1: Math.atan2(" + y + ", " + x[i] + ") !== +0");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A5.js
index 1fceab108..64d528bee 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A5.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +0 and x is +0, Math.atan2(y,x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A5.js
- * @description Checking if Math.atan2(y,x) is +0, where y is +0 and x is +0
- */
+/*---
+info: If y is +0 and x is +0, Math.atan2(y,x) is +0
+description: Checking if Math.atan2(y,x) is +0, where y is +0 and x is +0
+---*/
 
 // CHECK#1
 y = +0;
 x = +0;
 if (Math.atan2(y,x) !== +0)
 	$ERROR("#1: Math.atan2(" + y + ", " + x + ") !== +0");
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A6.js
index e75cad001..c6201ff7c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A6.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is +0 and x is -0, Math.atan2(y,x) is an implementation-dependent approximation to +PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A6.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI, where y is +0 and x is -0
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is +0 and x is -0, Math.atan2(y,x) is an implementation-dependent
+    approximation to +PI
+description: >
+    Checking if Math.atan2(y,x) is an approximation to +PI, where y is
+    +0 and x is -0
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 //prec = 0.00000000000001;
@@ -17,4 +19,3 @@ y = +0;
 x = -0;
 if (!isEqual(Math.atan2(y,x), Math.PI))
 	$ERROR("#1: Math.abs(Math.atan2(" + y + ", -0) - Math.PI) >= " + prec);
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A7.js
index 972befbd6..953e68870 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A7.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to +0 and x<0, Math.atan2(y,x) is an implementation-dependent approximation to +PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A7.js
- * @description Checking if Math.atan2(y,x) is an approximation to +PI, where y is equal to +0 and x<0
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js"); 
+/*---
+info: >
+    If y is equal to +0 and x<0, Math.atan2(y,x) is an
+    implementation-dependent approximation to +PI
+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
+---*/
 
 // CHECK#1
 y = +0;
@@ -25,4 +28,3 @@ for (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);
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A8.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A8.js
index 51673b4c3..900dff2f2 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A8.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A8.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is equal to -0 and x>0, Math.atan2(y,x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A8.js
- * @description Checking if Math.atan2(y,x) is -0, where y is equal to -0 and x>0
- */
+/*---
+info: If y is equal to -0 and x>0, Math.atan2(y,x) is -0
+description: Checking if Math.atan2(y,x) is -0, where y is equal to -0 and x>0
+includes: [$FAIL.js]
+---*/
 
 // CHECK#1
 y = -0;
@@ -21,4 +20,3 @@ for (i = 0; i < xnum; i++)
 	if (Math.atan2(y,x[i]) !== -0)
 		$FAIL("#1: Math.atan2(" + y + ", " + x[i] + ") !== -0");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A9.js b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A9.js
index 56db227ac..c08286fe0 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A9.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A9.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If y is -0 and x is +0, Math.atan2(y,x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.5/S15.8.2.5_A9.js
- * @description Checking if Math.atan2(y,x) is -0, where y is -0 and x is +0
- */
+/*---
+info: If y is -0 and x is +0, Math.atan2(y,x) is -0
+description: Checking if Math.atan2(y,x) is -0, where y is -0 and x is +0
+---*/
 
 // CHECK#1
 y = -0;
 x = +0;
 if (Math.atan2(y,x) !== -0)
 	$ERROR("#1: Math.atan2(" + y + ", " + x + ") !== -0");
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A1.js
index cf8b205cb..4ce7024ae 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.ceil(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A1.js
- * @description Checking if Math.ceil(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.ceil(x) is NaN
+description: Checking if Math.ceil(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.ceil(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.ceil(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A2.js
index cda2b1f77..f926c8d2f 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.ceil(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A2.js
- * @description Checking if Math.ceil(x) is +0, where x is +0
- */
+/*---
+info: If x is +0, Math.ceil(x) is +0
+description: Checking if Math.ceil(x) is +0, where x is +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.ceil(x) !== +0)
 {
 	$ERROR("#1: 'var x = +0; Math.ceil(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A3.js
index cc0e0dd35..3a0a5c14c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.ceil(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A3.js
- * @description Checking if Math.ceil(x) is -0, where x is -0
- */
+/*---
+info: If x is -0, Math.ceil(x) is -0
+description: Checking if Math.ceil(x) is -0, where x is -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.ceil(x) !== -0)
 {
 	$ERROR("#1: 'var x = -0; Math.ceil(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A4.js
index 08151bc08..7bae84bc8 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.ceil(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A4.js
- * @description Checking if Math.ceil(x) is +Infinity, where x is +Infinity
- */
+/*---
+info: If x is +Infinity, Math.ceil(x) is +Infinity
+description: Checking if Math.ceil(x) is +Infinity, where x is +Infinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.ceil(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x = +Infinity; Math.ceil(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A5.js
index ac16f0644..b258098b1 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.ceil(x) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A5.js
- * @description Checking if Math.ceil(x) is -Infinity, where x is -Infinity
- */
+/*---
+info: If x is -Infinity, Math.ceil(x) is -Infinity
+description: Checking if Math.ceil(x) is -Infinity, where x is -Infinity
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (Math.ceil(x) !== -Infinity)
 {
 	$ERROR("#1: 'var x = -Infinity; Math.ceil(x) !== -Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A6.js
index 3f3768fea..c1e65656c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is less than 0 but greater than -1, Math.ceil(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A6.js
- * @description Checking if Math.ceil(x) is -0, where x is less than 0 but greater than -1
- */
+/*---
+info: If x is less than 0 but greater than -1, Math.ceil(x) is -0
+description: >
+    Checking if Math.ceil(x) is -0, where x is less than 0 but greater
+    than -1
+---*/
 
 // CHECK#1
 var x = -0.000000000000001;
@@ -28,4 +28,3 @@ if (Math.ceil(x) !== -0)
 {
 	$ERROR("#3: 'var x = -0.5; Math.ceil(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A7.js
index 4f038783e..158ba67db 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of Math.ceil(x) is the same as the value of -Math.floor(-x)
- *
- * @path ch15/15.8/15.8.2/15.8.2.6/S15.8.2.6_A7.js
- * @description Checking if Math.ceil(x) equals to -Math.floor(-x) on 2000 floating point argument values
- */
+/*---
+info: The value of Math.ceil(x) is the same as the value of -Math.floor(-x)
+description: >
+    Checking if Math.ceil(x) equals to -Math.floor(-x) on 2000
+    floating point argument values
+---*/
 
 // CHECK#1
 for (i=-1000; i<1000; i++)
@@ -17,4 +17,3 @@ for (i=-1000; i<1000; i++)
 		$ERROR("#1: 'x = " + x + "; Math.ceil(x) !== -Math.floor(-x)'");
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A1.js
index 53a7380cb..040fe7a21 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.cos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A1.js
- * @description Checking if Math.cos(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.cos(x) is NaN
+description: Checking if Math.cos(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.cos(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.cos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A2.js
index 2faeeba39..327f2fa9f 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.cos(x) is 1
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A2.js
- * @description Checking if Math.cos(+0) is 1
- */
+/*---
+info: If x is +0, Math.cos(x) is 1
+description: Checking if Math.cos(+0) is 1
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.cos(x) !== 1)
 {
 	$ERROR("#1: 'var x = +0; Math.cos(x) !== 1'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A3.js
index 274c29162..122e6d190 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.cos(x) is 1
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A3.js
- * @description Checking if Math.cos(-0) is 1
- */
+/*---
+info: If x is -0, Math.cos(x) is 1
+description: Checking if Math.cos(-0) is 1
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.cos(x) !== 1)
 {
 	$ERROR("#1: 'var x = -0; Math.cos(x) !== 1'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A4.js
index 4722df258..d1b22eba7 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.cos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A4.js
- * @description Checking if Math.cos(+Infinity) is NaN
- */
+/*---
+info: If x is +Infinity, Math.cos(x) is NaN
+description: Checking if Math.cos(+Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.cos(x)))
 {
 	$ERROR("#1: 'var x = +Infinity; isNaN(Math.cos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A5.js
index 9623fd4fe..5648ae9c7 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.cos(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A5.js
- * @description Checking if Math.cos(-Infinity) is NaN
- */
+/*---
+info: If x is -Infinity, Math.cos(x) is NaN
+description: Checking if Math.cos(-Infinity) is NaN
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (!isNaN(Math.cos(x)))
 {
 	$ERROR("#1: 'var x = -Infinity; isNaN(Math.cos(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A6.js
index f9099ce89..3707b3a69 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Cosine is a periodic function with period 2*PI
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A6.js
- * @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
- */
+/*---
+info: Cosine is a periodic function with period 2*PI
+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
   prec = 0.000000000003;
@@ -43,4 +45,3 @@ for (i = 0; i < snum; i++)
 		}
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A7.js
index 3465dff94..603fa27ea 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A7.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.cos it is recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.7/S15.8.2.7_A7.js
- * @description Checking if Math.cos is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.cos it is recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.cos is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -156,4 +159,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.cos(x) = " + y[i] + "\nMath.cos(x) = " + Math.cos(x[i]) + "\nMath.abs(libc.cos(x) - Math.cos(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A1.js
index 2b79549a7..60471003c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.exp(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A1.js
- * @description Checking if Math.exp(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.exp(x) is NaN
+description: Checking if Math.exp(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.exp(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.exp(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A2.js
index b216ee261..725c02a4b 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.exp(x) is 1
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A2.js
- * @description Checking if Math.exp(+0) is 1
- */
+/*---
+info: If x is +0, Math.exp(x) is 1
+description: Checking if Math.exp(+0) is 1
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.exp(x) !== 1)
 {
 	$ERROR("#1: 'var x = +0; Math.exp(x) !== 1'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A3.js
index a5dc78a91..81edd144b 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.exp(x) is 1
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A3.js
- * @description Checking if Math.exp(-0) is 1
- */
+/*---
+info: If x is -0, Math.exp(x) is 1
+description: Checking if Math.exp(-0) is 1
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.exp(x) !== 1)
 {
 	$ERROR("#1: 'var x = -0; Math.exp(x) !== 1'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A4.js
index 110af2bc9..4e7f5543b 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.exp(x) is +Ifinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A4.js
- * @description Checking if Math.exp(+Infinity) is +Ifinity
- */
+/*---
+info: If x is +Infinity, Math.exp(x) is +Ifinity
+description: Checking if Math.exp(+Infinity) is +Ifinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.exp(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x = +Infinity; Math.exp(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A5.js
index 479b20a06..c4819b89c 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.exp(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A5.js
- * @description Checking if Math.exp(-Infinity) is +0
- */
+/*---
+info: If x is -Infinity, Math.exp(x) is +0
+description: Checking if Math.exp(-Infinity) is +0
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (Math.exp(x) !== +0)
 {
 	$ERROR("#1: 'var x = -Infinity; Math.exp(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A6.js
index 15bd288a7..3b0701316 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A6.js
@@ -1,15 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Math.exp, recommended that implementations use the approximation algorithms for IEEE 754 arithmetic contained in fdlibm
- *
- * @path ch15/15.8/15.8.2/15.8.2.8/S15.8.2.8_A6.js
- * @description Checking if Math.exp is approximately equals to its mathematical values on the set of 64 argument values; all the sample values is calculated with LibC
- */
-
-$INCLUDE("math_precision.js");
-$INCLUDE("math_isequal.js");
+/*---
+info: >
+    Math.exp, recommended that implementations use the approximation
+    algorithms for IEEE 754 arithmetic contained in fdlibm
+description: >
+    Checking if Math.exp is approximately equals to its mathematical
+    values on the set of 64 argument values; all the sample values is
+    calculated with LibC
+includes:
+    - math_precision.js
+    - math_isequal.js
+---*/
 
 // CHECK#1
 vnum = 64;
@@ -158,4 +161,3 @@ for (i = 0; i < vnum; i++)
 		$ERROR("\nx = " + x[i] + "\nlibc.exp(x) = " + y[i] + "\nMath.exp(x) = " + Math.exp(x[i]) + "\nMath.abs(libc.exp(x) - Math.exp(x)) > " + prec + "\n\n"); 
 	}
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A1.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A1.js
index b7a457c71..33c292794 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A1.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is NaN, Math.floor(x) is NaN
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A1.js
- * @description Checking if Math.floor(NaN) is NaN
- */
+/*---
+info: If x is NaN, Math.floor(x) is NaN
+description: Checking if Math.floor(NaN) is NaN
+---*/
 
 // CHECK#1
 var x = NaN;
@@ -14,4 +12,3 @@ if (!isNaN(Math.floor(x)))
 {
 	$ERROR("#1: 'var x=NaN; isNaN(Math.floor(x)) === false'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A2.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A2.js
index e512ef187..2932b1919 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A2.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +0, Math.floor(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A2.js
- * @description Checking if Math.floor(x) is +0, where x is +0
- */
+/*---
+info: If x is +0, Math.floor(x) is +0
+description: Checking if Math.floor(x) is +0, where x is +0
+---*/
 
 // CHECK#1
 var x = +0;
@@ -14,4 +12,3 @@ if (Math.floor(x) !== +0)
 {
 	$ERROR("#1: 'var x = +0; Math.floor(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A3.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A3.js
index 61e385e77..4bc077485 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A3.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -0, Math.floor(x) is -0
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A3.js
- * @description Checking if Math.floor(x) is -0, where x is -0
- */
+/*---
+info: If x is -0, Math.floor(x) is -0
+description: Checking if Math.floor(x) is -0, where x is -0
+---*/
 
 // CHECK#1
 var x = -0;
@@ -14,4 +12,3 @@ if (Math.floor(x) !== -0)
 {
 	$ERROR("#1: 'var x = -0; Math.floor(x) !== -0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A4.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A4.js
index 4f85a55f1..8dd418051 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A4.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is +Infinity, Math.floor(x) is +Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A4.js
- * @description Checking if Math.floor(x) is +Infinity, where x is +Infinity
- */
+/*---
+info: If x is +Infinity, Math.floor(x) is +Infinity
+description: Checking if Math.floor(x) is +Infinity, where x is +Infinity
+---*/
 
 // CHECK#1
 var x = +Infinity;
@@ -14,4 +12,3 @@ if (Math.floor(x) !== +Infinity)
 {
 	$ERROR("#1: 'var x = +Infinity; Math.floor(x) !== +Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A5.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A5.js
index 9c2fcba25..fc87edbf2 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A5.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is -Infinity, Math.floor(x) is -Infinity
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A5.js
- * @description Checking if Math.floor(x) is -Infinity, where x is -Infinity
- */
+/*---
+info: If x is -Infinity, Math.floor(x) is -Infinity
+description: Checking if Math.floor(x) is -Infinity, where x is -Infinity
+---*/
 
 // CHECK#1
 var x = -Infinity;
@@ -14,4 +12,3 @@ if (Math.floor(x) !== -Infinity)
 {
 	$ERROR("#1: 'var x = -Infinity; Math.floor(x) !== -Infinity'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A6.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A6.js
index ae9305f07..80479c866 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A6.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If x is greater than 0 but less than 1, Math.floor(x) is +0
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A6.js
- * @description Checking if Math.floor(x) is +0, where x is greater than 0 but less than 1
- */
+/*---
+info: If x is greater than 0 but less than 1, Math.floor(x) is +0
+description: >
+    Checking if Math.floor(x) is +0, where x is greater than 0 but
+    less than 1
+---*/
 
 // CHECK#1
 var x = 0.000000000000001;
@@ -28,4 +28,3 @@ if (Math.floor(x) !== +0)
 {
 	$ERROR("#3: 'var x = 0.5; Math.ceil(x) !== +0'");
 }
-
diff --git a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A7.js b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A7.js
index 7cd585b77..a174698e8 100644
--- a/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A7.js
+++ b/test/suite/ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of Math.floor(x) is the same as the value of -Math.ceil(-x)
- *
- * @path ch15/15.8/15.8.2/15.8.2.9/S15.8.2.9_A7.js
- * @description Checking if Math.floor(x) is equal to -Math.ceil(-x) on 2000 floating-point argument values
- */
+/*---
+info: The value of Math.floor(x) is the same as the value of -Math.ceil(-x)
+description: >
+    Checking if Math.floor(x) is equal to -Math.ceil(-x) on 2000
+    floating-point argument values
+---*/
 
 // CHECK#1
 for (i=-1000; i<1000; i++)
@@ -17,4 +17,3 @@ for (i=-1000; i<1000; i++)
 		$ERROR("#1: 'x = " + x + "; Math.floor(x) !== -Math.ceil(-x)'");
 	}
 }
-
diff --git a/test/suite/ch15/15.9/15.9.1/15.9.1.15/15.9.1.15-1.js b/test/suite/ch15/15.9/15.9.1/15.9.1.15/15.9.1.15-1.js
index b31302315..ff51ca8eb 100644
--- a/test/suite/ch15/15.9/15.9.1/15.9.1.15/15.9.1.15-1.js
+++ b/test/suite/ch15/15.9/15.9.1/15.9.1.15/15.9.1.15-1.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.1/15.9.1.15/15.9.1.15-1.js

- * @description Date Time String Format - specified default values will be set for all optional fields(MM, DD, mm, ss and time zone) when they are absent

- */

-

-

-function testcase() {

-        var result = false;

-        var expectedDateTimeStr = "1970-01-01T00:00:00.000Z";

-        var dateObj = new Date("1970");

-        var dateStr = dateObj.toISOString();

-        result = dateStr === expectedDateTimeStr;

-        return result;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date Time String Format - specified default values will be set for
+    all optional fields(MM, DD, mm, ss and time zone) when they are
+    absent
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var result = false;
+        var expectedDateTimeStr = "1970-01-01T00:00:00.000Z";
+        var dateObj = new Date("1970");
+        var dateStr = dateObj.toISOString();
+        result = dateStr === expectedDateTimeStr;
+        return result;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A1.js b/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A1.js
index d7d5643d2..5a8b5854c 100644
--- a/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A1.js
+++ b/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as a function rather than as a constructor,
- * it should be "string" representing the current time (UTC)
- *
- * @path ch15/15.9/15.9.2/S15.9.2.1_A1.js
- * @description Checking type of returned value
- */
+/*---
+info: >
+    When Date is called as a function rather than as a constructor,
+    it should be "string" representing the current time (UTC)
+description: Checking type of returned value
+---*/
 
 //CHECK#1
 if( typeof Date() !== "string" ) {
@@ -78,4 +77,3 @@ if( typeof Date(undefined) !== "string"  ) {
 if( typeof Date(null) !== "string"  ) {
   $ERROR('#15: typeof Date(null) should be "string", actual is '+(typeof Date(null)));
 }
-
diff --git a/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A2.js b/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A2.js
index 8f87742de..941f66fe8 100644
--- a/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A2.js
+++ b/test/suite/ch15/15.9/15.9.2/S15.9.2.1_A2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * All of the arguments are optional, any arguments supplied are
- * accepted but are completely ignored. A string is created and returned as
- * if by the expression (new Date()).toString()
- *
- * @path ch15/15.9/15.9.2/S15.9.2.1_A2.js
- * @description Use various number arguments and various types of ones
- */
+/*---
+info: >
+    All of the arguments are optional, any arguments supplied are
+    accepted but are completely ignored. A string is created and returned as
+    if by the expression (new Date()).toString()
+description: Use various number arguments and various types of ones
+---*/
 
 function isEqual(d1, d2) {
   if (d1 === d2) {
@@ -89,4 +88,3 @@ if( !isEqual(Date(undefined), (new Date()).toString()) ) {
 if( !isEqual(Date(null), (new Date()).toString()) ) {
   $ERROR('#15: Date(null) is equal to (new Date()).toString()');
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
index 629d08712..e4f2eb58d 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
index 36199a6ce..730d7caf6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
index da20c7b94..2c5f9f46d 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
index 85c2753bb..ec28033a4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ 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");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
index b3bc53242..174ea1356 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ 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");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
index a33cd7238..92e28bed0 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+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'");
@@ -224,4 +224,3 @@ 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");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
index e9a37e7dc..d78b7c50a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 2 arguments, (year, month)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
index c9482d234..098fc7ef7 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 3 arguments, (year, month, date)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
index 42dd6b78c..062da59d9 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 4 arguments, (year, month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31, 23);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
index 371830aa5..b55f4ac40 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+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") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
index ca8352d2a..0129dc05a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+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") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
index 42cc29817..e1442dc93 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+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") {
@@ -189,4 +189,3 @@ 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");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
index 3b7c9cf85..4edc05341 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
- * @description Test based on delete prototype.toString - 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +70,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
index 16b9f1492..b99af24c1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
- * @description Test based on overwriting prototype.toString - 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 2 arguments, (year,
+    month)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,5 +72,3 @@ 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'");
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
index 00e3030c7..e4278ea8c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
- * @description Test based on delete prototype.toString - 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +70,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
index d9b53f87d..af8286ea9 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
- * @description Test based on overwriting prototype.toString - 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 3 arguments, (year,
+    month, date)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,5 +72,3 @@ 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'");
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
index 8fa20093a..67248c7c4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
- * @description Test based on delete prototype.toString - 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +70,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
index 1a11ac25a..d199d5d80 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
- * @description Test based on overwriting prototype.toString - 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 4 arguments, (year,
+    month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
index 42ab3dfda..018eec031 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
- * @description Test based on delete prototype.toString - 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +70,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
index b7e2710e9..514fc315b 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
- * @description Test based on overwriting prototype.toString - 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 5 arguments, (year,
+    month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
index 7372fc8ee..62ff57be0 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +68,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
index d5d0d16f4..6382ea122 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
- * @description Test based on overwriting prototype.toString - 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 6 arguments, (year,
+    month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
index 16cf59479..ca2f56c3c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -68,4 +68,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
index 40b9dd5b7..4b2276d35 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
- * @description Test based on overwriting prototype.toString - 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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;
 
@@ -70,4 +72,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
index b99a99669..a0f72dbb8 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 2 arguments, (year, month)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -43,4 +42,3 @@ catch(e){
     $ERROR("#2: The 2nd step is calling ToNumber(month)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
index c711b38f4..2b4ba9df6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 3 arguments, (year, month, date)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -54,4 +53,3 @@ catch(e){
     $ERROR("#3: The 3rd step is calling ToNumber(date)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
index 4665dd2a4..3759b039b 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 4 arguments, (year, month, date, hours)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -65,4 +64,3 @@ catch(e){
     $ERROR("#4: The 4th step is calling ToNumber(hours)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
index f27c87a71..8490af46a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 5 arguments, (year, month, date, hours, minutes)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -76,4 +75,3 @@ catch(e){
     $ERROR("#5: The 5th step is calling ToNumber(minutes)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
index fb538ce52..cc79688e1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -87,4 +86,3 @@ catch(e){
     $ERROR("#6: The 6th step is calling ToNumber(seconds)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
index 84586a1d1..54b619da5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -98,4 +97,3 @@ catch(e){
     $ERROR("#7: The 7th step is calling ToNumber(ms)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
index 6aafec22c..c5d5bd8b6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 2 arguments, (year, month)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2211638400000 !== new Date(1899, 11).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (-2649600000 !== new Date(1969, 11).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (944035200000 !== new Date(1999, 11).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4099795200000 !== new Date(2099, 11).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
index 34cf98bba..5eb7a3a3c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 3 arguments, (year, month, date)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2209046400000 !== new Date(1899, 11, 31).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12, 1).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0, 1).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (-57600000 !== new Date(1969, 11, 31).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12, 1).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0, 1).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (946627200000 !== new Date(1999, 11, 31).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12, 1).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0, 1).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4102387200000 !== new Date(2099, 11, 31).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12, 1).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0, 1).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
index fdb6387b4..4d69a652f 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 4 arguments, (year, month, date, hours)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2208963600000 !== new Date(1899, 11, 31, 23).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (25200000 !== new Date(1969, 11, 31, 23).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12, 1, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0, 1, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (946710000000 !== new Date(1999, 11, 31, 23).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4102470000000 !== new Date(2099, 11, 31, 23).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
index 296ec5d8a..061e6550e 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 5 arguments, (year, month, date, hours, minutes)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2208960060000 !== new Date(1899, 11, 31, 23, 59).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (28740000 !== new Date(1969, 11, 31, 23, 59).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (946713540000 !== new Date(1999, 11, 31, 23, 59).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4102473540000 !== new Date(2099, 11, 31, 23, 59).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
index b6f579459..05323c930 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2208960001000 !== new Date(1899, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (28799000 !== new Date(1969, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (946713599000 !== new Date(1999, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4102473599000 !== new Date(2099, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
index adfb0465c..b3b5317c5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");

-

 if (-2208960000001 !== new Date(1899, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}

-

+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}

-

+}
+
 if (28799999 !== new Date(1969, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}

-

+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}

-

+}
+
 if (946713599999 !== new Date(1999, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}

-

+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}

-

+}
+
 if (4102473599999 !== new Date(2099, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}

-

+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
index 887cd4e89..84af065f5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 2 arguments, (year, month)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12))) {
 if (!isNaN(DateValue(2100, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
index 3c3ff0cd4..374a68833 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 3 arguments, (year, month, date)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1))) {
 if (!isNaN(DateValue(2100, 0, 1))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
index 311fca2fc..5e19f40db 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 4 arguments, (year, month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
index 44a235743..ce348dce1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 5 arguments, (year, month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
index d22d80aea..4a6367e40 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0, 0, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0, 0, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
index b0d9d93f7..56d4aa9d5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initialises the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
- * @description Checking types of newly created objects and it values
- */
-
-$INCLUDE("Date_constants.js");
- 
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initialises the newly created object
+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'");
 }
@@ -154,4 +154,3 @@ var x84 = new Date(date_2100_start);
 if(x84 === undefined){
   $FAIL("#8.4: new Date(date_2100_start) !== undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
index 588612961..019d6c453 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
- * @description Checking Date.prototype property of newly constructed objects
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+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") {
@@ -131,4 +131,3 @@ var x83 = new Date(date_2100_start);
 if(Date.prototype !== x83.constructor.prototype){
   $FAIL("#8.3: Date.prototype !== x83.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
index d95df2702..da8b599e4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
- * @description Test based on delete prototype.toString
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+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]") {
@@ -50,4 +50,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
index 824bd006a..6b824c3c6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
- * @description Test based on overwriting prototype.toString
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: Test based on overwriting prototype.toString
+includes:
+    - $FAIL.js
+    - Date_constants.js
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -52,4 +52,3 @@ 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'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T1.js
index 6d357cc4b..956a39113 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype;
 Date.prototype = 1;
 if (Date.prototype !== x) {
   $ERROR('#1: The Date.prototype has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T2.js
index 5885ccfad..a3797aa98 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype !== false) {
   $ERROR('#1: The Date.prototype property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype !== false) {
 if (!Date.hasOwnProperty('prototype')) {
   $FAIL('#2: The Date.prototype property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T3.js
index 980aa3251..f4de3f21a 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "prototype" has { DontEnum, DontDelete, ReadOnly } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.1/S15.9.4.1_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date property "prototype" has { DontEnum, DontDelete, ReadOnly }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.propertyIsEnumerable('prototype')) {
   $ERROR('#1: The Date.prototype property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date) {
     $ERROR('#2: The Date.prototype has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T1.js
index 2fb4afce9..0c8744fcd 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "parse" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date property "parse" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.parse;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.parse === x) {
   $ERROR('#1: The Date.parse has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T2.js
index c3cac9de8..e690dcdeb 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "parse" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date property "parse" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.parse  === false) {
   $ERROR('#1: The Date.parse property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.parse  === false) {
 if (Date.hasOwnProperty('parse')) {
   $FAIL('#2: The Date.parse property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T3.js
index a0386541b..66f615576 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "parse" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date property "parse" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.propertyIsEnumerable('parse')) {
   $ERROR('#1: The Date.parse property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date) {
     $ERROR('#2: The Date.parse has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A2_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A2_T1.js
index 579c1ecd6..4cf3504f2 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "parse" is 1
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A2_T1.js
- * @description The "length" property of the "parse" is 1
- */
+/*---
+info: The "length" property of the "parse" is 1
+description: The "length" property of the "parse" is 1
+---*/
 
 if(Date.parse.hasOwnProperty("length") !== true){
   $ERROR('#1: The parse has a "length" property');
@@ -15,5 +13,3 @@ if(Date.parse.hasOwnProperty("length") !== true){
 if(Date.parse.length !== 1){
   $ERROR('#2: The "length" property of the parse is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T1.js
index e802350b4..5ad6fa622 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.parse.length;
 Date.parse.length = 1;
 if (Date.parse.length !== x) {
   $ERROR('#1: The Date.parse.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T2.js
index a613528aa..26a6ee371 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.parse.length  !== false) {
   $ERROR('#1: The Date.parse.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.parse.length  !== false) {
 if (!Date.parse.hasOwnProperty('length')) {
   $FAIL('#2: The Date.parse.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T3.js
index 13b9cc0ad..6de8539e8 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.2/S15.9.4.2_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.parse property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.parse.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.parse.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.parse) {
     $ERROR('#2: The Date.parse.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T1.js
index 6df1fbc65..7b7d6ae3a 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "UTC" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date property "UTC" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.UTC;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.UTC === x) {
   $ERROR('#1: The Date.UTC has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T2.js
index f4214ab90..f8151d7c2 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "UTC" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date property "UTC" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.UTC  === false) {
   $ERROR('#1: The Date.UTC property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.UTC  === false) {
 if (Date.hasOwnProperty('UTC')) {
   $FAIL('#2: The Date.UTC property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T3.js
index cad9d23d1..fbbfb703b 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date property "UTC" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date property "UTC" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.propertyIsEnumerable('UTC')) {
   $ERROR('#1: The Date.UTC property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date) {
     $ERROR('#2: The Date.UTC has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A2_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A2_T1.js
index 5e99089e5..23006e429 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "UTC" is 7
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A2_T1.js
- * @description The "length" property of the "UTC" is 7
- */
+/*---
+info: The "length" property of the "UTC" is 7
+description: The "length" property of the "UTC" is 7
+---*/
 
 if(Date.UTC.hasOwnProperty("length") !== true){
   $ERROR('#1: The UTC has a "length" property');
@@ -15,5 +13,3 @@ if(Date.UTC.hasOwnProperty("length") !== true){
 if(Date.UTC.length !== 7){
   $ERROR('#2: The "length" property of the UTC is 7');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T1.js
index 9935b2f35..9fcb93140 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.UTC.length;
 Date.UTC.length = 1;
 if (Date.UTC.length !== x) {
   $ERROR('#1: The Date.UTC.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T2.js
index 725626ab3..1906fc444 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.UTC.length  !== false) {
   $ERROR('#1: The Date.UTC.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.UTC.length  !== false) {
 if (!Date.UTC.hasOwnProperty('length')) {
   $FAIL('#2: The Date.UTC.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T3.js
index 8eb62a943..d5d9ebc55 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.4/15.9.4.3/S15.9.4.3_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.UTC property "length" has { ReadOnly, DontDelete, DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.UTC.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.UTC.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.UTC) {
     $ERROR('#2: The Date.UTC.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-1.js b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-1.js
index c336c2c8f..d374da645 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-1.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-1.js

- * @description Date.now must exist as a function

- */

-

-

-function testcase() {

-        return typeof Date.now === "function";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.now must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return typeof Date.now === "function";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-2.js b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-2.js
index c20ca6e6e..9e8a03ae5 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-2.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-2.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-2.js

- * @description Date.now must exist as a function taking 0 parameters

- */

-

-

-function testcase() {

-        return Date.now.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.now must exist as a function taking 0 parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Date.now.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-3.js b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-3.js
index 24408d293..afaf183f3 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-3.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-3.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-3.js

- * @description Date.now must exist as a function

- */

-

-

-function testcase() {

-

-        var fun = Date.now;

-        return (typeof (fun) === "function");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.now must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var fun = Date.now;
+        return (typeof (fun) === "function");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-4.js b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-4.js
index b3e381628..2a4824253 100644
--- a/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-4.js
+++ b/test/suite/ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-4.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.4/15.9.4.4/15.9.4.4-0-4.js

- * @description Date.now - returns number

- */

-

-

-function testcase() {        

-        return typeof Date.now() === "number";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.now - returns number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {        
+        return typeof Date.now() === "number";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.4/S15.9.4_A1.js b/test/suite/ch15/15.9/15.9.4/S15.9.4_A1.js
index 0136767f7..981afcf50 100644
--- a/test/suite/ch15/15.9/15.9.4/S15.9.4_A1.js
+++ b/test/suite/ch15/15.9/15.9.4/S15.9.4_A1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date constructor has the property "prototype"
- *
- * @path ch15/15.9/15.9.4/S15.9.4_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Date constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Date.hasOwnProperty("prototype")){
   $ERROR('#1: The Date constructor has the property "prototype"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/S15.9.4_A2.js b/test/suite/ch15/15.9/15.9.4/S15.9.4_A2.js
index 6fdd2de7f..aa64a3a5b 100644
--- a/test/suite/ch15/15.9/15.9.4/S15.9.4_A2.js
+++ b/test/suite/ch15/15.9/15.9.4/S15.9.4_A2.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date constructor has the property "parse"
- *
- * @path ch15/15.9/15.9.4/S15.9.4_A2.js
- * @description Checking existence of the property "parse"
- */
+/*---
+info: The Date constructor has the property "parse"
+description: Checking existence of the property "parse"
+---*/
 
 if(!Date.hasOwnProperty("parse")){
   $ERROR('#1: The Date constructor has the property "parse"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/S15.9.4_A3.js b/test/suite/ch15/15.9/15.9.4/S15.9.4_A3.js
index 6dd7de3f7..e4e99ef83 100644
--- a/test/suite/ch15/15.9/15.9.4/S15.9.4_A3.js
+++ b/test/suite/ch15/15.9/15.9.4/S15.9.4_A3.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date constructor has the property "UTC"
- *
- * @path ch15/15.9/15.9.4/S15.9.4_A3.js
- * @description Checking existence of the property "UTC"
- */
+/*---
+info: The Date constructor has the property "UTC"
+description: Checking existence of the property "UTC"
+---*/
 
 if(!Date.hasOwnProperty("UTC")){
   $ERROR('#1: The Date constructor has the property "UTC"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.4/S15.9.4_A4.js b/test/suite/ch15/15.9/15.9.4/S15.9.4_A4.js
index 127edb03b..558543b80 100644
--- a/test/suite/ch15/15.9/15.9.4/S15.9.4_A4.js
+++ b/test/suite/ch15/15.9/15.9.4/S15.9.4_A4.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Date
- * constructor is the Function prototype object
- *
- * @path ch15/15.9/15.9.4/S15.9.4_A4.js
- * @description Checking Function.prototype.isPrototypeOf(Date)
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Date
+    constructor is the Function prototype object
+description: Checking Function.prototype.isPrototypeOf(Date)
+---*/
 
 //CHECK#1
 if (!(Function.prototype.isPrototypeOf(Date))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Date constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.9/15.9.4/S15.9.4_A5.js b/test/suite/ch15/15.9/15.9.4/S15.9.4_A5.js
index 13520bfbf..cb1ed28e5 100644
--- a/test/suite/ch15/15.9/15.9.4/S15.9.4_A5.js
+++ b/test/suite/ch15/15.9/15.9.4/S15.9.4_A5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Date constructor has length property whose value is 7
- *
- * @path ch15/15.9/15.9.4/S15.9.4_A5.js
- * @description Checking Date.length property
- */
+/*---
+info: Date constructor has length property whose value is 7
+description: Checking Date.length property
+---*/
 
 //CHECK#1
 if (!Date.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if (!Date.hasOwnProperty("length")){
 if (Date.length !== 7) {
   $ERROR('#2: Date constructor length property value should be 7');
 }
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T1.js
index 85d98138f..6bd2fa329 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "constructor" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "constructor" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.constructor;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.constructor === x) {
   $ERROR('#1: The Date.prototype.constructor has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T2.js
index 700e78172..237497157 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "constructor" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "constructor" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.constructor  === false) {
   $ERROR('#1: The Date.prototype.constructor property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.constructor  === false) {
 if (Date.prototype.hasOwnProperty('constructor')) {
   $FAIL('#2: The Date.prototype.constructor property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T3.js
index 311bcec9f..3c1973015 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "constructor" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "constructor" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('constructor')) {
   $ERROR('#1: The Date.prototype.constructor property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.constructor has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A2_T1.js
index cc19d7123..fd904302a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "constructor" is 7
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A2_T1.js
- * @description The "length" property of the "constructor" is 7
- */
+/*---
+info: The "length" property of the "constructor" is 7
+description: The "length" property of the "constructor" is 7
+---*/
 
 if(Date.prototype.constructor.hasOwnProperty("length") !== true){
   $ERROR('#1: The constructor has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.constructor.hasOwnProperty("length") !== true){
 if(Date.prototype.constructor.length !== 7){
   $ERROR('#2: The "length" property of the constructor is 7');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T1.js
index d7d46b0f8..c7bb3acbf 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.constructor property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.constructor property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.constructor.length;
 Date.prototype.constructor.length = 1;
 if (Date.prototype.constructor.length !== x) {
   $ERROR('#1: The Date.prototype.constructor.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T2.js
index 3da0dba90..c5552d037 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.constructor property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.constructor property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.constructor.length  !== false) {
   $ERROR('#1: The Date.prototype.constructor.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.constructor.length  !== false) {
 if (!Date.prototype.constructor.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.constructor.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T3.js
index 849b58b01..644c5c58f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.constructor property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.1/S15.9.5.1_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.constructor property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.constructor.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.constructor.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.constructor) {
     $ERROR('#2: The Date.prototype.constructor.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T1.js
index 32dcb04fd..0c8019ccd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getFullYear" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getFullYear;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getFullYear === x) {
   $ERROR('#1: The Date.prototype.getFullYear has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T2.js
index 48ac01fa0..1d7429037 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getFullYear" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getFullYear  === false) {
   $ERROR('#1: The Date.prototype.getFullYear property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getFullYear  === false) {
 if (Date.prototype.hasOwnProperty('getFullYear')) {
   $FAIL('#2: The Date.prototype.getFullYear property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T3.js
index e89854f71..e45c1ab59 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getFullYear" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getFullYear')) {
   $ERROR('#1: The Date.prototype.getFullYear property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getFullYear has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A2_T1.js
index 935f21c0f..ea312ba97 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getFullYear" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A2_T1.js
- * @description The "length" property of the "getFullYear" is 0
- */
+/*---
+info: The "length" property of the "getFullYear" is 0
+description: The "length" property of the "getFullYear" is 0
+---*/
 
 if(Date.prototype.getFullYear.hasOwnProperty("length") !== true){
   $ERROR('#1: The getFullYear has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getFullYear.hasOwnProperty("length") !== true){
 if(Date.prototype.getFullYear.length !== 0){
   $ERROR('#2: The "length" property of the getFullYear is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T1.js
index 61ea3058f..5ff6e59c0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getFullYear.length;
 Date.prototype.getFullYear.length = 1;
 if (Date.prototype.getFullYear.length !== x) {
   $ERROR('#1: The Date.prototype.getFullYear.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T2.js
index f038c67f3..c9116e9e4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getFullYear.length  !== false) {
   $ERROR('#1: The Date.prototype.getFullYear.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getFullYear.length  !== false) {
 if (!Date.prototype.getFullYear.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getFullYear.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T3.js
index e15219d55..0a2a34a8c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.10/S15.9.5.10_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getFullYear.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getFullYear.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getFullYear) {
     $ERROR('#2: The Date.prototype.getFullYear.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T1.js
index 77c306501..e638f8b95 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCFullYear;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCFullYear === x) {
   $ERROR('#1: The Date.prototype.getUTCFullYear has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T2.js
index 7f9bb3ca8..c51b2edbd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCFullYear  === false) {
   $ERROR('#1: The Date.prototype.getUTCFullYear property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCFullYear  === false) {
 if (Date.prototype.hasOwnProperty('getUTCFullYear')) {
   $FAIL('#2: The Date.prototype.getUTCFullYear property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T3.js
index 8641b5bd2..4a514b4f7 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCFullYear" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCFullYear')) {
   $ERROR('#1: The Date.prototype.getUTCFullYear property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCFullYear has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A2_T1.js
index 41624187c..3bd121e02 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCFullYear" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A2_T1.js
- * @description The "length" property of the "getUTCFullYear" is 0
- */
+/*---
+info: The "length" property of the "getUTCFullYear" is 0
+description: The "length" property of the "getUTCFullYear" is 0
+---*/
 
 if(Date.prototype.getUTCFullYear.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCFullYear has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCFullYear.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCFullYear.length !== 0){
   $ERROR('#2: The "length" property of the getUTCFullYear is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T1.js
index 0139980c5..e58d67c1b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCFullYear.length;
 Date.prototype.getUTCFullYear.length = 1;
 if (Date.prototype.getUTCFullYear.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCFullYear.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T2.js
index 760684fcc..0dbac7707 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCFullYear.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCFullYear.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCFullYear.length  !== false) {
 if (!Date.prototype.getUTCFullYear.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCFullYear.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T3.js
index 92c3a7b0d..677051a56 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.11/S15.9.5.11_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCFullYear.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCFullYear.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCFullYear) {
     $ERROR('#2: The Date.prototype.getUTCFullYear.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T1.js
index 556b8408a..e44a45f46 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getMonth" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getMonth;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getMonth === x) {
   $ERROR('#1: The Date.prototype.getMonth has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T2.js
index 3c10eae2e..6e596b2f0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getMonth" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMonth  === false) {
   $ERROR('#1: The Date.prototype.getMonth property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getMonth  === false) {
 if (Date.prototype.hasOwnProperty('getMonth')) {
   $FAIL('#2: The Date.prototype.getMonth property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T3.js
index c69df9793..0ecfa1d8f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getMonth" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getMonth')) {
   $ERROR('#1: The Date.prototype.getMonth property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getMonth has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A2_T1.js
index 47ed855ed..780f8fbd0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getMonth" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A2_T1.js
- * @description The "length" property of the "getMonth" is 0
- */
+/*---
+info: The "length" property of the "getMonth" is 0
+description: The "length" property of the "getMonth" is 0
+---*/
 
 if(Date.prototype.getMonth.hasOwnProperty("length") !== true){
   $ERROR('#1: The getMonth has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getMonth.hasOwnProperty("length") !== true){
 if(Date.prototype.getMonth.length !== 0){
   $ERROR('#2: The "length" property of the getMonth is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T1.js
index bf5bf66f7..3e79ff14a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getMonth.length;
 Date.prototype.getMonth.length = 1;
 if (Date.prototype.getMonth.length !== x) {
   $ERROR('#1: The Date.prototype.getMonth.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T2.js
index d555488ec..0752dbaa9 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMonth.length  !== false) {
   $ERROR('#1: The Date.prototype.getMonth.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getMonth.length  !== false) {
 if (!Date.prototype.getMonth.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getMonth.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T3.js
index e19077e23..47782c44f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.12/S15.9.5.12_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getMonth.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getMonth.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getMonth) {
     $ERROR('#2: The Date.prototype.getMonth.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T1.js
index 7b52ba2de..6eb160983 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCMonth" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMonth;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCMonth === x) {
   $ERROR('#1: The Date.prototype.getUTCMonth has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T2.js
index e744f8df6..001ef001a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCMonth" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMonth  === false) {
   $ERROR('#1: The Date.prototype.getUTCMonth property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCMonth  === false) {
 if (Date.prototype.hasOwnProperty('getUTCMonth')) {
   $FAIL('#2: The Date.prototype.getUTCMonth property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T3.js
index c09e96f41..d3a00b539 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCMonth" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCMonth')) {
   $ERROR('#1: The Date.prototype.getUTCMonth property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCMonth has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A2_T1.js
index 9d604be79..4b3226bea 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCMonth" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A2_T1.js
- * @description The "length" property of the "getUTCMonth" is 0
- */
+/*---
+info: The "length" property of the "getUTCMonth" is 0
+description: The "length" property of the "getUTCMonth" is 0
+---*/
 
 if(Date.prototype.getUTCMonth.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCMonth has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCMonth.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCMonth.length !== 0){
   $ERROR('#2: The "length" property of the getUTCMonth is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T1.js
index b36862957..f0eb495b5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMonth.length;
 Date.prototype.getUTCMonth.length = 1;
 if (Date.prototype.getUTCMonth.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCMonth.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T2.js
index 850415584..470ea2143 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMonth.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCMonth.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCMonth.length  !== false) {
 if (!Date.prototype.getUTCMonth.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCMonth.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T3.js
index 3e364a3d6..7dbba28dc 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.13/S15.9.5.13_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCMonth.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCMonth.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCMonth) {
     $ERROR('#2: The Date.prototype.getUTCMonth.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T1.js
index 40699e8ae..d17e2c1d2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getDate" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getDate;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getDate === x) {
   $ERROR('#1: The Date.prototype.getDate has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T2.js
index fb8261482..181343e42 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getDate" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getDate  === false) {
   $ERROR('#1: The Date.prototype.getDate property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getDate  === false) {
 if (Date.prototype.hasOwnProperty('getDate')) {
   $FAIL('#2: The Date.prototype.getDate property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T3.js
index 1dc39e93c..6a7b1769e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getDate" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getDate')) {
   $ERROR('#1: The Date.prototype.getDate property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getDate has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A2_T1.js
index ecd6fb8ca..358a6e76e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getDate" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A2_T1.js
- * @description The "length" property of the "getDate" is 0
- */
+/*---
+info: The "length" property of the "getDate" is 0
+description: The "length" property of the "getDate" is 0
+---*/
 
 if(Date.prototype.getDate.hasOwnProperty("length") !== true){
   $ERROR('#1: The getDate has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getDate.hasOwnProperty("length") !== true){
 if(Date.prototype.getDate.length !== 0){
   $ERROR('#2: The "length" property of the getDate is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T1.js
index 942319f73..c11e68d3c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getDate.length;
 Date.prototype.getDate.length = 1;
 if (Date.prototype.getDate.length !== x) {
   $ERROR('#1: The Date.prototype.getDate.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T2.js
index ad36fd81b..bc886d0b3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getDate.length  !== false) {
   $ERROR('#1: The Date.prototype.getDate.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getDate.length  !== false) {
 if (!Date.prototype.getDate.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getDate.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T3.js
index ffec9e3f2..a2fe6352e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.14/S15.9.5.14_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getDate.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getDate.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getDate) {
     $ERROR('#2: The Date.prototype.getDate.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T1.js
index b07c42ee4..63bdb5de7 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCDate" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCDate;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCDate === x) {
   $ERROR('#1: The Date.prototype.getUTCDate has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T2.js
index 94425617e..2eaaa7f17 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCDate" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCDate  === false) {
   $ERROR('#1: The Date.prototype.getUTCDate property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCDate  === false) {
 if (Date.prototype.hasOwnProperty('getUTCDate')) {
   $FAIL('#2: The Date.prototype.getUTCDate property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T3.js
index 1f9077223..0cdbb071a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCDate" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCDate')) {
   $ERROR('#1: The Date.prototype.getUTCDate property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCDate has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A2_T1.js
index ccdad27aa..1e0663500 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCDate" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A2_T1.js
- * @description The "length" property of the "getUTCDate" is 0
- */
+/*---
+info: The "length" property of the "getUTCDate" is 0
+description: The "length" property of the "getUTCDate" is 0
+---*/
 
 if(Date.prototype.getUTCDate.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCDate has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCDate.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCDate.length !== 0){
   $ERROR('#2: The "length" property of the getUTCDate is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T1.js
index f91c38358..7018bdaa1 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCDate.length;
 Date.prototype.getUTCDate.length = 1;
 if (Date.prototype.getUTCDate.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCDate.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T2.js
index e0617d446..7d61a2c8a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCDate.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCDate.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCDate.length  !== false) {
 if (!Date.prototype.getUTCDate.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCDate.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T3.js
index 849a02db0..d6c556dc6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.15/S15.9.5.15_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCDate.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCDate.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCDate) {
     $ERROR('#2: The Date.prototype.getUTCDate.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T1.js
index 51eeb1ec5..a1a22884f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getDay" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getDay;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getDay === x) {
   $ERROR('#1: The Date.prototype.getDay has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T2.js
index 09f499c78..3b6adbc9b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getDay" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getDay  === false) {
   $ERROR('#1: The Date.prototype.getDay property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getDay  === false) {
 if (Date.prototype.hasOwnProperty('getDay')) {
   $FAIL('#2: The Date.prototype.getDay property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T3.js
index 566071d92..1110b6aaf 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getDay" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getDay')) {
   $ERROR('#1: The Date.prototype.getDay property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getDay has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A2_T1.js
index 02d078baf..f12fe6285 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getDay" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A2_T1.js
- * @description The "length" property of the "getDay" is 0
- */
+/*---
+info: The "length" property of the "getDay" is 0
+description: The "length" property of the "getDay" is 0
+---*/
 
 if(Date.prototype.getDay.hasOwnProperty("length") !== true){
   $ERROR('#1: The getDay has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getDay.hasOwnProperty("length") !== true){
 if(Date.prototype.getDay.length !== 0){
   $ERROR('#2: The "length" property of the getDay is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T1.js
index 71f53d71f..2f2d7cd5e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getDay property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getDay.length;
 Date.prototype.getDay.length = 1;
 if (Date.prototype.getDay.length !== x) {
   $ERROR('#1: The Date.prototype.getDay.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T2.js
index 70d64e1d5..7159d2abe 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getDay property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getDay.length  !== false) {
   $ERROR('#1: The Date.prototype.getDay.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getDay.length  !== false) {
 if (!Date.prototype.getDay.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getDay.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T3.js
index 7de02a0d9..0a891a962 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.16/S15.9.5.16_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getDay property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getDay.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getDay.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getDay) {
     $ERROR('#2: The Date.prototype.getDay.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T1.js
index 2ea449028..40ac52b50 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCDay" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCDay;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCDay === x) {
   $ERROR('#1: The Date.prototype.getUTCDay has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T2.js
index 11a9d0ea3..ef22e807f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCDay" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCDay  === false) {
   $ERROR('#1: The Date.prototype.getUTCDay property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCDay  === false) {
 if (Date.prototype.hasOwnProperty('getUTCDay')) {
   $FAIL('#2: The Date.prototype.getUTCDay property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T3.js
index c336efdca..1c8030707 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCDay" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCDay" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCDay')) {
   $ERROR('#1: The Date.prototype.getUTCDay property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCDay has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A2_T1.js
index f3699c47d..5fb141ab4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCDay" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A2_T1.js
- * @description The "length" property of the "getUTCDay" is 0
- */
+/*---
+info: The "length" property of the "getUTCDay" is 0
+description: The "length" property of the "getUTCDay" is 0
+---*/
 
 if(Date.prototype.getUTCDay.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCDay has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCDay.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCDay.length !== 0){
   $ERROR('#2: The "length" property of the getUTCDay is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T1.js
index 533c59f3f..9febfd2dd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDay property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCDay.length;
 Date.prototype.getUTCDay.length = 1;
 if (Date.prototype.getUTCDay.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCDay.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T2.js
index 96faa270c..e1290acc4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDay property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCDay.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCDay.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCDay.length  !== false) {
 if (!Date.prototype.getUTCDay.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCDay.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T3.js
index 89e7f5e38..4a72bf54b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCDay property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.17/S15.9.5.17_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCDay property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCDay.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCDay.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCDay) {
     $ERROR('#2: The Date.prototype.getUTCDay.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T1.js
index 21df7c849..448f28630 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getHours" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getHours;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getHours === x) {
   $ERROR('#1: The Date.prototype.getHours has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T2.js
index 3eed77e59..ebb9cb3f8 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getHours" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getHours  === false) {
   $ERROR('#1: The Date.prototype.getHours property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getHours  === false) {
 if (Date.prototype.hasOwnProperty('getHours')) {
   $FAIL('#2: The Date.prototype.getHours property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T3.js
index 2c06a04c5..f09fb78b8 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getHours" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getHours')) {
   $ERROR('#1: The Date.prototype.getHours property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getHours has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A2_T1.js
index abf67c992..595c7640d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getHours" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A2_T1.js
- * @description The "length" property of the "getHours" is 0
- */
+/*---
+info: The "length" property of the "getHours" is 0
+description: The "length" property of the "getHours" is 0
+---*/
 
 if(Date.prototype.getHours.hasOwnProperty("length") !== true){
   $ERROR('#1: The getHours has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getHours.hasOwnProperty("length") !== true){
 if(Date.prototype.getHours.length !== 0){
   $ERROR('#2: The "length" property of the getHours is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T1.js
index 6226fb411..7b7867d3f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getHours.length;
 Date.prototype.getHours.length = 1;
 if (Date.prototype.getHours.length !== x) {
   $ERROR('#1: The Date.prototype.getHours.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T2.js
index 7d8503375..ff8c74ff0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getHours.length  !== false) {
   $ERROR('#1: The Date.prototype.getHours.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getHours.length  !== false) {
 if (!Date.prototype.getHours.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getHours.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T3.js
index 2639f7f35..37dcc52a3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.18/S15.9.5.18_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getHours.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getHours.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getHours) {
     $ERROR('#2: The Date.prototype.getHours.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T1.js
index 83aec2d9f..e77978a76 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCHours" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCHours;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCHours === x) {
   $ERROR('#1: The Date.prototype.getUTCHours has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T2.js
index dbe96536f..5ba5a68d0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCHours" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCHours  === false) {
   $ERROR('#1: The Date.prototype.getUTCHours property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCHours  === false) {
 if (Date.prototype.hasOwnProperty('getUTCHours')) {
   $FAIL('#2: The Date.prototype.getUTCHours property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T3.js
index cce164641..b85972f92 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCHours" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCHours')) {
   $ERROR('#1: The Date.prototype.getUTCHours property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCHours has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A2_T1.js
index 8bd281f48..c72cc0749 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCHours" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A2_T1.js
- * @description The "length" property of the "getUTCHours" is 0
- */
+/*---
+info: The "length" property of the "getUTCHours" is 0
+description: The "length" property of the "getUTCHours" is 0
+---*/
 
 if(Date.prototype.getUTCHours.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCHours has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCHours.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCHours.length !== 0){
   $ERROR('#2: The "length" property of the getUTCHours is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T1.js
index f3a6d38bb..f5270be7c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCHours.length;
 Date.prototype.getUTCHours.length = 1;
 if (Date.prototype.getUTCHours.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCHours.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T2.js
index 2c6be6fcf..80219e76d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCHours.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCHours.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCHours.length  !== false) {
 if (!Date.prototype.getUTCHours.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCHours.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T3.js
index 2f6373d3a..7fdab747e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.19/S15.9.5.19_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCHours.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCHours.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCHours) {
     $ERROR('#2: The Date.prototype.getUTCHours.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T1.js
index 3e56c55ad..77d1fc0b3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "toString" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toString;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.toString === x) {
   $ERROR('#1: The Date.prototype.toString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T2.js
index f1a5d6fba..965d8e366 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "toString" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toString  === false) {
   $ERROR('#1: The Date.prototype.toString property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.toString  === false) {
 if (Date.prototype.hasOwnProperty('toString')) {
   $FAIL('#2: The Date.prototype.toString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T3.js
index 489fe75e1..2beef2822 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "toString" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toString')) {
   $ERROR('#1: The Date.prototype.toString property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A2_T1.js
index faa1123e6..6652fac77 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A2_T1.js
- * @description The "length" property of the "toString" is 0
- */
+/*---
+info: The "length" property of the "toString" is 0
+description: The "length" property of the "toString" is 0
+---*/
 
 if(Date.prototype.toString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toString.hasOwnProperty("length") !== true){
 if(Date.prototype.toString.length !== 0){
   $ERROR('#2: The "length" property of the toString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T1.js
index fb4895618..eeec1689a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toString property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toString.length;
 Date.prototype.toString.length = 1;
 if (Date.prototype.toString.length !== x) {
   $ERROR('#1: The Date.prototype.toString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T2.js
index 74aaa12a0..d0b7e580f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toString property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toString.length  !== false) {
   $ERROR('#1: The Date.prototype.toString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toString.length  !== false) {
 if (!Date.prototype.toString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T3.js
index 67524d6e0..1c8190499 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.2/S15.9.5.2_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toString property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toString) {
     $ERROR('#2: The Date.prototype.toString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T1.js
index c006aaa9f..7146b594d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getMinutes" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getMinutes;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getMinutes === x) {
   $ERROR('#1: The Date.prototype.getMinutes has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T2.js
index e7c433356..a2f39cebf 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getMinutes" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMinutes  === false) {
   $ERROR('#1: The Date.prototype.getMinutes property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getMinutes  === false) {
 if (Date.prototype.hasOwnProperty('getMinutes')) {
   $FAIL('#2: The Date.prototype.getMinutes property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T3.js
index 6cb2fdffc..e0c10163c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getMinutes" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getMinutes')) {
   $ERROR('#1: The Date.prototype.getMinutes property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getMinutes has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A2_T1.js
index 7c12101cb..53e3b061d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getMinutes" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A2_T1.js
- * @description The "length" property of the "getMinutes" is 0
- */
+/*---
+info: The "length" property of the "getMinutes" is 0
+description: The "length" property of the "getMinutes" is 0
+---*/
 
 if(Date.prototype.getMinutes.hasOwnProperty("length") !== true){
   $ERROR('#1: The getMinutes has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getMinutes.hasOwnProperty("length") !== true){
 if(Date.prototype.getMinutes.length !== 0){
   $ERROR('#2: The "length" property of the getMinutes is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T1.js
index b179bb4ea..dad760cb6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getMinutes.length;
 Date.prototype.getMinutes.length = 1;
 if (Date.prototype.getMinutes.length !== x) {
   $ERROR('#1: The Date.prototype.getMinutes.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T2.js
index b5c9881d1..aa8d18919 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMinutes.length  !== false) {
   $ERROR('#1: The Date.prototype.getMinutes.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getMinutes.length  !== false) {
 if (!Date.prototype.getMinutes.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getMinutes.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T3.js
index 720c89c3f..e99b4cc28 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.20/S15.9.5.20_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getMinutes.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getMinutes.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getMinutes) {
     $ERROR('#2: The Date.prototype.getMinutes.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T1.js
index a9815a7b1..a1434e0fe 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMinutes;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCMinutes === x) {
   $ERROR('#1: The Date.prototype.getUTCMinutes has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T2.js
index e37b3ccd7..57315d4b3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMinutes  === false) {
   $ERROR('#1: The Date.prototype.getUTCMinutes property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCMinutes  === false) {
 if (Date.prototype.hasOwnProperty('getUTCMinutes')) {
   $FAIL('#2: The Date.prototype.getUTCMinutes property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T3.js
index e4b9e14cf..54121666a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCMinutes" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCMinutes')) {
   $ERROR('#1: The Date.prototype.getUTCMinutes property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCMinutes has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A2_T1.js
index bb81eb252..6287bad13 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCMinutes" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A2_T1.js
- * @description The "length" property of the "getUTCMinutes" is 0
- */
+/*---
+info: The "length" property of the "getUTCMinutes" is 0
+description: The "length" property of the "getUTCMinutes" is 0
+---*/
 
 if(Date.prototype.getUTCMinutes.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCMinutes has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCMinutes.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCMinutes.length !== 0){
   $ERROR('#2: The "length" property of the getUTCMinutes is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T1.js
index 747dc26a1..28340ab78 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMinutes.length;
 Date.prototype.getUTCMinutes.length = 1;
 if (Date.prototype.getUTCMinutes.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCMinutes.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T2.js
index cfc633fee..a03e616b2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMinutes.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCMinutes.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCMinutes.length  !== false) {
 if (!Date.prototype.getUTCMinutes.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCMinutes.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T3.js
index 419a6d45c..1518f8587 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.21/S15.9.5.21_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCMinutes.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCMinutes.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCMinutes) {
     $ERROR('#2: The Date.prototype.getUTCMinutes.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T1.js
index e2999bc32..c2ee4bb69 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getSeconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getSeconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getSeconds === x) {
   $ERROR('#1: The Date.prototype.getSeconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T2.js
index f00746bd3..a0c3fafa2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getSeconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getSeconds  === false) {
   $ERROR('#1: The Date.prototype.getSeconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getSeconds  === false) {
 if (Date.prototype.hasOwnProperty('getSeconds')) {
   $FAIL('#2: The Date.prototype.getSeconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T3.js
index 302a570b3..da38d6838 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getSeconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getSeconds')) {
   $ERROR('#1: The Date.prototype.getSeconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getSeconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A2_T1.js
index 35dc678fa..d258f90c3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getSeconds" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A2_T1.js
- * @description The "length" property of the "getSeconds" is 0
- */
+/*---
+info: The "length" property of the "getSeconds" is 0
+description: The "length" property of the "getSeconds" is 0
+---*/
 
 if(Date.prototype.getSeconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The getSeconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getSeconds.hasOwnProperty("length") !== true){
 if(Date.prototype.getSeconds.length !== 0){
   $ERROR('#2: The "length" property of the getSeconds is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T1.js
index daf06895d..b11769895 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getSeconds.length;
 Date.prototype.getSeconds.length = 1;
 if (Date.prototype.getSeconds.length !== x) {
   $ERROR('#1: The Date.prototype.getSeconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T2.js
index 83b659f12..3d5194e11 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getSeconds.length  !== false) {
   $ERROR('#1: The Date.prototype.getSeconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getSeconds.length  !== false) {
 if (!Date.prototype.getSeconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getSeconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T3.js
index b18859412..7a107e83b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.22/S15.9.5.22_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getSeconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getSeconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getSeconds) {
     $ERROR('#2: The Date.prototype.getSeconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T1.js
index 0cdbf9427..8f7077c35 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCSeconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getUTCSeconds === x) {
   $ERROR('#1: The Date.prototype.getUTCSeconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T2.js
index f5e7db5f4..b97a57367 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCSeconds  === false) {
   $ERROR('#1: The Date.prototype.getUTCSeconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getUTCSeconds  === false) {
 if (Date.prototype.hasOwnProperty('getUTCSeconds')) {
   $FAIL('#2: The Date.prototype.getUTCSeconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T3.js
index ffe8be9b6..9f3401d1b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getUTCSeconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCSeconds')) {
   $ERROR('#1: The Date.prototype.getUTCSeconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCSeconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A2_T1.js
index fc133e721..5ac80d903 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCSeconds" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A2_T1.js
- * @description The "length" property of the "getUTCSeconds" is 0
- */
+/*---
+info: The "length" property of the "getUTCSeconds" is 0
+description: The "length" property of the "getUTCSeconds" is 0
+---*/
 
 if(Date.prototype.getUTCSeconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCSeconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCSeconds.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCSeconds.length !== 0){
   $ERROR('#2: The "length" property of the getUTCSeconds is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T1.js
index cc7476cae..f4c0b7732 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCSeconds.length;
 Date.prototype.getUTCSeconds.length = 1;
 if (Date.prototype.getUTCSeconds.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCSeconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T2.js
index dedb7c86d..9ce225632 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCSeconds.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCSeconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCSeconds.length  !== false) {
 if (!Date.prototype.getUTCSeconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCSeconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T3.js
index 04bc31c50..deb430eac 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.23/S15.9.5.23_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCSeconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCSeconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCSeconds) {
     $ERROR('#2: The Date.prototype.getUTCSeconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T1.js
index fd166c2ea..6eb5437d3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getMilliseconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getMilliseconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getMilliseconds === x) {
   $ERROR('#1: The Date.prototype.getMilliseconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T2.js
index b2b37d417..dd0bcbbe1 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getMilliseconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMilliseconds  === false) {
   $ERROR('#1: The Date.prototype.getMilliseconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getMilliseconds  === false) {
 if (Date.prototype.hasOwnProperty('getMilliseconds')) {
   $FAIL('#2: The Date.prototype.getMilliseconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T3.js
index a0610a781..384db9e06 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getMilliseconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getMilliseconds')) {
   $ERROR('#1: The Date.prototype.getMilliseconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getMilliseconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A2_T1.js
index 2383ea3d7..da2a5fe4d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getMilliseconds" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A2_T1.js
- * @description The "length" property of the "getMilliseconds" is 0
- */
+/*---
+info: The "length" property of the "getMilliseconds" is 0
+description: The "length" property of the "getMilliseconds" is 0
+---*/
 
 if(Date.prototype.getMilliseconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The getMilliseconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getMilliseconds.hasOwnProperty("length") !== true){
 if(Date.prototype.getMilliseconds.length !== 0){
   $ERROR('#2: The "length" property of the getMilliseconds is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T1.js
index 9b79b4ac0..48a76dbd3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getMilliseconds.length;
 Date.prototype.getMilliseconds.length = 1;
 if (Date.prototype.getMilliseconds.length !== x) {
   $ERROR('#1: The Date.prototype.getMilliseconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T2.js
index 04d18b9f8..00dc8c7c4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getMilliseconds.length  !== false) {
   $ERROR('#1: The Date.prototype.getMilliseconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getMilliseconds.length  !== false) {
 if (!Date.prototype.getMilliseconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getMilliseconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T3.js
index d124f847f..af6fb37fd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.24/S15.9.5.24_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getMilliseconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getMilliseconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getMilliseconds) {
     $ERROR('#2: The Date.prototype.getMilliseconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T1.js
index bccbfde14..f74fff32d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype property "getUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMilliseconds;
 if(x === 1)
@@ -16,5 +16,3 @@ else
 if (Date.prototype.getUTCMilliseconds === x) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T2.js
index 17c840b02..70234415c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype property "getUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMilliseconds  === false) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds property has not the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCMilliseconds  === false) {
 if (Date.prototype.hasOwnProperty('getUTCMilliseconds')) {
   $FAIL('#2: The Date.prototype.getUTCMilliseconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T3.js
index ead8d5d01..e762849d3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype property "getUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getUTCMilliseconds')) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getUTCMilliseconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A2_T1.js
index e2889842f..665e32931 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getUTCMilliseconds" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A2_T1.js
- * @description The "length" property of the "getUTCMilliseconds" is 0
- */
+/*---
+info: The "length" property of the "getUTCMilliseconds" is 0
+description: The "length" property of the "getUTCMilliseconds" is 0
+---*/
 
 if(Date.prototype.getUTCMilliseconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The getUTCMilliseconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getUTCMilliseconds.hasOwnProperty("length") !== true){
 if(Date.prototype.getUTCMilliseconds.length !== 0){
   $ERROR('#2: The "length" property of the getUTCMilliseconds is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T1.js
index 5611af8ca..b15ccc116 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getUTCMilliseconds.length;
 Date.prototype.getUTCMilliseconds.length = 1;
 if (Date.prototype.getUTCMilliseconds.length !== x) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T2.js
index 0e7f61c4d..32780f266 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getUTCMilliseconds.length  !== false) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getUTCMilliseconds.length  !== false) {
 if (!Date.prototype.getUTCMilliseconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getUTCMilliseconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T3.js
index 7ada8bdbf..653e51e45 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.25/S15.9.5.25_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getUTCMilliseconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getUTCMilliseconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getUTCMilliseconds) {
     $ERROR('#2: The Date.prototype.getUTCMilliseconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T1.js
index 603d2b7ef..bf4a89174 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTimezoneOffset" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype property "getTimezoneOffset" has { DontEnum }
+    attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getTimezoneOffset;
 if(x === 1)
@@ -16,5 +16,3 @@ else
 if (Date.prototype.getTimezoneOffset === x) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T2.js
index b212690de..955151065 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTimezoneOffset" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype property "getTimezoneOffset" has { DontEnum }
+    attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getTimezoneOffset  === false) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset property has not the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getTimezoneOffset  === false) {
 if (Date.prototype.hasOwnProperty('getTimezoneOffset')) {
   $FAIL('#2: The Date.prototype.getTimezoneOffset property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T3.js
index fb4a98de9..662df8ce1 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTimezoneOffset" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype property "getTimezoneOffset" has { DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getTimezoneOffset')) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getTimezoneOffset has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A2_T1.js
index ef197f19f..d3d986715 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getTimezoneOffset" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A2_T1.js
- * @description The "length" property of the "getTimezoneOffset" is 0
- */
+/*---
+info: The "length" property of the "getTimezoneOffset" is 0
+description: The "length" property of the "getTimezoneOffset" is 0
+---*/
 
 if(Date.prototype.getTimezoneOffset.hasOwnProperty("length") !== true){
   $ERROR('#1: The getTimezoneOffset has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getTimezoneOffset.hasOwnProperty("length") !== true){
 if(Date.prototype.getTimezoneOffset.length !== 0){
   $ERROR('#2: The "length" property of the getTimezoneOffset is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T1.js
index 722b2f96e..cba44a18e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTimezoneOffset property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getTimezoneOffset property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getTimezoneOffset.length;
 Date.prototype.getTimezoneOffset.length = 1;
 if (Date.prototype.getTimezoneOffset.length !== x) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T2.js
index f17cfd443..37caf0fee 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTimezoneOffset property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getTimezoneOffset property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getTimezoneOffset.length  !== false) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getTimezoneOffset.length  !== false) {
 if (!Date.prototype.getTimezoneOffset.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getTimezoneOffset.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T3.js
index 74d6c59a8..323fc2746 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTimezoneOffset property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.26/S15.9.5.26_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getTimezoneOffset property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getTimezoneOffset.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getTimezoneOffset.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getTimezoneOffset) {
     $ERROR('#2: The Date.prototype.getTimezoneOffset.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T1.js
index 4f7f05782..242c295c1 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setTime" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setTime;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setTime === x) {
   $ERROR('#1: The Date.prototype.setTime has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T2.js
index 51ac9d33f..763a417b7 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setTime" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setTime  === false) {
   $ERROR('#1: The Date.prototype.setTime property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setTime  === false) {
 if (Date.prototype.hasOwnProperty('setTime')) {
   $FAIL('#2: The Date.prototype.setTime property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T3.js
index 724a44920..06ddbe421 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setTime" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setTime')) {
   $ERROR('#1: The Date.prototype.setTime property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setTime has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A2_T1.js
index eaa2be63e..5449bfcbe 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setTime" is 1
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A2_T1.js
- * @description The "length" property of the "setTime" is 1
- */
+/*---
+info: The "length" property of the "setTime" is 1
+description: The "length" property of the "setTime" is 1
+---*/
 
 if(Date.prototype.setTime.hasOwnProperty("length") !== true){
   $ERROR('#1: The setTime has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setTime.hasOwnProperty("length") !== true){
 if(Date.prototype.setTime.length !== 1){
   $ERROR('#2: The "length" property of the setTime is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T1.js
index f6ed13a31..dbfb43352 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setTime.length;
 Date.prototype.setTime.length = 1;
 if (Date.prototype.setTime.length !== x) {
   $ERROR('#1: The Date.prototype.setTime.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T2.js
index 81e908366..b9ff4f940 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setTime.length  !== false) {
   $ERROR('#1: The Date.prototype.setTime.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setTime.length  !== false) {
 if (!Date.prototype.setTime.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setTime.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T3.js
index 8b8076aa2..a0dd23da2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.27/S15.9.5.27_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setTime.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setTime.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setTime) {
     $ERROR('#2: The Date.prototype.setTime.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T1.js
index 5cef7c9d2..331a0f6b3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setMilliseconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setMilliseconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setMilliseconds === x) {
   $ERROR('#1: The Date.prototype.setMilliseconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T2.js
index 0a2bd573c..4010f048e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setMilliseconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMilliseconds  === false) {
   $ERROR('#1: The Date.prototype.setMilliseconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setMilliseconds  === false) {
 if (Date.prototype.hasOwnProperty('setMilliseconds')) {
   $FAIL('#2: The Date.prototype.setMilliseconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T3.js
index 0a971a540..be9766ff3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setMilliseconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setMilliseconds')) {
   $ERROR('#1: The Date.prototype.setMilliseconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setMilliseconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A2_T1.js
index dc0f0de0f..e46998d20 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setMilliseconds" is 1
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A2_T1.js
- * @description The "length" property of the "setMilliseconds" is 1
- */
+/*---
+info: The "length" property of the "setMilliseconds" is 1
+description: The "length" property of the "setMilliseconds" is 1
+---*/
 
 if(Date.prototype.setMilliseconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The setMilliseconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setMilliseconds.hasOwnProperty("length") !== true){
 if(Date.prototype.setMilliseconds.length !== 1){
   $ERROR('#2: The "length" property of the setMilliseconds is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T1.js
index 11e36f7fc..e3061ac23 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setMilliseconds.length;
 Date.prototype.setMilliseconds.length = 1;
 if (Date.prototype.setMilliseconds.length !== x) {
   $ERROR('#1: The Date.prototype.setMilliseconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T2.js
index 544966622..ab5b33cec 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMilliseconds.length  !== false) {
   $ERROR('#1: The Date.prototype.setMilliseconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setMilliseconds.length  !== false) {
 if (!Date.prototype.setMilliseconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setMilliseconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T3.js
index 5f8bcfa38..fe622c843 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.28/S15.9.5.28_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setMilliseconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setMilliseconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setMilliseconds) {
     $ERROR('#2: The Date.prototype.setMilliseconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T1.js
index 9449b1a74..e358cd0a6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype property "setUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMilliseconds;
 if(x === 1)
@@ -16,5 +16,3 @@ else
 if (Date.prototype.setUTCMilliseconds === x) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T2.js
index 9560e635b..fdf36a820 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype property "setUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMilliseconds  === false) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds property has not the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCMilliseconds  === false) {
 if (Date.prototype.hasOwnProperty('setUTCMilliseconds')) {
   $FAIL('#2: The Date.prototype.setUTCMilliseconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T3.js
index 9a06d1829..b183acfcd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMilliseconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype property "setUTCMilliseconds" has { DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCMilliseconds')) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCMilliseconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A2_T1.js
index f511aab54..8f0dc905d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCMilliseconds" is 1
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A2_T1.js
- * @description The "length" property of the "setUTCMilliseconds" is 1
- */
+/*---
+info: The "length" property of the "setUTCMilliseconds" is 1
+description: The "length" property of the "setUTCMilliseconds" is 1
+---*/
 
 if(Date.prototype.setUTCMilliseconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCMilliseconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCMilliseconds.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCMilliseconds.length !== 1){
   $ERROR('#2: The "length" property of the setUTCMilliseconds is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T1.js
index 34cc24453..31a6ea904 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMilliseconds.length;
 Date.prototype.setUTCMilliseconds.length = 1;
 if (Date.prototype.setUTCMilliseconds.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T2.js
index 50230b077..0323b3c50 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMilliseconds.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCMilliseconds.length  !== false) {
 if (!Date.prototype.setUTCMilliseconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCMilliseconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T3.js
index 89742c8da..20c45f75c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.29/S15.9.5.29_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMilliseconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCMilliseconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCMilliseconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCMilliseconds) {
     $ERROR('#2: The Date.prototype.setUTCMilliseconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T1.js
index 53ef69842..a606c73d9 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "toDateString" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toDateString;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.toDateString === x) {
   $ERROR('#1: The Date.prototype.toDateString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T2.js
index 19a98a7b6..94b25b069 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "toDateString" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toDateString  === false) {
   $ERROR('#1: The Date.prototype.toDateString property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.toDateString  === false) {
 if (Date.prototype.hasOwnProperty('toDateString')) {
   $FAIL('#2: The Date.prototype.toDateString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T3.js
index 49874ffa0..b88e1d44d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "toDateString" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toDateString')) {
   $ERROR('#1: The Date.prototype.toDateString property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toDateString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A2_T1.js
index 600439362..8841c14a6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toDateString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A2_T1.js
- * @description The "length" property of the "toDateString" is 0
- */
+/*---
+info: The "length" property of the "toDateString" is 0
+description: The "length" property of the "toDateString" is 0
+---*/
 
 if(Date.prototype.toDateString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toDateString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toDateString.hasOwnProperty("length") !== true){
 if(Date.prototype.toDateString.length !== 0){
   $ERROR('#2: The "length" property of the toDateString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T1.js
index 2c9de6cdc..306a5074d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toDateString.length;
 Date.prototype.toDateString.length = 1;
 if (Date.prototype.toDateString.length !== x) {
   $ERROR('#1: The Date.prototype.toDateString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T2.js
index 83e794a08..80742f009 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toDateString.length  !== false) {
   $ERROR('#1: The Date.prototype.toDateString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toDateString.length  !== false) {
 if (!Date.prototype.toDateString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toDateString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T3.js
index abaf2c2c2..7b6641a3f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.3/S15.9.5.3_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toDateString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toDateString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toDateString) {
     $ERROR('#2: The Date.prototype.toDateString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T1.js
index 76a6aeb49..bc7b99a6b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setSeconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setSeconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setSeconds === x) {
   $ERROR('#1: The Date.prototype.setSeconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T2.js
index 4f691eaf9..c2c734317 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setSeconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setSeconds  === false) {
   $ERROR('#1: The Date.prototype.setSeconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setSeconds  === false) {
 if (Date.prototype.hasOwnProperty('setSeconds')) {
   $FAIL('#2: The Date.prototype.setSeconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T3.js
index 350a993d3..2dfd3da64 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setSeconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setSeconds')) {
   $ERROR('#1: The Date.prototype.setSeconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setSeconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A2_T1.js
index a87097cd4..ddde8e9d5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setSeconds" is 2
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A2_T1.js
- * @description The "length" property of the "setSeconds" is 2
- */
+/*---
+info: The "length" property of the "setSeconds" is 2
+description: The "length" property of the "setSeconds" is 2
+---*/
 
 if(Date.prototype.setSeconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The setSeconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setSeconds.hasOwnProperty("length") !== true){
 if(Date.prototype.setSeconds.length !== 2){
   $ERROR('#2: The "length" property of the setSeconds is 2');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T1.js
index 26aa6c79d..41ed1b3ee 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setSeconds.length;
 Date.prototype.setSeconds.length = 1;
 if (Date.prototype.setSeconds.length !== x) {
   $ERROR('#1: The Date.prototype.setSeconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T2.js
index 19b6442b8..25a3552db 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setSeconds.length  !== false) {
   $ERROR('#1: The Date.prototype.setSeconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setSeconds.length  !== false) {
 if (!Date.prototype.setSeconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setSeconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T3.js
index eed00a549..ea9f8090a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.30/S15.9.5.30_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setSeconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setSeconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setSeconds) {
     $ERROR('#2: The Date.prototype.setSeconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T1.js
index 2f34d162d..85dfcc3e2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCSeconds;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCSeconds === x) {
   $ERROR('#1: The Date.prototype.setUTCSeconds has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T2.js
index d6173a2f2..7bb3599e5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCSeconds  === false) {
   $ERROR('#1: The Date.prototype.setUTCSeconds property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCSeconds  === false) {
 if (Date.prototype.hasOwnProperty('setUTCSeconds')) {
   $FAIL('#2: The Date.prototype.setUTCSeconds property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T3.js
index 5b32a6c7e..ec3636089 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCSeconds" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCSeconds')) {
   $ERROR('#1: The Date.prototype.setUTCSeconds property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCSeconds has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A2_T1.js
index 8bd48c9bd..affeba772 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCSeconds" is 2
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A2_T1.js
- * @description The "length" property of the "setUTCSeconds" is 2
- */
+/*---
+info: The "length" property of the "setUTCSeconds" is 2
+description: The "length" property of the "setUTCSeconds" is 2
+---*/
 
 if(Date.prototype.setUTCSeconds.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCSeconds has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCSeconds.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCSeconds.length !== 2){
   $ERROR('#2: The "length" property of the setUTCSeconds is 2');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T1.js
index 0c7459eca..d456f6aac 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCSeconds.length;
 Date.prototype.setUTCSeconds.length = 1;
 if (Date.prototype.setUTCSeconds.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCSeconds.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T2.js
index d225fae1c..b32c4e92e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCSeconds.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCSeconds.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCSeconds.length  !== false) {
 if (!Date.prototype.setUTCSeconds.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCSeconds.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T3.js
index 4193461f1..d759ca4d2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCSeconds property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.31/S15.9.5.31_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCSeconds property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCSeconds.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCSeconds.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCSeconds) {
     $ERROR('#2: The Date.prototype.setUTCSeconds.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T1.js
index 018978f0e..6c9eed49e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setMinutes" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setMinutes;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setMinutes === x) {
   $ERROR('#1: The Date.prototype.setMinutes has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T2.js
index 332164955..1a33a24c4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setMinutes" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMinutes  === false) {
   $ERROR('#1: The Date.prototype.setMinutes property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setMinutes  === false) {
 if (Date.prototype.hasOwnProperty('setMinutes')) {
   $FAIL('#2: The Date.prototype.setMinutes property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T3.js
index 87d29833a..a3b63f7e7 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setMinutes" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setMinutes')) {
   $ERROR('#1: The Date.prototype.setMinutes property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setMinutes has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A2_T1.js
index 3a1233585..2817d8342 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setMinutes" is 3
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A2_T1.js
- * @description The "length" property of the "setMinutes" is 3
- */
+/*---
+info: The "length" property of the "setMinutes" is 3
+description: The "length" property of the "setMinutes" is 3
+---*/
 
 if(Date.prototype.setMinutes.hasOwnProperty("length") !== true){
   $ERROR('#1: The setMinutes has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setMinutes.hasOwnProperty("length") !== true){
 if(Date.prototype.setMinutes.length !== 3){
   $ERROR('#2: The "length" property of the setMinutes is 3');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T1.js
index 690c807ff..563c18e7c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setMinutes.length;
 Date.prototype.setMinutes.length = 1;
 if (Date.prototype.setMinutes.length !== x) {
   $ERROR('#1: The Date.prototype.setMinutes.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T2.js
index cb8151654..3c440505b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMinutes.length  !== false) {
   $ERROR('#1: The Date.prototype.setMinutes.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setMinutes.length  !== false) {
 if (!Date.prototype.setMinutes.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setMinutes.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T3.js
index e14c49365..74fdeb46f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.32/S15.9.5.32_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setMinutes.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setMinutes.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setMinutes) {
     $ERROR('#2: The Date.prototype.setMinutes.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T1.js
index da4fcf04d..d31a0fa92 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMinutes;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCMinutes === x) {
   $ERROR('#1: The Date.prototype.setUTCMinutes has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T2.js
index ca7484c7d..5bdd9fb61 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMinutes  === false) {
   $ERROR('#1: The Date.prototype.setUTCMinutes property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCMinutes  === false) {
 if (Date.prototype.hasOwnProperty('setUTCMinutes')) {
   $FAIL('#2: The Date.prototype.setUTCMinutes property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T3.js
index 8966e3b29..5a23703d5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCMinutes" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCMinutes')) {
   $ERROR('#1: The Date.prototype.setUTCMinutes property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCMinutes has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A2_T1.js
index d383a4150..3963793de 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCMinutes" is 3
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A2_T1.js
- * @description The "length" property of the "setUTCMinutes" is 3
- */
+/*---
+info: The "length" property of the "setUTCMinutes" is 3
+description: The "length" property of the "setUTCMinutes" is 3
+---*/
 
 if(Date.prototype.setUTCMinutes.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCMinutes has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCMinutes.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCMinutes.length !== 3){
   $ERROR('#2: The "length" property of the setUTCMinutes is 3');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T1.js
index e3f400bb2..7a6dd8638 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMinutes.length;
 Date.prototype.setUTCMinutes.length = 1;
 if (Date.prototype.setUTCMinutes.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCMinutes.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T2.js
index 56bf360f4..4719b7f75 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMinutes.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCMinutes.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCMinutes.length  !== false) {
 if (!Date.prototype.setUTCMinutes.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCMinutes.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T3.js
index 9b3046cf2..d5c1889f7 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMinutes property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.33/S15.9.5.33_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMinutes property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCMinutes.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCMinutes.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCMinutes) {
     $ERROR('#2: The Date.prototype.setUTCMinutes.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T1.js
index a37436263..ac63ad39e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setHours" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setHours;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setHours === x) {
   $ERROR('#1: The Date.prototype.setHours has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T2.js
index 4338fe4d1..3ba248942 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setHours" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setHours  === false) {
   $ERROR('#1: The Date.prototype.setHours property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setHours  === false) {
 if (Date.prototype.hasOwnProperty('setHours')) {
   $FAIL('#2: The Date.prototype.setHours property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T3.js
index 9d7b77ccf..16678d325 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setHours" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setHours')) {
   $ERROR('#1: The Date.prototype.setHours property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setHours has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A2_T1.js
index c8cdf8d18..5958ef728 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setHours" is 4
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A2_T1.js
- * @description The "length" property of the "setHours" is 4
- */
+/*---
+info: The "length" property of the "setHours" is 4
+description: The "length" property of the "setHours" is 4
+---*/
 
 if(Date.prototype.setHours.hasOwnProperty("length") !== true){
   $ERROR('#1: The setHours has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setHours.hasOwnProperty("length") !== true){
 if(Date.prototype.setHours.length !== 4){
   $ERROR('#2: The "length" property of the setHours is 4');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T1.js
index 36a1f2beb..42f99aa3f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setHours.length;
 Date.prototype.setHours.length = 1;
 if (Date.prototype.setHours.length !== x) {
   $ERROR('#1: The Date.prototype.setHours.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T2.js
index 3aa14f87f..14d2bc7a6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setHours.length  !== false) {
   $ERROR('#1: The Date.prototype.setHours.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setHours.length  !== false) {
 if (!Date.prototype.setHours.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setHours.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T3.js
index 2b1e1170a..ceaa30068 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.34/S15.9.5.34_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setHours property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setHours.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setHours.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setHours) {
     $ERROR('#2: The Date.prototype.setHours.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T1.js
index 14eb1e938..2f68a3b72 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCHours" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCHours;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCHours === x) {
   $ERROR('#1: The Date.prototype.setUTCHours has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T2.js
index 48ae1293e..3fe6cc4ca 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCHours" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCHours  === false) {
   $ERROR('#1: The Date.prototype.setUTCHours property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCHours  === false) {
 if (Date.prototype.hasOwnProperty('setUTCHours')) {
   $FAIL('#2: The Date.prototype.setUTCHours property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T3.js
index 84a291371..e777d3192 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCHours" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCHours" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCHours')) {
   $ERROR('#1: The Date.prototype.setUTCHours property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCHours has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A2_T1.js
index ae7c776ec..c90705c08 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCHours" is 4
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A2_T1.js
- * @description The "length" property of the "setUTCHours" is 4
- */
+/*---
+info: The "length" property of the "setUTCHours" is 4
+description: The "length" property of the "setUTCHours" is 4
+---*/
 
 if(Date.prototype.setUTCHours.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCHours has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCHours.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCHours.length !== 4){
   $ERROR('#2: The "length" property of the setUTCHours is 4');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T1.js
index 4a91fbd99..a603d05ed 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCHours.length;
 Date.prototype.setUTCHours.length = 1;
 if (Date.prototype.setUTCHours.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCHours.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T2.js
index 58aa9d005..02bb688c8 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCHours.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCHours.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCHours.length  !== false) {
 if (!Date.prototype.setUTCHours.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCHours.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T3.js
index ab008bb30..b2f9eff15 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCHours property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.35/S15.9.5.35_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCHours property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCHours.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCHours.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCHours) {
     $ERROR('#2: The Date.prototype.setUTCHours.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T1.js
index 6fbe7aafb..e4951e30a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setDate" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setDate;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setDate === x) {
   $ERROR('#1: The Date.prototype.setDate has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T2.js
index 894a3c5aa..0e908308f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setDate" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setDate  === false) {
   $ERROR('#1: The Date.prototype.setDate property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setDate  === false) {
 if (Date.prototype.hasOwnProperty('setDate')) {
   $FAIL('#2: The Date.prototype.setDate property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T3.js
index b18f38eca..dec68f72d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setDate" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setDate')) {
   $ERROR('#1: The Date.prototype.setDate property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setDate has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A2_T1.js
index ebbc2615c..5e09915a0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setDate" is 1
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A2_T1.js
- * @description The "length" property of the "setDate" is 1
- */
+/*---
+info: The "length" property of the "setDate" is 1
+description: The "length" property of the "setDate" is 1
+---*/
 
 if(Date.prototype.setDate.hasOwnProperty("length") !== true){
   $ERROR('#1: The setDate has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setDate.hasOwnProperty("length") !== true){
 if(Date.prototype.setDate.length !== 1){
   $ERROR('#2: The "length" property of the setDate is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T1.js
index 8b887aee8..b96326408 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setDate.length;
 Date.prototype.setDate.length = 1;
 if (Date.prototype.setDate.length !== x) {
   $ERROR('#1: The Date.prototype.setDate.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T2.js
index 9c04e1411..1a5f6c8e0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setDate.length  !== false) {
   $ERROR('#1: The Date.prototype.setDate.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setDate.length  !== false) {
 if (!Date.prototype.setDate.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setDate.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T3.js
index 26d92540e..08d357bfd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.36/S15.9.5.36_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setDate property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setDate.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setDate.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setDate) {
     $ERROR('#2: The Date.prototype.setDate.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T1.js
index 617573371..806d05d89 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCDate" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCDate;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCDate === x) {
   $ERROR('#1: The Date.prototype.setUTCDate has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T2.js
index d58be542b..cd2953813 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCDate" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCDate  === false) {
   $ERROR('#1: The Date.prototype.setUTCDate property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCDate  === false) {
 if (Date.prototype.hasOwnProperty('setUTCDate')) {
   $FAIL('#2: The Date.prototype.setUTCDate property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T3.js
index cfb8e21e8..3b1f0c8b4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCDate" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCDate" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCDate')) {
   $ERROR('#1: The Date.prototype.setUTCDate property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCDate has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A2_T1.js
index d4bb55a7b..9672970d6 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCDate" is 1
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A2_T1.js
- * @description The "length" property of the "setUTCDate" is 1
- */
+/*---
+info: The "length" property of the "setUTCDate" is 1
+description: The "length" property of the "setUTCDate" is 1
+---*/
 
 if(Date.prototype.setUTCDate.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCDate has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCDate.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCDate.length !== 1){
   $ERROR('#2: The "length" property of the setUTCDate is 1');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T1.js
index c524ec87e..d9e5b3ee4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCDate.length;
 Date.prototype.setUTCDate.length = 1;
 if (Date.prototype.setUTCDate.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCDate.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T2.js
index 39582f3df..5c509af1d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCDate.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCDate.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCDate.length  !== false) {
 if (!Date.prototype.setUTCDate.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCDate.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T3.js
index f67320131..79724bde5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCDate property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.37/S15.9.5.37_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCDate property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCDate.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCDate.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCDate) {
     $ERROR('#2: The Date.prototype.setUTCDate.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T1.js
index f2be81b67..85955bd18 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setMonth" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setMonth;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setMonth === x) {
   $ERROR('#1: The Date.prototype.setMonth has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T2.js
index 139e310a8..b69a2dfd9 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setMonth" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMonth  === false) {
   $ERROR('#1: The Date.prototype.setMonth property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setMonth  === false) {
 if (Date.prototype.hasOwnProperty('setMonth')) {
   $FAIL('#2: The Date.prototype.setMonth property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T3.js
index 162a054cf..be7e53d72 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setMonth" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setMonth')) {
   $ERROR('#1: The Date.prototype.setMonth property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setMonth has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A2_T1.js
index 92b0536b4..a1823910d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setMonth" is 2
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A2_T1.js
- * @description The "length" property of the "setMonth" is 2
- */
+/*---
+info: The "length" property of the "setMonth" is 2
+description: The "length" property of the "setMonth" is 2
+---*/
 
 if(Date.prototype.setMonth.hasOwnProperty("length") !== true){
   $ERROR('#1: The setMonth has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setMonth.hasOwnProperty("length") !== true){
 if(Date.prototype.setMonth.length !== 2){
   $ERROR('#2: The "length" property of the setMonth is 2');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T1.js
index 95f5e6e4d..e5162f4b4 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setMonth.length;
 Date.prototype.setMonth.length = 1;
 if (Date.prototype.setMonth.length !== x) {
   $ERROR('#1: The Date.prototype.setMonth.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T2.js
index 748d8c0d8..976dd2c0d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setMonth.length  !== false) {
   $ERROR('#1: The Date.prototype.setMonth.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setMonth.length  !== false) {
 if (!Date.prototype.setMonth.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setMonth.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T3.js
index 44dbf4120..8be8f7366 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.38/S15.9.5.38_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setMonth property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setMonth.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setMonth.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setMonth) {
     $ERROR('#2: The Date.prototype.setMonth.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T1.js
index cda7834d4..96b599421 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCMonth" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMonth;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCMonth === x) {
   $ERROR('#1: The Date.prototype.setUTCMonth has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T2.js
index 7410ef8df..1acad798f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCMonth" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMonth  === false) {
   $ERROR('#1: The Date.prototype.setUTCMonth property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCMonth  === false) {
 if (Date.prototype.hasOwnProperty('setUTCMonth')) {
   $FAIL('#2: The Date.prototype.setUTCMonth property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T3.js
index d4903506c..f776df416 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCMonth" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCMonth" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCMonth')) {
   $ERROR('#1: The Date.prototype.setUTCMonth property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCMonth has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A2_T1.js
index ca7e80273..57281bd02 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCMonth" is 2
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A2_T1.js
- * @description The "length" property of the "setUTCMonth" is 2
- */
+/*---
+info: The "length" property of the "setUTCMonth" is 2
+description: The "length" property of the "setUTCMonth" is 2
+---*/
 
 if(Date.prototype.setUTCMonth.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCMonth has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCMonth.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCMonth.length !== 2){
   $ERROR('#2: The "length" property of the setUTCMonth is 2');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T1.js
index 83b94e76b..678a8a6bb 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCMonth.length;
 Date.prototype.setUTCMonth.length = 1;
 if (Date.prototype.setUTCMonth.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCMonth.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T2.js
index e136c348c..5c848b07a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCMonth.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCMonth.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCMonth.length  !== false) {
 if (!Date.prototype.setUTCMonth.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCMonth.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T3.js
index ae997c7a6..a772ce07d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCMonth property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.39/S15.9.5.39_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCMonth property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCMonth.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCMonth.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCMonth) {
     $ERROR('#2: The Date.prototype.setUTCMonth.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T1.js
index 2ccd4cd33..878511b6c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "toTimeString" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toTimeString;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.toTimeString === x) {
   $ERROR('#1: The Date.prototype.toTimeString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T2.js
index 34b5d5e9b..2867c22a2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "toTimeString" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toTimeString  === false) {
   $ERROR('#1: The Date.prototype.toTimeString property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.toTimeString  === false) {
 if (Date.prototype.hasOwnProperty('toTimeString')) {
   $FAIL('#2: The Date.prototype.toTimeString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T3.js
index f5347efe9..f8bc12fcd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "toTimeString" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toTimeString')) {
   $ERROR('#1: The Date.prototype.toTimeString property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toTimeString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A2_T1.js
index e715fc04c..da0425ed2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toTimeString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A2_T1.js
- * @description The "length" property of the "toTimeString" is 0
- */
+/*---
+info: The "length" property of the "toTimeString" is 0
+description: The "length" property of the "toTimeString" is 0
+---*/
 
 if(Date.prototype.toTimeString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toTimeString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toTimeString.hasOwnProperty("length") !== true){
 if(Date.prototype.toTimeString.length !== 0){
   $ERROR('#2: The "length" property of the toTimeString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T1.js
index 95acec7b9..f618c3123 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toTimeString.length;
 Date.prototype.toTimeString.length = 1;
 if (Date.prototype.toTimeString.length !== x) {
   $ERROR('#1: The Date.prototype.toTimeString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T2.js
index 50b977a8f..9de3908b8 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toTimeString.length  !== false) {
   $ERROR('#1: The Date.prototype.toTimeString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toTimeString.length  !== false) {
 if (!Date.prototype.toTimeString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toTimeString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T3.js
index 06d643a03..4f30d278a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.4/S15.9.5.4_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toTimeString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toTimeString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toTimeString) {
     $ERROR('#2: The Date.prototype.toTimeString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/15.9.5.40_1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/15.9.5.40_1.js
index c863d9df7..7b4babe69 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/15.9.5.40_1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/15.9.5.40_1.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.40/15.9.5.40_1.js

- * @description Date.prototype.setFullYear - Date.prototype is itself an instance of Date

- */

-

-

-function testcase() {

-    try {

-        var origYear = Date.prototype.getFullYear();

-        Date.prototype.setFullYear(2012);

-        return Date.prototype.getFullYear()===2012;

-    } finally {

-        Date.prototype.setFullYear(origYear);

-    }

-}

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.setFullYear - Date.prototype is itself an instance
+    of Date
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    try {
+        var origYear = Date.prototype.getFullYear();
+        Date.prototype.setFullYear(2012);
+        return Date.prototype.getFullYear()===2012;
+    } finally {
+        Date.prototype.setFullYear(origYear);
+    }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T1.js
index eed001722..ce47ec558 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setFullYear" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setFullYear;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setFullYear === x) {
   $ERROR('#1: The Date.prototype.setFullYear has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T2.js
index f47ef8e8e..ecbb80c3f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setFullYear" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setFullYear  === false) {
   $ERROR('#1: The Date.prototype.setFullYear property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setFullYear  === false) {
 if (Date.prototype.hasOwnProperty('setFullYear')) {
   $FAIL('#2: The Date.prototype.setFullYear property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T3.js
index 269dff07b..84e711983 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setFullYear" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setFullYear')) {
   $ERROR('#1: The Date.prototype.setFullYear property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setFullYear has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A2_T1.js
index 3252fcf51..4e0868f9d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setFullYear" is 3
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A2_T1.js
- * @description The "length" property of the "setFullYear" is 3
- */
+/*---
+info: The "length" property of the "setFullYear" is 3
+description: The "length" property of the "setFullYear" is 3
+---*/
 
 if(Date.prototype.setFullYear.hasOwnProperty("length") !== true){
   $ERROR('#1: The setFullYear has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setFullYear.hasOwnProperty("length") !== true){
 if(Date.prototype.setFullYear.length !== 3){
   $ERROR('#2: The "length" property of the setFullYear is 3');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T1.js
index 3f98730ba..480eb2444 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setFullYear.length;
 Date.prototype.setFullYear.length = 1;
 if (Date.prototype.setFullYear.length !== x) {
   $ERROR('#1: The Date.prototype.setFullYear.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T2.js
index 0178e6d61..672cd63fc 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setFullYear.length  !== false) {
   $ERROR('#1: The Date.prototype.setFullYear.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setFullYear.length  !== false) {
 if (!Date.prototype.setFullYear.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setFullYear.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T3.js
index 81908fec2..aba07828f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.40/S15.9.5.40_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setFullYear.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setFullYear.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setFullYear) {
     $ERROR('#2: The Date.prototype.setFullYear.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T1.js
index 758701c31..8985e6396 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCFullYear;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.setUTCFullYear === x) {
   $ERROR('#1: The Date.prototype.setUTCFullYear has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T2.js
index b0d1be915..8fef08fcb 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCFullYear  === false) {
   $ERROR('#1: The Date.prototype.setUTCFullYear property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.setUTCFullYear  === false) {
 if (Date.prototype.hasOwnProperty('setUTCFullYear')) {
   $FAIL('#2: The Date.prototype.setUTCFullYear property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T3.js
index 05ac995a2..abde07230 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "setUTCFullYear" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('setUTCFullYear')) {
   $ERROR('#1: The Date.prototype.setUTCFullYear property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.setUTCFullYear has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A2_T1.js
index 7d606db98..36ed3762e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "setUTCFullYear" is 3
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A2_T1.js
- * @description The "length" property of the "setUTCFullYear" is 3
- */
+/*---
+info: The "length" property of the "setUTCFullYear" is 3
+description: The "length" property of the "setUTCFullYear" is 3
+---*/
 
 if(Date.prototype.setUTCFullYear.hasOwnProperty("length") !== true){
   $ERROR('#1: The setUTCFullYear has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.setUTCFullYear.hasOwnProperty("length") !== true){
 if(Date.prototype.setUTCFullYear.length !== 3){
   $ERROR('#2: The "length" property of the setUTCFullYear is 3');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T1.js
index 282dfc410..80620fdb2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.setUTCFullYear.length;
 Date.prototype.setUTCFullYear.length = 1;
 if (Date.prototype.setUTCFullYear.length !== x) {
   $ERROR('#1: The Date.prototype.setUTCFullYear.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T2.js
index 02e4d52eb..2c139b82b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.setUTCFullYear.length  !== false) {
   $ERROR('#1: The Date.prototype.setUTCFullYear.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.setUTCFullYear.length  !== false) {
 if (!Date.prototype.setUTCFullYear.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.setUTCFullYear.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T3.js
index bae4122b2..ba7bc73ed 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.setUTCFullYear property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.41/S15.9.5.41_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.setUTCFullYear property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.setUTCFullYear.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.setUTCFullYear.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.setUTCFullYear) {
     $ERROR('#2: The Date.prototype.setUTCFullYear.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T1.js
index 0f212776e..72c5124b0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toUTCString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "toUTCString" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toUTCString;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.toUTCString === x) {
   $ERROR('#1: The Date.prototype.toUTCString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T2.js
index 9c6e927ee..7deb84ffe 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toUTCString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "toUTCString" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toUTCString  === false) {
   $ERROR('#1: The Date.prototype.toUTCString property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.toUTCString  === false) {
 if (Date.prototype.hasOwnProperty('toUTCString')) {
   $FAIL('#2: The Date.prototype.toUTCString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T3.js
index 6ff43e092..d8469590a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toUTCString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "toUTCString" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toUTCString')) {
   $ERROR('#1: The Date.prototype.toUTCString property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toUTCString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A2_T1.js
index 4f001e19a..53ea3a74f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toUTCString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A2_T1.js
- * @description The "length" property of the "toUTCString" is 0
- */
+/*---
+info: The "length" property of the "toUTCString" is 0
+description: The "length" property of the "toUTCString" is 0
+---*/
 
 if(Date.prototype.toUTCString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toUTCString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toUTCString.hasOwnProperty("length") !== true){
 if(Date.prototype.toUTCString.length !== 0){
   $ERROR('#2: The "length" property of the toUTCString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T1.js
index d20074d8b..4d1f85be5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toUTCString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toUTCString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toUTCString.length;
 Date.prototype.toUTCString.length = 1;
 if (Date.prototype.toUTCString.length !== x) {
   $ERROR('#1: The Date.prototype.toUTCString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T2.js
index c25c220ed..1ef10449b 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toUTCString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toUTCString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toUTCString.length  !== false) {
   $ERROR('#1: The Date.prototype.toUTCString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toUTCString.length  !== false) {
 if (!Date.prototype.toUTCString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toUTCString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T3.js
index cdd78f501..2113c32e1 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toUTCString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.42/S15.9.5.42_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toUTCString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toUTCString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toUTCString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toUTCString) {
     $ERROR('#2: The Date.prototype.toUTCString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-10.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-10.js
index c8e9efde3..9f0ade23a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-10.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-10.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-10.js

- * @description Date.prototype.toISOString - RangeError is not thrown when value of date is Date(1970, 0, -99999999, 0, 0, 0, 1), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-

-        if (timeZoneMinutes > 0) {

-            date = new Date(1970, 0, -99999999, 0, 0, 0, 1);

-

-            try {

-                date.toISOString();

-                return false;

-            } catch (e) {

-                return e instanceof RangeError;

-            }

-        } else {

-            date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes + 60, 0, 1);

-

-            dateStr = date.toISOString();

-

-            return dateStr[dateStr.length - 1] === "Z";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is not thrown when value
+    of date is Date(1970, 0, -99999999, 0, 0, 0, 1), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+
+        if (timeZoneMinutes > 0) {
+            date = new Date(1970, 0, -99999999, 0, 0, 0, 1);
+
+            try {
+                date.toISOString();
+                return false;
+            } catch (e) {
+                return e instanceof RangeError;
+            }
+        } else {
+            date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes + 60, 0, 1);
+
+            dateStr = date.toISOString();
+
+            return dateStr[dateStr.length - 1] === "Z";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-11.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-11.js
index 0c799c923..94445f085 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-11.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-11.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-11.js

- * @description Date.prototype.toISOString - RangeError is not thrown when value of date is Date(1970, 0, 100000001, 0, 0, 0, -1), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-

-        date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes - 60, 0, -1);

-        dateStr = date.toISOString();

-

-        return dateStr[dateStr.length - 1] === "Z";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is not thrown when value
+    of date is Date(1970, 0, 100000001, 0, 0, 0, -1), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+
+        date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes - 60, 0, -1);
+        dateStr = date.toISOString();
+
+        return dateStr[dateStr.length - 1] === "Z";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-12.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-12.js
index 26fe670d6..80d0e06fa 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-12.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-12.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-12.js

- * @description Date.prototype.toISOString - RangeError is not thrown when value of date is Date(1970, 0, 100000001, 0, 0, 0, 0), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-

-        date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes - 60, 0, 0);

-        dateStr = date.toISOString();

-

-        return dateStr[dateStr.length - 1] === "Z";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is not thrown when value
+    of date is Date(1970, 0, 100000001, 0, 0, 0, 0), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+
+        date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes - 60, 0, 0);
+        dateStr = date.toISOString();
+
+        return dateStr[dateStr.length - 1] === "Z";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-13.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-13.js
index 6d55349b4..b3c3a97f8 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-13.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-13.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-13.js

- * @description Date.prototype.toISOString - RangeError is thrown when value of date is Date(1970, 0, 100000001, 0, 0, 0, 1), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-        try {

-            if (timeZoneMinutes > 0) {

-                date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes + 60, 0, 1);

-                dateStr = date.toISOString();

-                return false;

-            } else {

-                date = new Date(1970, 0, 100000001, 0, 0, 0, 1);

-                dateStr = date.toISOString();

-                return false;

-            }

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is thrown when value of
+    date is Date(1970, 0, 100000001, 0, 0, 0, 1), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+        try {
+            if (timeZoneMinutes > 0) {
+                date = new Date(1970, 0, 100000001, 0, 0 + timeZoneMinutes + 60, 0, 1);
+                dateStr = date.toISOString();
+                return false;
+            } else {
+                date = new Date(1970, 0, 100000001, 0, 0, 0, 1);
+                dateStr = date.toISOString();
+                return false;
+            }
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-14.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-14.js
index f45aa5b80..11234d068 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-14.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-14.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-14.js

- * @description Date.prototype.toISOString - when value of year is -Infinity Date.prototype.toISOString throw the RangeError

- */

-

-

-function testcase() {

-        var date = new Date(-Infinity, 1, 70, 0, 0, 0);

-

-        try {

-            date.toISOString();

-        } catch (ex) {

-            return ex instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - when value of year is -Infinity
+    Date.prototype.toISOString throw the RangeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var date = new Date(-Infinity, 1, 70, 0, 0, 0);
+
+        try {
+            date.toISOString();
+        } catch (ex) {
+            return ex instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-15.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-15.js
index 7b2bde326..4c75aa10a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-15.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-15.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-15.js

- * @description Date.prototype.toISOString - value of year is Infinity Date.prototype.toISOString throw the RangeError

- */

-

-

-function testcase() {

-        var date = new Date(Infinity, 1, 70, 0, 0, 0);

-

-        try {

-            date.toISOString();

-        } catch (ex) {

-            return ex instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - value of year is Infinity
+    Date.prototype.toISOString throw the RangeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var date = new Date(Infinity, 1, 70, 0, 0, 0);
+
+        try {
+            date.toISOString();
+        } catch (ex) {
+            return ex instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-16.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-16.js
index b9bb639aa..22887fb69 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-16.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-16.js
@@ -1,22 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-16.js

- * @description Date.prototype.toISOString - when this is a String object that value format is 'YYYY-MM-DDTHH:mm:ss.sssZ' Date.prototype.toISOString throw the TypeError

- */

-

-

-function testcase() {

-        var date = new String("1970-01-00000:00:00.000Z");

-

-        try {

-            Date.prototype.toISOString.call(date);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - when this is a String object that
+    value format is 'YYYY-MM-DDTHH:mm:ss.sssZ'
+    Date.prototype.toISOString throw the TypeError
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var date = new String("1970-01-00000:00:00.000Z");
+
+        try {
+            Date.prototype.toISOString.call(date);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-2.js
index a37905d70..415b0c0de 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-2.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-2.js

- * @description Date.prototype.toISOString must exist as a function taking 0 parameters

- */

-

-

-function testcase() {

-        return Date.prototype.toISOString.length === 0;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString must exist as a function taking 0
+    parameters
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return Date.prototype.toISOString.length === 0;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-3.js
index 2d27b3155..dc9efacae 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-3.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-3.js

- * @description Date.prototype.toISOString must exist as a function

- */

-

-

-function testcase() {

-        return typeof (Date.prototype.toISOString) === "function";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.prototype.toISOString must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        return typeof (Date.prototype.toISOString) === "function";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-4.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-4.js
index 2d716f6ce..170dfc2c5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-4.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-4.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-4.js

- * @description Date.prototype.toISOString - format of returned string is 'YYYY-MM-DDTHH:mm:ss.sssZ', the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var date = new Date(1999, 9, 10, 10, 10, 10, 10);

-        var localDate = new Date(date.getTime() - date.getTimezoneOffset() * 60000);

-

-        return localDate.toISOString() === "1999-10-10T10:10:10.010Z";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - format of returned string is
+    'YYYY-MM-DDTHH:mm:ss.sssZ', the time zone is UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var date = new Date(1999, 9, 10, 10, 10, 10, 10);
+        var localDate = new Date(date.getTime() - date.getTimezoneOffset() * 60000);
+
+        return localDate.toISOString() === "1999-10-10T10:10:10.010Z";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-5.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-5.js
index a214ce397..471c31b03 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-5.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-5.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-5.js

- * @description Date.prototype.toISOString - The returned string is the UTC time zone(0)

- */

-

-

-function testcase() {

-        var dateStr = (new Date()).toISOString();

-        return dateStr[dateStr.length - 1] === "Z";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - The returned string is the UTC time
+    zone(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var dateStr = (new Date()).toISOString();
+        return dateStr[dateStr.length - 1] === "Z";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-6.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-6.js
index 19d0df0ea..e4bc5642e 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-6.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-6.js

- * @description Date.prototype.toISOString - TypeError is thrown when this is any other objects instead of Date object

- */

-

-

-function testcase() {

-

-        try {

-            Date.prototype.toISOString.call([]);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - TypeError is thrown when this is any
+    other objects instead of Date object
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Date.prototype.toISOString.call([]);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-7.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-7.js
index 52c70ffea..d307851db 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-7.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-7.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-7.js

- * @description Date.prototype.toISOString - TypeError is thrown when this is any primitive values

- */

-

-

-function testcase() {

-

-        try {

-            Date.prototype.toISOString.call(15);

-            return false;

-        } catch (ex) {

-            return ex instanceof TypeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - TypeError is thrown when this is any
+    primitive values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        try {
+            Date.prototype.toISOString.call(15);
+            return false;
+        } catch (ex) {
+            return ex instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-8.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-8.js
index b21867345..ddbfb9568 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-8.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-8.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-8.js

- * @description Date.prototype.toISOString - RangeError is thrown when value of date is Date(1970, 0, -99999999, 0, 0, 0, -1), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-        try {

-            if (timeZoneMinutes > 0) {

-                date = new Date(1970, 0, -99999999, 0, 0, 0, -1);

-            } else {

-                date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes - 60, 0, -1);

-            }

-

-            dateStr = date.toISOString();

-

-            return false;

-        } catch (e) {

-            return e instanceof RangeError;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is thrown when value of
+    date is Date(1970, 0, -99999999, 0, 0, 0, -1), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+        try {
+            if (timeZoneMinutes > 0) {
+                date = new Date(1970, 0, -99999999, 0, 0, 0, -1);
+            } else {
+                date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes - 60, 0, -1);
+            }
+
+            dateStr = date.toISOString();
+
+            return false;
+        } catch (e) {
+            return e instanceof RangeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-9.js b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-9.js
index cd2d640e2..81ec72ba0 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-9.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-9.js
@@ -1,33 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.43/15.9.5.43-0-9.js

- * @description Date.prototype.toISOString - RangeError is not thrown when value of date is Date(1970, 0, -99999999, 0, 0, 0, 0), the time zone is UTC(0)

- */

-

-

-function testcase() {

-        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);

-        var date, dateStr;

-

-        if (timeZoneMinutes > 0) {

-            date = new Date(1970, 0, -99999999, 0, 0, 0, 0);

-

-            try {

-                date.toISOString();

-                return false;

-            } catch (e) {

-                return e instanceof RangeError;

-            }

-        } else {

-            date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes + 60, 0, 0);

-

-            dateStr = date.toISOString();

-

-            return dateStr[dateStr.length - 1] === "Z";

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Date.prototype.toISOString - RangeError is not thrown when value
+    of date is Date(1970, 0, -99999999, 0, 0, 0, 0), the time zone is
+    UTC(0)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var timeZoneMinutes = new Date().getTimezoneOffset() * (-1);
+        var date, dateStr;
+
+        if (timeZoneMinutes > 0) {
+            date = new Date(1970, 0, -99999999, 0, 0, 0, 0);
+
+            try {
+                date.toISOString();
+                return false;
+            } catch (e) {
+                return e instanceof RangeError;
+            }
+        } else {
+            date = new Date(1970, 0, -99999999, 0, 0 + timeZoneMinutes + 60, 0, 0);
+
+            dateStr = date.toISOString();
+
+            return dateStr[dateStr.length - 1] === "Z";
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-1.js
index 5d0bfeb6e..ab1fda74c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-1.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-1.js

- * @description Date.prototype.toJSON must exist as a function

- */

-

-

-function testcase() {

-  var f = Date.prototype.toJSON;

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.prototype.toJSON must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Date.prototype.toJSON;
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-2.js
index 38a34a5bc..7b7c20fe2 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.9/15.9.5/15.9.5.44/15.9.5.44-0-2.js

- * @description Date.prototype.toJSON must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Date.prototype.toJSON.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Date.prototype.toJSON must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Date.prototype.toJSON.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T1.js
index 2e689a291..97e12b003 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "toLocaleString" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleString;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.toLocaleString === x) {
   $ERROR('#1: The Date.prototype.toLocaleString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T2.js
index 0597790ba..65e7040a9 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "toLocaleString" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleString  === false) {
   $ERROR('#1: The Date.prototype.toLocaleString property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.toLocaleString  === false) {
 if (Date.prototype.hasOwnProperty('toLocaleString')) {
   $FAIL('#2: The Date.prototype.toLocaleString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T3.js
index e50c50234..5aa5454eb 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "toLocaleString" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toLocaleString')) {
   $ERROR('#1: The Date.prototype.toLocaleString property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toLocaleString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A2_T1.js
index 27d81cb13..055955eb3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toLocaleString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A2_T1.js
- * @description The "length" property of the "toLocaleString" is 0
- */
+/*---
+info: The "length" property of the "toLocaleString" is 0
+description: The "length" property of the "toLocaleString" is 0
+---*/
 
 if(Date.prototype.toLocaleString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toLocaleString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toLocaleString.hasOwnProperty("length") !== true){
 if(Date.prototype.toLocaleString.length !== 0){
   $ERROR('#2: The "length" property of the toLocaleString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T1.js
index 8c81b0c92..7f82de091 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleString.length;
 Date.prototype.toLocaleString.length = 1;
 if (Date.prototype.toLocaleString.length !== x) {
   $ERROR('#1: The Date.prototype.toLocaleString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T2.js
index c5b47908c..d088846b9 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleString.length  !== false) {
   $ERROR('#1: The Date.prototype.toLocaleString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toLocaleString.length  !== false) {
 if (!Date.prototype.toLocaleString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toLocaleString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T3.js
index b8921b7a5..a60768720 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.5/S15.9.5.5_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toLocaleString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toLocaleString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toLocaleString) {
     $ERROR('#2: The Date.prototype.toLocaleString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T1.js
index 3c133d009..686c2b0ca 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleDateString" has { DontEnum }
+    attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleDateString;
 if(x === 1)
@@ -16,5 +16,3 @@ else
 if (Date.prototype.toLocaleDateString === x) {
   $ERROR('#1: The Date.prototype.toLocaleDateString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T2.js
index 47f1f4277..ff1342482 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleDateString" has { DontEnum }
+    attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleDateString  === false) {
   $ERROR('#1: The Date.prototype.toLocaleDateString property has not the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toLocaleDateString  === false) {
 if (Date.prototype.hasOwnProperty('toLocaleDateString')) {
   $FAIL('#2: The Date.prototype.toLocaleDateString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T3.js
index 4d9c51550..462cc9077 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleDateString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleDateString" has { DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toLocaleDateString')) {
   $ERROR('#1: The Date.prototype.toLocaleDateString property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toLocaleDateString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A2_T1.js
index c9d389f59..f63559b5d 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toLocaleDateString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A2_T1.js
- * @description The "length" property of the "toLocaleDateString" is 0
- */
+/*---
+info: The "length" property of the "toLocaleDateString" is 0
+description: The "length" property of the "toLocaleDateString" is 0
+---*/
 
 if(Date.prototype.toLocaleDateString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toLocaleDateString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toLocaleDateString.hasOwnProperty("length") !== true){
 if(Date.prototype.toLocaleDateString.length !== 0){
   $ERROR('#2: The "length" property of the toLocaleDateString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T1.js
index 2f084f6fb..1756a1621 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleDateString.length;
 Date.prototype.toLocaleDateString.length = 1;
 if (Date.prototype.toLocaleDateString.length !== x) {
   $ERROR('#1: The Date.prototype.toLocaleDateString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T2.js
index fe41070eb..8942bbdd3 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleDateString.length  !== false) {
   $ERROR('#1: The Date.prototype.toLocaleDateString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toLocaleDateString.length  !== false) {
 if (!Date.prototype.toLocaleDateString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toLocaleDateString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T3.js
index 711997c20..eef709369 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleDateString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.6/S15.9.5.6_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleDateString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toLocaleDateString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toLocaleDateString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toLocaleDateString) {
     $ERROR('#2: The Date.prototype.toLocaleDateString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T1.js
index 29c7d077d..6af44d2cd 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleTimeString" has { DontEnum }
+    attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleTimeString;
 if(x === 1)
@@ -16,5 +16,3 @@ else
 if (Date.prototype.toLocaleTimeString === x) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T2.js
index 30e58a91e..edd446033 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleTimeString" has { DontEnum }
+    attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleTimeString  === false) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString property has not the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toLocaleTimeString  === false) {
 if (Date.prototype.hasOwnProperty('toLocaleTimeString')) {
   $FAIL('#2: The Date.prototype.toLocaleTimeString property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T3.js
index 61b3a2482..4c591355f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "toLocaleTimeString" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype property "toLocaleTimeString" has { DontEnum }
+    attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('toLocaleTimeString')) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.toLocaleTimeString has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A2_T1.js
index be00eb3c4..fdcc03799 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "toLocaleTimeString" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A2_T1.js
- * @description The "length" property of the "toLocaleTimeString" is 0
- */
+/*---
+info: The "length" property of the "toLocaleTimeString" is 0
+description: The "length" property of the "toLocaleTimeString" is 0
+---*/
 
 if(Date.prototype.toLocaleTimeString.hasOwnProperty("length") !== true){
   $ERROR('#1: The toLocaleTimeString has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.toLocaleTimeString.hasOwnProperty("length") !== true){
 if(Date.prototype.toLocaleTimeString.length !== 0){
   $ERROR('#2: The "length" property of the toLocaleTimeString is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T1.js
index 0e9518387..97070a156 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.toLocaleTimeString.length;
 Date.prototype.toLocaleTimeString.length = 1;
 if (Date.prototype.toLocaleTimeString.length !== x) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T2.js
index 36dda6272..c22f7ec81 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.toLocaleTimeString.length  !== false) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.toLocaleTimeString.length  !== false) {
 if (!Date.prototype.toLocaleTimeString.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.toLocaleTimeString.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T3.js
index 23d6b9d68..b43aec9bb 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.toLocaleTimeString property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.7/S15.9.5.7_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.toLocaleTimeString property "length" has { ReadOnly,
+    DontDelete, DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.toLocaleTimeString.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.toLocaleTimeString.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.toLocaleTimeString) {
     $ERROR('#2: The Date.prototype.toLocaleTimeString.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T1.js
index 34bec1bbc..6e3e70c69 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "valueOf" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "valueOf" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.valueOf;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.valueOf === x) {
   $ERROR('#1: The Date.prototype.valueOf has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T2.js
index cad6fca8e..f62a26283 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "valueOf" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "valueOf" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.valueOf  === false) {
   $ERROR('#1: The Date.prototype.valueOf property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.valueOf  === false) {
 if (Date.prototype.hasOwnProperty('valueOf')) {
   $FAIL('#2: The Date.prototype.valueOf property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T3.js
index 3576b8249..2a179599c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "valueOf" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "valueOf" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('valueOf')) {
   $ERROR('#1: The Date.prototype.valueOf property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.valueOf has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A2_T1.js
index 43906a360..65084321f 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "valueOf" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A2_T1.js
- * @description The "length" property of the "valueOf" is 0
- */
+/*---
+info: The "length" property of the "valueOf" is 0
+description: The "length" property of the "valueOf" is 0
+---*/
 
 if(Date.prototype.valueOf.hasOwnProperty("length") !== true){
   $ERROR('#1: The valueOf has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.valueOf.hasOwnProperty("length") !== true){
 if(Date.prototype.valueOf.length !== 0){
   $ERROR('#2: The "length" property of the valueOf is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T1.js
index b8651be96..720320e62 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.valueOf.length;
 Date.prototype.valueOf.length = 1;
 if (Date.prototype.valueOf.length !== x) {
   $ERROR('#1: The Date.prototype.valueOf.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T2.js
index 8730a29c3..25ec4c822 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.valueOf.length  !== false) {
   $ERROR('#1: The Date.prototype.valueOf.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.valueOf.length  !== false) {
 if (!Date.prototype.valueOf.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.valueOf.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T3.js
index d9a983d99..8f30e46a5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.8/S15.9.5.8_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.valueOf property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.valueOf.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.valueOf.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.valueOf) {
     $ERROR('#2: The Date.prototype.valueOf.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T1.js
index 77612f2de..698cd4b32 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T1.js
- * @description Checking absence of ReadOnly attribute
- */
+/*---
+info: The Date.prototype property "getTime" has { DontEnum } attributes
+description: Checking absence of ReadOnly attribute
+---*/
 
 x = Date.prototype.getTime;
 if(x === 1)
@@ -16,5 +14,3 @@ else
 if (Date.prototype.getTime === x) {
   $ERROR('#1: The Date.prototype.getTime has not the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T2.js
index e31ccafae..d65f8d8a5 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T2.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T2.js
- * @description Checking absence of DontDelete attribute
- */
+/*---
+info: The Date.prototype property "getTime" has { DontEnum } attributes
+description: Checking absence of DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getTime  === false) {
   $ERROR('#1: The Date.prototype.getTime property has not the attributes DontDelete');
@@ -15,5 +14,3 @@ if (delete Date.prototype.getTime  === false) {
 if (Date.prototype.hasOwnProperty('getTime')) {
   $FAIL('#2: The Date.prototype.getTime property has not the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T3.js
index e8b85fa1a..91852225c 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype property "getTime" has { DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A1_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: The Date.prototype property "getTime" has { DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.propertyIsEnumerable('getTime')) {
   $ERROR('#1: The Date.prototype.getTime property has the attribute DontEnum');
@@ -17,5 +15,3 @@ for(x in Date.prototype) {
     $ERROR('#2: The Date.prototype.getTime has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A2_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A2_T1.js
index ef403fcbd..bc3c8b440 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The "length" property of the "getTime" is 0
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A2_T1.js
- * @description The "length" property of the "getTime" is 0
- */
+/*---
+info: The "length" property of the "getTime" is 0
+description: The "length" property of the "getTime" is 0
+---*/
 
 if(Date.prototype.getTime.hasOwnProperty("length") !== true){
   $ERROR('#1: The getTime has a "length" property');
@@ -15,5 +13,3 @@ if(Date.prototype.getTime.hasOwnProperty("length") !== true){
 if(Date.prototype.getTime.length !== 0){
   $ERROR('#2: The "length" property of the getTime is 0');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T1.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T1.js
index a10f337c0..adebbad84 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T1.js
@@ -1,17 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T1.js
- * @description Checking ReadOnly attribute
- */
+/*---
+info: >
+    The Date.prototype.getTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking ReadOnly attribute
+---*/
 
 x = Date.prototype.getTime.length;
 Date.prototype.getTime.length = 1;
 if (Date.prototype.getTime.length !== x) {
   $ERROR('#1: The Date.prototype.getTime.length has the attribute ReadOnly');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T2.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T2.js
index b2d85ac08..ffe307872 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T2.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T2.js
- * @description Checking DontDelete attribute
- */
+/*---
+info: >
+    The Date.prototype.getTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontDelete attribute
+includes: [$FAIL.js]
+---*/
 
 if (delete Date.prototype.getTime.length  !== false) {
   $ERROR('#1: The Date.prototype.getTime.length property has the attributes DontDelete');
@@ -15,5 +16,3 @@ if (delete Date.prototype.getTime.length  !== false) {
 if (!Date.prototype.getTime.hasOwnProperty('length')) {
   $FAIL('#2: The Date.prototype.getTime.length property has the attributes DontDelete');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T3.js b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T3.js
index 20f77f3fc..102fc5c3a 100644
--- a/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T3.js
+++ b/test/suite/ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype.getTime property "length" has { ReadOnly, DontDelete, DontEnum } attributes
- *
- * @path ch15/15.9/15.9.5/15.9.5.9/S15.9.5.9_A3_T3.js
- * @description Checking DontEnum attribute
- */
+/*---
+info: >
+    The Date.prototype.getTime property "length" has { ReadOnly, DontDelete,
+    DontEnum } attributes
+description: Checking DontEnum attribute
+---*/
 
 if (Date.prototype.getTime.propertyIsEnumerable('length')) {
   $ERROR('#1: The Date.prototype.getTime.length property has the attribute DontEnum');
@@ -17,5 +17,3 @@ for(x in Date.prototype.getTime) {
     $ERROR('#2: The Date.prototype.getTime.length has the attribute DontEnum');
   }
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A01_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A01_T1.js
index 0f2a8e241..b49fbdba0 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A01_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A01_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "constructor"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A01_T1.js
- * @description The Date.prototype has the property "constructor"
- */
+/*---
+info: The Date.prototype has the property "constructor"
+description: The Date.prototype has the property "constructor"
+---*/
 
 if(Date.prototype.hasOwnProperty("constructor") !== true){
   $ERROR('#1: The Date.prototype has the property "constructor"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A02_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A02_T1.js
index 78c72f007..ff32741a4 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A02_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A02_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A02_T1.js
- * @description The Date.prototype has the property "toString"
- */
+/*---
+info: The Date.prototype has the property "toString"
+description: The Date.prototype has the property "toString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toString") !== true){
   $ERROR('#1: The Date.prototype has the property "toString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A03_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A03_T1.js
index e73d4016b..1054ba1b0 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A03_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A03_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toDateString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A03_T1.js
- * @description The Date.prototype has the property "toDateString"
- */
+/*---
+info: The Date.prototype has the property "toDateString"
+description: The Date.prototype has the property "toDateString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toDateString") !== true){
   $ERROR('#1: The Date.prototype has the property "toDateString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A04_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A04_T1.js
index 6a8dd9cfe..cdc83469e 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A04_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A04_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toTimeString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A04_T1.js
- * @description The Date.prototype has the property "toTimeString"
- */
+/*---
+info: The Date.prototype has the property "toTimeString"
+description: The Date.prototype has the property "toTimeString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toTimeString") !== true){
   $ERROR('#1: The Date.prototype has the property "toTimeString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A05_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A05_T1.js
index f42b4f00b..3cf140765 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A05_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A05_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toLocaleString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A05_T1.js
- * @description The Date.prototype has the property "toLocaleString"
- */
+/*---
+info: The Date.prototype has the property "toLocaleString"
+description: The Date.prototype has the property "toLocaleString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toLocaleString") !== true){
   $ERROR('#1: The Date.prototype has the property "toLocaleString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A06_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A06_T1.js
index eb60ccdde..3a4742993 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A06_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A06_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toLocaleDateString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A06_T1.js
- * @description The Date.prototype has the property "toLocaleDateString"
- */
+/*---
+info: The Date.prototype has the property "toLocaleDateString"
+description: The Date.prototype has the property "toLocaleDateString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toLocaleDateString") !== true){
   $ERROR('#1: The Date.prototype has the property "toLocaleDateString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A07_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A07_T1.js
index a90a02ec6..e136a835f 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A07_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A07_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toLocaleTimeString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A07_T1.js
- * @description The Date.prototype has the property "toLocaleTimeString"
- */
+/*---
+info: The Date.prototype has the property "toLocaleTimeString"
+description: The Date.prototype has the property "toLocaleTimeString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toLocaleTimeString") !== true){
   $ERROR('#1: The Date.prototype has the property "toLocaleTimeString"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A08_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A08_T1.js
index 64f093612..6228aeaba 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A08_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A08_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "valueOf"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A08_T1.js
- * @description The Date.prototype has the property "valueOf"
- */
+/*---
+info: The Date.prototype has the property "valueOf"
+description: The Date.prototype has the property "valueOf"
+---*/
 
 if(Date.prototype.hasOwnProperty("valueOf") !== true){
   $ERROR('#1: The Date.prototype has the property "valueOf"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A09_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A09_T1.js
index 3c8bdba83..58df8ab05 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A09_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A09_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getTime"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A09_T1.js
- * @description The Date.prototype has the property "getTime"
- */
+/*---
+info: The Date.prototype has the property "getTime"
+description: The Date.prototype has the property "getTime"
+---*/
 
 if(Date.prototype.hasOwnProperty("getTime") !== true){
   $ERROR('#1: The Date.prototype has the property "getTime"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A10_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A10_T1.js
index 7f104ee37..534fb440b 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A10_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A10_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getFullYear"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A10_T1.js
- * @description The Date.prototype has the property "getFullYear"
- */
+/*---
+info: The Date.prototype has the property "getFullYear"
+description: The Date.prototype has the property "getFullYear"
+---*/
 
 if(Date.prototype.hasOwnProperty("getFullYear") !== true){
   $ERROR('#1: The Date.prototype has the property "getFullYear"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A11_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A11_T1.js
index 8517a7509..723b811e1 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A11_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A11_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCFullYear"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A11_T1.js
- * @description The Date.prototype has the property "getUTCFullYear"
- */
+/*---
+info: The Date.prototype has the property "getUTCFullYear"
+description: The Date.prototype has the property "getUTCFullYear"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCFullYear") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCFullYear"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A12_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A12_T1.js
index 416a4fcf5..db7ca30d5 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A12_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A12_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getMonth"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A12_T1.js
- * @description The Date.prototype has the property "getMonth"
- */
+/*---
+info: The Date.prototype has the property "getMonth"
+description: The Date.prototype has the property "getMonth"
+---*/
 
 if(Date.prototype.hasOwnProperty("getMonth") !== true){
   $ERROR('#1: The Date.prototype has the property "getMonth"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A13_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A13_T1.js
index d0c727e16..0da74b55a 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A13_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A13_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCMonth"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A13_T1.js
- * @description The Date.prototype has the property "getUTCMonth"
- */
+/*---
+info: The Date.prototype has the property "getUTCMonth"
+description: The Date.prototype has the property "getUTCMonth"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCMonth") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCMonth"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A14_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A14_T1.js
index 246f3a46c..b97b5d8e9 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A14_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A14_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getDate"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A14_T1.js
- * @description The Date.prototype has the property "getDate"
- */
+/*---
+info: The Date.prototype has the property "getDate"
+description: The Date.prototype has the property "getDate"
+---*/
 
 if(Date.prototype.hasOwnProperty("getDate") !== true){
   $ERROR('#1: The Date.prototype has the property "getDate"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A15_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A15_T1.js
index 2e7465dfc..becd18049 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A15_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A15_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCDate"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A15_T1.js
- * @description The Date.prototype has the property "getUTCDate"
- */
+/*---
+info: The Date.prototype has the property "getUTCDate"
+description: The Date.prototype has the property "getUTCDate"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCDate") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCDate"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A16_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A16_T1.js
index ef55aa7a9..8b0422f9d 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A16_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A16_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getDay"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A16_T1.js
- * @description The Date.prototype has the property "getDay"
- */
+/*---
+info: The Date.prototype has the property "getDay"
+description: The Date.prototype has the property "getDay"
+---*/
 
 if(Date.prototype.hasOwnProperty("getDay") !== true){
   $ERROR('#1: The Date.prototype has the property "getDay"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A17_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A17_T1.js
index c9bfa485a..4ef6ea1d9 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A17_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A17_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCDay"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A17_T1.js
- * @description The Date.prototype has the property "getUTCDay"
- */
+/*---
+info: The Date.prototype has the property "getUTCDay"
+description: The Date.prototype has the property "getUTCDay"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCDay") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCDay"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A18_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A18_T1.js
index cf8d5245b..d5dc8d374 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A18_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A18_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getHours"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A18_T1.js
- * @description The Date.prototype has the property "getHours"
- */
+/*---
+info: The Date.prototype has the property "getHours"
+description: The Date.prototype has the property "getHours"
+---*/
 
 if(Date.prototype.hasOwnProperty("getHours") !== true){
   $ERROR('#1: The Date.prototype has the property "getHours"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A19_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A19_T1.js
index 2d5b70915..f7b543494 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A19_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A19_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCHours"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A19_T1.js
- * @description The Date.prototype has the property "getUTCHours"
- */
+/*---
+info: The Date.prototype has the property "getUTCHours"
+description: The Date.prototype has the property "getUTCHours"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCHours") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCHours"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A20_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A20_T1.js
index d0d6133ad..1c2650cf4 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A20_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A20_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getMinutes"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A20_T1.js
- * @description The Date.prototype has the property "getMinutes"
- */
+/*---
+info: The Date.prototype has the property "getMinutes"
+description: The Date.prototype has the property "getMinutes"
+---*/
 
 if(Date.prototype.hasOwnProperty("getMinutes") !== true){
   $ERROR('#1: The Date.prototype has the property "getMinutes"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A21_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A21_T1.js
index 12d9ca1ed..1dfed5457 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A21_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A21_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCMinutes"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A21_T1.js
- * @description The Date.prototype has the property "getUTCMinutes"
- */
+/*---
+info: The Date.prototype has the property "getUTCMinutes"
+description: The Date.prototype has the property "getUTCMinutes"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCMinutes") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCMinutes"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A22_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A22_T1.js
index a37801e4b..75155bcc8 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A22_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A22_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getSeconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A22_T1.js
- * @description The Date.prototype has the property "getSeconds"
- */
+/*---
+info: The Date.prototype has the property "getSeconds"
+description: The Date.prototype has the property "getSeconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("getSeconds") !== true){
   $ERROR('#1: The Date.prototype has the property "getSeconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A23_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A23_T1.js
index eeaec5dc2..a41c881bc 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A23_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A23_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCSeconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A23_T1.js
- * @description The Date.prototype has the property "getUTCSeconds"
- */
+/*---
+info: The Date.prototype has the property "getUTCSeconds"
+description: The Date.prototype has the property "getUTCSeconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCSeconds") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCSeconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A24_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A24_T1.js
index d6e868c4e..b6d43965c 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A24_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A24_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getMilliseconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A24_T1.js
- * @description The Date.prototype has the property "getMilliseconds"
- */
+/*---
+info: The Date.prototype has the property "getMilliseconds"
+description: The Date.prototype has the property "getMilliseconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("getMilliseconds") !== true){
   $ERROR('#1: The Date.prototype has the property "getMilliseconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A25_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A25_T1.js
index 04e6f1c84..888987d7a 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A25_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A25_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getUTCMilliseconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A25_T1.js
- * @description The Date.prototype has the property "getUTCMilliseconds"
- */
+/*---
+info: The Date.prototype has the property "getUTCMilliseconds"
+description: The Date.prototype has the property "getUTCMilliseconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("getUTCMilliseconds") !== true){
   $ERROR('#1: The Date.prototype has the property "getUTCMilliseconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A26_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A26_T1.js
index ce76fb651..38db7c015 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A26_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A26_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "getTimezoneOffset"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A26_T1.js
- * @description The Date.prototype has the property "getTimezoneOffset"
- */
+/*---
+info: The Date.prototype has the property "getTimezoneOffset"
+description: The Date.prototype has the property "getTimezoneOffset"
+---*/
 
 if(Date.prototype.hasOwnProperty("getTimezoneOffset") !== true){
   $ERROR('#1: The Date.prototype has the property "getTimezoneOffset"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A27_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A27_T1.js
index 21cd10a25..f141ac415 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A27_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A27_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setTime"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A27_T1.js
- * @description The Date.prototype has the property "setTime"
- */
+/*---
+info: The Date.prototype has the property "setTime"
+description: The Date.prototype has the property "setTime"
+---*/
 
 if(Date.prototype.hasOwnProperty("setTime") !== true){
   $ERROR('#1: The Date.prototype has the property "setTime"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A28_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A28_T1.js
index 902674bed..a4c3e351c 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A28_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A28_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setMilliseconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A28_T1.js
- * @description The Date.prototype has the property "setMilliseconds"
- */
+/*---
+info: The Date.prototype has the property "setMilliseconds"
+description: The Date.prototype has the property "setMilliseconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("setMilliseconds") !== true){
   $ERROR('#1: The Date.prototype has the property "setMilliseconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A29_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A29_T1.js
index 2a01da027..911e52ad9 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A29_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A29_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCMilliseconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A29_T1.js
- * @description The Date.prototype has the property "setUTCMilliseconds"
- */
+/*---
+info: The Date.prototype has the property "setUTCMilliseconds"
+description: The Date.prototype has the property "setUTCMilliseconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCMilliseconds") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCMilliseconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A30_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A30_T1.js
index cda5c8f5b..757f7830d 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A30_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A30_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setSeconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A30_T1.js
- * @description The Date.prototype has the property "setSeconds"
- */
+/*---
+info: The Date.prototype has the property "setSeconds"
+description: The Date.prototype has the property "setSeconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("setSeconds") !== true){
   $ERROR('#1: The Date.prototype has the property "setSeconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A31_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A31_T1.js
index 1e01f2c56..c9163180b 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A31_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A31_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCSeconds"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A31_T1.js
- * @description The Date.prototype has the property "setUTCSeconds"
- */
+/*---
+info: The Date.prototype has the property "setUTCSeconds"
+description: The Date.prototype has the property "setUTCSeconds"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCSeconds") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCSeconds"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A32_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A32_T1.js
index 0af442aa9..c204fdae5 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A32_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A32_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setMinutes"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A32_T1.js
- * @description The Date.prototype has the property "setMinutes"
- */
+/*---
+info: The Date.prototype has the property "setMinutes"
+description: The Date.prototype has the property "setMinutes"
+---*/
 
 if(Date.prototype.hasOwnProperty("setMinutes") !== true){
   $ERROR('#1: The Date.prototype has the property "setMinutes"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A33_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A33_T1.js
index 69e26bfdd..660f38ffa 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A33_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A33_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCMinutes"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A33_T1.js
- * @description The Date.prototype has the property "setUTCMinutes"
- */
+/*---
+info: The Date.prototype has the property "setUTCMinutes"
+description: The Date.prototype has the property "setUTCMinutes"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCMinutes") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCMinutes"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A34_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A34_T1.js
index 5456c1809..944d4a9d6 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A34_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A34_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setHours"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A34_T1.js
- * @description The Date.prototype has the property "setHours"
- */
+/*---
+info: The Date.prototype has the property "setHours"
+description: The Date.prototype has the property "setHours"
+---*/
 
 if(Date.prototype.hasOwnProperty("setHours") !== true){
   $ERROR('#1: The Date.prototype has the property "setHours"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A35_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A35_T1.js
index a12abf8c1..ccba4ecb3 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A35_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A35_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCHours"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A35_T1.js
- * @description The Date.prototype has the property "setUTCHours"
- */
+/*---
+info: The Date.prototype has the property "setUTCHours"
+description: The Date.prototype has the property "setUTCHours"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCHours") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCHours"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A36_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A36_T1.js
index 004946dd7..0eb00271b 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A36_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A36_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setDate"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A36_T1.js
- * @description The Date.prototype has the property "setDate"
- */
+/*---
+info: The Date.prototype has the property "setDate"
+description: The Date.prototype has the property "setDate"
+---*/
 
 if(Date.prototype.hasOwnProperty("setDate") !== true){
   $ERROR('#1: The Date.prototype has the property "setDate"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A37_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A37_T1.js
index 042b9e06e..c47570773 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A37_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A37_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCDate"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A37_T1.js
- * @description The Date.prototype has the property "setUTCDate"
- */
+/*---
+info: The Date.prototype has the property "setUTCDate"
+description: The Date.prototype has the property "setUTCDate"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCDate") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCDate"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A38_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A38_T1.js
index 9e8884645..a5f64814e 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A38_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A38_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setMonth"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A38_T1.js
- * @description The Date.prototype has the property "setMonth"
- */
+/*---
+info: The Date.prototype has the property "setMonth"
+description: The Date.prototype has the property "setMonth"
+---*/
 
 if(Date.prototype.hasOwnProperty("setMonth") !== true){
   $ERROR('#1: The Date.prototype has the property "setMonth"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A39_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A39_T1.js
index bd4e26109..32ffa628e 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A39_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A39_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCMonth"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A39_T1.js
- * @description The Date.prototype has the property "setUTCMonth"
- */
+/*---
+info: The Date.prototype has the property "setUTCMonth"
+description: The Date.prototype has the property "setUTCMonth"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCMonth") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCMonth"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A40_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A40_T1.js
index 4364b3bf8..5c41f5dd3 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A40_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A40_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setFullYear"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A40_T1.js
- * @description The Date.prototype has the property "setFullYear"
- */
+/*---
+info: The Date.prototype has the property "setFullYear"
+description: The Date.prototype has the property "setFullYear"
+---*/
 
 if(Date.prototype.hasOwnProperty("setFullYear") !== true){
   $ERROR('#1: The Date.prototype has the property "setFullYear"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A41_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A41_T1.js
index a5c713dbf..801268a65 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A41_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A41_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "setUTCFullYear"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A41_T1.js
- * @description The Date.prototype has the property "setUTCFullYear"
- */
+/*---
+info: The Date.prototype has the property "setUTCFullYear"
+description: The Date.prototype has the property "setUTCFullYear"
+---*/
 
 if(Date.prototype.hasOwnProperty("setUTCFullYear") !== true){
   $ERROR('#1: The Date.prototype has the property "setUTCFullYear"');
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.5/S15.9.5_A42_T1.js b/test/suite/ch15/15.9/15.9.5/S15.9.5_A42_T1.js
index 118343027..d35f2efa4 100644
--- a/test/suite/ch15/15.9/15.9.5/S15.9.5_A42_T1.js
+++ b/test/suite/ch15/15.9/15.9.5/S15.9.5_A42_T1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Date.prototype has the property "toUTCString"
- *
- * @path ch15/15.9/15.9.5/S15.9.5_A42_T1.js
- * @description The Date.prototype has the property "toUTCString"
- */
+/*---
+info: The Date.prototype has the property "toUTCString"
+description: The Date.prototype has the property "toUTCString"
+---*/
 
 if(Date.prototype.hasOwnProperty("toUTCString") !== true){
   $ERROR('#1: The Date.prototype has the property "toUTCString"');
 }
-
-
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_callable-predicate.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_callable-predicate.js
index ba66238e9..219fb79ab 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_callable-predicate.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_callable-predicate.js
@@ -1,10 +1,13 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Array.prototype.find shouldn't throw a TypeError if IsCallable(predicate) is true
- */
+/*---
+description: >
+    Array.prototype.find shouldn't throw a TypeError if
+    IsCallable(predicate) is true
+flags: [path]
+includes: [runTestCase.js]
+---*/
 
 var callableValues = [
     function () {},
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_empty-array-undefined.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_empty-array-undefined.js
index 19293c912..b98be4f17 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_empty-array-undefined.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_empty-array-undefined.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Find on empty array should return undefined
- */
+/*---
+description: Find on empty array should return undefined
+flags: [path]
+---*/
 
 var a = [].find(function () {
 	return true;
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_length-property.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_length-property.js
index 5184bd9cf..ae30d483a 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_length-property.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_length-property.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description The length property of the find method is 1
- */
+/*---
+description: The length property of the find method is 1
+flags: [path]
+---*/
 
 if ([].find.length !== 1) {
 	$ERROR('1: [].find.length !== 1. Actual: ' + [].find.length);
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_modify-after-start.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_modify-after-start.js
index 2fc5f4303..4efc24fee 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_modify-after-start.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_modify-after-start.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Array may be mutated by calls to the predicate
- */
+/*---
+description: Array may be mutated by calls to the predicate
+flags: [path]
+---*/
 
 [1, 2, 3].find(function (v, i, arr) {
 	arr[i + 1] = arr[i + 1] + 1;
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_non-returning-predicate.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_non-returning-predicate.js
index 0b63d32ad..bccdea5f4 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_non-returning-predicate.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_non-returning-predicate.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Find with a predicate with no return value should return undefined
- */
+/*---
+description: Find with a predicate with no return value should return undefined
+flags: [path]
+---*/
 
 var a = [1, 2, 3].find(function () {});
 
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_noncallable-predicate.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_noncallable-predicate.js
index 1fcda5f49..320515368 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_noncallable-predicate.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_noncallable-predicate.js
@@ -1,10 +1,13 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Array.prototype.find should throw a TypeError if IsCallable(predicate) is false
- */
+/*---
+description: >
+    Array.prototype.find should throw a TypeError if
+    IsCallable(predicate) is false
+flags: [path]
+includes: [runTestCase.js]
+---*/
 
 var uncallableValues = [
     undefined,
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_predicate-arguments.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_predicate-arguments.js
index 8ce121795..81cecf94d 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_predicate-arguments.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_predicate-arguments.js
@@ -1,10 +1,12 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description predicate is called with three arguments: the value of the element, the index of the element, and the object being traversed.
- */
+/*---
+description: >
+    predicate is called with three arguments: the value of the
+    element, the index of the element, and the object being traversed.
+flags: [path]
+---*/
 
 var a = [1];
 
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_push-after-start.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_push-after-start.js
index 0ed0138de..88bccb87f 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_push-after-start.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_push-after-start.js
@@ -1,10 +1,12 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Elements added to array after find has been called should not be visited
- */
+/*---
+description: >
+    Elements added to array after find has been called should not be
+    visited
+flags: [path]
+---*/
 
 [1].find(function (v, i, arr) {
 	arr.push('string');
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_remove-after-start.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_remove-after-start.js
index 169e6fdeb..b625d7ac9 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_remove-after-start.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_remove-after-start.js
@@ -1,10 +1,12 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Elements removed from array after find has been called should not be visited
- */
+/*---
+description: >
+    Elements removed from array after find has been called should not
+    be visited
+flags: [path]
+---*/
 
 [1, 'string', 2].find(function (v, i, arr) {
 	var stringIndex = arr.indexOf('string');
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_return-found-value.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_return-found-value.js
index b65ead1c3..f44f7afd2 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_return-found-value.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_return-found-value.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Find should return value if predicate returns true
- */
+/*---
+description: Find should return value if predicate returns true
+flags: [path]
+---*/
 
 var testVals = [
 	undefined,
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_skip-empty.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_skip-empty.js
index a24b0b830..b00ee1eeb 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_skip-empty.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_skip-empty.js
@@ -1,10 +1,12 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description predicate is called only for elements of the array which actually exist; it is not called for missing elements of the array
- */
+/*---
+description: >
+    predicate is called only for elements of the array which actually
+    exist; it is not called for missing elements of the array
+flags: [path]
+---*/
 
 var a = [];
 
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-defined.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-defined.js
index f28f6fc4a..acc8ba7c3 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-defined.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-defined.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description thisArg should be bound to this if provided
- */
+/*---
+description: thisArg should be bound to this if provided
+flags: [path]
+---*/
 
 var globalThis = this;
 
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-is-object.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-is-object.js
index 7897090a6..6fc7a4410 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-is-object.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-is-object.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description Array.prototype.find should convert thisArg into an object
- */
+/*---
+description: Array.prototype.find should convert thisArg into an object
+flags: [path]
+---*/
+
 var dataTypes = [
     undefined,
     null,
diff --git a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-undefined.js b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-undefined.js
index 54a2c9fd4..969a588ed 100644
--- a/test/suite/es6/Array.prototype.find/Array.prototype.find_this-undefined.js
+++ b/test/suite/es6/Array.prototype.find/Array.prototype.find_this-undefined.js
@@ -1,10 +1,10 @@
 // Copyright (c) 2014 Matthew Meyers. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path
- * @description thisArg should be undefined if not provided
- */
+/*---
+description: thisArg should be undefined if not provided
+flags: [path]
+---*/
 
 var globalThis = this;
 
diff --git a/test/suite/es6/Math.fround/Math.fround_Infinity.js b/test/suite/es6/Math.fround/Math.fround_Infinity.js
index 7f2d80718..8cf240b82 100644
--- a/test/suite/es6/Math.fround/Math.fround_Infinity.js
+++ b/test/suite/es6/Math.fround/Math.fround_Infinity.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
- 
-/**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.fround
- * @description Math.fround should return Infinity if called with Infinity.
- *
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.fround"
+description: Math.fround should return Infinity if called with Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.fround(Infinity) === Infinity) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.fround/Math.fround_NaN.js b/test/suite/es6/Math.fround/Math.fround_NaN.js
index 6da866191..55f958a20 100644
--- a/test/suite/es6/Math.fround/Math.fround_NaN.js
+++ b/test/suite/es6/Math.fround/Math.fround_NaN.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.fround
- * @description Math.fround should return NaN if called with NaN.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.fround"
+description: Math.fround should return NaN if called with NaN.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.fround(NaN) === NaN) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.fround/Math.fround_Zero.js b/test/suite/es6/Math.fround/Math.fround_Zero.js
index a21e49f72..4e1514e0f 100644
--- a/test/suite/es6/Math.fround/Math.fround_Zero.js
+++ b/test/suite/es6/Math.fround/Math.fround_Zero.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.froun
- * @description Math.fround should return 0 if called with 0.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.froun"
+description: Math.fround should return 0 if called with 0.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.fround(0) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_Infinity.js b/test/suite/es6/Math.hypot/Math.hypot_Infinity.js
index 878a1ff24..1a3f7efb8 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_Infinity.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_Infinity.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return Infinity if called with any argument that is Infinity.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: >
+    Math.hypot should return Infinity if called with any argument that
+    is Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(3, Infinity) === Infinity) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_InfinityNaN.js b/test/suite/es6/Math.hypot/Math.hypot_InfinityNaN.js
index 25fcd742d..262c73243 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_InfinityNaN.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_InfinityNaN.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return Infinity if called with any argument that is Infinity.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: >
+    Math.hypot should return Infinity if called with any argument that
+    is Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(NaN, Infinity) === Infinity) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_NaN.js b/test/suite/es6/Math.hypot/Math.hypot_NaN.js
index c87dafc10..3077ceb2d 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_NaN.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_NaN.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return NaN if called with any argument that is NaN.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: >
+    Math.hypot should return NaN if called with any argument that is
+    NaN.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(NaN, 3) === NaN) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_NegInfinity.js b/test/suite/es6/Math.hypot/Math.hypot_NegInfinity.js
index 01d8f25e3..4837e0434 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_NegInfinity.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_NegInfinity.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return Infinity if called with any argument that is -Infinity.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: >
+    Math.hypot should return Infinity if called with any argument that
+    is -Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(3, -Infinity) === Infinity) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_NoArgs.js b/test/suite/es6/Math.hypot/Math.hypot_NoArgs.js
index fd83e4169..3d2a5e025 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_NoArgs.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_NoArgs.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return 0 if called with no arguments.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: Math.hypot should return 0 if called with no arguments.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
    if(Math.hypot() === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_Success.js b/test/suite/es6/Math.hypot/Math.hypot_Success.js
index d06bbe7f4..70ae76904 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_Success.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_Success.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return 4 if called with 3 and 2.6457513110645907.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: Math.hypot should return 4 if called with 3 and 2.6457513110645907.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
    if(Math.hypot(3,2.6457513110645907) === 4) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_Success_2.js b/test/suite/es6/Math.hypot/Math.hypot_Success_2.js
index deeb3bfa6..e4c34e7e1 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_Success_2.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_Success_2.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return 5 if called with 3 and 4.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: Math.hypot should return 5 if called with 3 and 4.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(3,4) === 5) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_Zero_2.js b/test/suite/es6/Math.hypot/Math.hypot_Zero_2.js
index f5eb735d2..f60f40a84 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_Zero_2.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_Zero_2.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot should return 0 if called with all arguments being 0.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: Math.hypot should return 0 if called with all arguments being 0.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot(0, 0) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.hypot/Math.hypot_lengthProp.js b/test/suite/es6/Math.hypot/Math.hypot_lengthProp.js
index ad931f497..77a3280b9 100644
--- a/test/suite/es6/Math.hypot/Math.hypot_lengthProp.js
+++ b/test/suite/es6/Math.hypot/Math.hypot_lengthProp.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot
- * @description Math.hypot.length should return 2.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.hypot"
+description: Math.hypot.length should return 2.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.hypot.length === 2) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_Infinity.js b/test/suite/es6/Math.trunc/Math.trunc_Infinity.js
index 7a261c67e..79af4aa08 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_Infinity.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_Infinity.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return Infinity when called with Infinity.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return Infinity when called with Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(.9) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_NaN.js b/test/suite/es6/Math.trunc/Math.trunc_NaN.js
index 438f31648..063fd4364 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_NaN.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_NaN.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return NaN when called with NaN.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return NaN when called with NaN.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(NaN) === NaN) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_NegDecimal.js b/test/suite/es6/Math.trunc/Math.trunc_NegDecimal.js
index 3db4a57a8..bf959729c 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_NegDecimal.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_NegDecimal.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return 0 if called with a value between 0 and -1.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return 0 if called with a value between 0 and -1.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(-.9) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_PosDecimal.js b/test/suite/es6/Math.trunc/Math.trunc_PosDecimal.js
index f9d49e196..b2c58955a 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_PosDecimal.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_PosDecimal.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return 0 if called with a value between 0 and 1.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return 0 if called with a value between 0 and 1.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(.9) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_Success.js b/test/suite/es6/Math.trunc/Math.trunc_Success.js
index a9263027a..144bf9d78 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_Success.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_Success.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return 4578 if called with 4578.584949
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return 4578 if called with 4578.584949
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(4578.584949) === 4578) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Math.trunc/Math.trunc_Zero.js b/test/suite/es6/Math.trunc/Math.trunc_Zero.js
index f00f8711e..edf661baa 100644
--- a/test/suite/es6/Math.trunc/Math.trunc_Zero.js
+++ b/test/suite/es6/Math.trunc/Math.trunc_Zero.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc
- * @description Math.trunc should return 0 when called with 0.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-math.trunc"
+description: Math.trunc should return 0 when called with 0.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Math.trunc(0) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_Double.js b/test/suite/es6/Number.isInteger/Number.isInteger_Double.js
index 16de171e3..018c53fc8 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_Double.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_Double.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return false if called with a double.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: Number.isInteger should return false if called with a double.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger(6.75) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_Infinity.js b/test/suite/es6/Number.isInteger/Number.isInteger_Infinity.js
index 11ba7a59e..191633156 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_Infinity.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_Infinity.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return false if called with Infinity.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: Number.isInteger should return false if called with Infinity.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger(Infinity) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_NaN.js b/test/suite/es6/Number.isInteger/Number.isInteger_NaN.js
index 12cd415b5..e1c5c5c1c 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_NaN.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_NaN.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return false if called with NaN.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: Number.isInteger should return false if called with NaN.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger(NaN) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_NonNumber.js b/test/suite/es6/Number.isInteger/Number.isInteger_NonNumber.js
index c7e619587..b89c62d3b 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_NonNumber.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_NonNumber.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return false if called with a string (non-Number)
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: >
+    Number.isInteger should return false if called with a string
+    (non-Number)
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger('2') === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_String.js b/test/suite/es6/Number.isInteger/Number.isInteger_String.js
index aa427d076..658fdf63b 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_String.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_String.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return false if called with a string (non-Number)
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: >
+    Number.isInteger should return false if called with a string
+    (non-Number)
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger('word') === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isInteger/Number.isInteger_Success.js b/test/suite/es6/Number.isInteger/Number.isInteger_Success.js
index 58f0b0fda..c49b4bfc0 100644
--- a/test/suite/es6/Number.isInteger/Number.isInteger_Success.js
+++ b/test/suite/es6/Number.isInteger/Number.isInteger_Success.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger
- * @description Number.isInteger should return true if called with an integer.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isinteger"
+description: Number.isInteger should return true if called with an integer.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.isInteger(478) === true) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isNaN/Number.isNaN_Boolean.js b/test/suite/es6/Number.isNaN/Number.isNaN_Boolean.js
index 78ff3c9ef..bc984f4d1 100644
--- a/test/suite/es6/Number.isNaN/Number.isNaN_Boolean.js
+++ b/test/suite/es6/Number.isNaN/Number.isNaN_Boolean.js
@@ -1,22 +1,18 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan
- * @description Number.IsNaN should return false if called with a boolean.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan"
+description: Number.IsNaN should return false if called with a boolean.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   return Number.isNaN(true);
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isNaN/Number.isNaN_NaN.js b/test/suite/es6/Number.isNaN/Number.isNaN_NaN.js
index 30e470aed..79ddbfa9b 100644
--- a/test/suite/es6/Number.isNaN/Number.isNaN_NaN.js
+++ b/test/suite/es6/Number.isNaN/Number.isNaN_NaN.js
@@ -1,22 +1,18 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan
- * @description Number.IsNaN should return true if called with NaN.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan"
+description: Number.IsNaN should return true if called with NaN.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   return Number.isNaN(NaN);
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isNaN/Number.isNaN_Object.js b/test/suite/es6/Number.isNaN/Number.isNaN_Object.js
index 218d5a7c1..b088e4323 100644
--- a/test/suite/es6/Number.isNaN/Number.isNaN_Object.js
+++ b/test/suite/es6/Number.isNaN/Number.isNaN_Object.js
@@ -1,22 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan
- * @description Number.IsNaN should return false if called with a non-number Object.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan"
+description: >
+    Number.IsNaN should return false if called with a non-number
+    Object.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   return !Number.isNaN(new Object());
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.isNaN/Number.isNaN_String.js b/test/suite/es6/Number.isNaN/Number.isNaN_String.js
index 9f6d5ce43..b50ee38db 100644
--- a/test/suite/es6/Number.isNaN/Number.isNaN_String.js
+++ b/test/suite/es6/Number.isNaN/Number.isNaN_String.js
@@ -1,22 +1,18 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan
- * @description Number.IsNaN should return false if called with a String.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.isnan"
+description: Number.IsNaN should return false if called with a String.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   return !Number.isNaN('string');
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.prototype.clz/Number.prototype.clz.js b/test/suite/es6/Number.prototype.clz/Number.prototype.clz.js
index 3874e9c4e..0940d37a8 100644
--- a/test/suite/es6/Number.prototype.clz/Number.prototype.clz.js
+++ b/test/suite/es6/Number.prototype.clz/Number.prototype.clz.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz
- * @description Number.prototype.clz should return 32 if passed 0.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz"
+description: Number.prototype.clz should return 32 if passed 0.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.prototype.clz(0) === 32) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.prototype.clz/Number.prototype.clz_1.js b/test/suite/es6/Number.prototype.clz/Number.prototype.clz_1.js
index 5e936b4fd..0e89eb7c4 100644
--- a/test/suite/es6/Number.prototype.clz/Number.prototype.clz_1.js
+++ b/test/suite/es6/Number.prototype.clz/Number.prototype.clz_1.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz
- * @description Number.prototype.clz should return 31 if passed 1.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz"
+description: Number.prototype.clz should return 31 if passed 1.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.prototype.clz(1) === 31) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/Number.prototype.clz/Number.prototype.clz_2.js b/test/suite/es6/Number.prototype.clz/Number.prototype.clz_2.js
index b5c493eb1..6b7f9a802 100644
--- a/test/suite/es6/Number.prototype.clz/Number.prototype.clz_2.js
+++ b/test/suite/es6/Number.prototype.clz/Number.prototype.clz_2.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz
- * @description Number.prototype.clz should return 0 if passed 2147483648
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.prototype.clz"
+description: Number.prototype.clz should return 0 if passed 2147483648
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if(Number.prototype.clz(2147483648) === 0) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailBadLocation.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailBadLocation.js
index a0c3e7570..ceddd3453 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailBadLocation.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailBadLocation.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should return false if a location is passed that is greather than the length of the string.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: >
+    String should return false if a location is passed that is
+    greather than the length of the string.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains('w', 5) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailLocation.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailLocation.js
index 7cc2ca311..9f8e38344 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailLocation.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailLocation.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should return false if a letter is not found in the word starting from the passed location.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: >
+    String should return false if a letter is not found in the word
+    starting from the passed location.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains('o', 3) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailMissingLetter.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailMissingLetter.js
index 3da025126..a51d33fa6 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_FailMissingLetter.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_FailMissingLetter.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should return false if a letter is not found in the word.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: String should return false if a letter is not found in the word.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains('a', 0) === false) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_Success.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_Success.js
index 17c71d32b..c653e6957 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_Success.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_Success.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should return true when called on 'word' and passed 'w' and the location 0.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: >
+    String should return true when called on 'word' and passed 'w' and
+    the location 0.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains('w', 0)) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_SuccessNoLocation.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_SuccessNoLocation.js
index 5cd0fd7ca..dc98cd258 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_SuccessNoLocation.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_SuccessNoLocation.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should return true when called on 'word' and passed 'w' and with no location (defaults to 0).
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: >
+    String should return true when called on 'word' and passed 'w' and
+    with no location (defaults to 0).
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains('w')) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.contains/String.prototype.contains_lengthProp.js b/test/suite/es6/String.prototype.contains/String.prototype.contains_lengthProp.js
index 363a2a1c3..e1580cc53 100644
--- a/test/suite/es6/String.prototype.contains/String.prototype.contains_lengthProp.js
+++ b/test/suite/es6/String.prototype.contains/String.prototype.contains_lengthProp.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains
- * @description String should have the property length with size of 1.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.contains"
+description: String should have the property length with size of 1.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.contains.length === 1) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail.js
index 423207657..8e34faaa7 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail.js
@@ -1,24 +1,20 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return false when called on 'word' and passed 'r'.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: endsWith should return false when called on 'word' and passed 'r'.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('r')) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail_2.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail_2.js
index 8a5dc78fe..df4a5c572 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail_2.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Fail_2.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return false when called on 'word' and passed 'd', with an endPosition of 3.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: >
+    endsWith should return false when called on 'word' and passed 'd',
+    with an endPosition of 3.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('d',3)) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success.js
index 033022dca..4128c4d33 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return true when called on 'word' and passed 'd' and with no endPosition (defaults to 4).
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: >
+    endsWith should return true when called on 'word' and passed 'd'
+    and with no endPosition (defaults to 4).
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('d')) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_2.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_2.js
index 525e2a4b8..431494277 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_2.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_2.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return true when called on 'word' and passed 'd' and with an endPosition of 4.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: >
+    endsWith should return true when called on 'word' and passed 'd'
+    and with an endPosition of 4.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('d', 4)) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_3.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_3.js
index 79dc7beb1..369b76c15 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_3.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_3.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return true when called on 'word' and passed 'd' and with an endPosition of 25.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: >
+    endsWith should return true when called on 'word' and passed 'd'
+    and with an endPosition of 25.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('d', 25)) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_4.js b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_4.js
index 3c829ebc7..1954027b9 100644
--- a/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_4.js
+++ b/test/suite/es6/String.prototype.endsWith/String.prototype.endsWith_Success_4.js
@@ -1,24 +1,22 @@
-/**Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
- */
+// Copyright (c) 2014, Ryan Lewis All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+// 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.  
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
- /**
- *
- * @author Ryan Lewis
- * @email ryanhlewis@hotmail.com
- * @spec http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith
- * @description endsWith should return true when called on 'word' and passed 'r', with an endPosition of 3.
- *
- */
+/*---
+author: Ryan Lewis
+email: ryanhlewis@hotmail.com
+spec: "http://people.mozilla.org/~jorendorff/es6-draft.html#sec-string.prototype.endswith"
+description: >
+    endsWith should return true when called on 'word' and passed 'r',
+    with an endPosition of 3.
+includes: [runTestCase.js]
+---*/
 
 function testcase() {
   if('word'.endsWith('r',3)) {
   	return true;
   }
  }
-runTestCase(testcase);
\ No newline at end of file
+runTestCase(testcase);
diff --git a/test/suite/es6/bug_596_1.js b/test/suite/es6/bug_596_1.js
index 5f742a5df..03462a2f8 100644
--- a/test/suite/es6/bug_596_1.js
+++ b/test/suite/es6/bug_596_1.js
@@ -1,35 +1,32 @@
-// Copyright (c) 2014, Thomas Dahlstrom All rights reserved. Redistribution 
-// and use in source and binary forms, with or without modification, are 
+// Copyright (c) 2014, Thomas Dahlstrom All rights reserved. Redistribution
+// and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright 
+// // 1. Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright 
-// notice, this list of conditions and the following disclaimer in the 
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
 // documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission.  
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
+// 3. Neither the name of the copyright holder nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission. 
+// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 // IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-/**
- * @path es6/bug_596_1.js
- * @description The SortCompare abstract operation calls ToString() for
- *              identical elements (step 14/15)
- * @author Thomas Dahlstrom (tdahlstrom@gmail.com)
- */
+/*---
+description: >
+    The SortCompare abstract operation calls ToString() for  identical
+    elements (step 14/15)
+author: Thomas Dahlstrom (tdahlstrom@gmail.com)
+---*/
 
 var counter = 0;
 var object = {
@@ -44,4 +41,3 @@ if (counter < 2) {
   // sort calls ToString() for each element at least once
   $ERROR('#1: [object, object].sort(); counter < 22. Actual: ' + (counter));
 }
-
diff --git a/test/suite/es6/bug_596_2.js b/test/suite/es6/bug_596_2.js
index 3ba1c468b..40284b0a2 100644
--- a/test/suite/es6/bug_596_2.js
+++ b/test/suite/es6/bug_596_2.js
@@ -1,35 +1,33 @@
-// Copyright (c) 2014, Thomas Dahlstrom All rights reserved. Redistribution 
-// and use in source and binary forms, with or without modification, are 
+// Copyright (c) 2014, Thomas Dahlstrom All rights reserved. Redistribution
+// and use in source and binary forms, with or without modification, are
 // permitted provided that the following conditions are met:
-// 
-// 1. Redistributions of source code must retain the above copyright 
+// // 1. Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright 
-// notice, this list of conditions and the following disclaimer in the 
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
 // documentation and/or other materials provided with the distribution.
-// 3. Neither the name of the copyright holder nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission.  
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
+// 3. Neither the name of the copyright holder nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission. 
+// // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
 // IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
+// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 // LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
+// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-/**
- * @path es6/bug_596_2.js
- * @description Array.prototype.sort does not change non-existent elements to
- *              undefined elements, that means holes are preserved (cf. spec
- *              text about [[Delete]] and sparse arrays)
- * @author Thomas Dahlstrom (tdahlstrom@gmail.com)
- */
+/*---
+description: >
+    Array.prototype.sort does not change non-existent elements to
+    undefined elements, that means holes are preserved (cf. spec  text
+    about [[Delete]] and sparse arrays)
+author: Thomas Dahlstrom (tdahlstrom@gmail.com)
+---*/
 
 var array = ['a',,void 0];
 
@@ -74,4 +72,3 @@ if (array.hasOwnProperty('1') !== true) {
 if (array.hasOwnProperty('2') !== false) {
     $ERROR("#8: array.hasOwnProperty('2'). Actual: " + array.hasOwnProperty('2'));
 }
-
diff --git a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T1.js b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T1.js
index 1421c4366..53bf1bf47 100644
--- a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T1.js
+++ b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T1.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Testing Array.from when passed a String
- * @author Hank Yates (hankyates@gmail.com)
- */
+/*---
+description: Testing Array.from when passed a String
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   var arrLikeSource = 'testValue',
diff --git a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T2.js b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T2.js
index b9012e7e8..75c533472 100644
--- a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T2.js
+++ b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T2.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Testing Array.from when passed an Object is passed
- * @author Hank Yates (hankyates@gmail.com)
- */
+/*---
+description: Testing Array.from when passed an Object is passed
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   var testArr = Array.from({
diff --git a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T3.js b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T3.js
index f9bb4ff53..88e0914dc 100644
--- a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T3.js
+++ b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.1_T3.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Testing Array.from when passed an undefined
- * @author Hank Yates (hankyates@gmail.com)
- */
+/*---
+description: Testing Array.from when passed an undefined
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   try {
@@ -16,4 +17,3 @@ runTestCase(function () {
   return false;
 
 });
-
diff --git a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T1.js b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T1.js
index a3dba8669..0dd475262 100644
--- a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T1.js
+++ b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T1.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Testing Array#of when passed Strings
- * @author Hank Yates (hankyates@gmail.com)
- */
+/*---
+description: Testing Array#of when passed Strings
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   var testArr = Array.of('testString', 'anotherTestString');
diff --git a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T2.js b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T2.js
index 4a93a5b37..a3dda9de2 100644
--- a/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T2.js
+++ b/test/suite/es6/ch22/22.1/22.1.2/S22.1.2.3_T2.js
@@ -1,9 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
-/**
- * @description Testing Array#of when passed single argument
- * @author Hank Yates (hankyates@gmail.com)
- */
+
+/*---
+description: Testing Array#of when passed single argument
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   var testArr = Array.of(3);
diff --git a/test/suite/es6/ch22/22.1/22.1.3/S22.1.3.6_T1.js b/test/suite/es6/ch22/22.1/22.1.3/S22.1.3.6_T1.js
index 755722da6..3e29816a2 100644
--- a/test/suite/es6/ch22/22.1/22.1.3/S22.1.3.6_T1.js
+++ b/test/suite/es6/ch22/22.1/22.1.3/S22.1.3.6_T1.js
@@ -1,10 +1,11 @@
 // Copyright (c) 2014 Hank Yates. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Testing Array#fill
- * @author Hank Yates (hankyates@gmail.com)
- */
+/*---
+description: Testing Array#fill
+author: Hank Yates (hankyates@gmail.com)
+includes: [runTestCase.js]
+---*/
 
 runTestCase(function () {
   var testArr = new Array('testString', 'anotherTestString', 3),
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.1_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.1_T1.js
index 0f7c216a5..ca8787b9c 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.1_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all is callable
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all is callable
+author: Sam Mikes
+---*/
 
 // CHECK#1
 var x = typeof Promise.all;
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.2_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.2_T1.js
index 49b563e1c..7702338b9 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.2_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A1.2_T1.js
@@ -1,14 +1,13 @@
-/// Copyright 2012 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Copyright 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all expects 1 argument
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all expects 1 argument
+author: Sam Mikes
+---*/
 
 // CHECK#1
 var x = Promise.all.length;
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.1_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.1_T1.js
index f73d5b21a..b8ea33eb8 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.1_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all([]) is a Promise
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all([]) is a Promise
+author: Sam Mikes
+---*/
 
 // CHECK#1
 var x = (Promise.all([]) instanceof Promise);
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.2_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.2_T1.js
index 2f07cd192..f8d1632bd 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.2_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.2_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all([]) is resolved immediately
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all([]) is resolved immediately
+author: Sam Mikes
+includes: [PromiseHelper.js]
+---*/
 
-$INCLUDE("PromiseHelper.js");
 var sequence = [];
 
 Promise.all([]).then(function () {
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T1.js
index 3ef289912..131cef817 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T1.js
@@ -1,15 +1,13 @@
-
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all is resolved with a new empty array
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all is resolved with a new empty array
+author: Sam Mikes
+---*/
 
 var arg = [];
 
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T2.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T2.js
index 4615e1dae..a27d0235e 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T2.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T2.js
@@ -1,15 +1,13 @@
-
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all is resolved with a new empty array
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all is resolved with a new empty array
+author: Sam Mikes
+---*/
 
 var arg = [];
 
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T3.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T3.js
index 264208e34..de8ce5dbd 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T3.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A2.3_T3.js
@@ -1,15 +1,13 @@
-
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all is resolved with a new empty array
- *
- * @author Sam Mikes
- */
+/*---
+info: Promise.all is resolved with a new empty array
+author: Sam Mikes
+---*/
 
 var arg = [];
 
diff --git a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A3.1_T1.js b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A3.1_T1.js
index 1f755760b..a3be628f7 100644
--- a/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A3.1_T1.js
+++ b/test/suite/es6/ch25/25.4/25.4.4/25.4.4.1/S25.4.4.1_A3.1_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2014 Ecma International.  All rights reserved.
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
-/// "Use Terms").   Any redistribution of this code must retain the above
-/// copyright and this notice and otherwise comply with the Use Terms.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
 
-/**
- * Promise.all expects an iterable argument; 
- * ref 7.4.1 non-Object fails CheckIterable
- * ref 7.4.2 GetIterator throws TypeError if CheckIterable fails
- *
- * @author Sam Mikes
- */
+/*---
+info: >
+    Promise.all expects an iterable argument; 
+    ref 7.4.1 non-Object fails CheckIterable
+    ref 7.4.2 GetIterator throws TypeError if CheckIterable fails
+author: Sam Mikes
+---*/
 
 var nonIterable = 3;
 
diff --git a/test/suite/intl402/ch06/6.2/6.2.2_a.js b/test/suite/intl402/ch06/6.2/6.2.2_a.js
index a56894570..af6d867d0 100644
--- a/test/suite/intl402/ch06/6.2/6.2.2_a.js
+++ b/test/suite/intl402/ch06/6.2/6.2.2_a.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that structurally valid language tags are accepted.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that structurally valid language tags are accepted.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var validLanguageTags = [
     "de", // ISO 639 language code
@@ -37,4 +36,3 @@ testWithIntlConstructors(function (Constructor) {
     });
     return true;
 });
-
diff --git a/test/suite/intl402/ch06/6.2/6.2.2_b.js b/test/suite/intl402/ch06/6.2/6.2.2_b.js
index 42d69e7c2..8b6f4f9ef 100644
--- a/test/suite/intl402/ch06/6.2/6.2.2_b.js
+++ b/test/suite/intl402/ch06/6.2/6.2.2_b.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that language tags with "_" are not accepted.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that language tags with "_" are not accepted.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var invalidLanguageTags = [
     "de_DE",
@@ -38,4 +37,3 @@ testWithIntlConstructors(function (Constructor) {
     });
     return true;
 });
-
diff --git a/test/suite/intl402/ch06/6.2/6.2.2_c.js b/test/suite/intl402/ch06/6.2/6.2.2_c.js
index 6d669ebef..e7569e178 100644
--- a/test/suite/intl402/ch06/6.2/6.2.2_c.js
+++ b/test/suite/intl402/ch06/6.2/6.2.2_c.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that language tags with invalid subtag sequences are not accepted.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that language tags with invalid subtag sequences are not
+    accepted.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var invalidLanguageTags = [
     "", // empty tag
@@ -44,4 +45,3 @@ testWithIntlConstructors(function (Constructor) {
     });
     return true;
 });
-
diff --git a/test/suite/intl402/ch06/6.2/6.2.3.js b/test/suite/intl402/ch06/6.2/6.2.3.js
index 4ae15ab27..a94e6463a 100644
--- a/test/suite/intl402/ch06/6.2/6.2.3.js
+++ b/test/suite/intl402/ch06/6.2/6.2.3.js
@@ -2,12 +2,11 @@
 // Copyright 2012  Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that language tags are canonicalized in return values.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that language tags are canonicalized in return values.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var canonicalizedTags = {
     "de": ["de"],
@@ -66,4 +65,3 @@ testWithIntlConstructors(function (Constructor) {
     });
     return true;
 });
-
diff --git a/test/suite/intl402/ch06/6.2/6.2.4.js b/test/suite/intl402/ch06/6.2/6.2.4.js
index 6ca47af14..93c4f047d 100644
--- a/test/suite/intl402/ch06/6.2/6.2.4.js
+++ b/test/suite/intl402/ch06/6.2/6.2.4.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the default locale is a String value representing the
- * structurally valid and canonicalized BCP 47 language tag.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the default locale is a String value representing the
+    structurally valid and canonicalized BCP 47 language tag.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var defaultLocale = new Constructor().resolvedOptions().locale;
@@ -16,4 +16,3 @@ testWithIntlConstructors(function (Constructor) {
     }
     return true;
 });
-
diff --git a/test/suite/intl402/ch06/6.3/6.3.1_a.js b/test/suite/intl402/ch06/6.3/6.3.1_a.js
index 01cc18b03..b74d53e07 100644
--- a/test/suite/intl402/ch06/6.3/6.3.1_a.js
+++ b/test/suite/intl402/ch06/6.3/6.3.1_a.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that well-formed currency codes are accepted.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that well-formed currency codes are accepted.
+author: Norbert Lindenberg
+---*/
 
 var wellFormedCurrencyCodes = [
     "BOB",
@@ -22,4 +22,3 @@ wellFormedCurrencyCodes.forEach(function (code) {
             format.resolvedOptions().currency + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch06/6.3/6.3.1_b.js b/test/suite/intl402/ch06/6.3/6.3.1_b.js
index 038dd1fc4..40542831d 100644
--- a/test/suite/intl402/ch06/6.3/6.3.1_b.js
+++ b/test/suite/intl402/ch06/6.3/6.3.1_b.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that invalid currency codes are not accepted.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that invalid currency codes are not accepted.
+author: Norbert Lindenberg
+---*/
 
 var invalidCurrencyCodes = [
     "",
@@ -32,4 +32,3 @@ invalidCurrencyCodes.forEach(function (code) {
         $ERROR("Invalid currency code '" + code + "' was rejected with wrong error " + error.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch06/6.4/6.4_a.js b/test/suite/intl402/ch06/6.4/6.4_a.js
index 05202353c..20cb6c3c8 100644
--- a/test/suite/intl402/ch06/6.4/6.4_a.js
+++ b/test/suite/intl402/ch06/6.4/6.4_a.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that valid time zone names are accepted.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that valid time zone names are accepted.
+author: Norbert Lindenberg
+---*/
 
 var validTimeZoneNames = [
     "UTC",
@@ -19,4 +19,3 @@ validTimeZoneNames.forEach(function (name) {
             format.resolvedOptions().timeZone + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch06/6.4/6.4_b.js b/test/suite/intl402/ch06/6.4/6.4_b.js
index 847d804e3..a3f7d8f21 100644
--- a/test/suite/intl402/ch06/6.4/6.4_b.js
+++ b/test/suite/intl402/ch06/6.4/6.4_b.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that invalid time zone names are not accepted.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that invalid time zone names are not accepted.
+author: Norbert Lindenberg
+---*/
 
 var invalidTimeZoneNames = [
     "",
@@ -31,4 +31,3 @@ invalidTimeZoneNames.forEach(function (name) {
         $ERROR("Invalid time zone name " + name + " was rejected with wrong error " + error.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch06/6.4/6.4_c.js b/test/suite/intl402/ch06/6.4/6.4_c.js
index a9969b648..6d5e5502d 100644
--- a/test/suite/intl402/ch06/6.4/6.4_c.js
+++ b/test/suite/intl402/ch06/6.4/6.4_c.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that additional time zone names, if accepted, are handled correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that additional time zone names, if accepted, are handled
+    correctly.
+author: Norbert Lindenberg
+---*/
 
 // canonicalization specified in conformance clause
 var additionalTimeZoneNames = {
@@ -33,4 +35,3 @@ Object.getOwnPropertyNames(additionalTimeZoneNames).forEach(function (name) {
         $ERROR("Time zone name " + name + " was rejected with wrong error " + error.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch08/8.0/8.0.js b/test/suite/intl402/ch08/8.0/8.0.js
index dedda973b..be395a4cb 100644
--- a/test/suite/intl402/ch08/8.0/8.0.js
+++ b/test/suite/intl402/ch08/8.0/8.0.js
@@ -1,12 +1,11 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl has Object.prototype as its prototype.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl has Object.prototype as its prototype.
+author: Norbert Lindenberg
+---*/
 
 if (Object.getPrototypeOf(Intl) !== Object.prototype) {
     $ERROR("Intl doesn't have Object.prototype as its prototype.");
 }
-
diff --git a/test/suite/intl402/ch08/8.0/8.0_L15.js b/test/suite/intl402/ch08/8.0/8.0_L15.js
index 0174bef54..817d053dc 100644
--- a/test/suite/intl402/ch08/8.0/8.0_L15.js
+++ b/test/suite/intl402/ch08/8.0/8.0_L15.js
@@ -1,15 +1,16 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl  meets the requirements for built-in objects
+    defined by the introduction of  chapter 15 of the ECMAScript
+    Language Specification.
+author: Norbert Lindenberg
+includes:
+    - fnGlobalObject.js
+    - testBuiltInObject.js
+---*/
 
 testBuiltInObject(fnGlobalObject().Intl, false, false, []);
 testBuiltInObject(Intl, false, false, ["Collator", "NumberFormat", "DateTimeFormat"]);
-
diff --git a/test/suite/intl402/ch09/9.1/9.1_a.js b/test/suite/intl402/ch09/9.1/9.1_a.js
index b7358304b..dd45f3faf 100644
--- a/test/suite/intl402/ch09/9.1/9.1_a.js
+++ b/test/suite/intl402/ch09/9.1/9.1_a.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that default locale is available.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that default locale is available.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var defaultLocale = new Constructor().resolvedOptions().locale;
@@ -15,4 +14,3 @@ testWithIntlConstructors(function (Constructor) {
         $ERROR("Default locale is not reported as available.");
     }
 });
-
diff --git a/test/suite/intl402/ch09/9.1/9.1_b.js b/test/suite/intl402/ch09/9.1/9.1_b.js
index a0abc7fc1..1dbf8eed2 100644
--- a/test/suite/intl402/ch09/9.1/9.1_b.js
+++ b/test/suite/intl402/ch09/9.1/9.1_b.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that appropriate fallback locales are provided for
- *     supported locales.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that appropriate fallback locales are provided for
+    supported locales.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var info = getLocaleSupportInfo(Constructor);
@@ -29,4 +29,3 @@ testWithIntlConstructors(function (Constructor) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_1.js b/test/suite/intl402/ch09/9.2/9.2.1_1.js
index 7386fdeda..d5d0856bf 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_1.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_1.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that canonicalization of locale lists treats undefined and empty lists the same.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that canonicalization of locale lists treats undefined and
+    empty lists the same.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var supportedForUndefined = Constructor.supportedLocalesOf(undefined);
@@ -20,4 +21,3 @@ testWithIntlConstructors(function (Constructor) {
     }
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_2.js b/test/suite/intl402/ch09/9.2/9.2.1_2.js
index e4fb3756d..666351c21 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_2.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_2.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a List is not affected by adversarial
- *     changes to Array.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a List is not affected by adversarial
+    changes to Array.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintArray();
 
@@ -18,4 +18,3 @@ testWithIntlConstructors(function (Constructor) {
         $ERROR("Canonicalization didn't remove duplicate language tags from locale list.");
     }
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_3.js b/test/suite/intl402/ch09/9.2/9.2.1_3.js
index e403b1765..5de59a302 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_3.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_3.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that a single string instead of a locale list is treated
- *     as the locale list containing that string.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that a single string instead of a locale list is treated  as
+    the locale list containing that string.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var validAndInvalidLanguageTags = [
     "de", // ISO 639 language code
@@ -84,4 +84,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_4.js b/test/suite/intl402/ch09/9.2/9.2.1_4.js
index b9bb9db79..4842b6f8a 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_4.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_4.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that non-objects are converted to objects before canonicalization.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that non-objects are converted to objects before
+    canonicalization.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     // undefined is handled separately
@@ -43,4 +44,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_8_c_ii.js b/test/suite/intl402/ch09/9.2/9.2.1_8_c_ii.js
index 8dfb9b7b3..fe8d031dc 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_8_c_ii.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_8_c_ii.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that values other than strings are not accepted as locales.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that values other than strings are not accepted as locales.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var notStringOrObject = [undefined, null, true, false, 0, 5, -5, NaN];
 
@@ -27,4 +26,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.1_8_c_vi.js b/test/suite/intl402/ch09/9.2/9.2.1_8_c_vi.js
index ef78fa97b..b7c978af6 100644
--- a/test/suite/intl402/ch09/9.2/9.2.1_8_c_vi.js
+++ b/test/suite/intl402/ch09/9.2/9.2.1_8_c_vi.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that canonicalization of locale lists removes duplicate language tags.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that canonicalization of locale lists removes duplicate
+    language tags.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var defaultLocale = new Constructor().resolvedOptions().locale;
@@ -15,4 +16,3 @@ testWithIntlConstructors(function (Constructor) {
         $ERROR("Canonicalization didn't remove duplicate language tags from locale list.");
     }
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.2.js b/test/suite/intl402/ch09/9.2/9.2.2.js
index cb74eaad2..6634dd0ee 100644
--- a/test/suite/intl402/ch09/9.2/9.2.2.js
+++ b/test/suite/intl402/ch09/9.2/9.2.2.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that locales that are reported by resolvedOptions
- *     are also reported by supportedLocalesOf.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that locales that are reported by resolvedOptions  are also
+    reported by supportedLocalesOf.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var info = getLocaleSupportInfo(Constructor);
@@ -42,4 +42,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.3_5.js b/test/suite/intl402/ch09/9.2/9.2.3_5.js
index 8ae8a216b..a6c8eb761 100644
--- a/test/suite/intl402/ch09/9.2/9.2.3_5.js
+++ b/test/suite/intl402/ch09/9.2/9.2.3_5.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["locale", "extension", "extensionIndex"]);
 
@@ -19,4 +19,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.5_11_g_ii_2.js b/test/suite/intl402/ch09/9.2/9.2.5_11_g_ii_2.js
index d4213d2da..baf7cb10f 100644
--- a/test/suite/intl402/ch09/9.2/9.2.5_11_g_ii_2.js
+++ b/test/suite/intl402/ch09/9.2/9.2.5_11_g_ii_2.js
@@ -2,11 +2,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that missing Unicode extension values default to true for
- *     boolean keys.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that missing Unicode extension values default to true for
+    boolean keys.
+author: Norbert Lindenberg
+---*/
 
 var extensions = ["-u-co-phonebk-kn", "-u-kn-co-phonebk"];
 extensions.forEach(function (extension) {
@@ -23,4 +24,3 @@ extensions.forEach(function (extension) {
         }
     }
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.5_6.js b/test/suite/intl402/ch09/9.2/9.2.5_6.js
index 4bc904ee1..9f82e7f21 100644
--- a/test/suite/intl402/ch09/9.2/9.2.5_6.js
+++ b/test/suite/intl402/ch09/9.2/9.2.5_6.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["dataLocale", "nu", "ca", "co", "locale"]);
 
@@ -19,4 +19,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.6_2.js b/test/suite/intl402/ch09/9.2/9.2.6_2.js
index 8d4f7efa9..a863ec1ce 100644
--- a/test/suite/intl402/ch09/9.2/9.2.6_2.js
+++ b/test/suite/intl402/ch09/9.2/9.2.6_2.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a List is not affected by adversarial
- *     changes to Array.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a List is not affected by adversarial
+    changes to Array.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintArray();
 
@@ -24,4 +24,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.6_4.js b/test/suite/intl402/ch09/9.2/9.2.6_4.js
index 7c053a381..afaaac90e 100644
--- a/test/suite/intl402/ch09/9.2/9.2.6_4.js
+++ b/test/suite/intl402/ch09/9.2/9.2.6_4.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that LookupSupportedLocales returns an empty list when
- *     given an empty list.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that LookupSupportedLocales returns an empty list when
+    given an empty list.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     // this test should work equally for both matching algorithms
@@ -20,4 +20,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.6_4_b.js b/test/suite/intl402/ch09/9.2/9.2.6_4_b.js
index a998e3378..206f3982b 100644
--- a/test/suite/intl402/ch09/9.2/9.2.6_4_b.js
+++ b/test/suite/intl402/ch09/9.2/9.2.6_4_b.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Unicode locale extension sequences do not affect
- *    whether a locale is considered supported, but are reported back.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Unicode locale extension sequences do not affect
+    whether a locale is considered supported, but are reported back.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     // this test should work equally for both matching algorithms
@@ -43,4 +43,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.6_4_c.js b/test/suite/intl402/ch09/9.2/9.2.6_4_c.js
index de68a9b66..b3007e187 100644
--- a/test/suite/intl402/ch09/9.2/9.2.6_4_c.js
+++ b/test/suite/intl402/ch09/9.2/9.2.6_4_c.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that LookupSupportedLocales includes the default locale
- *     and doesn't include the "no linguistic content" locale.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that LookupSupportedLocales includes the default locale  and
+    doesn't include the "no linguistic content" locale.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     // this test should work equally for both matching algorithms
@@ -29,4 +29,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.8_1_c.js b/test/suite/intl402/ch09/9.2/9.2.8_1_c.js
index 724db1edd..8ae2680ca 100644
--- a/test/suite/intl402/ch09/9.2/9.2.8_1_c.js
+++ b/test/suite/intl402/ch09/9.2/9.2.8_1_c.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option localeMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option localeMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var defaultLocale = new Constructor().resolvedOptions().locale;
@@ -33,4 +32,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch09/9.2/9.2.8_4.js b/test/suite/intl402/ch09/9.2/9.2.8_4.js
index 79c362f62..60391138a 100644
--- a/test/suite/intl402/ch09/9.2/9.2.8_4.js
+++ b/test/suite/intl402/ch09/9.2/9.2.8_4.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the array returned by SupportedLocales is extensible,
- *     but its properties are non-writable/non-configurable.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the array returned by SupportedLocales is extensible,
+    but its properties are non-writable/non-configurable.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 function testFrozenProperty(obj, property) {
     var desc = Object.getOwnPropertyDescriptor(obj, property);
@@ -32,4 +32,3 @@ testWithIntlConstructors(function (Constructor) {
 
     return true;
 });
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_1.js b/test/suite/intl402/ch10/10.1/10.1.1_1.js
index 432e073fc..1f35563bb 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_1.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_1.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that an object can't be re-initialized as a Collator.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that an object can't be re-initialized as a Collator.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var obj, error;
@@ -40,4 +39,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_10.js b/test/suite/intl402/ch10/10.1/10.1.1_10.js
index 5c6b657b5..08fae192c 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_10.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_10.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["localeMatcher", "kn", "kf"]);
 
@@ -15,4 +15,3 @@ var locale = new Intl.Collator(undefined, {localeMatcher: "lookup"}).resolvedOpt
 if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
     $ERROR("Collator returns invalid locale " + locale + ".");
 }
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_11.js b/test/suite/intl402/ch10/10.1/10.1.1_11.js
index 447fd8b28..da500b382 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_11.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_11.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option localeMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option localeMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.Collator, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_13.js b/test/suite/intl402/ch10/10.1/10.1.1_13.js
index 4129eebd2..7d9a2c1bc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_13.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_13.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the options numeric and caseFirst are processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the options numeric and caseFirst are processed
+    correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.Collator, "numeric", "boolean", undefined, undefined, {isOptional: true});
 testOption(Intl.Collator, "caseFirst", "string", ["upper", "lower", "false"], undefined, {isOptional: true});
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_19_b.js b/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
index f1fef2704..65e7d2ba0 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_19_b.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests the special handling of the "co" key in Intl.Collator.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests the special handling of the "co" key in Intl.Collator.
+author: Norbert Lindenberg
+---*/
 
 function checkCollation(extensionCoValue, usageValue, expectedCollations, expectedUsage) {
     var requestLocale = extensionCoValue !== undefined ? "de-DE-u-co-" + extensionCoValue : "de-DE";
@@ -41,4 +41,3 @@ checkCollation("search", undefined, ["default"], "sort");
 checkCollation("search", "search", ["default"], "search");
 
 checkCollation("search", "sort", ["default"], "sort");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_19_c.js b/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
index 4ad76d45b..7f3de815a 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_19_c.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the options numeric and caseFirst can be
- *     set through either the locale or the options.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the options numeric and caseFirst can be  set through
+    either the locale or the options.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var options = [
     {key: "kn", property: "numeric", type: "boolean", values: [true, false]},
@@ -60,4 +60,3 @@ options.forEach(function (option) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_20.js b/test/suite/intl402/ch10/10.1/10.1.1_20.js
index 97d70c0f9..a790d2019 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_20.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_20.js
@@ -1,13 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option sensitivity is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option sensitivity is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // the fallback is variant only for usage === sort, but that happens to be the fallback for usage
 testOption(Intl.Collator, "sensitivity", "string", ["base", "accent", "case", "variant"], "variant");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_23.js b/test/suite/intl402/ch10/10.1/10.1.1_23.js
index 0b5261509..5ad42aee1 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_23.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_23.js
@@ -1,13 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option ignorePunctuation is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option ignorePunctuation is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // the fallback is variant only for usage === sort, but that happens to be the fallback for usage
 testOption(Intl.Collator, "ignorePunctuation", "boolean", undefined, false);
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_6.js b/test/suite/intl402/ch10/10.1/10.1.1_6.js
index bc13436d7..cdda4cefc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_6.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_6.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option usage is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option usage is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.Collator, "usage", "string", ["sort", "search"], "sort");
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.1_a.js b/test/suite/intl402/ch10/10.1/10.1.1_a.js
index 56d4b9789..79cd5ba1e 100644
--- a/test/suite/intl402/ch10/10.1/10.1.1_a.js
+++ b/test/suite/intl402/ch10/10.1/10.1.1_a.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that constructing a Collator doesn't create or modify
- *     unwanted properties on the RegExp constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that constructing a Collator doesn't create or modify
+    unwanted properties on the RegExp constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testForUnwantedRegExpChanges(function () {
     new Intl.Collator("de-DE-u-co-phonebk");
diff --git a/test/suite/intl402/ch10/10.1/10.1.2.1_4.js b/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
index 22e69065e..ce3b986f7 100644
--- a/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
+++ b/test/suite/intl402/ch10/10.1/10.1.2.1_4.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that for non-object values passed as this to Collator a
- * wrapper object will be initialized and returned.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that for non-object values passed as this to Collator a
+    wrapper object will be initialized and returned.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = [true, 42, "国際化"];
 
@@ -18,4 +19,3 @@ thisValues.forEach(function (value) {
     }
     return true;
 });
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.2_a.js b/test/suite/intl402/ch10/10.1/10.1.2_a.js
index de69a4809..1cc9073cc 100644
--- a/test/suite/intl402/ch10/10.1/10.1.2_a.js
+++ b/test/suite/intl402/ch10/10.1/10.1.2_a.js
@@ -2,12 +2,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator can be subclassed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that Intl.Collator can be subclassed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // get a collator and have it sort an array for comparison with the subclass
 var locales = ["tlh", "id", "en"];
@@ -27,4 +26,3 @@ MyCollator.prototype.constructor = MyCollator;
 var collator = new MyCollator(locales);
 a.sort(collator.compare);
 testArraysAreSame(referenceSorted, a);
-
diff --git a/test/suite/intl402/ch10/10.1/10.1.3.js b/test/suite/intl402/ch10/10.1/10.1.3.js
index 7459d98d6..0ab3e51f3 100644
--- a/test/suite/intl402/ch10/10.1/10.1.3.js
+++ b/test/suite/intl402/ch10/10.1/10.1.3.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that objects constructed by Intl.Collator have the specified internal properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that objects constructed by Intl.Collator have the specified
+    internal properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.Collator();
 
@@ -16,4 +18,3 @@ if (actualPrototype !== Intl.Collator.prototype) {
 if (!Object.isExtensible(obj)) {
     $ERROR("Object constructed by Intl.Collator must be extensible.");
 }
-
diff --git a/test/suite/intl402/ch10/10.1/10.1_L15.js b/test/suite/intl402/ch10/10.1/10.1_L15.js
index 4dbabfd64..2185796cc 100644
--- a/test/suite/intl402/ch10/10.1/10.1_L15.js
+++ b/test/suite/intl402/ch10/10.1/10.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.Collator  meets the requirements for built-in
+    objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.Collator, true, true, ["supportedLocalesOf"], 0);
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.1.js b/test/suite/intl402/ch10/10.2/10.2.1.js
index 9eccb073c..a2e5dacd1 100644
--- a/test/suite/intl402/ch10/10.2/10.2.1.js
+++ b/test/suite/intl402/ch10/10.2/10.2.1.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype has the required attributes.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl.Collator.prototype has the required attributes.
+author: Norbert Lindenberg
+---*/
 
 var desc = Object.getOwnPropertyDescriptor(Intl.Collator, "prototype");
 if (desc === undefined) {
@@ -19,4 +19,3 @@ if (desc.enumerable) {
 if (desc.configurable) {
     $ERROR("Intl.Collator.prototype must not be configurable.");
 }
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_L15.js b/test/suite/intl402/ch10/10.2/10.2.2_L15.js
index 6ffcdde84..7076f2ce3 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_L15.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.supportedLocalesOf
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.Collator.supportedLocalesOf  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.Collator.supportedLocalesOf, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_a.js b/test/suite/intl402/ch10/10.2/10.2.2_a.js
index 5cf953ce8..772cb5c05 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_a.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_a.js
@@ -1,10 +1,11 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator has a supportedLocalesOf
- * property, and it works as planned.
- */
+/*---
+description: >
+    Tests that Intl.Collator has a supportedLocalesOf  property, and
+    it works as planned.
+---*/
 
 var defaultLocale = new Intl.Collator().resolvedOptions().locale;
 var notSupported = 'zxx'; // "no linguistic content"
@@ -24,4 +25,3 @@ if (supportedLocales.length !== 1) {
 if (supportedLocales[0] !== defaultLocale) {
     $ERROR('The default locale is not returned in the supported list.');
 }
-
diff --git a/test/suite/intl402/ch10/10.2/10.2.2_b.js b/test/suite/intl402/ch10/10.2/10.2.2_b.js
index 1b99fd8c5..38c78faad 100644
--- a/test/suite/intl402/ch10/10.2/10.2.2_b.js
+++ b/test/suite/intl402/ch10/10.2/10.2.2_b.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.supportedLocalesOf
- *     doesn't access arguments that it's not given.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.Collator.supportedLocalesOf  doesn't access
+    arguments that it's not given.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Object.prototype, "1");
 new Intl.Collator("und");
diff --git a/test/suite/intl402/ch10/10.2/10.2.3_b.js b/test/suite/intl402/ch10/10.2/10.2.3_b.js
index aef1e746a..5c02d60e2 100644
--- a/test/suite/intl402/ch10/10.2/10.2.3_b.js
+++ b/test/suite/intl402/ch10/10.2/10.2.3_b.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator does not accept Unicode locale
- *     extension keys and values that are not allowed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.Collator does not accept Unicode locale  extension
+    keys and values that are not allowed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var testArray = [
         "hello", "你好", "こんにちは",
@@ -49,4 +49,3 @@ Object.getOwnPropertyNames(keyValues).forEach(function (key) {
         testArraysAreSame(defaultSortedArray, testArray.sort(collator.compare));
     });
 });
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.1.js b/test/suite/intl402/ch10/10.3/10.3.1.js
index 699949e18..5103cbdcd 100644
--- a/test/suite/intl402/ch10/10.3/10.3.1.js
+++ b/test/suite/intl402/ch10/10.3/10.3.1.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype.constructor is the
- * Intl.Collator.
- */
+/*---
+description: >
+    Tests that Intl.Collator.prototype.constructor is the
+    Intl.Collator.
+---*/
 
 if (Intl.Collator.prototype.constructor !== Intl.Collator) {
     $ERROR("Intl.Collator.prototype.constructor is not the same as " +
            "Intl.Collator");
 }
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js b/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
index 3d49601db..2ef9a442b 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_1_a_L15.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the function returned by Intl.Collator.prototype.compare
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the function returned by
+    Intl.Collator.prototype.compare  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(new Intl.Collator().compare, true, false, [], 2);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_1_c.js b/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
index 73f2bcf09..43e9f2b3f 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_1_c.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that compare function is bound to its Intl.Collator.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that compare function is bound to its Intl.Collator.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var strings = ["d", "O", "od", "oe", "of", "ö", "o\u0308", "X", "y", "Z", "Z.", "𠮷野家", "吉野家", "!A", "A", "b", "C"];
 var locales = [undefined, ["de"], ["de-u-co-phonebk"], ["en"], ["ja"], ["sv"]];
@@ -33,4 +32,3 @@ locales.forEach(function (locales) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
index a946245b4..427f62d3a 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_a.js
@@ -2,12 +2,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the function returned by Intl.Collator.prototype.compare
- *     returns 0 when comparing Strings that are considered canonically equivalent
- *     by the Unicode standard.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that the function returned by
+    Intl.Collator.prototype.compare  returns 0 when comparing Strings
+    that are considered canonically equivalent  by the Unicode
+    standard.
+author: Norbert Lindenberg
+---*/
 
 var collator = new Intl.Collator();
 var pairs = [
@@ -65,4 +67,3 @@ function toU(s) {
     }
     return result;
 }
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
index c417d2b8a..8f3d83e18 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_b_NN.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the compare function isn't entirely unreasonable.
- *     This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the compare function isn't entirely unreasonable.  This
+    test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // this test should be valid at least for the following locales
 var locales = ["de", "en", "es", "fr", "it"];
@@ -19,4 +19,3 @@ locales.forEach(function (locale) {
     var expected = ["A", "b", "C", "d", "E", "f", "g", "H", "i", "J", "k", "L", "m", "N", "V", "w", "X", "y", "Z"];
     testArraysAreSame(expected, a);
 });
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
index 5d5060be5..67d3e49d8 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_c_NN.js
@@ -2,13 +2,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the compare function supports phonebook sorting if it says it does.
- *     This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the compare function supports phonebook sorting if it
+    says it does.  This test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // this test should be valid at least for the following locales
 var locales = ["de-DE-u-co-phonebk", "de-u-co-phonebk"];
@@ -19,4 +19,3 @@ if (locales.indexOf(collator.resolvedOptions().locale) !== -1) {
     var expected = ["A", "Ab", "Ä", "Af", "b", "od", "ö", "off"];
     testArraysAreSame(expected, a);
 }
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js b/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
index be5f1aa33..ccef21e26 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_CS_d_NN.js
@@ -2,13 +2,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the compare function supports different sensitivity settings.
- *     This test is not normative.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the compare function supports different sensitivity
+    settings.  This test is not normative.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // this test should be valid at least for the following locales
 var locales = ["de", "en", "es", "it"];
@@ -31,4 +31,3 @@ locales.forEach(function (locale) {
         testArraysAreSame(expected[sensitivity], matches);
     });
 });
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.2_L15.js b/test/suite/intl402/ch10/10.3/10.3.2_L15.js
index 5845ea3ca..68d032f36 100644
--- a/test/suite/intl402/ch10/10.3/10.3.2_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.2_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the getter for Intl.Collator.prototype.compare
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the getter for Intl.Collator.prototype.compare  meets
+    the requirements for built-in objects defined by the introduction
+    of  chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get , true, false, [], 0);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.3.js b/test/suite/intl402/ch10/10.3/10.3.3.js
index bc6b4fabb..8669a2770 100644
--- a/test/suite/intl402/ch10/10.3/10.3.3.js
+++ b/test/suite/intl402/ch10/10.3/10.3.3.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the object returned by Intl.Collator.prototype.resolvedOptions
- *     has the right properties.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the object returned by
+    Intl.Collator.prototype.resolvedOptions  has the right properties.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var actual = new Intl.Collator().resolvedOptions();
 
@@ -44,4 +44,3 @@ mustHaveProperty(actual, "ignorePunctuation", [false]);
 mustHaveProperty(actual, "collation", collations);
 mayHaveProperty(actual, "numeric", [true, false]);
 mayHaveProperty(actual, "caseFirst", ["upper", "lower", "false"]);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3.3_L15.js b/test/suite/intl402/ch10/10.3/10.3.3_L15.js
index 718cc9fea..6e9f6672b 100644
--- a/test/suite/intl402/ch10/10.3/10.3.3_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype.resolvedOptions
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.Collator.prototype.resolvedOptions  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.Collator.prototype.resolvedOptions, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_L15.js b/test/suite/intl402/ch10/10.3/10.3_L15.js
index 60719736c..09dfa2fc8 100644
--- a/test/suite/intl402/ch10/10.3/10.3_L15.js
+++ b/test/suite/intl402/ch10/10.3/10.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.Collator.prototype  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.Collator.prototype, false, false, ["constructor", "compare", "resolvedOptions"]);
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_a.js b/test/suite/intl402/ch10/10.3/10.3_a.js
index aa2e52845..e4016c262 100644
--- a/test/suite/intl402/ch10/10.3/10.3_a.js
+++ b/test/suite/intl402/ch10/10.3/10.3_a.js
@@ -1,10 +1,11 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype is an object that
- * has been initialized as an Intl.Collator.
- */
+/*---
+description: >
+    Tests that Intl.Collator.prototype is an object that  has been
+    initialized as an Intl.Collator.
+---*/
 
 // test by calling a function that would fail if "this" were not an object
 // initialized as an Intl.Collator
@@ -12,4 +13,3 @@ if (Intl.Collator.prototype.compare("aаあ아", "aаあ아") !== 0) {
     $ERROR("Intl.Collator.prototype is not an object that has been " +
         "initialized as an Intl.Collator.");
 }
-
diff --git a/test/suite/intl402/ch10/10.3/10.3_b.js b/test/suite/intl402/ch10/10.3/10.3_b.js
index 9c3c2db32..97dbfa390 100644
--- a/test/suite/intl402/ch10/10.3/10.3_b.js
+++ b/test/suite/intl402/ch10/10.3/10.3_b.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator.prototype functions throw a
- *     TypeError if called on a non-object value or an object that hasn't been
- *     initialized as a Collator.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.Collator.prototype functions throw a  TypeError if
+    called on a non-object value or an object that hasn't been
+    initialized as a Collator.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     "compare getter": Object.getOwnPropertyDescriptor(Intl.Collator.prototype, "compare").get,
@@ -30,4 +31,3 @@ Object.getOwnPropertyNames(functions).forEach(function (functionName) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch10/10.4/10.4_a.js b/test/suite/intl402/ch10/10.4/10.4_a.js
index 7527f65eb..a611bafb3 100644
--- a/test/suite/intl402/ch10/10.4/10.4_a.js
+++ b/test/suite/intl402/ch10/10.4/10.4_a.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.Collator instances have the specified properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl.Collator instances have the specified properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.Collator();
 
@@ -12,4 +12,3 @@ var toStringValue = Object.prototype.toString.call(obj);
 if (toStringValue !== "[object Object]") {
     $ERROR("Intl.Collator instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
 }
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_1.js b/test/suite/intl402/ch11/11.1/11.1.1_1.js
index 33af16975..7a520c8dc 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_1.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_1.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that an object can't be re-initialized as a NumberFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that an object can't be re-initialized as a NumberFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var obj, error;
@@ -40,4 +39,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_15.js b/test/suite/intl402/ch11/11.1/11.1.1_15.js
index 4d0467428..e634e3bb6 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_15.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_15.js
@@ -1,13 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option style is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option style is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.NumberFormat, "style", "string", ["decimal", "percent", "currency"], "decimal",
         {extra: {"currency": {currency: "CNY"}}});
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_17.js b/test/suite/intl402/ch11/11.1/11.1.1_17.js
index 08c0e8e5c..ccf619892 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_17.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_17.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option currency is processed correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that the option currency is processed correctly.
+author: Norbert Lindenberg
+---*/
 
 var validValues = ["CNY", "USD", "EUR", "IDR", "jpy", {toString: function () {return "INR";}}];
 var invalidValues = ["$", "SFr.", "US$", "ßP", {toString: function () {return;}}];
@@ -78,4 +78,3 @@ invalidValues.forEach(function (value) {
             return new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {currency: value});
     });
 });
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_19.js b/test/suite/intl402/ch11/11.1/11.1.1_19.js
index e41ca5bec..0263f663d 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_19.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_19.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the currency style can not be used without a specified currency.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that the currency style can not be used without a specified
+    currency.
+author: Norbert Lindenberg
+---*/
 
 var defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
 
@@ -28,4 +30,3 @@ expectError(function () {
 expectError(function () {
         return new Intl.NumberFormat([defaultLocale + "-u-cu-krw"], {style: "currency"});
 });
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_20_c.js b/test/suite/intl402/ch11/11.1/11.1.1_20_c.js
index d4a230c10..4301f8a4b 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_20_c.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_20_c.js
@@ -2,10 +2,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the number of fractional digits is determined correctly for currencies.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that the number of fractional digits is determined correctly
+    for currencies.
+author: Norbert Lindenberg
+---*/
 
 // data from http://www.currency-iso.org/dl_iso_table_a1.xml, 2013-02-25
 var currencyDigits = {
@@ -193,4 +195,3 @@ Object.getOwnPropertyNames(currencyDigits).forEach(function (currency) {
             currency + "; expected " + digits + ", got " + max + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_21.js b/test/suite/intl402/ch11/11.1/11.1.1_21.js
index 1751b8b57..b89468474 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_21.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_21.js
@@ -1,15 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option currencyDisplay is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option currencyDisplay is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.NumberFormat, "currencyDisplay", "string", ["code", "symbol", "name"],
     "symbol", {extra: {any: {style: "currency", currency: "XDR"}}});
 testOption(Intl.NumberFormat, "currencyDisplay", "string", ["code", "symbol", "name"],
     undefined, {noReturn: true});
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_32.js b/test/suite/intl402/ch11/11.1/11.1.1_32.js
index 9196318ef..d6fe982cf 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_32.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_32.js
@@ -1,11 +1,12 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the options minimumSignificantDigits and
- *     maximumSignificantDigits are read in the right sequence.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that the options minimumSignificantDigits and
+    maximumSignificantDigits are read in the right sequence.
+author: Norbert Lindenberg
+---*/
 
 var read = 0;
 
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_34.js b/test/suite/intl402/ch11/11.1/11.1.1_34.js
index 98ba9a062..8fbc6a9eb 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_34.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_34.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option useGrouping is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option useGrouping is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.NumberFormat, "useGrouping", "boolean", undefined, true);
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_6.js b/test/suite/intl402/ch11/11.1/11.1.1_6.js
index 5b9d342eb..5c3c9c973 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_6.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_6.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["localeMatcher"]);
 
@@ -15,4 +15,3 @@ var locale = new Intl.NumberFormat(undefined, {localeMatcher: "lookup"}).resolve
 if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
     $ERROR("NumberFormat returns invalid locale " + locale + ".");
 }
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_7.js b/test/suite/intl402/ch11/11.1/11.1.1_7.js
index 4b13b245b..76c6cd48d 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_7.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_7.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option localeMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option localeMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.NumberFormat, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.1_a.js b/test/suite/intl402/ch11/11.1/11.1.1_a.js
index 611816b61..941a9a279 100644
--- a/test/suite/intl402/ch11/11.1/11.1.1_a.js
+++ b/test/suite/intl402/ch11/11.1/11.1.1_a.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that constructing a NumberFormat doesn't create or modify
- *     unwanted properties on the RegExp constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that constructing a NumberFormat doesn't create or modify
+    unwanted properties on the RegExp constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testForUnwantedRegExpChanges(function () {
     new Intl.NumberFormat("de-DE-u-nu-latn");
diff --git a/test/suite/intl402/ch11/11.1/11.1.2.1_4.js b/test/suite/intl402/ch11/11.1/11.1.2.1_4.js
index 18b5b98fa..9b985c2d4 100644
--- a/test/suite/intl402/ch11/11.1/11.1.2.1_4.js
+++ b/test/suite/intl402/ch11/11.1/11.1.2.1_4.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that for non-object values passed as this to NumberFormat a
- * wrapper object will be initialized and returned.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that for non-object values passed as this to NumberFormat a
+    wrapper object will be initialized and returned.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = [true, 42, "国際化"];
 
@@ -18,4 +19,3 @@ thisValues.forEach(function (value) {
     }
     return true;
 });
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.2.js b/test/suite/intl402/ch11/11.1/11.1.2.js
index 0ca8cbbda..e230c8d40 100644
--- a/test/suite/intl402/ch11/11.1/11.1.2.js
+++ b/test/suite/intl402/ch11/11.1/11.1.2.js
@@ -2,12 +2,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat can be subclassed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that Intl.NumberFormat can be subclassed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // get a number format and have it format an array of numbers for comparison with the subclass
 var locales = ["tlh", "id", "en"];
@@ -27,4 +26,3 @@ MyNumberFormat.prototype.constructor = MyNumberFormat;
 var format = new MyNumberFormat(locales);
 var actual = a.map(format.format);
 testArraysAreSame(referenceFormatted, actual);
-
diff --git a/test/suite/intl402/ch11/11.1/11.1.3.js b/test/suite/intl402/ch11/11.1/11.1.3.js
index f0bfb5552..f940fbb88 100644
--- a/test/suite/intl402/ch11/11.1/11.1.3.js
+++ b/test/suite/intl402/ch11/11.1/11.1.3.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that objects constructed by Intl.NumberFormat have the specified internal properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that objects constructed by Intl.NumberFormat have the
+    specified internal properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.NumberFormat();
 
@@ -16,4 +18,3 @@ if (actualPrototype !== Intl.NumberFormat.prototype) {
 if (!Object.isExtensible(obj)) {
     $ERROR("Object constructed by Intl.NumberFormat must be extensible.");
 }
-
diff --git a/test/suite/intl402/ch11/11.1/11.1_L15.js b/test/suite/intl402/ch11/11.1/11.1_L15.js
index e40ffc53e..80a4dcf9d 100644
--- a/test/suite/intl402/ch11/11.1/11.1_L15.js
+++ b/test/suite/intl402/ch11/11.1/11.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat  meets the requirements for built-in
+    objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.NumberFormat, true, true, ["supportedLocalesOf"], 0);
-
diff --git a/test/suite/intl402/ch11/11.2/11.2.1.js b/test/suite/intl402/ch11/11.2/11.2.1.js
index 83bebb283..8db3242e7 100644
--- a/test/suite/intl402/ch11/11.2/11.2.1.js
+++ b/test/suite/intl402/ch11/11.2/11.2.1.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype has the required attributes.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that Intl.NumberFormat.prototype has the required attributes.
+author: Norbert Lindenberg
+---*/
 
 var desc = Object.getOwnPropertyDescriptor(Intl.NumberFormat, "prototype");
 if (desc === undefined) {
@@ -19,4 +19,3 @@ if (desc.enumerable) {
 if (desc.configurable) {
     $ERROR("Intl.NumberFormat.prototype must not be configurable.");
 }
-
diff --git a/test/suite/intl402/ch11/11.2/11.2.2_L15.js b/test/suite/intl402/ch11/11.2/11.2.2_L15.js
index 49dce3bae..fbabbce99 100644
--- a/test/suite/intl402/ch11/11.2/11.2.2_L15.js
+++ b/test/suite/intl402/ch11/11.2/11.2.2_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.supportedLocalesOf
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat.supportedLocalesOf  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.NumberFormat.supportedLocalesOf, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch11/11.2/11.2.2_a.js b/test/suite/intl402/ch11/11.2/11.2.2_a.js
index c6c9f9a46..309c148f7 100644
--- a/test/suite/intl402/ch11/11.2/11.2.2_a.js
+++ b/test/suite/intl402/ch11/11.2/11.2.2_a.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat has a supportedLocalesOf
- * property, and it works as planned.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat has a supportedLocalesOf  property,
+    and it works as planned.
+author:: Roozbeh Pournader
+---*/
 
 var defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
 var notSupported = 'zxx'; // "no linguistic content"
@@ -25,4 +26,3 @@ if (supportedLocales.length !== 1) {
 if (supportedLocales[0] !== defaultLocale) {
     $ERROR('The default locale is not returned in the supported list.');
 }
-
diff --git a/test/suite/intl402/ch11/11.2/11.2.2_b.js b/test/suite/intl402/ch11/11.2/11.2.2_b.js
index 6b4d77e77..b6ea0b49a 100644
--- a/test/suite/intl402/ch11/11.2/11.2.2_b.js
+++ b/test/suite/intl402/ch11/11.2/11.2.2_b.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.supportedLocalesOf
- *     doesn't access arguments that it's not given.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat.supportedLocalesOf  doesn't access
+    arguments that it's not given.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Object.prototype, "1");
 new Intl.NumberFormat("und");
diff --git a/test/suite/intl402/ch11/11.2/11.2.3_b.js b/test/suite/intl402/ch11/11.2/11.2.3_b.js
index 70fe7cf11..b4200d91b 100644
--- a/test/suite/intl402/ch11/11.2/11.2.3_b.js
+++ b/test/suite/intl402/ch11/11.2/11.2.3_b.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat does not accept Unicode locale
- *     extension keys and values that are not allowed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat does not accept Unicode locale
+    extension keys and values that are not allowed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = ["ja-JP", "zh-Hans-CN", "zh-Hant-TW"];
 var input = 1234567.89;
@@ -43,4 +43,3 @@ locales.forEach(function (locale) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.1.js b/test/suite/intl402/ch11/11.3/11.3.1.js
index 46c7fc519..4ca432c75 100644
--- a/test/suite/intl402/ch11/11.3/11.3.1.js
+++ b/test/suite/intl402/ch11/11.3/11.3.1.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.constructor is the
- * Intl.NumberFormat.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.constructor is the
+    Intl.NumberFormat.
+author:: Roozbeh Pournader
+---*/
 
 if (Intl.NumberFormat.prototype.constructor !== Intl.NumberFormat) {
     $ERROR("Intl.NumberFormat.prototype.constructor is not the same as " +
           "Intl.NumberFormat");
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_1_a_L15.js b/test/suite/intl402/ch11/11.3/11.3.2_1_a_L15.js
index 8e1c95835..829a02764 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_1_a_L15.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_1_a_L15.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the function returned by Intl.NumberFormat.prototype.format
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the function returned by
+    Intl.NumberFormat.prototype.format  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(new Intl.NumberFormat().format, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_1_a_ii.js b/test/suite/intl402/ch11/11.3/11.3.2_1_a_ii.js
index cb284f43e..feb525bb6 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_1_a_ii.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_1_a_ii.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.format
- * converts other types to numbers.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.format  converts other
+    types to numbers.
+author:: Roozbeh Pournader
+---*/
 
 var formatter = new Intl.NumberFormat();
 var testData = [undefined, null, true, '0.6666666', {valueOf: function () { return '0.1234567';}}];
@@ -24,4 +25,3 @@ for (i in testData) {
             'Expected output: "'+correctResult+'"');
     }
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_1_c.js b/test/suite/intl402/ch11/11.3/11.3.2_1_c.js
index 3fc877b31..9e473296c 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_1_c.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_1_c.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that format function is bound to its Intl.NumberFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that format function is bound to its Intl.NumberFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var numbers = [0, -0, 1, -1, 5.5, 123, -123, -123.45, 123.44501, 0.001234,
     -0.00000000123, 0.00000000000000000000000000000123, 1.2, 0.0000000012344501,
@@ -38,4 +37,3 @@ locales.forEach(function (locales) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_FN_1.js b/test/suite/intl402/ch11/11.3/11.3.2_FN_1.js
index 5f14e7772..92e81abae 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_FN_1.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_FN_1.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.format
- * doesn't treat all numbers as negative.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.format  doesn't treat all
+    numbers as negative.
+author:: Roozbeh Pournader
+---*/
 
 var formatter = new Intl.NumberFormat();
   
@@ -16,4 +17,3 @@ if (formatter.format(1) === formatter.format(-1)) {
 if (formatter.format(-0) !== formatter.format(0)) {
     $ERROR('Intl.NumberFormat is formatting signed zeros differently.');
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_FN_2.js b/test/suite/intl402/ch11/11.3/11.3.2_FN_2.js
index ec11a679d..fcc1358d8 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_FN_2.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_FN_2.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.format
- * handles NaN, Infinity, and -Infinity properly.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.format  handles NaN,
+    Infinity, and -Infinity properly.
+author:: Roozbeh Pournader
+---*/
 
 // FIXME: We are only listing Numeric_Type=Decimal. May need to add more
 // when the spec clarifies. Current as of Unicode 6.1.
@@ -56,4 +57,3 @@ if (hasUnicodeDigits.test(formattedNegativeInfinity)) {
     $ERROR('Intl.NumberFormat formats negative Infinity ' + 
         'using a digit.');
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_FN_3_b.js b/test/suite/intl402/ch11/11.3/11.3.2_FN_3_b.js
index efe15575d..1b5742a37 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_FN_3_b.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_FN_3_b.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.format
- * formats percent values properly.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.format  formats percent
+    values properly.
+author:: Roozbeh Pournader
+---*/
 
 var numberFormatter = new Intl.NumberFormat();
 var percentFormatter = new Intl.NumberFormat(undefined, {style: 'percent'});
@@ -24,4 +25,3 @@ if (formattedTwentyPercent.indexOf(formattedTwenty) === -1) {
 if (percentFormatter.format(0.011) === percentFormatter.format(0.02)) {
     $ERROR('Intl.NumberFormat is formatting 1.1% and 2% the same way.');
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_FN_3_e.js b/test/suite/intl402/ch11/11.3/11.3.2_FN_3_e.js
index 234ae6325..2f1316037 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_FN_3_e.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_FN_3_e.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.format
- * supports all alternative numbering systems.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.format  supports all
+    alternative numbering systems.
+author:: Roozbeh Pournader
+---*/
 
 var numberingSystems = {
     arab: 0x0660,
@@ -44,4 +45,3 @@ for (s in numberingSystems) {
 }
 
 // FIXME: Unfinished
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_L15.js b/test/suite/intl402/ch11/11.3/11.3.2_L15.js
index 17b688b7a..5a56ef6a0 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_L15.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_L15.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the getter for Intl.NumberFormat.prototype.format
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the getter for Intl.NumberFormat.prototype.format
+    meets the requirements for built-in objects defined by the
+    introduction of  chapter 15 of the ECMAScript Language
+    Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.NumberFormat.prototype, "format").get , true, false, [], 0);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_TRF.js b/test/suite/intl402/ch11/11.3/11.3.2_TRF.js
index c042a318a..239a5806c 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_TRF.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_TRF.js
@@ -2,12 +2,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the digits are determined correctly when specifying pre/post decimal digits.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the digits are determined correctly when specifying
+    pre/post decimal digits.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = [
     new Intl.NumberFormat().resolvedOptions().locale,
@@ -53,4 +54,3 @@ var testData = {
 testNumberFormat(locales, numberingSystems,
     {useGrouping: false, minimumIntegerDigits: 3, minimumFractionDigits: 1, maximumFractionDigits: 3},
     testData);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.2_TRP.js b/test/suite/intl402/ch11/11.3/11.3.2_TRP.js
index 9ab6550b6..85be15790 100644
--- a/test/suite/intl402/ch11/11.3/11.3.2_TRP.js
+++ b/test/suite/intl402/ch11/11.3/11.3.2_TRP.js
@@ -2,12 +2,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the digits are determined correctly when specifying significant digits.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the digits are determined correctly when specifying
+    significant digits.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = [
     new Intl.NumberFormat().resolvedOptions().locale,
@@ -53,4 +54,3 @@ var testData = {
 testNumberFormat(locales, numberingSystems,
     {useGrouping: false, minimumSignificantDigits: 3, maximumSignificantDigits: 5},
     testData);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.3.js b/test/suite/intl402/ch11/11.3/11.3.3.js
index 5a220ccc9..aca7d4746 100644
--- a/test/suite/intl402/ch11/11.3/11.3.3.js
+++ b/test/suite/intl402/ch11/11.3/11.3.3.js
@@ -1,13 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the object returned by Intl.NumberFormat.prototype.resolvedOptions
- *     has the right properties.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the object returned by
+    Intl.NumberFormat.prototype.resolvedOptions  has the right
+    properties.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var actual = new Intl.NumberFormat().resolvedOptions();
 
@@ -28,4 +29,3 @@ mustHaveProperty(actual, "maximumFractionDigits", [3]);
 mustNotHaveProperty(actual, "minimumSignificantDigits");
 mustNotHaveProperty(actual, "maximumSignificantDigits");
 mustHaveProperty(actual, "useGrouping", [true]);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3.3_L15.js b/test/suite/intl402/ch11/11.3/11.3.3_L15.js
index b9f95866d..97f3b9fae 100644
--- a/test/suite/intl402/ch11/11.3/11.3.3_L15.js
+++ b/test/suite/intl402/ch11/11.3/11.3.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype.resolvedOptions
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype.resolvedOptions  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.NumberFormat.prototype.resolvedOptions, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3_L15.js b/test/suite/intl402/ch11/11.3/11.3_L15.js
index ac1f0c05d..0b6b1a6a4 100644
--- a/test/suite/intl402/ch11/11.3/11.3_L15.js
+++ b/test/suite/intl402/ch11/11.3/11.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.NumberFormat.prototype, false, false, ["constructor", "format", "resolvedOptions"]);
-
diff --git a/test/suite/intl402/ch11/11.3/11.3_a.js b/test/suite/intl402/ch11/11.3/11.3_a.js
index 282a10bf6..092140c08 100644
--- a/test/suite/intl402/ch11/11.3/11.3_a.js
+++ b/test/suite/intl402/ch11/11.3/11.3_a.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype is an object that
- * has been initialized as an Intl.NumberFormat.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype is an object that  has been
+    initialized as an Intl.NumberFormat.
+author:: Roozbeh Pournader
+---*/
 
 // test by calling a function that would fail if "this" were not an object
 // initialized as an Intl.NumberFormat
@@ -13,4 +14,3 @@ if (typeof Intl.NumberFormat.prototype.format(0) !== "string") {
     $ERROR("Intl.NumberFormat's prototype is not an object that has been " +
         "initialized as an Intl.NumberFormat");
 }
-
diff --git a/test/suite/intl402/ch11/11.3/11.3_b.js b/test/suite/intl402/ch11/11.3/11.3_b.js
index 6d0162b1d..7b2453b3b 100644
--- a/test/suite/intl402/ch11/11.3/11.3_b.js
+++ b/test/suite/intl402/ch11/11.3/11.3_b.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat.prototype functions throw a
- *     TypeError if called on a non-object value or an object that hasn't been
- *     initialized as a NumberFormat.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat.prototype functions throw a
+    TypeError if called on a non-object value or an object that hasn't
+    been  initialized as a NumberFormat.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     "format getter": Object.getOwnPropertyDescriptor(Intl.NumberFormat.prototype, "format").get,
@@ -30,4 +31,3 @@ Object.getOwnPropertyNames(functions).forEach(function (functionName) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch11/11.4/11.4_a.js b/test/suite/intl402/ch11/11.4/11.4_a.js
index a562879ec..9d92e8d54 100644
--- a/test/suite/intl402/ch11/11.4/11.4_a.js
+++ b/test/suite/intl402/ch11/11.4/11.4_a.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.NumberFormat instances have the specified properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.NumberFormat instances have the specified
+    properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.NumberFormat();
 
@@ -12,4 +14,3 @@ var toStringValue = Object.prototype.toString.call(obj);
 if (toStringValue !== "[object Object]") {
     $ERROR("Intl.NumberFormat instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
 }
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_1.js b/test/suite/intl402/ch12/12.1/12.1.1_1.js
index 8136fb421..0290ea9a1 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_1.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_1.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that an object can't be re-initialized as a DateTimeFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that an object can't be re-initialized as a DateTimeFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testWithIntlConstructors(function (Constructor) {
     var obj, error;
@@ -40,4 +39,3 @@ testWithIntlConstructors(function (Constructor) {
     
     return true;
 });
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_18.js b/test/suite/intl402/ch12/12.1/12.1.1_18.js
index f75ea1e32..d3c2add26 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_18.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_18.js
@@ -1,15 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option hour12 is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option hour12 is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.DateTimeFormat, "hour12", "boolean", undefined, undefined,
     {extra: {any: {hour: "numeric", minute: "numeric"}}});
 testOption(Intl.DateTimeFormat, "hour12", "boolean", undefined, undefined,
     {noReturn: true});
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_22.js b/test/suite/intl402/ch12/12.1/12.1.1_22.js
index 5c317c6b9..ee2cc9b8e 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_22.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_22.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["weekday", "era", "year", "month", "day", "hour", "minute", "second", "timeZone"]);
 
@@ -15,4 +15,3 @@ var locale = new Intl.DateTimeFormat(undefined, {localeMatcher: "lookup"}).resol
 if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
     $ERROR("DateTimeFormat returns invalid locale " + locale + ".");
 }
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_23.js b/test/suite/intl402/ch12/12.1/12.1.1_23.js
index d26e1d28c..c6cc932e3 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_23.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_23.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the options for the date and time components are processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the options for the date and time components are
+    processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 getDateTimeComponents().forEach(function (component) {
     testOption(Intl.DateTimeFormat, component, "string", getDateTimeComponentValues(component), undefined, {isILD: true});
 });
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_25.js b/test/suite/intl402/ch12/12.1/12.1.1_25.js
index ccaf7be03..490e5bd9a 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_25.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_25.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option formatMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option formatMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.DateTimeFormat, "formatMatcher", "string", ["basic", "best fit"], "best fit", {noReturn: true});
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_5.js b/test/suite/intl402/ch12/12.1/12.1.1_5.js
index c6b166814..43bcf386a 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_5.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_5.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["localeMatcher"]);
 
@@ -15,4 +15,3 @@ var locale = new Intl.DateTimeFormat(undefined, {localeMatcher: "lookup"}).resol
 if (!isCanonicalizedStructurallyValidLanguageTag(locale)) {
     $ERROR("DateTimeFormat returns invalid locale " + locale + ".");
 }
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_6.js b/test/suite/intl402/ch12/12.1/12.1.1_6.js
index 148ca02f6..2266d0342 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_6.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_6.js
@@ -1,12 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the option localeMatcher is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that the option localeMatcher is processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testOption(Intl.DateTimeFormat, "localeMatcher", "string", ["lookup", "best fit"], "best fit", {noReturn: true});
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_TDTO.js b/test/suite/intl402/ch12/12.1/12.1.1_TDTO.js
index 5df6a1cf2..74bc6a0c5 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_TDTO.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_TDTO.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the set of options for the date and time components is processed correctly.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the set of options for the date and time components is
+    processed correctly.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = [[], ["zh-Hans-CN"], ["hi-IN"], ["en-US"], ["id-ID"]];
 var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
@@ -103,5 +104,3 @@ testWithToLocale("toLocaleTimeString", {weekday: "short", year: "numeric", month
 
 // time/time: steps 6a
 testWithToLocale("toLocaleTimeString", {hour: "numeric", minute: "numeric"}, {hour: "numeric", minute: "numeric"});
-
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.1_a.js b/test/suite/intl402/ch12/12.1/12.1.1_a.js
index 4f5f3dbf5..d2ee50656 100644
--- a/test/suite/intl402/ch12/12.1/12.1.1_a.js
+++ b/test/suite/intl402/ch12/12.1/12.1.1_a.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that constructing a DateTimeFormat doesn't create or modify
- *     unwanted properties on the RegExp constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that constructing a DateTimeFormat doesn't create or modify
+    unwanted properties on the RegExp constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 testForUnwantedRegExpChanges(function () {
     new Intl.DateTimeFormat("de-DE-u-ca-gregory");
diff --git a/test/suite/intl402/ch12/12.1/12.1.2.1_4.js b/test/suite/intl402/ch12/12.1/12.1.2.1_4.js
index cb22be8f9..db5de9486 100644
--- a/test/suite/intl402/ch12/12.1/12.1.2.1_4.js
+++ b/test/suite/intl402/ch12/12.1/12.1.2.1_4.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that for non-object values passed as this to DateTimeFormat a
- * wrapper object will be initialized and returned.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that for non-object values passed as this to DateTimeFormat
+    a  wrapper object will be initialized and returned.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = [true, 42, "国際化"];
 
@@ -18,4 +19,3 @@ thisValues.forEach(function (value) {
     }
     return true;
 });
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.2.js b/test/suite/intl402/ch12/12.1/12.1.2.js
index 3ffed2ec8..5a3819f59 100644
--- a/test/suite/intl402/ch12/12.1/12.1.2.js
+++ b/test/suite/intl402/ch12/12.1/12.1.2.js
@@ -2,12 +2,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat can be subclassed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that Intl.DateTimeFormat can be subclassed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 // get a date-time format and have it format an array of dates for comparison with the subclass
 var locales = ["tlh", "id", "en"];
@@ -27,4 +26,3 @@ MyDateTimeFormat.prototype.constructor = MyDateTimeFormat;
 var format = new MyDateTimeFormat(locales);
 var actual = a.map(format.format);
 testArraysAreSame(referenceFormatted, actual);
-
diff --git a/test/suite/intl402/ch12/12.1/12.1.3.js b/test/suite/intl402/ch12/12.1/12.1.3.js
index 5e70bbb8f..4c0ab6640 100644
--- a/test/suite/intl402/ch12/12.1/12.1.3.js
+++ b/test/suite/intl402/ch12/12.1/12.1.3.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that objects constructed by Intl.DateTimeFormat have the specified internal properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that objects constructed by Intl.DateTimeFormat have the
+    specified internal properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.DateTimeFormat();
 
@@ -16,4 +18,3 @@ if (actualPrototype !== Intl.DateTimeFormat.prototype) {
 if (!Object.isExtensible(obj)) {
     $ERROR("Object constructed by Intl.DateTimeFormat must be extensible.");
 }
-
diff --git a/test/suite/intl402/ch12/12.1/12.1_L15.js b/test/suite/intl402/ch12/12.1/12.1_L15.js
index 46c4f5f50..07306a232 100644
--- a/test/suite/intl402/ch12/12.1/12.1_L15.js
+++ b/test/suite/intl402/ch12/12.1/12.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.DateTimeFormat, true, true, ["supportedLocalesOf"], 0);
-
diff --git a/test/suite/intl402/ch12/12.2/12.2.1.js b/test/suite/intl402/ch12/12.2/12.2.1.js
index 3590c0a9d..0a352a554 100644
--- a/test/suite/intl402/ch12/12.2/12.2.1.js
+++ b/test/suite/intl402/ch12/12.2/12.2.1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype has the required attributes.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype has the required
+    attributes.
+author: Norbert Lindenberg
+---*/
 
 var desc = Object.getOwnPropertyDescriptor(Intl.DateTimeFormat, "prototype");
 if (desc === undefined) {
@@ -19,4 +21,3 @@ if (desc.enumerable) {
 if (desc.configurable) {
     $ERROR("Intl.DateTimeFormat.prototype must not be configurable.");
 }
-
diff --git a/test/suite/intl402/ch12/12.2/12.2.2_L15.js b/test/suite/intl402/ch12/12.2/12.2.2_L15.js
index 8b21df1fd..b7de4f47c 100644
--- a/test/suite/intl402/ch12/12.2/12.2.2_L15.js
+++ b/test/suite/intl402/ch12/12.2/12.2.2_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.supportedLocalesOf
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.supportedLocalesOf  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.DateTimeFormat.supportedLocalesOf, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch12/12.2/12.2.2_a.js b/test/suite/intl402/ch12/12.2/12.2.2_a.js
index 42eedc0a1..2c30dfea9 100644
--- a/test/suite/intl402/ch12/12.2/12.2.2_a.js
+++ b/test/suite/intl402/ch12/12.2/12.2.2_a.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat has a supportedLocalesOf
- * property, and it works as planned.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat has a supportedLocalesOf  property,
+    and it works as planned.
+author:: Roozbeh Pournader
+---*/
 
 var defaultLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
 var notSupported = 'zxx'; // "no linguistic content"
@@ -25,4 +26,3 @@ if (supportedLocales.length !== 1) {
 if (supportedLocales[0] !== defaultLocale) {
     $ERROR('The default locale is not returned in the supported list.');
 }
-
diff --git a/test/suite/intl402/ch12/12.2/12.2.2_b.js b/test/suite/intl402/ch12/12.2/12.2.2_b.js
index 06bc8027e..2d5db9380 100644
--- a/test/suite/intl402/ch12/12.2/12.2.2_b.js
+++ b/test/suite/intl402/ch12/12.2/12.2.2_b.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.supportedLocalesOf
- *     doesn't access arguments that it's not given.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.supportedLocalesOf  doesn't access
+    arguments that it's not given.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Object.prototype, "1");
 new Intl.DateTimeFormat("und");
diff --git a/test/suite/intl402/ch12/12.2/12.2.3_b.js b/test/suite/intl402/ch12/12.2/12.2.3_b.js
index 65fd9dc5f..cbb756f73 100644
--- a/test/suite/intl402/ch12/12.2/12.2.3_b.js
+++ b/test/suite/intl402/ch12/12.2/12.2.3_b.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat does not accept Unicode locale
- *     extension keys and values that are not allowed.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat does not accept Unicode locale
+    extension keys and values that are not allowed.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = ["ja-JP", "zh-Hans-CN", "zh-Hant-TW"];
 var input = new Date(Date.parse("1989-11-09T17:57:00Z"));
@@ -44,4 +44,3 @@ locales.forEach(function (locale) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch12/12.2/12.2.3_c.js b/test/suite/intl402/ch12/12.2/12.2.3_c.js
index 0aced6ca9..8a4ac3eef 100644
--- a/test/suite/intl402/ch12/12.2/12.2.3_c.js
+++ b/test/suite/intl402/ch12/12.2/12.2.3_c.js
@@ -1,13 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat provides the required date-time
- *     format component subsets.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat provides the required date-time
+    format component subsets.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var locales = ["de-DE", "en-US", "hi-IN", "id-ID", "ja-JP", "th-TH", "zh-Hans-CN", "zh-Hant-TW", "zxx"];
 var subsets = [
@@ -49,4 +49,3 @@ locales.forEach(function (locale) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.1.js b/test/suite/intl402/ch12/12.3/12.3.1.js
index 1755dd64b..add5b98ca 100644
--- a/test/suite/intl402/ch12/12.3/12.3.1.js
+++ b/test/suite/intl402/ch12/12.3/12.3.1.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype.constructor is the
- * Intl.DateTimeFormat.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype.constructor is the
+    Intl.DateTimeFormat.
+author:: Roozbeh Pournader
+---*/
 
 if (Intl.DateTimeFormat.prototype.constructor !== Intl.DateTimeFormat) {
     $ERROR("Intl.DateTimeFormat.prototype.constructor is not the same as " +
           "Intl.DateTimeFormat");
 }
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_1_a_L15.js b/test/suite/intl402/ch12/12.3/12.3.2_1_a_L15.js
index 2fb768d09..bd595ddf9 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_1_a_L15.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_1_a_L15.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the function returned by Intl.DateTimeFormat.prototype.format
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the function returned by
+    Intl.DateTimeFormat.prototype.format  meets the requirements for
+    built-in objects defined by the introduction of  chapter 15 of the
+    ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(new Intl.DateTimeFormat().format, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_1_c.js b/test/suite/intl402/ch12/12.3/12.3.2_1_c.js
index d4b9f891f..ed8e9893f 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_1_c.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_1_c.js
@@ -1,12 +1,11 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that format function is bound to its Intl.DateTimeFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: Tests that format function is bound to its Intl.DateTimeFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var dates = [new Date(), new Date(0), new Date(Date.parse("1989-11-09T17:57:00Z"))];
 var locales = [undefined, ["de"], ["th-u-ca-gregory-nu-thai"], ["en"], ["ja-u-ca-japanese"], ["ar-u-ca-islamicc-nu-arab"]];
@@ -31,4 +30,3 @@ locales.forEach(function (locales) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_FDT_1.js b/test/suite/intl402/ch12/12.3/12.3.2_FDT_1.js
index d643d7928..613fa68d5 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_FDT_1.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_FDT_1.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that format handles non-finite values correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that format handles non-finite values correctly.
+author: Norbert Lindenberg
+---*/
 
 var invalidValues = [NaN, Infinity, -Infinity];
 
@@ -23,4 +23,3 @@ invalidValues.forEach(function (value) {
         $ERROR("Invalid value " + value + " was rejected with wrong error " + error.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_FDT_7_a_iv.js b/test/suite/intl402/ch12/12.3/12.3.2_FDT_7_a_iv.js
index f13878403..8f100ccdb 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_FDT_7_a_iv.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_FDT_7_a_iv.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that format uses a proleptic Gregorian calendar with no year 0.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that format uses a proleptic Gregorian calendar with no year
+    0.
+author: Norbert Lindenberg
+---*/
 
 var dates = [
     0, // January 1, 1970
@@ -29,4 +31,3 @@ dates.forEach(function (date) {
             expectedYearString + ", got " + dateString + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_L15.js b/test/suite/intl402/ch12/12.3/12.3.2_L15.js
index 73d309e26..67c877715 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_L15.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_L15.js
@@ -1,14 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the getter for Intl.DateTimeFormat.prototype.format
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that the getter for Intl.DateTimeFormat.prototype.format
+    meets the requirements for built-in objects defined by the
+    introduction of  chapter 15 of the ECMAScript Language
+    Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, "format").get , true, false, [], 0);
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.2_TLT_2.js b/test/suite/intl402/ch12/12.3/12.3.2_TLT_2.js
index bf0a8ed36..bb72014a0 100644
--- a/test/suite/intl402/ch12/12.3/12.3.2_TLT_2.js
+++ b/test/suite/intl402/ch12/12.3/12.3.2_TLT_2.js
@@ -1,16 +1,15 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that the behavior of a Record is not affected by adversarial
- *     changes to Object.prototype.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the behavior of a Record is not affected by
+    adversarial  changes to Object.prototype.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintProperties(["weekday", "era", "year", "month", "day", "hour", "minute", "second", "inDST"]);
 
 var format = new Intl.DateTimeFormat();
 var time = format.format();
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.3.js b/test/suite/intl402/ch12/12.3/12.3.3.js
index b5735c350..0ad6cb21b 100644
--- a/test/suite/intl402/ch12/12.3/12.3.3.js
+++ b/test/suite/intl402/ch12/12.3/12.3.3.js
@@ -1,13 +1,14 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that the object returned by Intl.DateTimeFormat.prototype.resolvedOptions
- *     has the right properties.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that the object returned by
+    Intl.DateTimeFormat.prototype.resolvedOptions  has the right
+    properties.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var actual = new Intl.DateTimeFormat().resolvedOptions();
 
@@ -49,4 +50,3 @@ mustNotHaveProperty(actual, "minute");
 mustNotHaveProperty(actual, "second");
 mustNotHaveProperty(actual, "timeZoneName");
 mustNotHaveProperty(actual, "hour12");
-
diff --git a/test/suite/intl402/ch12/12.3/12.3.3_L15.js b/test/suite/intl402/ch12/12.3/12.3.3_L15.js
index 1b4079ebe..3c5d380fd 100644
--- a/test/suite/intl402/ch12/12.3/12.3.3_L15.js
+++ b/test/suite/intl402/ch12/12.3/12.3.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype.resolvedOptions
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype.resolvedOptions  meets
+    the requirements for built-in objects defined by the introduction
+    of  chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.DateTimeFormat.prototype.resolvedOptions, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch12/12.3/12.3_L15.js b/test/suite/intl402/ch12/12.3/12.3_L15.js
index 55f1c16ca..ddefa389a 100644
--- a/test/suite/intl402/ch12/12.3/12.3_L15.js
+++ b/test/suite/intl402/ch12/12.3/12.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype  meets the requirements
+    for built-in objects defined by the introduction of  chapter 15 of
+    the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Intl.DateTimeFormat.prototype, false, false, ["constructor", "format", "resolvedOptions"]);
-
diff --git a/test/suite/intl402/ch12/12.3/12.3_a.js b/test/suite/intl402/ch12/12.3/12.3_a.js
index e1d795b91..398e5a94d 100644
--- a/test/suite/intl402/ch12/12.3/12.3_a.js
+++ b/test/suite/intl402/ch12/12.3/12.3_a.js
@@ -1,11 +1,12 @@
 // Copyright 2012 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype is an object that
- * has been initialized as an Intl.DateTimeFormat.
- * @author: Roozbeh Pournader
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype is an object that  has
+    been initialized as an Intl.DateTimeFormat.
+author:: Roozbeh Pournader
+---*/
 
 // test by calling a function that would fail if "this" were not an object
 // initialized as an Intl.DateTimeFormat
@@ -13,4 +14,3 @@ if (typeof Intl.DateTimeFormat.prototype.format(0) !== "string") {
     $ERROR("Intl.DateTimeFormat's prototype is not an object that has been " +
         "initialized as an Intl.DateTimeFormat");
 }
-
diff --git a/test/suite/intl402/ch12/12.3/12.3_b.js b/test/suite/intl402/ch12/12.3/12.3_b.js
index d905bf571..85cbf4787 100644
--- a/test/suite/intl402/ch12/12.3/12.3_b.js
+++ b/test/suite/intl402/ch12/12.3/12.3_b.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat.prototype functions throw a
- *     TypeError if called on a non-object value or an object that hasn't been
- *     initialized as a DateTimeFormat.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat.prototype functions throw a
+    TypeError if called on a non-object value or an object that hasn't
+    been  initialized as a DateTimeFormat.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     "format getter": Object.getOwnPropertyDescriptor(Intl.DateTimeFormat.prototype, "format").get,
@@ -30,4 +31,3 @@ Object.getOwnPropertyNames(functions).forEach(function (functionName) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch12/12.4/12.4_a.js b/test/suite/intl402/ch12/12.4/12.4_a.js
index 8e8d5954c..71dfb1ff5 100644
--- a/test/suite/intl402/ch12/12.4/12.4_a.js
+++ b/test/suite/intl402/ch12/12.4/12.4_a.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Intl.DateTimeFormat instances have the specified properties.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Intl.DateTimeFormat instances have the specified
+    properties.
+author: Norbert Lindenberg
+---*/
 
 var obj = new Intl.DateTimeFormat();
 
@@ -12,4 +14,3 @@ var toStringValue = Object.prototype.toString.call(obj);
 if (toStringValue !== "[object Object]") {
     $ERROR("Intl.DateTimeFormat instance produces wrong [[Class]] - toString returns " + toStringValue + ".");
 }
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_1.js b/test/suite/intl402/ch13/13.1/13.1.1_1.js
index 37be9711b..b8763c1fb 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_1.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that localeCompare rejects values that can't be coerced to an object.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that localeCompare rejects values that can't be coerced to
+    an object.
+author: Norbert Lindenberg
+---*/
 
 var invalidValues = [undefined, null];
  
@@ -21,4 +23,3 @@ invalidValues.forEach(function (value) {
         $ERROR("String.prototype.localeCompare rejected this = " + value + " with wrong error " + error.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_2.js b/test/suite/intl402/ch13/13.1/13.1.1_2.js
index bad7c0fdd..3485a7ab1 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_2.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_2.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that localeCompare coerces this to a string.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that localeCompare coerces this to a string.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = [true, 5, "hello", {toString: function () { return "good bye"; }}];
 var thatValues = ["true", "5", "hello", "good bye"];
@@ -23,4 +23,3 @@ for (i = 0; i < thisValues.length; i++) {
         }
     }
 }
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_3_1.js b/test/suite/intl402/ch13/13.1/13.1.1_3_1.js
index 113a2d9aa..33a341bfe 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_3_1.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_3_1.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that localeCompare coerces that to a string.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that localeCompare coerces that to a string.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = ["true", "5", "hello", "good bye"];
 var thatValues = [true, 5, "hello", {toString: function () { return "good bye"; }}];
@@ -23,4 +23,3 @@ for (i = 0; i < thisValues.length; i++) {
         }
     }
 }
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_3_2.js b/test/suite/intl402/ch13/13.1/13.1.1_3_2.js
index 441166c9f..d11266a83 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_3_2.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_3_2.js
@@ -1,11 +1,12 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare treats a missing
- *     "that" argument, undefined, and "undefined" as equivalent.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that String.prototype.localeCompare treats a missing  "that"
+    argument, undefined, and "undefined" as equivalent.
+author: Norbert Lindenberg
+---*/
 
 var thisValues = ["a", "t", "u", "undefined", "UNDEFINED", "nicht definiert", "xyz", "未定义"];
 
@@ -19,4 +20,3 @@ for (i = 0; i < thisValues.length; i++) {
         $ERROR("String.prototype.localeCompare does not treat undefined 'that' argument as \"undefined\".");
     }
 }
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_6_1.js b/test/suite/intl402/ch13/13.1/13.1.1_6_1.js
index 30607d317..46bcaf8f9 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_6_1.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_6_1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare throws the same exceptions as Intl.Collator.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that String.prototype.localeCompare throws the same
+    exceptions as Intl.Collator.
+author: Norbert Lindenberg
+---*/
 
 var locales = [null, [NaN], ["i"], ["de_DE"]];
 var options = [
@@ -62,4 +64,3 @@ options.forEach(function (options) {
             " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_6_2.js b/test/suite/intl402/ch13/13.1/13.1.1_6_2.js
index 481a7803b..3d48267c3 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_6_2.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_6_2.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare uses the standard
- *     built-in Intl.Collator constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that String.prototype.localeCompare uses the standard
+    built-in Intl.Collator constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Intl, "Collator");
 "a".localeCompare("b");
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_7.js b/test/suite/intl402/ch13/13.1/13.1.1_7.js
index f0c588f64..429aed591 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_7.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_7.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that localeCompare produces the same results as Intl.Collator.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that localeCompare produces the same results as
+    Intl.Collator.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var strings = ["d", "O", "od", "oe", "of", "ö", "o\u0308", "X", "y", "Z", "Z.", "𠮷野家", "吉野家", "!A", "A", "b", "C"];
 var locales = [undefined, ["de"], ["de-u-co-phonebk"], ["en"], ["ja"], ["sv"]];
@@ -30,4 +31,3 @@ locales.forEach(function (locales) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.1/13.1.1_L15.js b/test/suite/intl402/ch13/13.1/13.1.1_L15.js
index d921de000..bd1e39611 100644
--- a/test/suite/intl402/ch13/13.1/13.1.1_L15.js
+++ b/test/suite/intl402/ch13/13.1/13.1.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that String.prototype.localeCompare
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that String.prototype.localeCompare  meets the requirements
+    for built-in objects defined by the introduction of  chapter 15 of
+    the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(String.prototype.localeCompare, true, false, [], 1);
-
diff --git a/test/suite/intl402/ch13/13.2/13.2.1_1.js b/test/suite/intl402/ch13/13.2/13.2.1_1.js
index da1ee8fe5..8ffe0adae 100644
--- a/test/suite/intl402/ch13/13.2/13.2.1_1.js
+++ b/test/suite/intl402/ch13/13.2/13.2.1_1.js
@@ -1,10 +1,10 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that toLocaleString handles "this Number value" correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: Tests that toLocaleString handles "this Number value" correctly.
+author: Norbert Lindenberg
+---*/
 
 var invalidValues = [undefined, null, "5", false, {valueOf: function () { return 5; }}];
 var validValues = [5, NaN, -1234567.89, -Infinity];
@@ -34,4 +34,3 @@ validValues.forEach(function (value) {
             value + " and corresponding Number object: " + valueResult + " vs. " + objectResult + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch13/13.2/13.2.1_4_1.js b/test/suite/intl402/ch13/13.2/13.2.1_4_1.js
index e6e0b1163..414548da7 100644
--- a/test/suite/intl402/ch13/13.2/13.2.1_4_1.js
+++ b/test/suite/intl402/ch13/13.2/13.2.1_4_1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Number.prototype.toLocaleString throws the same exceptions as Intl.NumberFormat.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Number.prototype.toLocaleString throws the same
+    exceptions as Intl.NumberFormat.
+author: Norbert Lindenberg
+---*/
 
 var locales = [null, [NaN], ["i"], ["de_DE"]];
 var options = [
@@ -64,4 +66,3 @@ options.forEach(function (options) {
             " for options " + JSON.stringify(options) + "; expected " + referenceError.name + ".");
     }
 });
-
diff --git a/test/suite/intl402/ch13/13.2/13.2.1_4_2.js b/test/suite/intl402/ch13/13.2/13.2.1_4_2.js
index a79cfffde..3df98305e 100644
--- a/test/suite/intl402/ch13/13.2/13.2.1_4_2.js
+++ b/test/suite/intl402/ch13/13.2/13.2.1_4_2.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Number.prototype.toLocaleString uses the standard
- *     built-in Intl.NumberFormat constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Number.prototype.toLocaleString uses the standard
+    built-in Intl.NumberFormat constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Intl, "NumberFormat");
 (0.0).toLocaleString();
diff --git a/test/suite/intl402/ch13/13.2/13.2.1_5.js b/test/suite/intl402/ch13/13.2/13.2.1_5.js
index eb953b64d..76e23b8e2 100644
--- a/test/suite/intl402/ch13/13.2/13.2.1_5.js
+++ b/test/suite/intl402/ch13/13.2/13.2.1_5.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Number.prototype.toLocaleString produces the same results as Intl.NumberFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Number.prototype.toLocaleString produces the same
+    results as Intl.NumberFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var numbers = [0, -0, 1, -1, 5.5, 123, -123, -123.45, 123.44501, 0.001234,
     -0.00000000123, 0.00000000000000000000000000000123, 1.2, 0.0000000012344501,
@@ -38,4 +39,3 @@ locales.forEach(function (locales) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.2/13.2.1_L15.js b/test/suite/intl402/ch13/13.2/13.2.1_L15.js
index 8b53f7496..436c1922f 100644
--- a/test/suite/intl402/ch13/13.2/13.2.1_L15.js
+++ b/test/suite/intl402/ch13/13.2/13.2.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Number.prototype.toLocaleString
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Number.prototype.toLocaleString  meets the requirements
+    for built-in objects defined by the introduction of  chapter 15 of
+    the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Number.prototype.toLocaleString, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_1.js b/test/suite/intl402/ch13/13.3/13.3.0_1.js
index 0f2902162..5896d610a 100644
--- a/test/suite/intl402/ch13/13.3/13.3.0_1.js
+++ b/test/suite/intl402/ch13/13.3/13.3.0_1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString & Co. handle "this time value" correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString & Co. handle "this time
+    value" correctly.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     toLocaleString: Date.prototype.toLocaleString,
@@ -29,4 +31,3 @@ Object.getOwnPropertyNames(functions).forEach(function (p) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_2.js b/test/suite/intl402/ch13/13.3/13.3.0_2.js
index 7d5f32fa6..034d17cb3 100644
--- a/test/suite/intl402/ch13/13.3/13.3.0_2.js
+++ b/test/suite/intl402/ch13/13.3/13.3.0_2.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString & Co. handle non-finite values correctly.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString & Co. handle non-finite
+    values correctly.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     toLocaleString: Date.prototype.toLocaleString,
@@ -23,4 +25,3 @@ Object.getOwnPropertyNames(functions).forEach(function (p) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_6_1.js b/test/suite/intl402/ch13/13.3/13.3.0_6_1.js
index c97b240b4..a3f241581 100644
--- a/test/suite/intl402/ch13/13.3/13.3.0_6_1.js
+++ b/test/suite/intl402/ch13/13.3/13.3.0_6_1.js
@@ -1,10 +1,12 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString & Co. throws the same exceptions as Intl.DateTimeFormat.
- * @author Norbert Lindenberg
- */
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString & Co. throws the same
+    exceptions as Intl.DateTimeFormat.
+author: Norbert Lindenberg
+---*/
 
 var functions = {
     toLocaleString: Date.prototype.toLocaleString,
@@ -71,4 +73,3 @@ Object.getOwnPropertyNames(functions).forEach(function (p) {
         }
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_6_2.js b/test/suite/intl402/ch13/13.3/13.3.0_6_2.js
index dcce05906..3dc637881 100644
--- a/test/suite/intl402/ch13/13.3/13.3.0_6_2.js
+++ b/test/suite/intl402/ch13/13.3/13.3.0_6_2.js
@@ -1,13 +1,13 @@
 // Copyright 2013 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString & Co. use the standard
- *     built-in Intl.DateTimeFormat constructor.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString & Co. use the standard
+    built-in Intl.DateTimeFormat constructor.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 taintDataProperty(Intl, "DateTimeFormat");
 new Date().toLocaleString();
diff --git a/test/suite/intl402/ch13/13.3/13.3.0_7.js b/test/suite/intl402/ch13/13.3/13.3.0_7.js
index fe7c9271d..3a9691dbf 100644
--- a/test/suite/intl402/ch13/13.3/13.3.0_7.js
+++ b/test/suite/intl402/ch13/13.3/13.3.0_7.js
@@ -1,12 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString & Co. produces the same results as Intl.DateTimeFormat.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testIntl.js");
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString & Co. produces the same
+    results as Intl.DateTimeFormat.
+author: Norbert Lindenberg
+includes: [testIntl.js]
+---*/
 
 var functions = {
     toLocaleString: [Date.prototype.toLocaleString,
@@ -55,4 +56,3 @@ Object.getOwnPropertyNames(functions).forEach(function (p) {
         });
     });
 });
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.1_L15.js b/test/suite/intl402/ch13/13.3/13.3.1_L15.js
index a8c697c07..6f57f2691 100644
--- a/test/suite/intl402/ch13/13.3/13.3.1_L15.js
+++ b/test/suite/intl402/ch13/13.3/13.3.1_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleString
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Date.prototype.toLocaleString  meets the requirements
+    for built-in objects defined by the introduction of  chapter 15 of
+    the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Date.prototype.toLocaleString, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.2_L15.js b/test/suite/intl402/ch13/13.3/13.3.2_L15.js
index 5eeed944e..bfae24b82 100644
--- a/test/suite/intl402/ch13/13.3/13.3.2_L15.js
+++ b/test/suite/intl402/ch13/13.3/13.3.2_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleDateString
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Date.prototype.toLocaleDateString  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Date.prototype.toLocaleDateString, true, false, [], 0);
-
diff --git a/test/suite/intl402/ch13/13.3/13.3.3_L15.js b/test/suite/intl402/ch13/13.3/13.3.3_L15.js
index dac7c3513..b252d4cc7 100644
--- a/test/suite/intl402/ch13/13.3/13.3.3_L15.js
+++ b/test/suite/intl402/ch13/13.3/13.3.3_L15.js
@@ -1,14 +1,13 @@
 // Copyright 2012 Mozilla Corporation. All rights reserved.
 // This code is governed by the license found in the LICENSE file.
 
-/**
- * @description Tests that Date.prototype.toLocaleTimeString
- *     meets the requirements for built-in objects defined by the introduction of
- *     chapter 15 of the ECMAScript Language Specification.
- * @author Norbert Lindenberg
- */
-
-$INCLUDE("testBuiltInObject.js");
+/*---
+description: >
+    Tests that Date.prototype.toLocaleTimeString  meets the
+    requirements for built-in objects defined by the introduction of
+    chapter 15 of the ECMAScript Language Specification.
+author: Norbert Lindenberg
+includes: [testBuiltInObject.js]
+---*/
 
 testBuiltInObject(Date.prototype.toLocaleTimeString, true, false, [], 0);
-